[jboss-cvs] JBoss Messaging SVN: r2604 - projects/jms-integration.

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

Author: clebert.suconic at jboss.com
Date: 2007-04-25 00:02:10 -0400 (Wed, 25 Apr 2007)
New Revision: 2604

Modified:
   projects/jms-integration/build.xml
Log:
Fixing build

Modified: projects/jms-integration/build.xml
===================================================================
--- projects/jms-integration/build.xml	2007-04-25 04:01:22 UTC (rev 2603)
+++ projects/jms-integration/build.xml	2007-04-25 04:02:10 UTC (rev 2604)
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE project [
    <!ENTITY libraries SYSTEM "thirdparty/libraries.ent">
-]>
+]>
+
+
 <!-- =========================================================================================== -->
 <!--                                                                                             -->
 <!-- JBoss, Home of Professional Open Source                                                     -->
@@ -51,8 +53,10 @@
    <property name="build.tests.classes-jdk15" value="${tests.output}/classes-jdk15"/>
    <property name="build.tests.lib" value="${tests.output}/lib"/>
    <property name="build.tests.reports" value="${tests.output}/reports"/>
-   <property name="build.tests.ejbarchive" value="jboss-messaging-tests-ejb.jar"/>
+   <property name="build.tests.ejbarchive" value="jboss-messaging-tests-ejb.jar"/>
+   <property name="project.thirdparty" value="${project.root}/thirdparty"/>
 
+
    <property name="javac.debug" value="true"/>
    <property name="javac.optimize" value="false"/>
    <property name="javac.depend" value="false"/>
@@ -92,44 +96,50 @@
 
    <property name="nodownload" value="false"/>
 
-   &libraries;
+   &libraries;
+	
 
-
    <path id="integration.classpath">
       <pathelement location="${build.tests.classes}"/>
       <pathelement location="./src/etc"/>
-
-      <path refid="jboss.common.core.classpath"/>
+
+   	  <path refid="apache.log4j.classpath"/>
+	  <pathelement path="${jboss-home}/client/jboss-client.jar"/>
+	  <pathelement path="${jboss-home}/client/jnp-client.jar"/>
+	  <pathelement path="${jboss-home}/client/jboss-j2ee.jar"/>
+	  <pathelement path="${jboss-home}/client/jmx-invoker-adaptor-client.jar"/>
+	  <pathelement path="${jboss-home}/client/jbosssx-client.jar"/>
+	  <pathelement path="${jboss-home}/client/jboss-transaction-client.jar"/>
+   	
+   	<path refid="trove.trove.classpath"/>
+   	<path refid="jboss.microcontainer.classpath"/>
+   	<path refid="javassist.javassist.classpath"/>
+   	<path refid="jboss.messaging.classpath"/>
+	   <path refid="oswego.concurrent.classpath"/>
+ 	   <path refid="jboss.jbossretro.rt.classpath"/>
+ 	  <path refid="jboss.common.core.classpath"/>
+       <path refid="junit.junit.classpath"/>
       <path refid="jboss.common.logging.log4j.classpath"/>
       <path refid="jboss.common.logging.spi.classpath"/>
       <path refid="jboss.aop.classpath"/>
       <path refid="jboss.remoting.classpath"/>
       <path refid="jboss.serialization.classpath"/>
-      <path refid="jboss.jbossts.classpath"/>
+      <path refid="jboss.jbossts.classpath"/> 
 
-      <path refid="junit.junit.classpath"/>
-      <!-- <path refid="dom4j.dom4j.classpath"/> -->
       <path refid="apache.log4j.classpath"/>
       <path refid="apache.logging.classpath"/>
       <path refid="apache.xerces.classpath"/>
       <path refid="apache.logging.classpath"/>
       <path refid="jboss.test14.classpath"/>
       <path refid="retrotranslator.retrotranslator.classpath"/>
-      <path refid="jboss.backport.concurrent.classpath"/>
-
-
-      <!-- TODO: Figure out what's wrong with dependencies and remove this -->
-      <fileset dir="./thirdparty">
-         <include name="**/*.jar"/>
-      </fileset>
-
-      <fileset dir="${jboss-home}/client">
-         <include name="**/*.jar"/>
-      </fileset>
-
-
+      <path refid="jboss.backport.concurrent.classpath"/> 
    </path>
 
+	   <target name="test">
+	   	 <pathconvert property="path.converted" refid="integration.classpath" />
+	   	 <echo message="Path=${path.converted}"/>
+	   </target>
+
 
    <!--
         Create the thirdparty folder from items in the repository then generate a new libraries.ent