[jboss-cvs] JBossAS SVN: r94883 - in branches/Branch_5_x: component-matrix and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2009-10-14 13:30:43 -0400 (Wed, 14 Oct 2009)
New Revision: 94883

Modified:
   branches/Branch_5_x/build/build-distr.xml
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
JBAS-7241: integrated new jboss-jpa components


Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml	2009-10-14 17:25:31 UTC (rev 94882)
+++ branches/Branch_5_x/build/build-distr.xml	2009-10-14 17:30:43 UTC (rev 94883)
@@ -174,6 +174,10 @@
                 excludes="*-sources.jar, *-javadoc.jar"/> 
       <fileset dir="${jboss.jboss.jpa.deployers.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar"/>
+      <fileset dir="${jboss.jboss.jpa.impl.lib}" includes="*.jar"
+               excludes="*-sources.jar, *-javadoc.jar"/>
+      <fileset dir="${jboss.jboss.jpa.spi.lib}" includes="*.jar"
+               excludes="*-sources.jar, *-javadoc.jar"/>
       <fileset dir="${jboss.jboss.ejb3.endpoint.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar"/>
 

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-10-14 17:25:31 UTC (rev 94882)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-10-14 17:30:43 UTC (rev 94883)
@@ -87,7 +87,9 @@
     <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
     <version.org.jboss.jopr>1.3.2-SNAPSHOT</version.org.jboss.jopr>    
-    <version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>
+    <version.org.jboss.jpa.deployers>1.0.1-20091014.133942-1</version.org.jboss.jpa.deployers>
+    <version.org.jboss.jpa.impl>1.0.0-20091014.155826-1</version.org.jboss.jpa.impl>
+    <version.org.jboss.jpa.spi>1.0.0-20091014.133355-1</version.org.jboss.jpa.spi>
     <version.org.jboss.logbridge>1.0.0.GA</version.org.jboss.logbridge>
     <version.org.jboss.logmanager>1.1.0.GA</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
@@ -1844,14 +1846,25 @@
         <version>${version.weld.api}</version>
       </dependency>
 
-      <!-- Normally comes in via EJB3, but we may need a patched one -->
       <dependency>
         <groupId>org.jboss.jpa</groupId>
         <artifactId>jboss-jpa-deployers</artifactId>
-        <version>${version.org.jboss.jpa}</version>
+        <version>${version.org.jboss.jpa.deployers}</version>
       </dependency>
 
       <dependency>
+        <groupId>org.jboss.jpa</groupId>
+        <artifactId>jboss-jpa-impl</artifactId>
+        <version>${version.org.jboss.jpa.impl}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.jpa</groupId>
+        <artifactId>jboss-jpa-spi</artifactId>
+        <version>${version.org.jboss.jpa.spi}</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.jboss.man</groupId>
         <artifactId>jboss-managed</artifactId>
         <version>${version.org.jboss.man}</version>

Modified: branches/Branch_5_x/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml	2009-10-14 17:25:31 UTC (rev 94882)
+++ branches/Branch_5_x/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml	2009-10-14 17:30:43 UTC (rev 94883)
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  vi:ts=3:sw=3:expandtab
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+   <!-- Install the default CEMFBuilder, this will build a JPA 1 compliant
+        container entity manager factory. -->
+   <bean name="CEMFBuilder" class="org.jboss.jpa.builder.DefaultCEMFBuilder"/>
 
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
    <bean name="DataSourceDependencyResolver" class="org.jboss.as.jpa.resolvers.JBossASDataSourceDependencyResolver"/>
    
    <bean name="JavaEEModuleInformer" class="org.jboss.as.javaee.SimpleJavaEEModuleInformer"/>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-10-14 17:25:31 UTC (rev 94882)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-10-14 17:30:43 UTC (rev 94883)
@@ -1,3 +1,6 @@
+<!--
+  vi:ts=2:sw=2:expandtab
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
@@ -695,7 +698,6 @@
               </mapping>
             </dependency>
 
-
             <dependency>
               <groupId>org.jboss.jpa</groupId>
               <artifactId>jboss-jpa-deployers</artifactId>
@@ -704,6 +706,21 @@
               </mapping>
             </dependency>
             <dependency>
+              <groupId>org.jboss.jpa</groupId>
+              <artifactId>jboss-jpa-impl</artifactId>
+              <mapping>
+                <componentId>jboss.jboss-jpa-impl</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>org.jboss.jpa</groupId>
+              <artifactId>jboss-jpa-spi</artifactId>
+              <mapping>
+                <componentId>jboss.jboss-jpa-spi</componentId>
+              </mapping>
+            </dependency>
+
+            <dependency>
               <groupId>org.jboss.security</groupId>
               <artifactId>jboss-security-spi</artifactId>
               <mapping>