From: <fg...@us...> - 2009-05-24 12:04:17
|
Revision: 1219 http://openutils.svn.sourceforge.net/openutils/?rev=1219&view=rev Author: fgiust Date: 2009-05-24 12:04:12 +0000 (Sun, 24 May 2009) Log Message: ----------- disable broken modules Modified Paths: -------------- trunk/openutils-configuration-services/pom.xml trunk/openutils-configuration-services/src/test/resources/spring-database.xml trunk/openutils-hibernate-security/pom.xml trunk/openutils-spring-rmibernate/pom.xml trunk/openutils-usermanagement/pom.xml trunk/pom.xml Modified: trunk/openutils-configuration-services/pom.xml =================================================================== --- trunk/openutils-configuration-services/pom.xml 2009-05-24 10:38:26 UTC (rev 1218) +++ trunk/openutils-configuration-services/pom.xml 2009-05-24 12:04:12 UTC (rev 1219) @@ -65,6 +65,11 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.6</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <version>1.5.6</version> </dependency> @@ -129,6 +134,6 @@ </dependency> </dependencies> <properties> - <spring.version>2.5.1</spring.version> + <spring.version>2.5.6</spring.version> </properties> </project> \ No newline at end of file Modified: trunk/openutils-configuration-services/src/test/resources/spring-database.xml =================================================================== --- trunk/openutils-configuration-services/src/test/resources/spring-database.xml 2009-05-24 10:38:26 UTC (rev 1218) +++ trunk/openutils-configuration-services/src/test/resources/spring-database.xml 2009-05-24 12:04:12 UTC (rev 1219) @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> -<!-- - # ATTENZIONE: queste proprietà sono utilizzate solo per gli unit tests - # i file per la configurazione del db utilizzati dall'applicazione web sono in - # src/main/web-app/WEB-INF ---> + <!-- + # ATTENZIONE: queste proprietà sono utilizzate solo per gli unit tests # i file per la configurazione del db + utilizzati dall'applicazione web sono in # src/main/web-app/WEB-INF + --> <beans> <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> - <property name="location"> - <value>classpath:database.properties</value> - </property> + <property name="location" value="classpath:database.properties" /> </bean> <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> <property name="driverClassName"> @@ -25,4 +22,4 @@ <value>${hibernate.connection.password}</value> </property> </bean> -</beans> +</beans> \ No newline at end of file Modified: trunk/openutils-hibernate-security/pom.xml =================================================================== --- trunk/openutils-hibernate-security/pom.xml 2009-05-24 10:38:26 UTC (rev 1218) +++ trunk/openutils-hibernate-security/pom.xml 2009-05-24 12:04:12 UTC (rev 1219) @@ -131,6 +131,11 @@ <version>1.5.6</version> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.6</version> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>3.3.1.GA</version> @@ -150,6 +155,12 @@ </exclusions> </dependency> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> <version>3.4.0.GA</version> Modified: trunk/openutils-spring-rmibernate/pom.xml =================================================================== --- trunk/openutils-spring-rmibernate/pom.xml 2009-05-24 10:38:26 UTC (rev 1218) +++ trunk/openutils-spring-rmibernate/pom.xml 2009-05-24 12:04:12 UTC (rev 1219) @@ -65,6 +65,12 @@ </exclusions> </dependency> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <optional>true</optional> + </dependency> + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.7.0</version> @@ -86,11 +92,6 @@ <version>3.1</version> </dependency> <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>2.1_3</version> - </dependency> - <dependency> <groupId>asm</groupId> <artifactId>asm</artifactId> <version>2.2.3</version> Modified: trunk/openutils-usermanagement/pom.xml =================================================================== --- trunk/openutils-usermanagement/pom.xml 2009-05-24 10:38:26 UTC (rev 1218) +++ trunk/openutils-usermanagement/pom.xml 2009-05-24 12:04:12 UTC (rev 1219) @@ -77,18 +77,11 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> <version>3.4.0.GA</version> - <exclusions> - <exclusion> - <!-- not needed here, just load annotations --> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>2.1_3</version> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> </dependency> <dependency> <groupId>commons-dbcp</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-24 10:38:26 UTC (rev 1218) +++ trunk/pom.xml 2009-05-24 12:04:12 UTC (rev 1219) @@ -281,6 +281,11 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.6</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.5.6</version> <exclusions> @@ -328,9 +333,9 @@ <module>openutils-dbmigration</module> <module>openutils-backup</module> <module>openutils-configuration-dataobjects</module> - <module>openutils-configuration-services</module> + <!--<module>openutils-configuration-services</module>--> <module>openutils-hibernate-security</module> - <module>openutils-spring-rmibernate</module> + <!--<module>openutils-spring-rmibernate</module>--> <module>openutils-elfunctions</module> <module>openutils-mgnlspring</module> <module>openutils-mgnlstripes</module> @@ -344,6 +349,6 @@ <module>openutils-mgnlstruts11</module> <module>openutils-mgnlmedia</module> <module>openutils-mgnlcriteria</module> - <module>openutils-spring-remote-callback</module> + <!--<module>openutils-spring-remote-callback</module>--> </modules> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |