Author: kpiwko(a)redhat.com Date: 2010-06-16 07:18:36 -0400 (Wed, 16 Jun 2010) New Revision: 13180 Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml branches/enterprise/JBPAPP_5_0/examples/spring/resources/META-INF/persistence-spring.xml branches/enterprise/JBPAPP_5_0/examples/spring/resources/WEB-INF/applicationContext.xml Log: JBPAPP-4486, upgraded Spring to 2.5.6.SEC01 Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2010-06-16 05:35:05 UTC (rev 13179) +++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2010-06-16 11:18:36 UTC (rev 13180) @@ -51,6 +51,7 @@ <version.drools>5.0.1</version.drools> <version.testng>5.9</version.testng> <version.resteasy>1.2.1.GA_CP02</version.resteasy> + <version.spring>2.5.6.SEC01</version.spring> </properties> <dependencyManagement> @@ -868,7 +869,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring</artifactId> - <version>2.0.6</version> + <version>${version.spring}</version> <exclusions> <!-- Prevent the insanity which is commons-logging pom introducing dependencies on weird stuff --> Modified: branches/enterprise/JBPAPP_5_0/examples/spring/resources/META-INF/persistence-spring.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/spring/resources/META-INF/persistence-spring.xml 2010-06-16 05:35:05 UTC (rev 13179) +++ branches/enterprise/JBPAPP_5_0/examples/spring/resources/META-INF/persistence-spring.xml 2010-06-16 11:18:36 UTC (rev 13180) @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" - http://java.sun.com/xml/ns/persistence - http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0"> <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL"> <provider>org.hibernate.ejb.HibernatePersistence</provider> + <!-- classes must be enumerated due to a known bug in Seam 2.5.6, SPR-5787 --> + <class>org.jboss.seam.example.spring.Booking</class> + <class>org.jboss.seam.example.spring.Hotel</class> + <class>org.jboss.seam.example.spring.User</class> <properties> <property name="hibernate.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.show_sql" value="true"/> Modified: branches/enterprise/JBPAPP_5_0/examples/spring/resources/WEB-INF/applicationContext.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/spring/resources/WEB-INF/applicationContext.xml 2010-06-16 05:35:05 UTC (rev 13179) +++ branches/enterprise/JBPAPP_5_0/examples/spring/resources/WEB-INF/applicationContext.xml 2010-06-16 11:18:36 UTC (rev 13180) @@ -26,7 +26,7 @@ <property name="dataSource" ref="dataSource"/> <property name="persistenceUnitName" value="bookingDatabase"/> <!-- Use alternate location to prevent JBoss AS from automatically loading persistence units (in-container) --> - <property name="persistenceXmlLocation" value="classpath:META-INF/persistence-spring.xml"/> + <property name="persistenceXmlLocation" value="classpath*:/META-INF/persistence-spring.xml"/> </bean> <!-- This example uses resource local JpaTransactionManager. You could just as easily use a JtaTransactionManager -->