[jboss-cvs] JBoss Messaging SVN: r4400 - trunk.

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

Author: jmesnil
Date: 2008-06-06 06:56:20 -0400 (Fri, 06 Jun 2008)
New Revision: 4400

Modified:
   trunk/build-messaging.xml
   trunk/build-thirdparty.xml
Log:
JBMESSAGING-1050: Replace usage of oswego concurrent with java.util.concurrent
- removed concurrent.jar from the list of direct dependencies but the jar is still required (though JBoss Microcontainer) to run our code

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2008-06-06 10:08:34 UTC (rev 4399)
+++ trunk/build-messaging.xml	2008-06-06 10:56:20 UTC (rev 4400)
@@ -205,7 +205,6 @@
       <path refid="jboss.test14.classpath"/>
       <path refid="jboss.jboss.retro.classpath"/>
       <pathelement location="${test.dir}/lib/easymock.jar"/>
-      <path refid="oswego.concurrent.classpath"/>
       <path refid="apache.ant.classpath"/>
    </path>
 
@@ -214,6 +213,7 @@
       <pathelement location="${test.classes.dir}"/>
       <pathelement location="${src.config.dir}"/>
       <path refid="test.compilation.classpath"/>
+      <path refid="oswego.concurrent.classpath"/>
       <path refid="slf4j.api.classpath"/>
       <path refid="slf4j.log4j.classpath"/>
    </path>
@@ -242,6 +242,7 @@
       <path refid="jboss.common.classpath"/>
       <path refid="jboss.common.core.classpath"/>
       <path refid="jboss.jnpserver.classpath"/>
+      <path refid="oswego.concurrent.classpath"/>
       <path refid="slf4j.api.classpath"/>
       <path refid="slf4j.log4j.classpath"/>
    </path>

Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml	2008-06-06 10:08:34 UTC (rev 4399)
+++ trunk/build-thirdparty.xml	2008-06-06 10:56:20 UTC (rev 4400)
@@ -82,7 +82,6 @@
       -->
       <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="apache-logging" version="1.1.0.jboss"/>
       <componentref name="javassist" version="3.6.0.GA/"/>