[jboss-svn-commits] JBL Code SVN: r16823 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/load_generator.

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

Author: kevin.conner at jboss.com
Date: 2007-11-26 05:49:52 -0500 (Mon, 26 Nov 2007)
New Revision: 16823

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/load_generator/build.xml
Log:
Reapply fix for JBESB-1322

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/load_generator/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/load_generator/build.xml	2007-11-26 09:14:40 UTC (rev 16822)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/load_generator/build.xml	2007-11-26 10:49:52 UTC (rev 16823)
@@ -5,49 +5,48 @@
 		${line.separator}
 	</description>
 
-	<property environment="env"/>
-
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml" />
-	<property file="${product.dir}/install/deployment.properties" />
 
-	<path id="groovy.classpath">
-		<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
-			<include name="jboss-aop-jdk50**/*.jar"/>
-		</fileset>
-		<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="*.jar"/>
-		<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="*.jar" />
-		<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="commons-*.jar" />
-		<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar" />
-		<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="xercesImpl.jar" />
-	</path>
+	<target name="init-groovy" depends="dependencies">
+		<path id="groovy.classpath">
+			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
+				<include name="jboss-aop-jdk50**/*.jar"/>
+			</fileset>
+			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="*.jar"/>
+			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="*.jar" />
+			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib" includes="commons-*.jar" />
+			<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar" />
+			<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="xercesImpl.jar" />
+		</path>
 
-	<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovy.classpath" />
+		<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovy.classpath" />
+	</target>
 
-	<target name="compile-churn" depends="compile" description="compile groovy to bytecode">
-		<mkdir dir="${basedir}/build/classes" />
-		<copy todir="${basedir}/build/classes" overwrite="true">
+	<target name="compile-churn" depends="compile, init-groovy" description="compile groovy to bytecode">
+		<mkdir dir="load_generator_classes" />
+		<copy todir="load_generator_classes" overwrite="true">
 			<fileset dir="${basedir}/scripts/">
 				<include name="*.xml" />
 				<include name="*.properties" />
 			</fileset>
 		</copy>
-		<groovyc destdir="build/classes" srcdir="${basedir}/scripts" includes="*.groovy" classpathref="groovy.classpath" />
+		<groovyc destdir="load_generator_classes" srcdir="${basedir}/scripts" includes="*.groovy" classpathref="groovy.classpath" />
 	</target>
 
 	<target name="load-agent" depends="compile-churn" description="Test the load agent script/settings">
 		<java classname="JmsLoadAgent" >
 			<classpath refid="groovy.classpath" />
-			<classpath location="${basedir}/build/classes" />
-			<arg value="${basedir}/build/classes/load.xml" />
+			<classpath location="load_generator_classes" />
+			<arg value="load_generator_classes/load.xml" />
 		</java>
 	</target>
 
 	<target name="load-report" depends="compile-churn" description="Test the report agent script/settings">
 		<java classname="LoadReport">
 			<classpath refid="groovy.classpath" />
-			<classpath location="${basedir}/build/classes" />
-			<arg value="${basedir}/build/classes/load.xml" />
+			<classpath location="load_generator_classes" />
+			<arg value="load_generator_classes/load.xml" />
 		</java>
 	</target>