[jboss-cvs] JBossAS SVN: r95026 - in trunk: component-matrix and 2 other directories.

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

Author: wolfc
Date: 2009-10-16 07:03:01 -0400 (Fri, 16 Oct 2009)
New Revision: 95026

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
   trunk/server/pom.xml
Log:
JBAS-7241: integrated new jboss-jpa components (merged 94883)


Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-10-16 10:40:49 UTC (rev 95025)
+++ trunk/build/build.xml	2009-10-16 11:03:01 UTC (rev 95026)
@@ -2002,6 +2002,8 @@
       <fileset refid="org.hibernate:hibernate-annotations:jar"/>
       <fileset refid="org.hibernate:hibernate-validator:jar"/>
       <fileset refid="org.jboss.jpa:jboss-jpa-deployers:jar"/>
+      <fileset refid="org.jboss.jpa:jboss-jpa-impl:jar"/>
+      <fileset refid="org.jboss.jpa:jboss-jpa-spi:jar"/>
       <fileset refid="org.jboss.aspects:jboss-current-invocation-aspects:jar"/>
       <fileset refid="org.jboss.aspects:jboss-remoting-aspects:jar"/>
       <fileset refid="org.jboss.aspects:jboss-security-aspects:jar"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-10-16 10:40:49 UTC (rev 95025)
+++ trunk/component-matrix/pom.xml	2009-10-16 11:03:01 UTC (rev 95026)
@@ -83,7 +83,9 @@
     <version.org.jboss.ejb3>1.1.19</version.org.jboss.ejb3>
     <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.2.Beta1</version.org.jboss.jbossxb>
-    <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.logging>2.2.0.CR1</version.org.jboss.logging>
     <version.org.jboss.logmanager>1.1.0.CR6</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
@@ -1920,14 +1922,25 @@
         <version>1.0.1${version.suffix.org.jboss.javaee}</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: trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml	2009-10-16 10:40:49 UTC (rev 95025)
+++ trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml	2009-10-16 11:03:01 UTC (rev 95026)
@@ -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: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2009-10-16 10:40:49 UTC (rev 95025)
+++ trunk/server/pom.xml	2009-10-16 11:03:01 UTC (rev 95026)
@@ -252,6 +252,18 @@
     </dependency>
     
     <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-deployers</artifactId>
+      <version>1.0.0</version>
+      <exclusions>
+        <exclusion>
+	  <groupId>org.jboss.metadata</groupId>
+	  <artifactId>jboss-metadata</artifactId>
+	</exclusion>
+      </exclusions>
+    </dependency>
+    
+    <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-deployment</artifactId>
     </dependency>
@@ -269,6 +281,12 @@
     <dependency>
       <groupId>org.jboss.jpa</groupId>
       <artifactId>jboss-jpa-deployers</artifactId>
+      <exclusions>
+        <exclusion>
+	  <groupId>org.jboss.metadata</groupId>
+	  <artifactId>jboss-metadata</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     
     <dependency>