[jboss-cvs] JBoss Messaging SVN: r4002 - branches/Branch_Stable.

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

Author: clebert.suconic at jboss.com
Date: 2008-04-03 15:56:14 -0400 (Thu, 03 Apr 2008)
New Revision: 4002

Modified:
   branches/Branch_Stable/build-messaging.xml
   branches/Branch_Stable/build-thirdparty.xml
Log:
Upgrading JBoss AOP (so we could work on a fix)

Modified: branches/Branch_Stable/build-messaging.xml
===================================================================
--- branches/Branch_Stable/build-messaging.xml	2008-04-03 19:54:09 UTC (rev 4001)
+++ branches/Branch_Stable/build-messaging.xml	2008-04-03 19:56:14 UTC (rev 4002)
@@ -156,13 +156,17 @@
               present in ./lib, it will take precedence over the corresponding repository instance.
     -->
    <path id="jboss.dependencies.classpath">
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+   	  <path refid="jboss.jboss.mdr.classpath"/>
       <path refid="jboss.aop.classpath"/>
       <path refid="jboss.remoting.classpath"/>
       <path refid="jboss.jbossts14.classpath"/>
       <path refid="jbossas.core.libs.classpath"/>
       <!-- some components at JBoss use JBossSerialization (JCA for instance) -->
-      <path refid="jboss.serialization.classpath"/>
+      <path refid="jboss.serialization.classpath"/>
    </path>
 
    <!--
@@ -232,8 +236,9 @@
       <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
       <echo message="NOTE: aopc incremental compilation might fail, if so do an ant clean first (see JBMESSAGING-271)"/>
       <aopc compilerclasspathref="aopc.classpath"
-            classpathref="aopc.classpath"
-            verbose="false">
+            classpathref="aopc.classpath"
+      	    instrumentor="org.jboss.aop.instrument.ClassicInstrumentor"
+            verbose="true">
          <classpath refid="aopc.classpath"/>
          <src path="${build.classes}/org/jboss/jms"/>
          <aoppath path="src/etc/prepare-aop.xml"/>

Modified: branches/Branch_Stable/build-thirdparty.xml
===================================================================
--- branches/Branch_Stable/build-thirdparty.xml	2008-04-03 19:54:09 UTC (rev 4001)
+++ branches/Branch_Stable/build-thirdparty.xml	2008-04-03 19:56:14 UTC (rev 4002)
@@ -82,16 +82,30 @@
       -->
       <componentref name="retrotranslator" version="0.9.6jboss"/>
       <componentref name="sun-javacc" version="3.2"/>
-      <componentref name="oswego-concurrent" version="1.3.4-brew"/>
-      <componentref name="apache-log4j" version="1.2.14-brew"/>
-      <componentref name="javassist" version="3.5.0.GA-brew"/>
-      <componentref name="jgroups" version="2.6.2.GA"/>
-      <componentref name="trove" version="1.0.2-brew"/>
-      <componentref name="jboss/common" version="1.2.0.GA-brew"/>
-      <componentref name="jboss/aop" version="1.5.5.GA"/>
-      <componentref name="jboss/remoting" version="2.4.0.Beta2"/>
+      <componentref name="oswego-concurrent" version="1.3.4-jboss-update1"/>
+      <componentref name="apache-log4j" version="1.2.14"/>
+      <componentref name="javassist" version="3.6.0.GA"/>
+      <componentref name="jgroups" version="2.6.2"/>
+      <componentref name="trove" version="1.0.2"/>
+      <componentref name="jboss/common-core" version="2.2.3.GA"/>
+      <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
+      <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
+      <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
+   	  <componentref name="jboss/jboss-mdr" version="2.0.0.Beta12"/>
+      <componentref name="jboss/aop" version="2.0.0.CR1"/>
+      <componentref name="jboss/remoting" version="2.4.0.CR1"/>
       <componentref name="jboss/jbossts14" version="4.2.3.SP3"/>
       <componentref name="jbossas/core-libs" version="4.2.0.GA"/>
+   	
+      
+   	  <!-- <componentref name="jboss/microcontainer" version="2.0.0.Beta5"/>
+      <componentref name="jboss/jboss-security-spi" version="2.0.1.GA"/>
+      <componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
+      <componentref name="jboss/integration" version="5.0.0.Beta4"/>
+      <componentref name="jboss/jbosssx-client" version="2.0.1.GA"/>
+      <componentref name="jboss/jboss-javaee" version="5.0.0.Beta3Update1"/>
+      <componentref name="jboss/jboss-common-logging-spi" version="2.0.4.GA"/> -->
+   	
 
 
       <!--
@@ -105,11 +119,11 @@
            Dependencies required to test the project.
       -->
       <componentref name="junit" version="3.8.2-brew"/>
-      <componentref name="hsqldb" version="1.8.0.2"/>
+      <componentref name="hsqldb" version="1.8.0.8-brew"/>
       <componentref name="dom4j" version="1.6.1-brew"/>
-      <componentref name="apache-xerces" version="2.7.1-brew"/> <!-- needed by org.jboss.logging.Log4jLoggerPlugin -->
+      <componentref name="apache-xerces" version="2.9.1"/> <!-- needed by org.jboss.logging.Log4jLoggerPlugin -->
       <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>
-      <componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/>
+      <componentref name="jboss/jbossxb" version="2.0.0.CR7"/>
       <componentref name="jboss/test14" version="1.0.0.GA"/>
 
       <!-- This is a non declared dependency of jboss/test14 -->