dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19750
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2015-08-08 12:52:55 +0700
message:
  minor fixes to MetadataFilter bean paths
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-importexport/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-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-07-22 05:41:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-08-08 05:52:55 +0000
@@ -822,7 +822,7 @@
     <property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
   </bean>
 
-  <bean id="org.hisp.dhis.commons.filter.MetaDataFilterService" class="org.hisp.dhis.commons.filter.DefaultMetaDataFilterService">
+  <bean id="org.hisp.dhis.common.filter.MetaDataFilterService" class="org.hisp.dhis.commons.filter.DefaultMetaDataFilterService">
     <property name="metaDataFilterStore" ref="org.hisp.dhis.filter.MetaDataFilterStore" />
     <property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
   </bean>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml	2015-01-04 14:43:37 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml	2015-08-08 05:52:55 +0000
@@ -214,17 +214,17 @@
 
   <bean id="org.hisp.dhis.importexport.action.dxf2.FilterListAction"
     class="org.hisp.dhis.importexport.action.dxf2.FilterListAction" scope="prototype">
-    <property name="metaDataFilterService" ref="org.hisp.dhis.filter.MetaDataFilterService" />
+    <property name="metaDataFilterService" ref="org.hisp.dhis.common.filter.MetaDataFilterService" />
   </bean>
 
   <bean id="org.hisp.dhis.importexport.action.dxf2.GetFilterListSortOrderAction"
     class="org.hisp.dhis.importexport.action.dxf2.GetFilterListSortOrderAction" scope="prototype">
-    <property name="metaDataFilterService" ref="org.hisp.dhis.filter.MetaDataFilterService" />
+    <property name="metaDataFilterService" ref="org.hisp.dhis.common.filter.MetaDataFilterService" />
   </bean>
 
   <bean id="org.hisp.dhis.importexport.action.dxf2.SaveFilterListSortOrderAction"
     class="org.hisp.dhis.importexport.action.dxf2.SaveFilterListSortOrderAction" scope="prototype">
-    <property name="metaDataFilterService" ref="org.hisp.dhis.filter.MetaDataFilterService" />
+    <property name="metaDataFilterService" ref="org.hisp.dhis.common.filter.MetaDataFilterService" />
   </bean>
 
   <bean id="org.hisp.dhis.importexport.action.dxf2.FilterExportFormAction"
@@ -233,7 +233,7 @@
   
   <bean id="org.hisp.dhis.importexport.action.dxf2.ShowUpdateFilterExportFormAction"
     class="org.hisp.dhis.importexport.action.dxf2.ShowUpdateFilterExportFormAction" scope="prototype">
-    <property name="metaDataFilterService" ref="org.hisp.dhis.filter.MetaDataFilterService" />
+    <property name="metaDataFilterService" ref="org.hisp.dhis.common.filter.MetaDataFilterService" />
   </bean>
   
 </beans>