Author: objectiser Date: 2011-06-29 06:48:49 -0400 (Wed, 29 Jun 2011) New Revision: 1402 Added: trunk/samples/esb/conf/ trunk/samples/esb/conf/riftsaw-base-build.xml trunk/samples/esb/esb_helloworld/ trunk/samples/esb/esb_helloworld/build.xml trunk/samples/esb/esb_helloworld_saml/ trunk/samples/esb/esb_helloworld_saml/build.xml trunk/samples/esb/esb_loan_fault/ trunk/samples/esb/esb_loan_fault/build.xml trunk/samples/quickstart/conf/ trunk/samples/quickstart/conf/riftsaw-base-build.xml Removed: trunk/samples/esb/esb_helloworld/build.xml trunk/samples/esb/esb_helloworld_saml/build.xml trunk/samples/esb/esb_loan_fault/build.xml Modified: 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: Update examples to point to new conf location. Added: trunk/samples/esb/conf/riftsaw-base-build.xml =================================================================== --- trunk/samples/esb/conf/riftsaw-base-build.xml (rev 0) +++ trunk/samples/esb/conf/riftsaw-base-build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -0,0 +1,41 @@ +<project name="riftsaw-base-build" basedir="."> + + <!-- Import the base Ant build script... --> + <property file="../../../install/deployment.properties" /> + + <!-- Import the base Ant build script... --> + <import file="${org.jboss.esb.home}/samples/quickstarts/conf/base-build.xml"/> + + <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> Deleted: trunk/samples/esb/esb_helloworld/build.xml =================================================================== --- trunk/samples/esb/bpel_helloworld/build.xml 2011-06-24 06:32:41 UTC (rev 1392) +++ trunk/samples/esb/esb_helloworld/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -1,45 +0,0 @@ -<project name="Quickstart_esb_bpel_hello_world" default="deploy" basedir="."> - - <description> - ${ant.project.name} - ${line.separator} - </description> - - <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> - - <property name="version" value="1" /> - - <property name="sample.esb.name" value="${ant.project.name}.esb" /> - - <target name="deployesb" > - <jar basedir="esbcontent" destfile="${deploy.dir}/${sample.esb.name}" /> - </target> - - <target name="undeployesb"> - <delete file="${deploy.dir}/${sample.esb.name}"/> - </target> - - <target name="deploy" depends="deployesb" > - <echo>Deploy ${ant.project.name}</echo> - </target> - - <target name="undeploy" depends="undeployesb" > - <echo>Undeploy ${ant.project.name}</echo> - </target> - - <!-- Import the base Ant build script... --> - <import file="${org_jboss_esb_home}/samples/quickstarts/conf/base-build.xml"/> - - <target name="runtest" depends="compile" - description="Will send an esb Message"> - <echo>Runs Test ESB Message Sender</echo> - <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.helloworld.test.SendEsbMessage" failonerror="true"> - <arg value="HelloWorldBPELESB"/> <!-- service category --> - <arg value="SayHello"/> <!-- service name --> - <arg value="Hello World via ESB to BPEL"/> <!-- Message text --> - <classpath refid="exec-classpath"/> - </java> - </target> - -</project> Copied: trunk/samples/esb/esb_helloworld/build.xml (from rev 1401, trunk/samples/esb/bpel_helloworld/build.xml) =================================================================== --- trunk/samples/esb/esb_helloworld/build.xml (rev 0) +++ trunk/samples/esb/esb_helloworld/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -0,0 +1,41 @@ +<project name="Quickstart_esb_bpel_hello_world" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <import file="../conf/riftsaw-base-build.xml"/> + + <property name="version" value="1" /> + + <property name="sample.esb.name" value="${ant.project.name}.esb" /> + + <target name="deployesb" > + <jar basedir="esbcontent" destfile="${deploy.dir}/${sample.esb.name}" /> + </target> + + <target name="undeployesb"> + <delete file="${deploy.dir}/${sample.esb.name}"/> + </target> + + <target name="deploy" depends="deployesb" > + <echo>Deploy ${ant.project.name}</echo> + </target> + + <target name="undeploy" depends="undeployesb" > + <echo>Undeploy ${ant.project.name}</echo> + </target> + + <target name="runtest" depends="compile" + description="Will send an esb Message"> + <echo>Runs Test ESB Message Sender</echo> + <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.helloworld.test.SendEsbMessage" failonerror="true"> + <arg value="HelloWorldBPELESB"/> <!-- service category --> + <arg value="SayHello"/> <!-- service name --> + <arg value="Hello World via ESB to BPEL"/> <!-- Message text --> + <classpath refid="exec-classpath"/> + </java> + </target> + +</project> Deleted: trunk/samples/esb/esb_helloworld_saml/build.xml =================================================================== --- trunk/samples/esb/bpel_helloworld_saml/build.xml 2011-06-24 06:32:41 UTC (rev 1392) +++ trunk/samples/esb/esb_helloworld_saml/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -1,159 +0,0 @@ -<project name="Quickstart_bpel_hello_world_saml" default="deploy" basedir="."> - - <description> - ${ant.project.name} - ${line.separator} - </description> - - - <property name="deployers.dir" value="${deploy.dir}/../deployers"/> - - - <!-- additional deploys --> - - <property name="additional.deploys" value="jboss-wsse-client.xml sts-client.properties, jboss-service.xml, login-config.xml, HelloWorldWS.wsdl"/> - - <property name="stswar.build.dir" location="build/war/classes"/> - - <target name="build-picklink-sts" description="make picklink-sts war"> - - <!-- War... --> - <jar destfile="build/picketlink-sts.war" - basedir="${basedir}/picketlink-sts" /> - -<!-- - <war warfile="build/picketlink-sts.war" - webxml="${basedir}/picketlink-sts/WEB-INF/web.xml"> - <webinf dir="${basedir}/picketlink-sts/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jboss-wsse-server.xml"/> - </webinf> - <fileset dir="${basedir}/war/view"> - <include name="**/*"/> - </fileset> - <classes dir="${basedir}"> - <include name="juddi.properties"/> - </classes> - </war> ---> - </target> - - <target name="quickstart-specific-predeploys" depends="build-picklink-sts" > - <!-- <copy todir="${deploy.dir}/../conf" - file="${basedir}/sts-login-config.xml"/> --> - <copy todir="${deploy.dir}/../conf/props" - file="${basedir}/props/sts-users.properties"/> - <copy todir="${deploy.dir}/../conf/props" - file="${basedir}/props/sts-roles.properties"/> - <copy file="${basedir}/build/picketlink-sts.war" todir="${deploy.dir}"/> - </target> - - <target name="quickstart-specific-undeploys"> - <delete file="${deploy.dir}/picketlink-sts.war"/> - <delete file="${deploy.dir}/../conf/sts-login-config.xml"/> - <delete file="${deploy.dir}/../conf/props/saml-users.properties"/> - <delete file="${deploy.dir}/../conf/props/saml-roles.properties"/> - </target> - - - <target name="quickstart-specific-clean"> - <delete file="${basedir}/login-config.xml"/> - </target> - - - <property name="version" value="1" /> - - <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> - - <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> - <property name="sample.esb.name" value="${ant.project.name}.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" /> - </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}WS.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}WS.war"/> - </target> - - <target name="undeploywar"> - <delete file="${deploy.dir}/${ant.project.name}WS.war"/> - </target> - - <target name="compileesbsrc" description="compiles src for esb"> - <!-- Compile... --> - <javac srcdir="${basedir}/src" destdir="${basedir}/esbcontent" debug="true"> - <classpath> - <path refid="compile-classpath" /> - </classpath> - </javac> - </target> - - <target name="deployesb" depends="compileesbsrc"> - <copy file="${basedir}/login-config-unfiltered.xml" tofile="${basedir}/esbcontent/login-config.xml" filtering="true" overwrite="true"> - <filterset> - <filter token="STS_CONFIG_FILE_PATH" value="${basedir}/esbcontent/sts-client.properties"/> - </filterset> - </copy> - <jar basedir="esbcontent" destfile="${deploy.dir}/${sample.esb.name}" > - </jar> - </target> - - <target name="undeployesb"> - <delete file="${deploy.dir}/${sample.esb.name}"/> - </target> - - <target name="deploy" depends="deploywar,quickstart-specific-predeploys,deployesb" > - <echo>Deploy ${ant.project.name}</echo> - <jar basedir="bpelContent" destfile="${deploy.dir}/${sample.jar.name}" /> - </target> - - <target name="undeploy" depends="undeploywar,undeployesb,quickstart-specific-undeploys" > - <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/${ant.project.name}/ebws/BPELESBSecurity/SayHelloWithSecurity"/> - <arg value="messages/hello_request1.xml"/> -<classpath refid="rs-exec-classpath"/> - </java> - </target> - -</project> Copied: trunk/samples/esb/esb_helloworld_saml/build.xml (from rev 1401, trunk/samples/esb/bpel_helloworld_saml/build.xml) =================================================================== --- trunk/samples/esb/esb_helloworld_saml/build.xml (rev 0) +++ trunk/samples/esb/esb_helloworld_saml/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -0,0 +1,140 @@ +<project name="Quickstart_bpel_hello_world_saml" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + + <property name="deployers.dir" value="${deploy.dir}/../deployers"/> + + + <!-- additional deploys --> + + <property name="additional.deploys" value="jboss-wsse-client.xml sts-client.properties, jboss-service.xml, login-config.xml, HelloWorldWS.wsdl"/> + + <property name="stswar.build.dir" location="build/war/classes"/> + + <target name="build-picklink-sts" description="make picklink-sts war"> + + <!-- War... --> + <jar destfile="build/picketlink-sts.war" + basedir="${basedir}/picketlink-sts" /> + </target> + + <target name="quickstart-specific-predeploys" depends="build-picklink-sts" > + <copy todir="${deploy.dir}/../conf/props" + file="${basedir}/props/sts-users.properties"/> + <copy todir="${deploy.dir}/../conf/props" + file="${basedir}/props/sts-roles.properties"/> + <copy file="${basedir}/build/picketlink-sts.war" todir="${deploy.dir}"/> + </target> + + <target name="quickstart-specific-undeploys"> + <delete file="${deploy.dir}/picketlink-sts.war"/> + <delete file="${deploy.dir}/../conf/sts-login-config.xml"/> + <delete file="${deploy.dir}/../conf/props/saml-users.properties"/> + <delete file="${deploy.dir}/../conf/props/saml-roles.properties"/> + </target> + + + <target name="quickstart-specific-clean"> + <delete file="${basedir}/login-config.xml"/> + </target> + + + <property name="version" value="1" /> + + <import file="../conf/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" /> + + <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" /> + </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}WS.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}WS.war"/> + </target> + + <target name="undeploywar"> + <delete file="${deploy.dir}/${ant.project.name}WS.war"/> + </target> + + <target name="compileesbsrc" description="compiles src for esb"> + <!-- Compile... --> + <javac srcdir="${basedir}/src" destdir="${basedir}/esbcontent" debug="true"> + <classpath> + <path refid="compile-classpath" /> + </classpath> + </javac> + </target> + + <target name="deployesb" depends="compileesbsrc"> + <copy file="${basedir}/login-config-unfiltered.xml" tofile="${basedir}/esbcontent/login-config.xml" filtering="true" overwrite="true"> + <filterset> + <filter token="STS_CONFIG_FILE_PATH" value="${basedir}/esbcontent/sts-client.properties"/> + </filterset> + </copy> + <jar basedir="esbcontent" destfile="${deploy.dir}/${sample.esb.name}" > + </jar> + </target> + + <target name="undeployesb"> + <delete file="${deploy.dir}/${sample.esb.name}"/> + </target> + + <target name="deploy" depends="deploywar,quickstart-specific-predeploys,deployesb" > + <echo>Deploy ${ant.project.name}</echo> + <jar basedir="bpelContent" destfile="${deploy.dir}/${sample.jar.name}" /> + </target> + + <target name="undeploy" depends="undeploywar,undeployesb,quickstart-specific-undeploys" > + <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/${ant.project.name}/ebws/BPELESBSecurity/SayHelloWithSecurity"/> + <arg value="messages/hello_request1.xml"/> +<classpath refid="rs-exec-classpath"/> + </java> + </target> + +</project> Deleted: trunk/samples/esb/esb_loan_fault/build.xml =================================================================== --- trunk/samples/esb/bpel_loan_fault/build.xml 2011-06-24 06:32:41 UTC (rev 1392) +++ trunk/samples/esb/esb_loan_fault/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -1,46 +0,0 @@ -<project name="Quickstart_esb_bpel_loan_fault" default="deploy" basedir="."> - - <description> - ${ant.project.name} - ${line.separator} - </description> - - <property file="../../../install/deployment.properties" /> - <import file="../../common/base-build.xml"/> - - <property name="version" value="1" /> - - <property name="sample.esb.name" value="${ant.project.name}.esb" /> - - <target name="deployesb" > - <jar basedir="esbcontent" destfile="${deploy.dir}/${sample.esb.name}" /> - </target> - - <target name="undeployesb"> - <delete file="${deploy.dir}/${sample.esb.name}"/> - </target> - - <target name="deploy" depends="deployesb" > - <echo>Deploy ${ant.project.name}</echo> - </target> - - <target name="undeploy" depends="undeployesb" > - <echo>Undeploy ${ant.project.name}</echo> - </target> - - <!-- Import the base Ant build script... --> - <import file="${org_jboss_esb_home}/samples/quickstarts/conf/base-build.xml"/> - - <target name="runtest" depends="compile" - description="Will send an esb Message"> - <echo>Runs Test ESB Message Sender</echo> - <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.loanfault.test.SendEsbMessage" failonerror="true"> - <jvmarg value="-Djava.endorsed.dirs=${org.jboss.esb.server.home}/lib/endorsed"/> - <arg value="LoanFaultBPELESB"/> <!-- service category --> - <arg value="LoanFail"/> <!-- service name --> - <arg value="&lt;request>&lt;firstName>Jane&lt;/firstName>&lt;name>Bloggs&lt;/name>&lt;amount>0&lt;/amount>&lt;/request>"/> <!-- Message text --> - <classpath refid="exec-classpath"/> - </java> - </target> - -</project> Copied: trunk/samples/esb/esb_loan_fault/build.xml (from rev 1401, trunk/samples/esb/bpel_loan_fault/build.xml) =================================================================== --- trunk/samples/esb/esb_loan_fault/build.xml (rev 0) +++ trunk/samples/esb/esb_loan_fault/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -0,0 +1,42 @@ +<project name="Quickstart_esb_bpel_loan_fault" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <import file="../conf/riftsaw-base-build.xml"/> + + <property name="version" value="1" /> + + <property name="sample.esb.name" value="${ant.project.name}.esb" /> + + <target name="deployesb" > + <jar basedir="esbcontent" destfile="${deploy.dir}/${sample.esb.name}" /> + </target> + + <target name="undeployesb"> + <delete file="${deploy.dir}/${sample.esb.name}"/> + </target> + + <target name="deploy" depends="deployesb" > + <echo>Deploy ${ant.project.name}</echo> + </target> + + <target name="undeploy" depends="undeployesb" > + <echo>Undeploy ${ant.project.name}</echo> + </target> + + <target name="runtest" depends="compile" + description="Will send an esb Message"> + <echo>Runs Test ESB Message Sender</echo> + <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.loanfault.test.SendEsbMessage" failonerror="true"> + <jvmarg value="-Djava.endorsed.dirs=${org.jboss.esb.server.home}/lib/endorsed"/> + <arg value="LoanFaultBPELESB"/> <!-- service category --> + <arg value="LoanFail"/> <!-- service name --> + <arg value="&lt;request>&lt;firstName>Jane&lt;/firstName>&lt;name>Bloggs&lt;/name>&lt;amount>0&lt;/amount>&lt;/request>"/> <!-- Message text --> + <classpath refid="exec-classpath"/> + </java> + </target> + +</project> Modified: trunk/samples/esb/invoke_esb_ebws/build.xml =================================================================== --- trunk/samples/esb/invoke_esb_ebws/build.xml 2011-06-28 16:36:46 UTC (rev 1401) +++ trunk/samples/esb/invoke_esb_ebws/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/esb/simple_esb_proxy_invoke/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/esb/simple_esb_proxy_invoke2/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/bpel_event_listener/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/riftsaw-base-build.xml"/> <property name="sample.jar.name" value="${ant.project.name}.jar" /> Added: trunk/samples/quickstart/conf/riftsaw-base-build.xml =================================================================== --- trunk/samples/quickstart/conf/riftsaw-base-build.xml (rev 0) +++ trunk/samples/quickstart/conf/riftsaw-base-build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -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="${deploy.dir}/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="${deploy.dir}/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/quickstart/dynpartner/build.xml =================================================================== --- trunk/samples/quickstart/dynpartner/build.xml 2011-06-28 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/dynpartner/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/fault_compensation/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -18,8 +18,7 @@ </sequential> </macrodef> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/hello_world/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/hello_world_header_ode/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/hello_world_header_wsdl/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/loan_approval/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/management/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/math/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/order_management/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -6,8 +6,7 @@ </description> <!-- Import the base Ant build script... --> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/salutations/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/say_hello/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/secure_invoke/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/secure_service/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/service_handler/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/simple_correlation/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/simple_correlation_header/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/simple_flow/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/simple_invoke/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/simple_pick/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/quickstart/while_wait/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -5,8 +5,7 @@ ${line.separator} </description> - <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/tutorial/BPEL-BluePrint1/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../../quickstart/conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/tutorial/BPEL-BluePrint2/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../../quickstart/conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/tutorial/BPEL-BluePrint3/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../../quickstart/conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/tutorial/BPEL-BluePrint4/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../../quickstart/conf/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 16:36:46 UTC (rev 1401) +++ trunk/samples/tutorial/BPEL-BluePrint5/build.xml 2011-06-29 10:48:49 UTC (rev 1402) @@ -6,7 +6,7 @@ </description> <property file="../../../install/deployment.properties" /> - <import file="../../common/riftsaw-base-build.xml"/> + <import file="../../quickstart/conf/riftsaw-base-build.xml"/> <property name="version" value="1" />