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

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

Author: jmesnil
Date: 2008-05-19 09:39:11 -0400 (Mon, 19 May 2008)
New Revision: 4237

Modified:
   trunk/.classpath
   trunk/build-messaging.xml
   trunk/build-thirdparty.xml
Log:
cleaned up dependencies (removed hsqldb, dom4j, apache-tomcat, added apache-logging)

Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2008-05-19 12:55:28 UTC (rev 4236)
+++ trunk/.classpath	2008-05-19 13:39:11 UTC (rev 4237)
@@ -13,11 +13,9 @@
 	<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
-	<classpathentry kind="lib" path="thirdparty/hsqldb/lib/hsqldb.jar"/>
 	<classpathentry kind="lib" path="thirdparty/apache-logging/lib/commons-logging.jar"/>
 	<classpathentry kind="lib" path="thirdparty/sun-javacc/lib/javacc.jar"/>
 	<classpathentry kind="lib" path="thirdparty/apache-xerces/lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="thirdparty/dom4j/lib/dom4j.jar"/>
 	<classpathentry kind="lib" path="thirdparty/javassist/lib/javassist.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/pluggable-instrumentor.jar"/>

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2008-05-19 12:55:28 UTC (rev 4236)
+++ trunk/build-messaging.xml	2008-05-19 13:39:11 UTC (rev 4237)
@@ -164,12 +164,7 @@
         They must available in the repository and declared as <componentrefs> in build-thirdparty.xml.
    -->
    <path id="external.dependencies.classpath">
-      <!--<path refid="apache.logging.classpath"/>-->
-      <!--<path refid="oswego.concurrent.classpath"/>-->
-      <!--<path refid="javassist.classpath"/>-->
       <path refid="jgroups.jgroups.classpath"/>
-      <!--<path refid="trove.trove.classpath"/>-->
-      <path refid="apache.logging.classpath"/>
       <path refid="apache.mina.classpath"/>
       <path refid="apache.log4j.classpath"/>
       <path refid="slf4j.api.classpath"/>
@@ -185,9 +180,7 @@
     -->
    <path id="jboss.dependencies.classpath">
       <path refid="jboss.common.classpath"/>
-      <!--<path refid="jboss.aop.classpath"/>-->
       <path refid="jboss.jbossts14.classpath"/>
-      <!--<path refid="jbossas.core.libs.classpath"/>-->
       <path refid="jboss.microcontainer.classpath"/>
       <path refid="jboss.jboss.security.spi.classpath"/>
       <path refid="jboss.jboss.jaspi.api.classpath"/>
@@ -249,9 +242,6 @@
       <path refid="apache.logging.classpath"/>
       <path refid="apache.xerces.classpath"/>
       <path refid="jboss.jbossxb.classpath"/>
-      <path refid="apache.logging.classpath"/>
-      <path refid="apache.tomcat.classpath"/>
-      <path refid="apache.logging.classpath"/>
       <path refid="jboss.aop.classpath"/>
       <path refid="jboss.microcontainer.classpath"/>
       <path refid="jboss.jboss.security.spi.classpath"/>

Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml	2008-05-19 12:55:28 UTC (rev 4236)
+++ trunk/build-thirdparty.xml	2008-05-19 13:39:11 UTC (rev 4237)
@@ -84,6 +84,7 @@
       <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/"/>
       <componentref name="jgroups" version="2.4.1.SP3-brew"/>
       <componentref name="trove" version="1.0.2-brew"/>
@@ -91,7 +92,6 @@
       <componentref name="jboss/common-core" version="2.2.2.GA"/>
       <componentref name="jboss/aop" version="2.0.0.beta2"/>
       <componentref name="jboss/jbossts14" version="4.2.3.SP3"/>
-      <!--<componentref name="jbossas/core-libs" version="4.2.1.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"/>
@@ -102,19 +102,10 @@
       <componentref name="apache-mina" version="2.0.0-M2-20080418.144850"/>
       <componentref name="slf4j/log4j" version="1.4.3"/>
 
-
       <!--
-          Totally unapropriate here, but this is what we need to do for the time being if we
-          want HTTP.
-          See http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4022727 for more details.
-      -->
-      <componentref name="apache-tomcat" version="5.5.15"/>
-
-      <!--
            Dependencies required to test the project.
       -->
       <componentref name="junit" version="3.8.2-brew"/>
-      <componentref name="hsqldb" version="1.8.0.2"/>
       <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="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>