Author: objectiser Date: 2010-08-20 18:45:24 -0400 (Fri, 20 Aug 2010) New Revision: 919 Added: trunk/samples/common/ trunk/samples/common/base-build.xml Modified: trunk/console/bpel2svg/src/test/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtilTest.java trunk/console/pom.xml trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/bin/bpelc trunk/distribution/src/main/release/bin/sendsoap trunk/distribution/src/main/release/install/build.xml trunk/distribution/src/main/release/install/deployment.properties trunk/docs/docbook/userguide/src/main/module/deploy.xml trunk/integration-tests/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_approval_service/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/build.xml trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/build.xml trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml trunk/pom.xml trunk/qa/build.xml trunk/samples/esb/bpel_helloworld/build.xml trunk/samples/esb/bpel_loan_fault/build.xml trunk/samples/esb/invoke_esb_ebws/build.xml trunk/samples/esb/simple_esb_proxy_invoke/build.xml trunk/samples/esb/simple_esb_proxy_invoke2/build.xml trunk/samples/quickstart/bpel_event_listener/build.xml trunk/samples/quickstart/hello_world/build.xml trunk/samples/quickstart/hello_world_header_ode/build.xml trunk/samples/quickstart/hello_world_header_wsdl/build.xml trunk/samples/quickstart/loan_approval/build.xml trunk/samples/quickstart/math/build.xml trunk/samples/quickstart/salutations/build.xml trunk/samples/quickstart/say_hello/build.xml trunk/samples/quickstart/secure_invoke/build.xml trunk/samples/quickstart/secure_service/build.xml trunk/samples/quickstart/service_handler/build.xml trunk/samples/quickstart/simple_correlation/build.xml trunk/samples/quickstart/simple_invoke/build.xml trunk/samples/quickstart/simple_pick/build.xml trunk/samples/tutorial/BPEL-BluePrint1/build.xml trunk/samples/tutorial/BPEL-BluePrint2/build.xml trunk/samples/tutorial/BPEL-BluePrint3/build.xml trunk/samples/tutorial/BPEL-BluePrint4/build.xml trunk/samples/tutorial/BPEL-BluePrint5/build.xml trunk/samples/tutorial/atm/build.xml trunk/samples/tutorial/purchase/build.xml trunk/samples/tutorial/travel_agency/build.xml trunk/stress-tests/build.xml trunk/stress-tests/src/test/resources/performance/build.xml Log: RIFTSAW-261 - removed most libs from build, used by samples and bin scripts, and instead reference libs in the RiftSaw modules or JBossAS. Still need to update and check windows scripts in bin. Also commented out console/bpel2svg as it requires junit4, however when top level pom was upgraded to this version it caused a npe in the integration tests (secure service unit test). Will probably just need to change bpel2svg to use junit3 style unit tests for now. Modified: trunk/console/bpel2svg/src/test/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtilTest.java =================================================================== --- trunk/console/bpel2svg/src/test/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtilTest.java 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/console/bpel2svg/src/test/java/org/jboss/soa/bpel/bpel2svg/BPEL2SVGUtilTest.java 2010-08-20 22:45:24 UTC (rev 919) @@ -17,7 +17,7 @@ */ package org.jboss.soa.bpel.bpel2svg; -import static org.junit.Assert.*; +import junit.framework.TestCase; import org.wso2.carbon.bpel.ui.bpel2svg.ActivityInterface; import org.wso2.carbon.bpel.ui.bpel2svg.AssignInterface; @@ -30,10 +30,9 @@ import org.wso2.carbon.bpel.ui.bpel2svg.WhileInterface; import org.wso2.carbon.bpel.ui.bpel2svg.ActivityInterface.ActivityState; -public class BPEL2SVGUtilTest { +public class BPEL2SVGUtilTest extends TestCase { - @org.junit.Test - @org.junit.Ignore + /* public void testGenerateMathNoTrace() { java.io.InputStream is=ClassLoader.getSystemResourceAsStream("bpel/Math.bpel"); @@ -92,8 +91,6 @@ } - @org.junit.Test - @org.junit.Ignore public void testGenerateMathRecvCompletedAssignFailed() { java.io.InputStream is=ClassLoader.getSystemResourceAsStream("bpel/Math.bpel"); @@ -160,8 +157,6 @@ } - @org.junit.Test - @org.junit.Ignore public void testGenerateMathRecvCompletedAssignActive() { java.io.InputStream is=ClassLoader.getSystemResourceAsStream("bpel/Math.bpel"); @@ -227,93 +222,76 @@ } } + */ - @org.junit.Test public void testMathGetLineNum53Seq() { checkActivityAtLine("bpel/Math.bpel", 53, SequenceInterface.class); } - @org.junit.Test public void testMathGetLineNum61PickReceive() { checkActivityAtLine("bpel/Math.bpel", 61, ReceiveInterface.class); } - @org.junit.Test public void testMathGetLineNum64Assign() { checkActivityAtLine("bpel/Math.bpel", 64, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum72AssignStill() { checkActivityAtLine("bpel/Math.bpel", 72, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum88Switch() { checkActivityAtLine("bpel/Math.bpel", 88, IfInterface.class); } - @org.junit.Test public void testMathGetLineNum118Sequence() { checkActivityAtLine("bpel/Math.bpel", 118, SequenceInterface.class); } - @org.junit.Test public void testMathGetLineNum119Assign() { checkActivityAtLine("bpel/Math.bpel", 119, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum132Sequence() { checkActivityAtLine("bpel/Math.bpel", 132, SequenceInterface.class); } - @org.junit.Test public void testMathGetLineNum133Switch() { checkActivityAtLine("bpel/Math.bpel", 133, IfInterface.class); } - @org.junit.Test public void testMathGetLineNum146Sequence() { checkActivityAtLine("bpel/Math.bpel", 146, SequenceInterface.class); } - @org.junit.Test public void testMathGetLineNum147Assign() { checkActivityAtLine("bpel/Math.bpel", 147, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum168Throw() { checkActivityAtLine("bpel/Math.bpel", 168, ThrowInterface.class); } - @org.junit.Test public void testMathGetLineNum177Sequence() { checkActivityAtLine("bpel/Math.bpel", 177, SequenceInterface.class); } - @org.junit.Test public void testMathGetLineNum178Assign() { checkActivityAtLine("bpel/Math.bpel", 178, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum186While() { checkActivityAtLine("bpel/Math.bpel", 186, WhileInterface.class); } - @org.junit.Test public void testMathGetLineNum188Assign() { checkActivityAtLine("bpel/Math.bpel", 188, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum229Assign() { checkActivityAtLine("bpel/Math.bpel", 229, AssignInterface.class); } - @org.junit.Test public void testMathGetLineNum253Reply() { checkActivityAtLine("bpel/Math.bpel", 253, ReplyInterface.class); } Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/console/pom.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -18,7 +18,9 @@ <modules> <module>integration</module> <module>identity</module> - <module>bpel2svg</module> + <!-- + <module>bpel2svg</module> + --> </modules> </project> Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/distribution/src/main/assembly/bin.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -64,6 +64,7 @@ <directory>../samples</directory> <outputDirectory>samples</outputDirectory> <includes> + <include>common/**</include> <include>esb/bpel_helloworld/**</include> <include>esb/bpel_loan_fault/**</include> <include>esb/invoke_esb_ebws/**</include> @@ -152,23 +153,11 @@ <include>mysql:mysql-connector-java</include> <include>org.apache.derby:derby</include> <include>org.apache.derby:derbytools</include> - <include>com.h2database:h2</include> + <include>com.h2database:h2</include> </includes> </dependencySet> <dependencySet> - <outputDirectory>/samples/common/lib</outputDirectory> - <includes> - <include>org.jboss.soa.bpel:riftsaw-tools</include> - <include>org.jboss.soa.bpel:riftsaw-utils</include> - <include>commons-codec:commons-codec</include> - <include>commons-httpclient:commons-httpclient</include> - <include>commons-logging:commons-logging</include> - <include>log4j:log4j</include> - </includes> - </dependencySet> - - <dependencySet> <outputDirectory>/modules/bpel-console</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> @@ -185,25 +174,7 @@ <outputDirectory>/lib</outputDirectory> <includes> <include>commons-codec:commons-codec</include> - <include>commons-collections:commons-collections</include> - <include>commons-httpclient:commons-httpclient</include> - <include>commons-logging:commons-logging</include> - <include>commons-pool:commons-pool</include> - <include>jaxen:jaxen</include> - <include>log4j:log4j</include> - <include>org.jboss.soa.bpel:riftsaw-bpel-api</include> - <include>org.jboss.soa.bpel:riftsaw-bpel-compiler</include> - <include>org.jboss.soa.bpel:riftsaw-bpel-obj</include> - <include>org.jboss.soa.bpel:riftsaw-bpel-schemas</include> <include>org.jboss.soa.bpel:riftsaw-tools</include> - <include>org.jboss.soa.bpel:riftsaw-utils</include> - <include>net.sf.saxon:saxon</include> - <include>net.sf.saxon:saxon-dom</include> - <include>net.sf.saxon:saxon-xpath</include> - <include>net.sf.saxon:saxon-xqj</include> - <include>wsdl4j:wsdl4j</include> - <include>xalan:xalan</include> - <include>xerces:xercesImpl</include> </includes> </dependencySet> Modified: trunk/distribution/src/main/release/bin/bpelc =================================================================== --- trunk/distribution/src/main/release/bin/bpelc 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/distribution/src/main/release/bin/bpelc 2010-08-20 22:45:24 UTC (rev 919) @@ -53,7 +53,13 @@ fi ODE_HOME=`cd "$ODE_BIN/.." && pwd` -LIB="$ODE_HOME/lib" + +. $ODE_HOME/install/deployment.properties + +LIB1="$ODE_HOME/modules/riftsaw.sar/lib" +LIB2="$ODE_HOME/lib" +LIB3="$org_jboss_as_home/client" + ETC="$ODE_HOME/etc" @@ -88,11 +94,21 @@ LOCALCLASSPATH="$ODE_CLASSPATH" # Add Ode libraries -for f in $LIB/*.jar +for f in $LIB1/*.jar do LOCALCLASSPATH=$LOCALCLASSPATH:$f done +for f in $LIB2/*.jar +do + LOCALCLASSPATH=$LOCALCLASSPATH:$f +done + +for f in $LIB3/*.jar +do + LOCALCLASSPATH=$LOCALCLASSPATH:$f +done + # For Cygwin, switch paths to Windows format before running java if $cygwin; then ODE_HOME=`cygpath --windows "$ODE_HOME"` Modified: trunk/distribution/src/main/release/bin/sendsoap =================================================================== --- trunk/distribution/src/main/release/bin/sendsoap 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/distribution/src/main/release/bin/sendsoap 2010-08-20 22:45:24 UTC (rev 919) @@ -53,7 +53,14 @@ fi ODE_HOME=`cd "$ODE_BIN/.." && pwd` -LIB="$ODE_HOME/lib" + +. $ODE_HOME/install/deployment.properties + +LIB1="$ODE_HOME/modules/riftsaw.sar/lib" +LIB2="$ODE_HOME/lib" +LIB3="$org_jboss_as_home/lib" +LIB4="$org_jboss_as_home/server/$org_jboss_as_config/lib" + ETC="$ODE_HOME/etc" @@ -88,11 +95,26 @@ LOCALCLASSPATH="$ODE_CLASSPATH" # Add Ode libraries -for f in $LIB/*.jar +for f in $LIB1/*.jar do LOCALCLASSPATH=$LOCALCLASSPATH:$f done +for f in $LIB2/*.jar +do + LOCALCLASSPATH=$LOCALCLASSPATH:$f +done + +for f in $LIB3/*.jar +do + LOCALCLASSPATH=$LOCALCLASSPATH:$f +done + +for f in $LIB4/*.jar +do + LOCALCLASSPATH=$LOCALCLASSPATH:$f +done + # For Cygwin, switch paths to Windows format before running java if $cygwin; then ODE_HOME=`cygpath --windows "$ODE_HOME"` Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/distribution/src/main/release/install/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -7,7 +7,7 @@ <property file="${org.jboss.soa.bpel.deployment.properties}"/> <property file="../version.properties" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deploy.dir" value="${server.dir}/deploy"/> <property name="deployers.dir" value="${server.dir}/deployers"/> @@ -16,7 +16,7 @@ <property name="bpel-runtime" value="riftsaw.sar" /> <property name="jbossesb-bpel" value="riftsaw.esb" /> <property name="bpel-esb-examples" value="esb" /> - <property name="esb.examples.dir" value="${org.jboss.esb.home}/samples/quickstarts"/> + <property name="esb.examples.dir" value="${org_jboss_esb_home}/samples/quickstarts"/> <!-- ws stack provider --> <property name="ws.stack" value="native" /> @@ -42,9 +42,9 @@ <target name="check.deploy.props"> <condition property="as.configured"> <and> - <isset property="org.jboss.as.home"/> - <isset property="org.jboss.as.config"/> - <isset property="org.jboss.esb.home"/> + <isset property="org_jboss_as_home"/> + <isset property="org_jboss_as_config"/> + <isset property="org_jboss_esb_home"/> </and> </condition> @@ -201,8 +201,8 @@ <unzip src="${ws.stack.dir}/jbossws-${ws.stack}-${ws.version}.zip" dest="${basedir}/ws-stack/dist/" /> <copy file="ws-stack/dist/jbossws-${ws.stack}-bin-dist/ant.properties.example" tofile="ws-stack/dist/jbossws-${ws.stack}-bin-dist/ant.properties" /> <ant dir="${basedir}/ws-stack/dist/jbossws-${ws.stack}-bin-dist" target="deploy-jboss510"> - <property name="jboss510.home" value="${org.jboss.as.home}" /> - <property name="jboss.server.instance" value="${org.jboss.as.config}" /> + <property name="jboss510.home" value="${org_jboss_as_home}" /> + <property name="jboss.server.instance" value="${org_jboss_as_config}" /> </ant> </target> Modified: trunk/distribution/src/main/release/install/deployment.properties =================================================================== --- trunk/distribution/src/main/release/install/deployment.properties 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/distribution/src/main/release/install/deployment.properties 2010-08-20 22:45:24 UTC (rev 919) @@ -8,15 +8,15 @@ # Use of relative paths or paths with spaces will cause runtime errors # when deploying and executing the samples. # (e.g. /var/local/jboss-5.1.0.GA) -org.jboss.as.home=/local/deploy/jboss-5.1.0.GA +org_jboss_as_home=/local/deploy/jboss-5.1.0.GA # The Configuration of JBoss AS to Use # (e.g. default) -org.jboss.as.config=default +org_jboss_as_config=default # The directory for JBossESB home # (e.g. /var/local/jbossesb-4.8) -org.jboss.esb.home=/var/local/jbossesb-4.8 +org_jboss_esb_home=/var/local/jbossesb-4.8 # database # (e.g. hsql postgres mysql) Modified: trunk/docs/docbook/userguide/src/main/module/deploy.xml =================================================================== --- trunk/docs/docbook/userguide/src/main/module/deploy.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/docs/docbook/userguide/src/main/module/deploy.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -29,7 +29,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deploy.dir" value="${server.dir}/deploy"/> <property name="server.lib.dir" value="${server.dir}/lib"/> Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -50,9 +50,9 @@ <ant antfile="build.xml" target="deploy" dir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install"> - <property name="org.jboss.as.home" value="${org.jboss.as.home}" /> - <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> - <property name="org.jboss.esb.home" value="${org.jboss.esb.home}" /> + <property name="org_jboss_as_home" value="${org_jboss_as_home}" /> + <property name="org_jboss_as_config" value="${org_jboss_as_config}" /> + <property name="org_jboss_esb_home" value="${org_jboss_esb_home}" /> <property name="database" value="${database}" /> </ant> </target> @@ -61,9 +61,9 @@ <ant antfile="build.xml" target="undeploy" dir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install"> - <property name="org.jboss.as.home" value="${org.jboss.as.home}" /> - <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> - <property name="org.jboss.esb.home" value="${org.jboss.esb.home}" /> + <property name="org_jboss_as_home" value="${org_jboss_as_home}" /> + <property name="org_jboss_as_config" value="${org_jboss_as_config}" /> + <property name="org_jboss_esb_home" value="${org_jboss_esb_home}" /> <property name="database" value="${database}" /> </ant> </target> @@ -72,14 +72,14 @@ <java classname="org.jboss.Main" fork="true" spawn="true" - dir="${org.jboss.as.home}/server/${org.jboss.as.config}" > - <arg line="-c ${org.jboss.as.config}"/> - <jvmarg value="-Djava.endorsed.dirs=${org.jboss.as.home}/lib/endorsed"/> + dir="${org_jboss_as_home}/server/${org_jboss_as_config}" > + <arg line="-c ${org_jboss_as_config}"/> + <jvmarg value="-Djava.endorsed.dirs=${org_jboss_as_home}/lib/endorsed"/> <jvmarg value="-Xms128m"/> <jvmarg value="-Xmx512m"/> <jvmarg value="-XX:MaxPermSize=256m"/> <classpath> - <pathelement path="${org.jboss.as.home}/bin/run.jar"/> + <pathelement path="${org_jboss_as_home}/bin/run.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> @@ -100,13 +100,13 @@ <target name="stop-server" > <echo>Stopping the server</echo> - <echo>Server is at ${org.jboss.as.home}</echo> + <echo>Server is at ${org_jboss_as_home}</echo> <java classname="org.jboss.Shutdown" fork="true" failonerror="false" resultproperty="shutdown.rc"> <arg line="-s jnp://localhost:1099 --shutdown"/> <classpath> - <pathelement path="${org.jboss.as.home}/bin/shutdown.jar"/> - <pathelement path="${org.jboss.as.home}/client/jbossall-client.jar"/> + <pathelement path="${org_jboss_as_home}/bin/shutdown.jar"/> + <pathelement path="${org_jboss_as_home}/client/jbossall-client.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_approval_service/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_approval_service/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_approval_service/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -15,7 +15,7 @@ <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -15,7 +15,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -7,7 +7,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deployers.dir" value="${server.dir}/deployers"/> <property name="server.lib.dir" value="${server.dir}/lib"/> @@ -20,7 +20,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> <fileset dir="${deployers.dir}/jbossws.deployer" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -7,7 +7,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deployers.dir" value="${server.dir}/deployers"/> <property name="server.lib.dir" value="${server.dir}/lib"/> @@ -21,7 +21,7 @@ <property name="client.build.dir" location="${deploy.dir}/${ant.project.name}/build/client"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <fileset dir="${deployers.dir}/jbossws.deployer" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -72,7 +72,7 @@ <pathelement location="${client.build.dir}"/> <path refid="compile-classpath" /> <pathelement location="${basedir}/client/resources"/> - <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="*.jar" /> + <fileset dir="${org_jboss_as_home}/lib/endorsed" includes="*.jar" /> </classpath> </java> </target> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -7,7 +7,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="project.under.test" value="Quickstart_bpel_secure_service" /> @@ -20,7 +20,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -15,7 +15,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -16,7 +16,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -16,7 +16,7 @@ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -13,7 +13,7 @@ location="${deploy.dir}/${ant.project.name}/build/war/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="deploywar" description="make war"> Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -15,8 +15,8 @@ location="${deploy.dir}/${ant.project.name}/build/ejb/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/common/lib/servlet-api.jar" /> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/common/lib/servlet-api.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="deployq"> Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -13,7 +13,7 @@ location="${deploy.dir}/${ant.project.name}/build/war/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="deploywar" description="make war"> Modified: trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -18,8 +18,8 @@ <javac srcdir="${src.dir}" destdir="${classes}" debug="true" deprecation="true" fork="true" > <classpath> - <fileset dir="${org.jboss.esb.home}/lib" /> - <fileset dir="${org.jboss.as.home}/client" excludes="jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jaxws-rt.jar jaxws-tools.jar" /> + <fileset dir="${org_jboss_esb_home}/lib" /> + <fileset dir="${org_jboss_as_home}/client" excludes="jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jaxws-rt.jar jaxws-tools.jar" /> </classpath> </javac> </target> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/pom.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -77,7 +77,7 @@ <riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version> <bpel.console.version>2.1.2</bpel.console.version> <commons.logging.version>1.1.1</commons.logging.version> - <junit.version>4.4</junit.version> + <junit.version>3.8.1</junit.version> <jboss.version>5.1.0.GA</jboss.version> <log4j.version>1.2.14</log4j.version> <jbossesb.version>4.8</jbossesb.version> Modified: trunk/qa/build.xml =================================================================== --- trunk/qa/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/qa/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -34,19 +34,19 @@ <property name="soa.p.distro.path" value="${download.dir}/${soa.p.filename}" /> <property name="soa.p.home" value="${riftsaw.home}/jboss-soa-p.5.0.0/jboss-as" /> - <property name="org.jboss.as.config" value="default" /> + <property name="org_jboss_as_config" value="default" /> <property name="ojdbc.url" value="http://www.qa.jboss.com/jdbc-drivers/maven2/com/oracle/ojdbc1... <property name="replace.qa.jdbc" value="true" /> - <property name="org.jboss.esb.home" value="${jboss.parent.dir}/jbossesb-${jbossesb.version}" /> + <property name="org_jboss_esb_home" value="${jboss.parent.dir}/jbossesb-${jbossesb.version}" /> <echo message="===============================" /> <echo message="database.......... ${database}" /> <echo message="riftsaw.version...... ${riftsaw.version}" /> <echo message="riftsaw.home......... ${riftsaw.home}" /> <echo message="jboss.home.. ${jboss.home}" /> - <echo message="org.jboss.esb.home .. ${org.jboss.esb.home}" /> + <echo message="org_jboss_esb_home .. ${org_jboss_esb_home}" /> <echo message="===============================" /> <condition property="is.jboss.distro.available"> @@ -96,7 +96,7 @@ <ant dir="${jboss.parent.dir}/jbossesb-${jbossesb.version}/install" target="deploy"> <property name="org.jboss.esb.server.home" value="${jboss.home}" /> - <property name="org.jboss.esb.server.config" value="${org.jboss.as.config}" /> + <property name="org.jboss.esb.server.config" value="${org_jboss_as_config}" /> </ant> <antcall target="get.ojdbc" /> @@ -110,8 +110,8 @@ <unzip src="../distribution/target/riftsaw-${riftsaw.version}.zip" dest="../distribution/target" /> <ant dir="../distribution/target/riftsaw-${riftsaw.version}/install" target="deploy"> - <property name="org.jboss.as.home" value="${jboss.home}" /> - <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> + <property name="org_jboss_as_home" value="${jboss.home}" /> + <property name="org_jboss_as_config" value="${org_jboss_as_config}" /> </ant> </target> @@ -177,12 +177,12 @@ <!-- ### Remove Security constraints, here basically for EAP, SOA-P testing --> <target name="remove.security.constraints"> <echo>Remove the security constraints for jmx-console</echo> - <copy todir="${soa.p.home}/server/${org.jboss.as.config}/deploy/jmx-console.war/WEB-INF" overwrite="true"> + <copy todir="${soa.p.home}/server/${org_jboss_as_config}/deploy/jmx-console.war/WEB-INF" overwrite="true"> <fileset dir="${basedir}/soa-p/jmx-console.war"> <include name="*.xml" /> </fileset> </copy> - <copy todir="${soa.p.home}/server/${org.jboss.as.config}/deploy" overwrite="true"> + <copy todir="${soa.p.home}/server/${org_jboss_as_config}/deploy" overwrite="true"> <fileset dir="${basedir}/soa-p"> <include name="jmx-invoker-service.xml" /> </fileset> @@ -200,13 +200,13 @@ <target name="stop-server" > <echo>Stopping the server</echo> - <echo>Server is at ${org.jboss.as.home}</echo> + <echo>Server is at ${org_jboss_as_home}</echo> <java classname="org.jboss.Shutdown" fork="true" failonerror="false" resultproperty="shutdown.rc"> <arg line="-s jnp://localhost:1099 --shutdown"/> <classpath> - <pathelement path="${org.jboss.as.home}/bin/shutdown.jar"/> - <pathelement path="${org.jboss.as.home}/client/jbossall-client.jar"/> + <pathelement path="${org_jboss_as_home}/bin/shutdown.jar"/> + <pathelement path="${org_jboss_as_home}/client/jbossall-client.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> Added: trunk/samples/common/base-build.xml =================================================================== --- trunk/samples/common/base-build.xml (rev 0) +++ trunk/samples/common/base-build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -0,0 +1,32 @@ +<project name="base-build" basedir="."> + + <!-- Import the base Ant build script... --> + <property file="../../install/deployment.properties" /> + + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> + <property name="conf.dir" value="${server.dir}/conf"/> + <property name="deploy.dir" value="${server.dir}/deploy"/> + <property name="deployers.dir" value="${server.dir}/deployers"/> + <property name="server.lib.dir" value="${server.dir}/lib"/> + <property name="server.client.dir" value="${org_jboss_as_home}/client"/> + <property name="riftsaw.lib.dir" value="${deploy.dir}/riftsaw.sar/lib"/> + + <path id="rs-exec-classpath"> + <fileset dir="../../../modules/riftsaw.sar/lib"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="../../../lib"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="${server.lib.dir}"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="${server.client.dir}"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="${org_jboss_as_home}/lib/endorsed"> + <include name="**/*.jar"/> + </fileset> + </path> + +</project> Modified: trunk/samples/esb/bpel_helloworld/build.xml =================================================================== --- trunk/samples/esb/bpel_helloworld/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/esb/bpel_helloworld/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.esb.name" value="${ant.project.name}.esb" /> <target name="deployesb" > @@ -34,7 +29,7 @@ </target> <!-- Import the base Ant build script... --> - <import file="${org.jboss.esb.home}/samples/quickstarts/conf/base-build.xml"/> + <import file="${org_jboss_esb_home}/samples/quickstarts/conf/base-build.xml"/> <target name="runtest" depends="compile" description="Will send an esb Message"> Modified: trunk/samples/esb/bpel_loan_fault/build.xml =================================================================== --- trunk/samples/esb/bpel_loan_fault/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/esb/bpel_loan_fault/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.esb.name" value="${ant.project.name}.esb" /> <target name="deployesb" > @@ -34,7 +29,7 @@ </target> <!-- Import the base Ant build script... --> - <import file="${org.jboss.esb.home}/samples/quickstarts/conf/base-build.xml"/> + <import file="${org_jboss_esb_home}/samples/quickstarts/conf/base-build.xml"/> <target name="runtest" depends="compile" description="Will send an esb Message"> Modified: trunk/samples/esb/invoke_esb_ebws/build.xml =================================================================== --- trunk/samples/esb/invoke_esb_ebws/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/esb/invoke_esb_ebws/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="sample.esb.name" value="CreditAgency.esb" /> @@ -41,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_approval_serviceWS"/> <arg value="messages/approve_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/esb/simple_esb_proxy_invoke/build.xml =================================================================== --- trunk/samples/esb/simple_esb_proxy_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/esb/simple_esb_proxy_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,24 +5,19 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="sample.esb.name" value="SimpleESBProxyInvoke.esb" /> <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> - <fileset dir="${org.jboss.esb.home}/lib" includes="*.jar" /> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> + <fileset dir="${org_jboss_esb_home}/lib" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -83,12 +78,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_invokeWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/esb/simple_esb_proxy_invoke2/build.xml =================================================================== --- trunk/samples/esb/simple_esb_proxy_invoke2/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/esb/simple_esb_proxy_invoke2/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,24 +5,19 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="sample.esb.name" value="${ant.project.name}-service.esb" /> <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> - <fileset dir="${org.jboss.esb.home}/lib" includes="*.jar" /> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> + <fileset dir="${org_jboss_esb_home}/lib" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -83,12 +78,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_invokeWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/bpel_event_listener/build.xml =================================================================== --- trunk/samples/quickstart/bpel_event_listener/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/bpel_event_listener/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,22 +5,15 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> + <import file="../../common/base-build.xml"/> - <property name="riftsaw.lib.dir" value="${deploy.dir}/riftsaw.sar/lib"/> - <property name="sample.jar.name" value="${ant.project.name}.jar" /> <property name="build.dir" location="build/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> <fileset dir="${riftsaw.lib.dir}" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -34,7 +27,7 @@ </classpath> </javac> - <jar basedir="${build.dir}" destfile="${riftsaw.lib.dir}/${sample.jar.name}" /> + <jar basedir="${build.dir}" destfile="${riftsaw.lib.dir}/${sample.jar.name}" /> </target> <target name="deploy" depends="makejar" > Modified: trunk/samples/quickstart/hello_world/build.xml =================================================================== --- trunk/samples/quickstart/hello_world/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/hello_world/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_hello_worldWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/quickstart/hello_world_header_ode/build.xml =================================================================== --- trunk/samples/quickstart/hello_world_header_ode/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/hello_world_header_ode/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/quickstart/hello_world_header_wsdl/build.xml =================================================================== --- trunk/samples/quickstart/hello_world_header_wsdl/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/hello_world_header_wsdl/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_hello_world_header_wsdlWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/quickstart/loan_approval/build.xml =================================================================== --- trunk/samples/quickstart/loan_approval/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/loan_approval/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,22 +5,17 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -77,12 +72,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_loan_approvalWS"/> <arg value="messages/loanreq1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -91,12 +81,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_loan_approvalWS"/> <arg value="messages/loanreq2.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -105,12 +90,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_loan_approvalWS"/> <arg value="messages/loanreq3.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -119,12 +99,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_loan_approvalWS"/> <arg value="messages/loanreq4.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/math/build.xml =================================================================== --- trunk/samples/quickstart/math/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/math/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/MathProcess"/> <arg value="messages/math_${op}_request.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/salutations/build.xml =================================================================== --- trunk/samples/quickstart/salutations/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/salutations/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/SalutationsProcess"/> <arg value="messages/salute_morning.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/SalutationsProcess"/> <arg value="messages/salute_afternoon.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/SalutationsProcess"/> <arg value="messages/salute_evening.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -74,12 +54,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/SalutationsProcess"/> <arg value="messages/salute_night.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/say_hello/build.xml =================================================================== --- trunk/samples/quickstart/say_hello/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/say_hello/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/SayHelloProcess"/> <arg value="messages/sayHello_request.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/secure_invoke/build.xml =================================================================== --- trunk/samples/quickstart/secure_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/secure_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,23 +5,17 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="deployers.dir" value="${server.dir}/deployers"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> <fileset dir="${deployers.dir}/jbossws.deployer" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -92,12 +86,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_secure_invokeWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/secure_service/build.xml =================================================================== --- trunk/samples/quickstart/secure_service/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/secure_service/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,24 +5,18 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="deployers.dir" value="${server.dir}/deployers"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="server.build.dir" location="build/server"/> <property name="client.build.dir" location="build/client"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <fileset dir="${deployers.dir}/jbossws.deployer" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -65,12 +59,12 @@ <arg value="${basedir}/bpelContent/HelloWorld.wsdl"/> <!-- arg value="http://localhost:8080/Quickstart_bpel_secure_serviceWS"/ --> <arg value="messages/hello_request1.xml"/> - <classpath> - <pathelement location="${client.build.dir}"/> - <path refid="compile-classpath" /> - <pathelement location="${basedir}/client/resources"/> - <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="*.jar" /> - </classpath> + <classpath> + <pathelement location="${client.build.dir}"/> + <path refid="compile-classpath" /> + <path refid="rs-exec-classpath" /> + <pathelement location="${basedir}/client/resources"/> + </classpath> </java> </target> Modified: trunk/samples/quickstart/service_handler/build.xml =================================================================== --- trunk/samples/quickstart/service_handler/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/service_handler/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,22 +5,16 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="deployers.dir" value="${server.dir}/deployers"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> - <property name="code.build.dir" location="build/classes"/> + <property name="code.build.dir" location="build/classes"/> - <path id="compile-classpath"> + <path id="compile-classpath"> <fileset dir="${deployers.dir}/jbossws.deployer" includes="*.jar" /> </path> @@ -54,12 +48,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_service_handlerWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/quickstart/simple_correlation/build.xml =================================================================== --- trunk/samples/quickstart/simple_correlation/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/simple_correlation/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/goodbye_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/hello_request2.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -74,12 +54,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/goodbye_request2.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -88,12 +63,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/hello_request3.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -102,12 +72,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_correlationWS"/> <arg value="messages/goodbye_request3.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/quickstart/simple_invoke/build.xml =================================================================== --- trunk/samples/quickstart/simple_invoke/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/simple_invoke/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,22 +5,17 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/> @@ -74,12 +69,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_invokeWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> Modified: trunk/samples/quickstart/simple_pick/build.xml =================================================================== --- trunk/samples/quickstart/simple_pick/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/quickstart/simple_pick/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_pickWS"/> <arg value="messages/hello_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/Quickstart_bpel_simple_pickWS"/> <arg value="messages/goodbye_request1.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/BPEL-BluePrint1/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint1/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/BPEL-BluePrint1/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"/> <arg value="messages/invalid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/BPEL-BluePrint2/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint2/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/BPEL-BluePrint2/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"/> <arg value="messages/invalid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"/> <arg value="messages/timeout.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/BPEL-BluePrint3/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint3/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/BPEL-BluePrint3/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"/> <arg value="messages/invalid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"/> <arg value="messages/throw_po_fault.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -74,12 +54,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"/> <arg value="messages/throw_inv_fault.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/BPEL-BluePrint4/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint4/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/BPEL-BluePrint4/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint4_PurchaseOrderService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint4_PurchaseOrderService"/> <arg value="messages/invalid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint4_PurchaseOrderConfirmService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -74,12 +54,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint4_PurchaseOrderCancelService"/> <arg value="messages/valid.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/BPEL-BluePrint5/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint5/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/BPEL-BluePrint5/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -5,16 +5,11 @@ ${line.separator} </description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> + <import file="../../common/base-build.xml"/> <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> - <property name="conf.dir" value="${server.dir}/conf"/> - <property name="deploy.dir" value="${server.dir}/deploy"/> - <property name="server.lib.dir" value="${server.dir}/lib"/> - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <target name="deploy"> @@ -32,12 +27,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint5_ReservationService"/> <arg value="messages/book_airline.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -46,12 +36,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint5_ReservationService"/> <arg value="messages/book_car.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -60,12 +45,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint5_ReservationService"/> <arg value="messages/book_hotel.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> @@ -74,12 +54,7 @@ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender"> <arg value="http://localhost:8080/BPEL_BluePrint5_ReservationService"/> <arg value="messages/book_all.xml"/> - <classpath> - <fileset dir="../../common/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${java.class.path}"/> - </classpath> + <classpath refid="rs-exec-classpath"/> </java> </target> </project> Modified: trunk/samples/tutorial/atm/build.xml =================================================================== --- trunk/samples/tutorial/atm/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/atm/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -2,22 +2,17 @@ <description>${ant.project.name}</description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> - + <import file="../../common/base-build.xml"/> + <property name="version" value="1" /> - - <property name="server.dir" - value="${org.jboss.as.home}/server/${org.jboss.as.config}" /> - <property name="conf.dir" value="${server.dir}/conf" /> - <property name="deploy.dir" value="${server.dir}/deploy" /> - <property name="server.lib.dir" value="${server.dir}/lib" /> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + <property name="war.build.dir" location="build/war/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="makewar" description="make war"> Modified: trunk/samples/tutorial/purchase/build.xml =================================================================== --- trunk/samples/tutorial/purchase/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/purchase/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -2,24 +2,19 @@ <description>${ant.project.name}</description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> - + <import file="../../common/base-build.xml"/> + <property name="version" value="1" /> - - <property name="server.dir" - value="${org.jboss.as.home}/server/${org.jboss.as.config}" /> - <property name="conf.dir" value="${server.dir}/conf" /> - <property name="deploy.dir" value="${server.dir}/deploy" /> - <property name="server.lib.dir" value="${server.dir}/lib" /> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + <property name="war.build.dir" location="build/war/classes" /> <property name="ejb.build.dir" location="build/ejb/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/common/lib/servlet-api.jar" /> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/common/lib/servlet-api.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="deployq"> Modified: trunk/samples/tutorial/travel_agency/build.xml =================================================================== --- trunk/samples/tutorial/travel_agency/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/samples/tutorial/travel_agency/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -2,22 +2,17 @@ <description>${ant.project.name}</description> - <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> - + <import file="../../common/base-build.xml"/> + <property name="version" value="1" /> - - <property name="server.dir" - value="${org.jboss.as.home}/server/${org.jboss.as.config}" /> - <property name="conf.dir" value="${server.dir}/conf" /> - <property name="deploy.dir" value="${server.dir}/deploy" /> - <property name="server.lib.dir" value="${server.dir}/lib" /> - + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + <property name="war.build.dir" location="build/war/classes" /> <path id="compile-classpath"> - <pathelement location="${org.jboss.as.home}/client/jboss-javaee.jar" /> + <pathelement location="${org_jboss_as_home}/client/jboss-javaee.jar" /> </path> <target name="makewar" description="make war"> Modified: trunk/stress-tests/build.xml =================================================================== --- trunk/stress-tests/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/stress-tests/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -45,9 +45,9 @@ <ant antfile="build.xml" target="deploy" dir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install"> - <property name="org.jboss.as.home" value="${org.jboss.as.home}" /> - <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> - <property name="org.jboss.esb.home" value="${org.jboss.esb.home}" /> + <property name="org_jboss_as_home" value="${org_jboss_as_home}" /> + <property name="org_jboss_as_config" value="${org_jboss_as_config}" /> + <property name="org_jboss_esb_home" value="${org_jboss_esb_home}" /> <property name="database" value="${database}" /> </ant> <ant antfile="src/test/resources/performance/build.xml" target="deploy"/> @@ -58,9 +58,9 @@ <ant antfile="build.xml" target="undeploy" dir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install"> - <property name="org.jboss.as.home" value="${org.jboss.as.home}" /> - <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> - <property name="org.jboss.esb.home" value="${org.jboss.esb.home}" /> + <property name="org_jboss_as_home" value="${org_jboss_as_home}" /> + <property name="org_jboss_as_config" value="${org_jboss_as_config}" /> + <property name="org_jboss_esb_home" value="${org_jboss_esb_home}" /> <property name="database" value="${database}" /> </ant> </target> @@ -69,14 +69,14 @@ <java classname="org.jboss.Main" fork="true" spawn="true" - dir="${org.jboss.as.home}/server/${org.jboss.as.config}" > - <arg line="-c ${org.jboss.as.config}"/> - <jvmarg value="-Djava.endorsed.dirs=${org.jboss.as.home}/lib/endorsed"/> + dir="${org_jboss_as_home}/server/${org_jboss_as_config}" > + <arg line="-c ${org_jboss_as_config}"/> + <jvmarg value="-Djava.endorsed.dirs=${org_jboss_as_home}/lib/endorsed"/> <jvmarg value="-Xms128m"/> <jvmarg value="-Xmx512m"/> <jvmarg value="-XX:MaxPermSize=256m"/> <classpath> - <pathelement path="${org.jboss.as.home}/bin/run.jar"/> + <pathelement path="${org_jboss_as_home}/bin/run.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> @@ -97,13 +97,13 @@ <target name="stop-server" > <echo>Stopping the server</echo> - <echo>Server is at ${org.jboss.as.home}</echo> + <echo>Server is at ${org_jboss_as_home}</echo> <java classname="org.jboss.Shutdown" fork="true" failonerror="false" resultproperty="shutdown.rc"> <arg line="-s jnp://localhost:1099 --shutdown"/> <classpath> - <pathelement path="${org.jboss.as.home}/bin/shutdown.jar"/> - <pathelement path="${org.jboss.as.home}/client/jbossall-client.jar"/> + <pathelement path="${org_jboss_as_home}/bin/shutdown.jar"/> + <pathelement path="${org_jboss_as_home}/client/jbossall-client.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> Modified: trunk/stress-tests/src/test/resources/performance/build.xml =================================================================== --- trunk/stress-tests/src/test/resources/performance/build.xml 2010-08-20 07:02:38 UTC (rev 918) +++ trunk/stress-tests/src/test/resources/performance/build.xml 2010-08-20 22:45:24 UTC (rev 919) @@ -10,7 +10,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> + <property name="server.dir" value="${org_jboss_as_home}/server/${org_jboss_as_config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deploy.dir" value="${server.dir}/deploy"/> <property name="server.lib.dir" value="${server.dir}/lib"/> @@ -21,7 +21,7 @@ <property name="war.build.dir" value="bin"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> + <fileset dir="${org_jboss_as_home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> </path> <property name="compile-classpath" refid="compile-classpath"/>