dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1868
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Mon 2010-05-17 23:11:03 +0200
message:
  Replaced LocationManagerResolver bean with annotations
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/importer/DefaultXMLImportService.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java
  dhis-2/dhis-support/dhis-support-external/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 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/importer/DefaultXMLImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/importer/DefaultXMLImportService.java	2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/importer/DefaultXMLImportService.java	2010-05-17 21:11:03 +0000
@@ -82,13 +82,9 @@
     @Autowired
     protected LocationManager locationManager;
     
+    @Autowired
     protected URIResolver dhisResolver;
 
-    public void setDhisResolver( URIResolver dhisResolver )
-    {
-        this.dhisResolver = dhisResolver;
-    }
-
     private DXFConverter converter;
 
     public void setConverter( DXFConverter converter )

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 21:11:03 +0000
@@ -269,8 +269,6 @@
           class="org.hisp.dhis.importexport.xml.importer.DefaultXMLImportService">
         <property name="converter"
                   ref="org.hisp.dhis.importexport.DXFConverter" />
-		<property name="dhisResolver"
-                  ref="org.hisp.dhis.external.location.LocationManagerResolver" />
     </bean>
 
     <bean id="org.hisp.dhis.importexport.invoker.ConverterInvoker"

=== modified file 'dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java'
--- dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java	2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java	2010-05-17 21:11:03 +0000
@@ -37,12 +37,14 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * 
  * @author bobj
  * @version created 12-Feb-2010
  */
+@Component("dhisResolver")
 public class DefaultLocationManagerResolver
     implements URIResolver
 {

=== modified file 'dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 21:11:03 +0000
@@ -13,16 +13,11 @@
 
   <context:component-scan base-package="org.hisp.dhis"/>
   
-  <!-- Change system environment variable with 'environmentVariable' property --> 
-  
   <bean id="locationManager"
     class="org.hisp.dhis.external.location.DefaultLocationManager"
     init-method="init">
-    <property name="environmentVariable" value="DHIS2_HOME"/>
+    <property name="environmentVariable" value="DHIS2_HOME"/> <!-- Change environment variable -->
     <property name="systemProperty" value="dhis2.home"/>
   </bean>
 
-  <bean id="org.hisp.dhis.external.location.LocationManagerResolver"
-    class="org.hisp.dhis.external.location.DefaultLocationManagerResolver"/>
-   
 </beans>