Author: jeff.yuchang Date: 2009-11-09 11:43:42 -0500 (Mon, 09 Nov 2009) New Revision: 257 Modified: trunk/distribution/src/main/release/install/build.xml trunk/distribution/src/main/release/install/deployment.properties trunk/integration-tests/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_atm/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml trunk/qa/build.xml trunk/qa/hudson-riftsaw-db.sh trunk/qa/hudson-riftsaw-jboss.sh trunk/qa/hudson-riftsaw-jdk5.sh trunk/qa/hudson-riftsaw-ws.sh trunk/samples/quickstart/atm/build.xml trunk/samples/quickstart/hello_world/build.xml trunk/samples/quickstart/loan_approval/build.xml trunk/samples/quickstart/simple_correlation/build.xml trunk/samples/quickstart/simple_invoke/build.xml Log: * replace the 'esb.server' in the deployment.properties as 'as.home'. also 'esb.config' as 'as.config'. Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/distribution/src/main/release/install/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -7,7 +7,7 @@ <property file="${org.jboss.soa.bpel.deployment.properties}"/> <property file="../version.properties" /> - <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.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"/> @@ -38,22 +38,21 @@ <property name="samples" value="../samples" /> <target name="check.deploy.props"> - <condition property="esb.server.configured"> + <condition property="as.configured"> <and> - <isset property="org.jboss.esb.server.home"/> - <isset property="org.jboss.esb.server.config"/> + <isset property="org.jboss.as.home"/> + <isset property="org.jboss.as.config"/> <isset property="org.jboss.esb.home"/> </and> </condition> - <fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/> + <fail unless="as.configured" message="Cannot determine target deployment, please check deployment.properties"/> </target> <target name="deploy" description="Deploys BPEL Runtime to the server"> <antcall target="internal.install.riftsaw.ws.stack"/> - <antcall target="remove.redundant.juddi" /> - + <echo message="Deploy BPEL runtime to JBoss server" /> <copy todir="${deployers.dir}/${bpel-deployer}"> <fileset dir="${modules}/${bpel-deployer}" /> @@ -107,6 +106,8 @@ tofile="${deploy.dir}/${bpel-runtime}/lib/xmlbeans-2.3.0.tmp"/> <copy file="${modules}/shared/xmlbeans.jar" todir="${deployers.dir}/esb.deployer/lib"/> + <antcall target="remove.redundant.juddi" /> + </target> <target name="undeploy" description="Undeploys BPEL Runtime"> @@ -205,8 +206,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.esb.server.home}" /> - <property name="jboss.server.instance" value="${org.jboss.esb.server.config}" /> + <property name="jboss510.home" value="${org.jboss.as.home}" /> + <property name="jboss.server.instance" value="${org.jboss.as.config}" /> </ant> </target> @@ -215,13 +216,16 @@ <get src="${ws.stack.distro.url}" dest="${ws.stack.dir}/jbossws-${ws.stack}-${ws.version}.zip" /> </target> - <condition property="is.juddi.duplicated"> - <available file="${org.jboss.esb.home}/server/${org.jboss.esb.server.config}/deploy/juddi-service.sar" /> - </condition> + <target name="check.juddi"> + <condition property="is.juddi.duplicated"> + <available file="${deploy.dir}/juddi-service.sar" /> + </condition> + </target> - <target name="remove.redundant.juddi" if="is.juddi.duplicated"> + <target name="remove.redundant.juddi" if="is.juddi.duplicated" depends="check.juddi"> <!-- JBoss WS install additional juddi, duplicated with JBossESB's juddi one, or in cluster environment --> - <delete dir="${org.jboss.esb.home}/server/${org.jboss.esb.server.config}/deploy/juddi-service.sar"/> + <echo> deleting the duplicated juddi service</echo> + <delete dir="${deploy.dir}/juddi-service.sar"/> </target> </project> Modified: trunk/distribution/src/main/release/install/deployment.properties =================================================================== --- trunk/distribution/src/main/release/install/deployment.properties 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/distribution/src/main/release/install/deployment.properties 2009-11-09 16:43:42 UTC (rev 257) @@ -8,11 +8,11 @@ # 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.esb.server.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.esb.server.config=default +org.jboss.as.config=default # The directory for JBossESB home # (e.g. /var/local/jbossesb-4.6.GA) Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/integration-tests/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -19,8 +19,8 @@ <ant antfile="build.xml" target="deploy" dir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install"> - <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}" /> - <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}" /> + <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> @@ -30,8 +30,8 @@ <ant antfile="build.xml" target="undeploy" dir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install"> - <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}" /> - <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}" /> + <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> @@ -41,14 +41,14 @@ <java classname="org.jboss.Main" fork="true" spawn="true" - dir="${org.jboss.esb.server.home}/server/default" > + dir="${org.jboss.as.home}/server/default" > <arg line="-c default"/> - <jvmarg value="-Djava.endorsed.dirs=${org.jboss.esb.server.home}/lib/endorsed"/> + <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.esb.server.home}/bin/run.jar"/> + <pathelement path="${org.jboss.as.home}/bin/run.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> @@ -61,7 +61,7 @@ <echo>JNP port detected, just waiting for 1 min 30 secs to ensure server started</echo> - <sleep minutes="2" seconds="30" /> + <sleep minutes="1" seconds="30" /> <echo>Server has started</echo> @@ -69,13 +69,13 @@ <target name="stop-server" > <echo>Stopping the server</echo> - <echo>Server is at ${org.jboss.esb.server.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.esb.server.home}/bin/shutdown.jar"/> - <pathelement path="${org.jboss.esb.server.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_atm/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_atm/build.xml 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_atm/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -15,7 +15,7 @@ <path id="compile-classpath"> <!-- Required for JMS Client Code. --> - <fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> + <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> </path> <target name="deploywar" description="make war"> 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 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -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.esb.server.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 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -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.esb.server.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/qa/build.xml =================================================================== --- trunk/qa/build.xml 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/qa/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -28,7 +28,7 @@ <property name="jbossesb.distro.url" value="http://jboss.org/downloading/?projectId=jbossesb&amp;url=... /> <property name="jbossesb.distro.path" value="${download.dir}/${jbossesb.filename}" /> - <property name="org.jboss.esb.server.config" value="default" /> + <property name="org.jboss.as.config" value="default" /> <echo message="database.......... ${database}" /> <echo message="riftsaw.version...... ${riftsaw.version}" /> @@ -72,7 +72,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.esb.server.config}" /> + <property name="org.jboss.esb.server.config" value="${org.jboss.as.config}" /> </ant> </target> @@ -83,8 +83,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.esb.server.home" value="${jboss.home}}" /> - <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}" /> + <property name="org.jboss.as.home" value="${jboss.home}}" /> + <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> </ant> </target> Modified: trunk/qa/hudson-riftsaw-db.sh =================================================================== --- trunk/qa/hudson-riftsaw-db.sh 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/qa/hudson-riftsaw-db.sh 2009-11-09 16:43:42 UTC (rev 257) @@ -26,11 +26,11 @@ ant $ANT_PROPERTIES drop.riftsaw.schema RIFTSAW_VERSION="2.0-SNAPSHOT" -ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" -ESB_CONFIG="default" +AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" +AS_CONFIG="default" echo build the RiftSaw and run integration tests -echo ESB_HOME=$ESB_HOME, ESB_CONIFG=$ESB_CONFIG +echo AS_HOME=$AS_HOME, AS_CONIFG=$AS_CONFIG cd ../integration-tests -mvn -Dorg.jboss.esb.server.home=$ESB_HOME -Dorg.jboss.esb.server.config=$ESB_CONFIG -Ddatabase=$DATABASE clean install +mvn -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Ddatabase=$DATABASE clean install Modified: trunk/qa/hudson-riftsaw-jboss.sh =================================================================== --- trunk/qa/hudson-riftsaw-jboss.sh 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/qa/hudson-riftsaw-jboss.sh 2009-11-09 16:43:42 UTC (rev 257) @@ -22,11 +22,11 @@ ant $ANT_PROPERTIES install.jbossesb RIFTSAW_VERSION="2.0-SNAPSHOT" -ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" -ESB_CONFIG="default" +AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" +AS_CONFIG="default" echo build the RiftSaw and run integration tests -echo ESB_HOME=$ESB_HOME, ESB_CONIFG=$ESB_CONFIG +echo AS_HOME=$AS_HOME, AS_CONIFG=$AS_CONFIG cd ../integration-tests -mvn -Dorg.jboss.esb.server.home=$ESB_HOME -Dorg.jboss.esb.server.config=$ESB_CONFIG -Ddatabase=$DATABASE clean install +mvn -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Ddatabase=$DATABASE clean install Modified: trunk/qa/hudson-riftsaw-jdk5.sh =================================================================== --- trunk/qa/hudson-riftsaw-jdk5.sh 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/qa/hudson-riftsaw-jdk5.sh 2009-11-09 16:43:42 UTC (rev 257) @@ -27,12 +27,12 @@ #ant $ANT_PROPERTIES drop.riftsaw.schema RIFTSAW_VERSION="2.0-SNAPSHOT" -ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" -ESB_CONFIG="default" +AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" +AS_CONFIG="default" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" echo build the RiftSaw and run integration tests -echo ESB_HOME=$ESB_HOME, ESB_CONIFG=$ESB_CONFIG WS_STACK_DIR=$WS_STACK_DIR WS_STACK=$WS_STACK +echo AS_HOME=$AS_HOME, AS_CONIFG=$AS_CONFIG WS_STACK_DIR=$WS_STACK_DIR WS_STACK=$WS_STACK cd ../integration-tests -mvn -Dorg.jboss.esb.server.home=$ESB_HOME -Dorg.jboss.esb.server.config=$ESB_CONFIG -Ddatabase=$DATABASE -Dws.stack.dir=$WS_STACK_DIR clean install +mvn -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Ddatabase=$DATABASE -Dws.stack.dir=$WS_STACK_DIR clean install Modified: trunk/qa/hudson-riftsaw-ws.sh =================================================================== --- trunk/qa/hudson-riftsaw-ws.sh 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/qa/hudson-riftsaw-ws.sh 2009-11-09 16:43:42 UTC (rev 257) @@ -26,12 +26,12 @@ #ant $ANT_PROPERTIES drop.riftsaw.schema RIFTSAW_VERSION="2.0-SNAPSHOT" -ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" -ESB_CONFIG="default" +AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" +AS_CONFIG="default" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" echo build the RiftSaw and run integration tests -echo ESB_HOME=$ESB_HOME, ESB_CONIFG=$ESB_CONFIG WS_STACK_DIR=$WS_STACK_DIR WS_STACK=$WS_STACK +echo AS_HOME=$AS_HOME, AS_CONIFG=$AS_CONFIG WS_STACK_DIR=$WS_STACK_DIR WS_STACK=$WS_STACK cd ../integration-tests -mvn -Dorg.jboss.esb.server.home=$ESB_HOME -Dorg.jboss.esb.server.config=$ESB_CONFIG -Ddatabase=$DATABASE -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR clean install +mvn -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Ddatabase=$DATABASE -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR clean install Modified: trunk/samples/quickstart/atm/build.xml =================================================================== --- trunk/samples/quickstart/atm/build.xml 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/samples/quickstart/atm/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -9,7 +9,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.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" /> @@ -19,7 +19,7 @@ <path id="compile-classpath"> <!-- Required for JMS Client Code. --> - <fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> + <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> </path> <property name="compile-classpath" refid="compile-classpath" /> Modified: trunk/samples/quickstart/hello_world/build.xml =================================================================== --- trunk/samples/quickstart/hello_world/build.xml 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/samples/quickstart/hello_world/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -10,7 +10,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.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/samples/quickstart/loan_approval/build.xml =================================================================== --- trunk/samples/quickstart/loan_approval/build.xml 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/samples/quickstart/loan_approval/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -10,7 +10,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.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"/> @@ -20,7 +20,7 @@ <property name="war.build.dir" location="build/war/classes"/> <path id="compile-classpath"> - <fileset dir="${org.jboss.esb.server.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/samples/quickstart/simple_correlation/build.xml =================================================================== --- trunk/samples/quickstart/simple_correlation/build.xml 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/samples/quickstart/simple_correlation/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -10,7 +10,7 @@ <property name="version" value="1" /> - <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.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/samples/quickstart/simple_invoke/build.xml =================================================================== --- trunk/samples/quickstart/simple_invoke/build.xml 2009-11-09 14:56:55 UTC (rev 256) +++ trunk/samples/quickstart/simple_invoke/build.xml 2009-11-09 16:43:42 UTC (rev 257) @@ -1,86 +1,86 @@ -<project name="Quickstart_bpel_simple_invoke" default="deploy" basedir="."> - - <description> - ${ant.project.name} - ${line.separator} - </description> - - <!-- Import the base Ant build script... --> - <property file="../../../install/deployment.properties" /> - - <property name="version" value="1" /> - - <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.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.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. --> - </path> - <property name="compile-classpath" refid="compile-classpath"/> - - <target name="makewar" description="make war"> - <!-- Compile... --> - <mkdir dir="${war.build.dir}" /> - <javac srcdir="war/src" destdir="${war.build.dir}" debug="true"> - <classpath> - <path refid="compile-classpath" /> - <fileset dir="war/resources/WEB-INF/lib" includes="*.jar" /> - </classpath> - </javac> - - <!-- War... --> - <war warfile="build/${ant.project.name}.war" - webxml="${basedir}/war/resources/WEB-INF/web.xml"> - <webinf dir="${basedir}/war/resources/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - <classes dir="${war.build.dir}" includes="**/*.class"/> - <fileset dir="${basedir}/war/view"> - <include name="**/*"/> - </fileset> - <classes dir="${basedir}"> - <include name="juddi.properties"/> - </classes> - </war> - </target> - - <target name="deploywar" depends="makewar" > - <copy todir="${deploy.dir}" - file="build/${ant.project.name}.war"/> +<project name="Quickstart_bpel_simple_invoke" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <!-- Import the base Ant build script... --> + <property file="../../../install/deployment.properties" /> + + <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. --> + </path> + <property name="compile-classpath" refid="compile-classpath"/> + + <target name="makewar" description="make war"> + <!-- Compile... --> + <mkdir dir="${war.build.dir}" /> + <javac srcdir="war/src" destdir="${war.build.dir}" debug="true"> + <classpath> + <path refid="compile-classpath" /> + <fileset dir="war/resources/WEB-INF/lib" includes="*.jar" /> + </classpath> + </javac> + + <!-- War... --> + <war warfile="build/${ant.project.name}.war" + webxml="${basedir}/war/resources/WEB-INF/web.xml"> + <webinf dir="${basedir}/war/resources/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + <classes dir="${war.build.dir}" includes="**/*.class"/> + <fileset dir="${basedir}/war/view"> + <include name="**/*"/> + </fileset> + <classes dir="${basedir}"> + <include name="juddi.properties"/> + </classes> + </war> </target> - - <target name="undeploywar"> - <delete file="${deploy.dir}/${ant.project.name}.war"/> - </target> - - <target name="deploy" depends="deploywar" > - <echo>Deploy ${ant.project.name}</echo> - <jar basedir="bpel" destfile="${deploy.dir}/${sample.jar.name}" /> - </target> - - <target name="undeploy" depends="undeploywar" > - <echo>Undeploy ${ant.project.name}</echo> - <delete file="${deploy.dir}/${sample.jar.name}" /> - </target> - - <target name="sendhello"> - <echo>Send test message to: ${ant.project.name}</echo> - <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> - </java> - </target> - -</project> + + <target name="deploywar" depends="makewar" > + <copy todir="${deploy.dir}" + file="build/${ant.project.name}.war"/> + </target> + + <target name="undeploywar"> + <delete file="${deploy.dir}/${ant.project.name}.war"/> + </target> + + <target name="deploy" depends="deploywar" > + <echo>Deploy ${ant.project.name}</echo> + <jar basedir="bpel" destfile="${deploy.dir}/${sample.jar.name}" /> + </target> + + <target name="undeploy" depends="undeploywar" > + <echo>Undeploy ${ant.project.name}</echo> + <delete file="${deploy.dir}/${sample.jar.name}" /> + </target> + + <target name="sendhello"> + <echo>Send test message to: ${ant.project.name}</echo> + <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> + </java> + </target> + +</project>