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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Oct 15 14:41:02 EDT 2009


Author: fnasser at redhat.com
Date: 2009-10-15 14:41:01 -0400 (Thu, 15 Oct 2009)
New Revision: 94979

Modified:
   branches/JBPAPP_5_0/aspects/build-original.xml
   branches/JBPAPP_5_0/aspects/build-retro.xml
   branches/JBPAPP_5_0/aspects/build.xml
   branches/JBPAPP_5_0/component-matrix/pom.xml
   branches/JBPAPP_5_0/testsuite/build.xml
   branches/JBPAPP_5_0/thirdparty/pom.xml
Log:
Remove jrockit-pluggable-instrumentor.jar as we do not support JRockit anymore

Modified: branches/JBPAPP_5_0/aspects/build-original.xml
===================================================================
--- branches/JBPAPP_5_0/aspects/build-original.xml	2009-10-15 18:11:33 UTC (rev 94978)
+++ branches/JBPAPP_5_0/aspects/build-original.xml	2009-10-15 18:41:01 UTC (rev 94979)
@@ -506,7 +506,6 @@
          </zipfileset>
          <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/lib">
             <include name="jdk14-pluggable-instrumentor.jar"/>
-            <include name="jrockit-pluggable-instrumentor.jar"/>
             <include name="jboss-aop.jar"/>
          </zipfileset>
          <zipfileset dir="${javassist.lib}" prefix="${aop.version}/lib">
@@ -563,7 +562,6 @@
             <include name="jboss-aop-jdk50.jar"/>
             <include name="pluggable-instrumentor.jar"/>
             <include name="jboss-aop-jdk50-client.jar"/>
-            <include name="jrockit-pluggable-instrumentor.jar"/>
          </zipfileset>
          <zipfileset dir="${javassist.lib}" prefix="${aop.version}/lib-50">
             <include name="javassist.jar"/>

Modified: branches/JBPAPP_5_0/aspects/build-retro.xml
===================================================================
--- branches/JBPAPP_5_0/aspects/build-retro.xml	2009-10-15 18:11:33 UTC (rev 94978)
+++ branches/JBPAPP_5_0/aspects/build-retro.xml	2009-10-15 18:41:01 UTC (rev 94979)
@@ -509,7 +509,6 @@
          </zipfileset>
          <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/lib">
             <include name="jdk14-pluggable-instrumentor.jar"/>
-            <include name="jrockit-pluggable-instrumentor.jar"/>
             <include name="jboss-aop.jar"/>
          </zipfileset>
          <zipfileset dir="${javassist.lib}" prefix="${aop.version}/lib">
@@ -566,7 +565,6 @@
             <include name="jboss-aop-jdk50.jar"/>
             <include name="pluggable-instrumentor.jar"/>
             <include name="jboss-aop-jdk50-client.jar"/>
-            <include name="jrockit-pluggable-instrumentor.jar"/>
          </zipfileset>
          <zipfileset dir="${javassist.lib}" prefix="${aop.version}/lib-50">
             <include name="javassist.jar"/>

Modified: branches/JBPAPP_5_0/aspects/build.xml
===================================================================
--- branches/JBPAPP_5_0/aspects/build.xml	2009-10-15 18:11:33 UTC (rev 94978)
+++ branches/JBPAPP_5_0/aspects/build.xml	2009-10-15 18:41:01 UTC (rev 94979)
@@ -291,7 +291,6 @@
          <fileset file="${build.lib}/jboss-aspect-library.jar"/>
          <fileset file="${jboss.aop.lib}/jboss-aop-aspects.jar"/>
          <fileset file="${jboss.aop.lib}/pluggable-instrumentor.jar"/>
-         <fileset file="${jboss.aop.lib}/jrockit-pluggable-instrumentor.jar"/>
       	 <fileset file="${build.meta.inf}/base-aspects.xml"/>
          <fileset dir="${build.etc}">
             <include name="META-INF/*.xml"/>

Modified: branches/JBPAPP_5_0/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0/component-matrix/pom.xml	2009-10-15 18:11:33 UTC (rev 94978)
+++ branches/JBPAPP_5_0/component-matrix/pom.xml	2009-10-15 18:41:01 UTC (rev 94979)
@@ -681,12 +681,6 @@
       
       <dependency>
         <groupId>org.jboss.aop</groupId>
-        <artifactId>jrockit-pluggable-instrumentor</artifactId>
-        <version>${version.org.jboss.aop}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.jboss.aop</groupId>
         <artifactId>pluggable-instrumentor</artifactId>
         <version>${version.org.jboss.aop}</version>
       </dependency>

Modified: branches/JBPAPP_5_0/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/build.xml	2009-10-15 18:11:33 UTC (rev 94978)
+++ branches/JBPAPP_5_0/testsuite/build.xml	2009-10-15 18:41:01 UTC (rev 94979)
@@ -511,7 +511,6 @@
       <pathelement path="${jboss.dist.client}/jboss-aop-client.jar" />
       <pathelement path="${jboss.dist.lib}/jboss-aop-deployers.jar" />
       <pathelement path="${jboss.dist.lib}/jboss-aop.jar" />
-      <pathelement path="${jboss.dist.server}/all/deployers/jboss-aop-jboss5.deployer/jrockit-pluggable-instrumentor.jar" />
       <pathelement path="${jboss.dist.server}/all/deployers/jboss-aop-jboss5.deployer/pluggable-instrumentor.jar" />
       <!-- path refid="jboss.aspects.classpath"/ -->
       <pathelement path="${jboss.dist.server}/all/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library.jar" />

Modified: branches/JBPAPP_5_0/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_0/thirdparty/pom.xml	2009-10-15 18:11:33 UTC (rev 94978)
+++ branches/JBPAPP_5_0/thirdparty/pom.xml	2009-10-15 18:41:01 UTC (rev 94979)
@@ -438,14 +438,6 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.aop</groupId>
-              <artifactId>jrockit-pluggable-instrumentor</artifactId>
-              <version>${version.org.jboss.aop}</version>
-              <mapping>
-                <componentId>jboss.aop</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
-              <groupId>org.jboss.aop</groupId>
               <artifactId>pluggable-instrumentor</artifactId>
               <version>${version.org.jboss.aop}</version>
               <mapping>
@@ -1144,10 +1136,6 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.aop</groupId>
-      <artifactId>jrockit-pluggable-instrumentor</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.aop</groupId>
       <artifactId>pluggable-instrumentor</artifactId>
     </dependency>
     <dependency>




More information about the jboss-cvs-commits mailing list