[jboss-cvs] JBossAS SVN: r89649 - in branches/JBPAPP_5_0: component-matrix and 1 other directories.

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

Author: ALRubinger
Date: 2009-06-02 02:15:40 -0400 (Tue, 02 Jun 2009)
New Revision: 89649

Modified:
   branches/JBPAPP_5_0/build/build-distr.xml
   branches/JBPAPP_5_0/component-matrix/pom.xml
   branches/JBPAPP_5_0/thirdparty/pom.xml
Log:
[JBAS-6624] Bring jboss-ejb3-metrics-deployer into the JBPAPP_5_0 build.  Also upgrade the requisite dependency upon jboss-man:2.1.1.Beta1

Modified: branches/JBPAPP_5_0/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_0/build/build-distr.xml	2009-06-02 05:38:21 UTC (rev 89648)
+++ branches/JBPAPP_5_0/build/build-distr.xml	2009-06-02 06:15:40 UTC (rev 89649)
@@ -128,6 +128,8 @@
       </fileset>
       <fileset dir="${jboss.jboss.ejb3.endpoint.deployer.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar"/>
+      <fileset dir="${jboss.jboss.ejb3.metrics.deployer.lib}" includes="*.jar"
+               excludes="*-sources.jar, *-javadoc.jar"/>
     </copy>
     
     <!-- Copy the third party libraries -->

Modified: branches/JBPAPP_5_0/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0/component-matrix/pom.xml	2009-06-02 05:38:21 UTC (rev 89648)
+++ branches/JBPAPP_5_0/component-matrix/pom.xml	2009-06-02 06:15:40 UTC (rev 89649)
@@ -72,6 +72,7 @@
     <version.org.jboss.ejb3.proxy.clustered.client>1.0.1</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.5</version.org.jboss.ejb3>
+    <version.org.jboss.ejb3.metrics.deployer>1.0.0-alpha-3</version.org.jboss.ejb3.metrics.deployer>
     <version.org.jboss.ejb3.endpoint.deployer>0.1.3</version.org.jboss.ejb3.endpoint.deployer>
     <version.org.jboss.integration>5.1.0.GA</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
@@ -79,7 +80,7 @@
     <version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>
     <version.org.jboss.logbridge>1.0.0.GA</version.org.jboss.logbridge>
     <version.org.jboss.logmanager>1.0.0.GA</version.org.jboss.logmanager>
-    <version.org.jboss.man>2.1.0.SP1</version.org.jboss.man>
+    <version.org.jboss.man>2.1.1.Beta1</version.org.jboss.man>
     <version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
     <version.org.jboss.metadata>1.0.1.GA</version.org.jboss.metadata>
     <version.org.jboss.microcontainer>2.0.6.GA</version.org.jboss.microcontainer>
@@ -1705,6 +1706,19 @@
           </exclusion>
         </exclusions>
       </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-as-int -->
+          <exclusion>
+            <groupId>org.jboss.ejb3</groupId>
+            <artifactId>jboss-ejb3-core</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       
       <dependency>
         <groupId>org.jboss.ejb3</groupId>

Modified: branches/JBPAPP_5_0/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_0/thirdparty/pom.xml	2009-06-02 05:38:21 UTC (rev 89648)
+++ branches/JBPAPP_5_0/thirdparty/pom.xml	2009-06-02 06:15:40 UTC (rev 89649)
@@ -535,6 +535,13 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.ejb3</groupId>
+              <artifactId>jboss-ejb3-metrics-deployer</artifactId>
+              <mapping>
+                <componentId>jboss.jboss-ejb3-metrics-deployer</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>org.jboss.ejb3</groupId>
               <artifactId>jboss-ejb3-mc-int</artifactId>
               <mapping>
                 <componentId>jboss.jboss-ejb3-mc-int</componentId>
@@ -1454,6 +1461,10 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-metrics-deployer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-proxy-impl</artifactId>
       <classifier>client</classifier>
     </dependency>