Author: objectiser Date: 2011-06-28 12:36:46 -0400 (Tue, 28 Jun 2011) New Revision: 1401 Added: trunk/samples/common/riftsaw-base-build.xml Removed: trunk/samples/common/base-build.xml Modified: trunk/samples/esb/bpel_helloworld/build.xml trunk/samples/esb/bpel_helloworld_saml/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/dynpartner/build.xml trunk/samples/quickstart/fault_compensation/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/management/build.xml trunk/samples/quickstart/math/build.xml trunk/samples/quickstart/order_management/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_correlation_header/build.xml trunk/samples/quickstart/simple_flow/build.xml trunk/samples/quickstart/simple_invoke/build.xml trunk/samples/quickstart/simple_pick/build.xml trunk/samples/quickstart/while_wait/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 Log: Updated sample configuration to use a different ant project name from the one used in the esb. Deleted: trunk/samples/common/base-build.xml =================================================================== --- trunk/samples/common/base-build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/common/base-build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -1,38 +0,0 @@ -<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> - <fileset dir="../../../modules/bpel-console"> - <include name="**/*.jar" /> - </fileset> - <fileset dir="${deploy.dir}/bpel-console/gwt-console-server.war/WEB-INF/lib"> - <include name="**/gson-*.jar"/> - </fileset> - </path> - -</project> Copied: trunk/samples/common/riftsaw-base-build.xml (from rev 1400, trunk/samples/common/base-build.xml) =================================================================== --- trunk/samples/common/riftsaw-base-build.xml (rev 0) +++ trunk/samples/common/riftsaw-base-build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -0,0 +1,38 @@ +<project name="riftsaw-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> + <fileset dir="../../../modules/bpel-console"> + <include name="**/*.jar" /> + </fileset> + <fileset dir="${deploy.dir}/bpel-console/gwt-console-server.war/WEB-INF/lib"> + <include name="**/gson-*.jar"/> + </fileset> + </path> + +</project> Modified: trunk/samples/esb/bpel_helloworld/build.xml =================================================================== --- trunk/samples/esb/bpel_helloworld/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/esb/bpel_helloworld/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/esb/bpel_helloworld_saml/build.xml =================================================================== --- trunk/samples/esb/bpel_helloworld_saml/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/esb/bpel_helloworld_saml/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -64,7 +64,7 @@ <property name="version" value="1" /> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> <property name="sample.esb.name" value="${ant.project.name}.esb" /> Modified: trunk/samples/esb/bpel_loan_fault/build.xml =================================================================== --- trunk/samples/esb/bpel_loan_fault/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/esb/bpel_loan_fault/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/esb/invoke_esb_ebws/build.xml =================================================================== --- trunk/samples/esb/invoke_esb_ebws/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/esb/invoke_esb_ebws/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/esb/simple_esb_proxy_invoke/build.xml =================================================================== --- trunk/samples/esb/simple_esb_proxy_invoke/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/esb/simple_esb_proxy_invoke/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/esb/simple_esb_proxy_invoke2/build.xml =================================================================== --- trunk/samples/esb/simple_esb_proxy_invoke2/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/esb/simple_esb_proxy_invoke2/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/bpel_event_listener/build.xml =================================================================== --- trunk/samples/quickstart/bpel_event_listener/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/bpel_event_listener/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="sample.jar.name" value="${ant.project.name}.jar" /> Modified: trunk/samples/quickstart/dynpartner/build.xml =================================================================== --- trunk/samples/quickstart/dynpartner/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/dynpartner/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/fault_compensation/build.xml =================================================================== --- trunk/samples/quickstart/fault_compensation/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/fault_compensation/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -19,7 +19,7 @@ </macrodef> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/hello_world/build.xml =================================================================== --- trunk/samples/quickstart/hello_world/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/hello_world/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/hello_world_header_ode/build.xml =================================================================== --- trunk/samples/quickstart/hello_world_header_ode/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/hello_world_header_ode/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/hello_world_header_wsdl/build.xml =================================================================== --- trunk/samples/quickstart/hello_world_header_wsdl/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/hello_world_header_wsdl/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/loan_approval/build.xml =================================================================== --- trunk/samples/quickstart/loan_approval/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/loan_approval/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/management/build.xml =================================================================== --- trunk/samples/quickstart/management/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/management/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="build.dir" location="target/build/classes"/> Modified: trunk/samples/quickstart/math/build.xml =================================================================== --- trunk/samples/quickstart/math/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/math/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/order_management/build.xml =================================================================== --- trunk/samples/quickstart/order_management/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/order_management/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -7,7 +7,7 @@ <!-- Import the base Ant build script... --> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/salutations/build.xml =================================================================== --- trunk/samples/quickstart/salutations/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/salutations/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/say_hello/build.xml =================================================================== --- trunk/samples/quickstart/say_hello/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/say_hello/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/secure_invoke/build.xml =================================================================== --- trunk/samples/quickstart/secure_invoke/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/secure_invoke/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/secure_service/build.xml =================================================================== --- trunk/samples/quickstart/secure_service/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/secure_service/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/service_handler/build.xml =================================================================== --- trunk/samples/quickstart/service_handler/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/service_handler/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/simple_correlation/build.xml =================================================================== --- trunk/samples/quickstart/simple_correlation/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/simple_correlation/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/simple_correlation_header/build.xml =================================================================== --- trunk/samples/quickstart/simple_correlation_header/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/simple_correlation_header/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/simple_flow/build.xml =================================================================== --- trunk/samples/quickstart/simple_flow/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/simple_flow/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/simple_invoke/build.xml =================================================================== --- trunk/samples/quickstart/simple_invoke/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/simple_invoke/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/simple_pick/build.xml =================================================================== --- trunk/samples/quickstart/simple_pick/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/simple_pick/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/quickstart/while_wait/build.xml =================================================================== --- trunk/samples/quickstart/while_wait/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/quickstart/while_wait/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/tutorial/BPEL-BluePrint1/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint1/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/tutorial/BPEL-BluePrint1/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/tutorial/BPEL-BluePrint2/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint2/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/tutorial/BPEL-BluePrint2/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/tutorial/BPEL-BluePrint3/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint3/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/tutorial/BPEL-BluePrint3/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/tutorial/BPEL-BluePrint4/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint4/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/tutorial/BPEL-BluePrint4/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" /> Modified: trunk/samples/tutorial/BPEL-BluePrint5/build.xml =================================================================== --- trunk/samples/tutorial/BPEL-BluePrint5/build.xml 2011-06-28 13:01:09 UTC (rev 1400) +++ trunk/samples/tutorial/BPEL-BluePrint5/build.xml 2011-06-28 16:36:46 UTC (rev 1401) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> + <import file="../../common/riftsaw-base-build.xml"/> <property name="version" value="1" />