Author: bdaw Date: 2008-03-20 13:07:39 -0400 (Thu, 20 Mar 2008) New Revision: 10352 Modified: modules/identity/trunk/identity/build.xml Log: bobo Modified: modules/identity/trunk/identity/build.xml =================================================================== --- modules/identity/trunk/identity/build.xml 2008-03-20 14:32:45 UTC (rev 10351) +++ modules/identity/trunk/identity/build.xml 2008-03-20 17:07:39 UTC (rev 10352) @@ -10,23 +10,30 @@ <!--<echo message="test classpath: ${test_classpath}"/>--> <!--<echo message="plugin classpath: ${plugin_classpath}"/>--> - <mkdir dir="target/jboss-unit"/> + <property name="target" value="${basedir}/target"/> + <property name="jboss-unit" value="${target}/jboss-unit"/> + + + <mkdir dir="${jboss-unit}"/> + + + <ant> <target name="deploy-opends"/> </ant> - <ant> - <target name="cargo.jboss-4.2.start"/> - </ant> + <antcall target="cargo.jboss-4.2.start"> + <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2"/> + </antcall> <ant> <target name="jboss-unit"/> </ant> - <ant> - <target name="cargo.jboss-4.2.stop"/> - </ant> + <antcall target="cargo.jboss-4.2.stop"> + <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2"/> + </antcall> <ant> <target name="undeploy-opends"/> @@ -75,7 +82,7 @@ <fileset dir="./src/test/resources/opends"/> </copy> - <delete dir="target/jboss-unit/tmp" failonerror="false" deleteonexit="true" quiet="true"/> + <delete dir="${jboss-unit}/tmp" failonerror="false" deleteonexit="true" quiet="true"/> </target> @@ -115,7 +122,7 @@ <sharedClasspath> <!-- Empty but need to be present because of a bug in our patch for cargo--> </sharedClasspath> - <configuration> + <configuration home="${test.jboss-4.2.tempdir}"> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> </configuration> @@ -130,7 +137,7 @@ home="${JBOSS_HOME}" log="${cargo.log.dir}/cargo.identity.shutdown.log" action="stop"> - <configuration> + <configuration home="${test.jboss-4.2.tempdir}"> <property name="cargo.rmi.port" value="1099"/> </configuration> </cargo>