dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2084
committer: Jo Størset <storset@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2010-11-17 00:33:53 +0530
message:
  Removed @Autowired annotation
modified:
  local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/TakeMySqlBackupAction.java
  local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/TakeMySqlBackupAction.java'
--- local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/TakeMySqlBackupAction.java	2010-08-30 12:04:09 +0000
+++ local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/TakeMySqlBackupAction.java	2010-11-16 19:03:53 +0000
@@ -9,6 +9,7 @@
 import org.hisp.dhis.config.Configuration_IN;
 import org.hisp.dhis.system.database.DatabaseInfoProvider;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
 
 import com.opensymphony.xwork2.Action;
 
@@ -21,18 +22,25 @@
 
     private ConfigurationService configurationService;
 
+    private DatabaseInfoProvider provider;
+ 
+    @Required
     public void setConfigurationService( ConfigurationService configurationService )
     {
         this.configurationService = configurationService;
     }
 
-    @Autowired
-    private DatabaseInfoProvider provider;
-        
+    @Required
+    public void setProvider( DatabaseInfoProvider provider )
+    {
+        this.provider = provider;
+    }
+    
     // -------------------------------------------------------------------------
     // Input and Output Parameters
     // -------------------------------------------------------------------------
 
+
     private String statusMessage;
     
     public String getStatusMessage()

=== modified file 'local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml	2010-10-28 09:17:13 +0000
+++ local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml	2010-11-16 19:03:53 +0000
@@ -1,53 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="
+<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
 
 
-  <bean id="org.hisp.dhis.config.action.NoAction"
-    class="org.hisp.dhis.config.action.NoAction"
-    scope="prototype">
-  </bean>
-
-<!-- Configuration -->	
-  <bean id="org.hisp.dhis.config.action.ConfigurationFormAction"
-	  class="org.hisp.dhis.config.action.ConfigurationFormAction"
-	  scope="prototype">
-	  <property name="configurationService">
-		<ref bean="org.hisp.dhis.config.ConfigurationService"/>
-	  </property>
-  </bean>
-
-  <bean id="org.hisp.dhis.config.action.ConfigurationResultAction"
-      class="org.hisp.dhis.config.action.ConfigurationResultAction"
-      scope="prototype">
-      <property name="configurationService">
-        <ref bean="org.hisp.dhis.config.ConfigurationService"/>
-      </property>
-  </bean>
-
-  <bean id="org.hisp.dhis.config.action.TakeMySqlBackupAction"
-      class="org.hisp.dhis.config.action.TakeMySqlBackupAction"
-      scope="prototype">
-      <property name="configurationService">
-        <ref bean="org.hisp.dhis.config.ConfigurationService"/>
-      </property>
-  </bean>
-
-  <bean id="org.hisp.dhis.config.action.StreamMySqlBackupAction"
-      class="org.hisp.dhis.config.action.StreamMySqlBackupAction"
-      scope="prototype">
-  </bean>
-  
-<!-- Maintenance -->
-  <bean id="org.hisp.dhis.config.action.ClearFolderAction"
-      class="org.hisp.dhis.config.action.ClearFolderAction"
-      scope="prototype">
-      <property name="configurationService">
-        <ref bean="org.hisp.dhis.config.ConfigurationService"/>
-      </property>
-  </bean>
-  
-					
+  <bean id="org.hisp.dhis.config.action.NoAction" class="org.hisp.dhis.config.action.NoAction"
+    scope="prototype">
+  </bean>
+
+  <!-- Configuration -->
+
+  <bean id="org.hisp.dhis.config.action.ConfigurationFormAction" class="org.hisp.dhis.config.action.ConfigurationFormAction"
+    scope="prototype">
+    <property name="configurationService" ref="org.hisp.dhis.config.ConfigurationService" />
+  </bean>
+
+  <bean id="org.hisp.dhis.config.action.ConfigurationResultAction" class="org.hisp.dhis.config.action.ConfigurationResultAction"
+    scope="prototype">
+    <property name="configurationService" ref="org.hisp.dhis.config.ConfigurationService" />
+  </bean>
+
+  <bean id="org.hisp.dhis.config.action.TakeMySqlBackupAction" class="org.hisp.dhis.config.action.TakeMySqlBackupAction"
+    scope="prototype">
+    <property name="configurationService" ref="org.hisp.dhis.config.ConfigurationService" />
+    <property name="provider" ref="databaseInfoProvider" />
+  </bean>
+
+  <bean id="org.hisp.dhis.config.action.StreamMySqlBackupAction" class="org.hisp.dhis.config.action.StreamMySqlBackupAction"
+    scope="prototype" />
+
+  <!-- Maintenance -->
+
+  <bean id="org.hisp.dhis.config.action.ClearFolderAction" class="org.hisp.dhis.config.action.ClearFolderAction"
+    scope="prototype">
+    <property name="configurationService">
+      <ref bean="org.hisp.dhis.config.ConfigurationService" />
+    </property>
+  </bean>
+
+
 </beans>