------------------------------------------------------------ revno: 1864 committer: Lars <larsh...@larshelg-laptop> branch nick: trunk timestamp: Mon 2010-05-17 20:10:42 +0200 message: Enabled Spring auto-wiring. Upgraded to quick 1.1.7 and removed Spring exclusions. modified: dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml dhis-2/pom.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-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 16:30:35 +0000 +++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 18:10:42 +0000 @@ -1,13 +1,18 @@ <?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:context="http://www.springframework.org/schema/context"; 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/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-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/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"; + default-autowire="byName"> + <context:component-scan base-package="no.tfs.nf"/> + <!-- Transactions --> <tx:annotation-driven transaction-manager="transactionManager"/> === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2010-05-11 14:20:51 +0000 +++ dhis-2/pom.xml 2010-05-17 18:10:42 +0000 @@ -41,13 +41,11 @@ </distributionManagement> <repositories> - <!-- <repository> <id>amplecode_maven2_repo</id> <name>AmpleCode Maven 2 repository</name> <url>http://www.amplecode.org/maven2</url> </repository> - --> <repository> <id>dhis.uio.no</id> <name>Dhis2 External Dependencies Repository</name> @@ -261,17 +259,10 @@ <artifactId>velocity-tools</artifactId> <version>1.2</version> </dependency> -<!-- TODO: NEED TO DECIDE ON QUICK --> <dependency> <groupId>org.amplecode</groupId> <artifactId>quick</artifactId> - <version>1.1.6</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - </exclusion> - </exclusions> + <version>1.1.7</version> </dependency> <dependency> <groupId>com.lowagie</groupId>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
