[seam-commits] Seam SVN: r13147 - in branches/community/Seam_2_2: examples/spring/resources/META-INF and 1 other directories.

[seam-commits at lists.jboss.org]

Author: kpiwko at redhat.com
Date: 2010-06-15 06:53:44 -0400 (Tue, 15 Jun 2010)
New Revision: 13147

Modified:
   branches/community/Seam_2_2/build/root.pom.xml
   branches/community/Seam_2_2/examples/spring/resources/META-INF/persistence-spring.xml
   branches/community/Seam_2_2/examples/spring/resources/WEB-INF/applicationContext.xml
Log:
JBSEAM-3035, upgraded Spring and Spring example to 2.5.6.SEC01 version

Modified: branches/community/Seam_2_2/build/root.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/root.pom.xml	2010-06-15 07:57:30 UTC (rev 13146)
+++ branches/community/Seam_2_2/build/root.pom.xml	2010-06-15 10:53:44 UTC (rev 13147)
@@ -43,6 +43,7 @@
     <version.drools>5.0.1</version.drools>
     <version.testng>5.10</version.testng>
     <version.resteasy>2.0-beta-2</version.resteasy>
+    <version.spring>2.5.6.SEC01</version.spring>
   </properties>
 
   <dependencyManagement>
@@ -881,7 +882,7 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring</artifactId>
-        <version>2.5.5</version>
+        <version>${version.spring}</version>
         <exclusions>
           <!-- Prevent the insanity which is commons-logging pom introducing dependencies on weird stuff -->
           <exclusion>

Modified: branches/community/Seam_2_2/examples/spring/resources/META-INF/persistence-spring.xml
===================================================================
--- branches/community/Seam_2_2/examples/spring/resources/META-INF/persistence-spring.xml	2010-06-15 07:57:30 UTC (rev 13146)
+++ branches/community/Seam_2_2/examples/spring/resources/META-INF/persistence-spring.xml	2010-06-15 10:53:44 UTC (rev 13147)
@@ -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/community/Seam_2_2/examples/spring/resources/WEB-INF/applicationContext.xml
===================================================================
--- branches/community/Seam_2_2/examples/spring/resources/WEB-INF/applicationContext.xml	2010-06-15 07:57:30 UTC (rev 13146)
+++ branches/community/Seam_2_2/examples/spring/resources/WEB-INF/applicationContext.xml	2010-06-15 10:53:44 UTC (rev 13147)
@@ -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 -->