[jboss-cvs] JBossAS SVN: r97675 - in trunk: build and 3 other directories.

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

Author: jaikiran
Date: 2009-12-10 01:38:45 -0500 (Thu, 10 Dec 2009)
New Revision: 97675

Modified:
   trunk/aspects/pom.xml
   trunk/build/pom.xml
   trunk/component-matrix/pom.xml
   trunk/ejb3/pom.xml
   trunk/webservices/pom.xml
Log:
JBAS-7531 EJB3 will no longer be integrated through org.jboss.ejb3:jboss-ejb3-as-int. Instead it's now through org.jboss.ejb3:jboss-ejb3_1

Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml	2009-12-10 06:36:06 UTC (rev 97674)
+++ trunk/aspects/pom.xml	2009-12-10 06:38:45 UTC (rev 97675)
@@ -71,10 +71,6 @@
       <artifactId>jboss-security-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-as-int</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-client</artifactId>
     </dependency>

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2009-12-10 06:36:06 UTC (rev 97674)
+++ trunk/build/pom.xml	2009-12-10 06:38:45 UTC (rev 97675)
@@ -368,6 +368,14 @@
       <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
     </dependency>
     <dependency>
+	<groupId>org.jboss.ejb3</groupId>
+	<artifactId>jboss-ejb3-mc-int</artifactId>
+    </dependency>
+    <dependency>
+	<groupId>org.jboss.ejb3</groupId>
+	<artifactId>jboss-ejb3-metrics-deployer</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-proxy-clustered</artifactId>
       <classifier>client</classifier>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-12-10 06:36:06 UTC (rev 97674)
+++ trunk/component-matrix/pom.xml	2009-12-10 06:38:45 UTC (rev 97675)
@@ -82,14 +82,16 @@
     <version.org.jboss.common.core>2.2.16.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.0.9.GA</version.org.jboss.deployers>
     <version.org.jboss.ejb3.common.client>1.0.1</version.org.jboss.ejb3.common.client>
-    <version.org.jboss.ejb3.core.client>1.1.21</version.org.jboss.ejb3.core.client>
+    <version.org.jboss.ejb3.core.client>1.1.22</version.org.jboss.ejb3.core.client>
     <version.org.jboss.ejb3.endpoint.deployer>0.1.4</version.org.jboss.ejb3.endpoint.deployer>
     <version.org.jboss.ejb3.jpa.int>2.0.0-alpha-1</version.org.jboss.ejb3.jpa.int>
+    <version.org.jboss.ejb3.mc.int>1.0.2</version.org.jboss.ejb3.mc.int>
+    <version.org.jboss.ejb3.metrics.deployer>1.0.2</version.org.jboss.ejb3.metrics.deployer>
     <version.org.jboss.ejb3.proxy.impl.client>1.0.6</version.org.jboss.ejb3.proxy.impl.client>
     <version.org.jboss.ejb3.proxy.spi.client>1.0.0</version.org.jboss.ejb3.proxy.spi.client>
     <version.org.jboss.ejb3.proxy.clustered.client>1.0.2</version.org.jboss.ejb3.proxy.clustered.client>
     <version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
-    <version.org.jboss.ejb3>1.1.21</version.org.jboss.ejb3>
+    <version.org.jboss.ejb3>1.0.0</version.org.jboss.ejb3>
     <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.2.Beta3</version.org.jboss.jbossxb>
     <version.org.jboss.jpa.deployers>1.0.1</version.org.jboss.jpa.deployers>
@@ -1750,8 +1752,9 @@
       
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
-        <artifactId>jboss-ejb3-as-int</artifactId>
+        <artifactId>jboss-ejb3_1</artifactId>
         <version>${version.org.jboss.ejb3}</version>
+	<type>pom</type>
         <exclusions>
           <exclusion>
             <groupId>org.hibernate</groupId>
@@ -1851,8 +1854,28 @@
         <artifactId>jboss-ejb3-jpa-int</artifactId>
         <version>${version.org.jboss.ejb3.jpa.int}</version>
       </dependency>
+      
+      <dependency>
+	<groupId>org.jboss.ejb3</groupId>
+	<artifactId>jboss-ejb3-mc-int</artifactId>
+	<version>${version.org.jboss.ejb3.mc.int}</version>
+      </dependency>
 
       <dependency>
+	<groupId>org.jboss.ejb3</groupId>
+	<artifactId>jboss-ejb3-metrics-deployer</artifactId>
+	<version>${version.org.jboss.ejb3.metrics.deployer}</version>
+	<exclusions>
+		<!-- EJB3 artifacts come in via jboss-ejb3_1 -->
+		<exclusion>
+			<groupId>org.jboss.ejb3</groupId>
+			<artifactId>jboss-ejb3-core</artifactId>
+		</exclusion>
+	</exclusions>
+
+      </dependency>
+
+      <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-proxy-impl</artifactId>
         <version>${version.org.jboss.ejb3.proxy.impl.client}</version>

Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml	2009-12-10 06:36:06 UTC (rev 97674)
+++ trunk/ejb3/pom.xml	2009-12-10 06:38:45 UTC (rev 97675)
@@ -200,7 +200,8 @@
     
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-as-int</artifactId>
+      <artifactId>jboss-ejb3_1</artifactId>
+      <type>pom</type>
       <exclusions>
         <!-- JBAS-679, may be removed when as-int is >= 1.1.5 -->
         <exclusion>

Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml	2009-12-10 06:36:06 UTC (rev 97674)
+++ trunk/webservices/pom.xml	2009-12-10 06:38:45 UTC (rev 97675)
@@ -127,7 +127,8 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-as-int</artifactId>
+      <artifactId>jboss-ejb3_1</artifactId>
+      <type>pom</type>
       <exclusions>
         <exclusion>
           <groupId>org.jboss.cache</groupId>