[Jboss-cvs] JBoss Messaging SVN: r1180 - in trunk: . tests tests/bin

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-08-02 17:24:56 -0400 (Wed, 02 Aug 2006)
New Revision: 1180

Modified:
   trunk/build-messaging.xml
   trunk/tests/bin/
   trunk/tests/build.xml
Log:
fixed library overriding mechanism. http://jira.jboss.org/jira/browse/JBMESSAGING-474

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2006-08-02 21:01:58 UTC (rev 1179)
+++ trunk/build-messaging.xml	2006-08-02 21:24:56 UTC (rev 1180)
@@ -266,7 +266,8 @@
    <!-- Compilation Tasks                                                                        -->
    <!-- ======================================================================================== -->
 
-   <target name="compile" depends="compile-parsers, compile-classes, compile-etc"/>
+   <target name="compile"
+           depends="resolve-local-dependencies, compile-parsers, compile-classes, compile-etc"/>
 
    <target name="compile-parsers">
 
@@ -307,7 +308,7 @@
    <target name="compile-classes">
 
       <mkdir dir="${build.classes}"/>
-      <!-- <display-path path="compilation.classpath"/> -->
+      <!--<display-path path="compilation.classpath"/>-->
       <javac destdir="${build.classes}"
              target="${javac.target}"
              source="${javac.source}"


Property changes on: trunk/tests/bin
___________________________________________________________________
Name: svn:ignore
   - .testrc

   + .test.execution.classpath
.testrc


Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml	2006-08-02 21:01:58 UTC (rev 1179)
+++ trunk/tests/build.xml	2006-08-02 21:24:56 UTC (rev 1180)
@@ -184,8 +184,10 @@
    <!-- Compilation Tasks                                                                        -->
    <!-- ======================================================================================== -->
 
-   <target name="compile">
+   <target name="init" depends="resolve-local-dependencies"/>
 
+   <target name="compile" depends="init">
+
       <mkdir dir="${build.tests.classes}"/>
       <javac destdir="${build.tests.classes}"
              optimize="${javac.optimize}"
@@ -244,7 +246,8 @@
       <property name="test.logs.cleared" value="true"/>
    </target>
 
-   <target name="start-rmi-server" description="Starts the RMI server used by remote tests">
+   <target name="start-rmi-server" depends="init"
+           description="Starts the RMI server used by remote tests">
 
       <java classname="org.jboss.test.messaging.tools.jmx.rmi.RMITestServer" fork="true" spawn="true">
          <sysproperty key="module.output" value="${tests.output}"/>
@@ -259,7 +262,8 @@
       </java>
    </target>
 
-   <target name="start-rmi-server-stress" description="Starts the RMI server used by remote stress tests">
+   <target name="start-rmi-server-stress" depends="init"
+           description="Starts the RMI server used by remote stress tests">
 
       <java classname="org.jboss.test.messaging.tools.jmx.rmi.RMITestServer" fork="true" spawn="true">
          <jvmarg value="-Xmx768M"/>
@@ -273,7 +277,8 @@
       </java>
    </target>
 
-   <target name="stop-rmi-server" description="Stops the RMI server used by remote tests">
+   <target name="stop-rmi-server" depends="init"
+           description="Stops the RMI server used by remote tests">
       <!-- <display-path path="test.execution.classpath"/> -->
       <java classname="org.jboss.test.messaging.tools.jmx.rmi.StopRMIServer"
             classpathref="test.execution.classpath"/>
@@ -636,7 +641,7 @@
    </target>
 
 
-   <target name="crash-test" description="Runs crash test">
+   <target name="crash-test" depends="init" description="Runs crash test">
 
       <junit printsummary="${junit.printsummary}"
              fork="${junit.fork}"
@@ -886,12 +891,7 @@
 
    <property name="test.execution.classpath.file" value=".test.execution.classpath"/>
 
-   <target name="get-test-execution-classpath">
-      <echo message="${test.execution.classpath.file}"/>
-      <!--
-      <pathconvert refid="test.execution.classpath" targetos="unix" pathsep=";"
-                   property="test.execution.classpath.unix"/>
-                   -->
+   <target name="get-test-execution-classpath" depends="init">
       <pathconvert refid="test.execution.classpath" targetos="windows"
                    property="test.execution.classpath.unix"/>
       <echo message="${test.execution.classpath.unix}" file="${test.execution.classpath.file}"/>