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

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

Author: kevin.conner at jboss.com
Date: 2010-06-11 06:08:47 -0400 (Fri, 11 Jun 2010)
New Revision: 33450

Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/load_generator/build.xml
Log:
Change groovy classpath to exec classpath: JBESB-3338

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/load_generator/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/load_generator/build.xml	2010-06-11 02:06:42 UTC (rev 33449)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/load_generator/build.xml	2010-06-11 10:08:47 UTC (rev 33450)
@@ -12,39 +12,8 @@
 		<delete dir="load_generator_classes"/>
 	</target>
 
-	<target name="init-groovy-as4" depends="dependencies" if="jbossas4">
-		<path id="groovy.classpath">
-			<pathelement path="build/classes"/>
-			<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" />
-	</target>
-
-	<target name="init-groovy-as5" depends="dependencies" if="jbossas5">
-        <path id="groovy.classpath">
-            <pathelement path="build/classes"/>
-            <fileset dir="${org.jboss.esb.server.home}/lib">
-                <include name="*.jar"/>
-            </fileset>
-            <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deployers/esb.deployer/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}/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" />
-    </target>
-
-
-	<target name="compile-churn" depends="compile, init-groovy-as4, init-groovy-as5" description="compile groovy to bytecode">
+	<target name="compile-churn" depends="compile" description="compile groovy to bytecode">
+		<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="exec-classpath" />
 		<mkdir dir="load_generator_classes" />
 		<copy todir="load_generator_classes" overwrite="true">
 			<fileset dir="${basedir}/scripts/">
@@ -55,12 +24,12 @@
 				<include name="log4j.xml" /> 
 			</fileset>
 		</copy>
-		<groovyc destdir="load_generator_classes" srcdir="${basedir}/scripts" includes="*.groovy" classpathref="groovy.classpath" />
+		<groovyc destdir="load_generator_classes" srcdir="${basedir}/scripts" includes="*.groovy" classpathref="exec-classpath" />
 	</target>
 
 	<target name="load-agent" depends="compile-churn" description="Test the load agent script/settings">
 		<java classname="JmsLoadAgent" >
-			<classpath refid="groovy.classpath" />
+			<classpath refid="exec-classpath" />
 			<classpath location="load_generator_classes" />
 			<arg value="load_generator_classes/load.xml" />
 		</java>
@@ -70,7 +39,7 @@
 		<java classname="LoadReport" fork="true">
 			<classpath location="${org.jboss.esb.server.home}/client"/>
 			<classpath location="build/classes"/>
-			<classpath refid="groovy.classpath"/>
+			<classpath refid="exec-classpath"/>
 			<classpath location="load_generator_classes"/>
 			<arg value="load_generator_classes/load.xml"/>
 		</java>
@@ -80,7 +49,7 @@
                 <java classname="LoadReport" fork="true">
                         <classpath location="${org.jboss.esb.server.home}/client"/>
                         <classpath location="build/classes"/>
-                        <classpath refid="groovy.classpath"/>
+                        <classpath refid="exec-classpath"/>
                         <classpath location="load_generator_classes"/>
                         <arg line="load_generator_classes/load.xml admin admin"/>
                 </java>