------------------------------------------------------------ revno: 1863 committer: Lars <larsh...@larshelg-laptop> branch nick: trunk timestamp: Mon 2010-05-17 18:30:35 +0200 message: Removed unnecessary Spring config removed: dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF/ dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF/dhis/ dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF/dhis/beans.xml modified: dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-commons/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-excel-reporting/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 14:19:14 +0000 +++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 16:30:35 +0000 @@ -3,6 +3,7 @@ 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";> + <!-- ReportExcel --> <bean id="org.hisp.dhis.reportexcel.ReportExcelStore" class="org.hisp.dhis.reportexcel.hibernate.HibernateReportExcelStore"> === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 14:19:14 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 16:30:35 +0000 @@ -2,8 +2,7 @@ <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:aop="http://www.springframework.org/schema/aop"; xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd -http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd";> +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";> <!-- Store definitions --> <bean id="org.hisp.dhis.caseaggregation.CaseAggregationMappingStore" === removed directory 'dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF' === removed directory 'dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF/dhis' === removed file 'dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 14:19:14 +0000 +++ dhis-2/dhis-services/dhis-service-xml/src/main/resources/META-INF/dhis/beans.xml 1970-01-01 00:00:00 +0000 @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:aop="http://www.springframework.org/schema/aop"; - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd -http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd";> - - -</beans> === modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 14:19:14 +0000 +++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 16:30:35 +0000 @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:aop="http://www.springframework.org/schema/aop"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:aop="http://www.springframework.org/schema/aop"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 14:19:14 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 16:30:35 +0000 @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:sec="http://www.springframework.org/schema/security"; - 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 - http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.0.xsd";> + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd";> <!-- Web Portal --> @@ -35,17 +34,12 @@ <property name="order"> <list> <value>dhis-web-portal</value> - <value>dhis-web-maintenance-settings - </value> + <value>dhis-web-maintenance-settings</value> <value>dhis-web-maintenance-user</value> - <value>dhis-web-maintenance-organisationunit - </value> - <value>dhis-web-maintenance-datadictionary - </value> - <value>dhis-web-maintenance-dataset - </value> - <value>dhis-web-maintenance-dataadmin - </value> + <value>dhis-web-maintenance-organisationunit</value> + <value>dhis-web-maintenance-datadictionary</value> + <value>dhis-web-maintenance-dataset</value> + <value>dhis-web-maintenance-dataadmin</value> <value>dhis-web-dataentry</value> </list> </property>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
