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

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

Author: ALRubinger
Date: 2010-08-03 14:01:07 -0400 (Tue, 03 Aug 2010)
New Revision: 107364

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/ejb3/pom.xml
   trunk/webservices/pom.xml
Log:
[JBAS-8307] Integrate EJB3 AS6 Depchain into AS build

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-08-03 17:04:23 UTC (rev 107363)
+++ trunk/build/build.xml	2010-08-03 18:01:07 UTC (rev 107364)
@@ -2137,7 +2137,6 @@
       <fileset refid="org.jboss.ejb3:jboss-ejb3-security:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-transactions:jar"/>
-      <fileset refid="org.jboss.ejb3:jboss-ejb3_1:jar"/>
       <fileset refid="org.jboss.ejb3.proxy:proxy-spi:jar"/>
       <fileset refid="org.jboss.ejb3.proxy:proxy-javassist:jar"/>
 	  <fileset refid="org.jboss.ejb3.proxy:proxy-reflect:jar"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-08-03 17:04:23 UTC (rev 107363)
+++ trunk/component-matrix/pom.xml	2010-08-03 18:01:07 UTC (rev 107364)
@@ -105,7 +105,7 @@
     <version.org.jboss.cluster.server.core>1.0.0.Alpha2</version.org.jboss.cluster.server.core>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.2.0.Alpha6</version.org.jboss.deployers>
-    <version.org.jboss.ejb3.bom>0.2.0-alpha-10</version.org.jboss.ejb3.bom>
+    <version.org.jboss.ejb3.depchain>1.0.0-alpha-1</version.org.jboss.ejb3.depchain>
     <!-- This to move into the EJB3 BOM -->
     <version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
     <version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -2864,9 +2864,9 @@
         </dependency>
         
       <dependency>
-        <groupId>org.jboss.ejb3.bom</groupId>
-        <artifactId>bom-as6</artifactId>
-        <version>${version.org.jboss.ejb3.bom}</version>
+        <groupId>org.jboss.ejb3.depchain</groupId>
+        <artifactId>jboss-ejb3-depchain-as6</artifactId>
+        <version>${version.org.jboss.ejb3.depchain}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -3995,10 +3995,10 @@
                         <exclude>sun-jaxws:streambuffer</exclude>
                         <exclude>sun-jaxws:jsr181-api</exclude>
                         <exclude>sun-jaxws:jaxws-api</exclude>
-			               <!-- JBAS-7531 org.jboss.ejb3:jboss-ejb3-as-int is retired.
-			                    Use org.jboss.ejb3:jboss-ejb3_1 instead
--->
+			                  <!-- JBAS-7531 org.jboss.ejb3:jboss-ejb3-as-int is retired. -->
 			                  <exclude>org.jboss.ejb3:jboss-ejb3-as-int</exclude>
+			                  <!-- JBAS-8307 Use org.jboss.ejb3.depchain:jboss-ejb3-depchain-as6 -->
+			                  <exclude>org.jboss.ejb3:jboss-ejb3_1</exclude>
 			                  <exclude>org.jboss.microcontainer:jboss-aop-mc-int</exclude>
 			                  <exclude>org.jboss.microcontainer:jboss-dependency</exclude>
 			                  <exclude>org.jboss.microcontainer:jboss-guice-int</exclude>

Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml	2010-08-03 17:04:23 UTC (rev 107363)
+++ trunk/ejb3/pom.xml	2010-08-03 18:01:07 UTC (rev 107364)
@@ -5,6 +5,7 @@
     <groupId>org.jboss.jbossas</groupId>
     <artifactId>jboss-as-parent</artifactId>
     <version>6.0.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
@@ -236,8 +237,9 @@
     </dependency>
     
     <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3_1</artifactId>
+      <groupId>org.jboss.ejb3.depchain</groupId>
+      <artifactId>jboss-ejb3-depchain-as6</artifactId>
+      <version>${version.org.jboss.ejb3.depchain}</version>
       <exclusions>
         <!-- JBAS-679, may be removed when as-int is >= 1.1.5 -->
         <exclusion>
@@ -245,6 +247,10 @@
           <artifactId>jboss-ejb3-proxy</artifactId>
         </exclusion>
         <exclusion>
+          <groupId> org.jboss.microcontainer</groupId>
+          <artifactId>jboss-aop-mc-int</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.jboss.cache</groupId>
           <artifactId>jbosscache-core</artifactId>
         </exclusion>
@@ -318,6 +324,7 @@
           <artifactId>jaxws-api</artifactId>
         </exclusion>
       </exclusions>
+      <type>pom</type>
     </dependency>
     
     <dependency>

Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml	2010-08-03 17:04:23 UTC (rev 107363)
+++ trunk/webservices/pom.xml	2010-08-03 18:01:07 UTC (rev 107364)
@@ -179,8 +179,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3_1</artifactId>
+      <groupId>org.jboss.ejb3.depchain</groupId>
+      <artifactId>jboss-ejb3-depchain-as6</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.jboss.ejb3</groupId>
@@ -259,7 +259,13 @@
           <groupId>sun-jaxws</groupId>
           <artifactId>jaxws-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId> org.jboss.microcontainer</groupId>
+          <artifactId>jboss-aop-mc-int</artifactId>
+        </exclusion>
       </exclusions>
+      <type>pom</type>
+      <version>${version.org.jboss.ejb3.depchain}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>