Author: objectiser Date: 2011-06-28 09:01:09 -0400 (Tue, 28 Jun 2011) New Revision: 1400 Removed: trunk/distribution/src/main/release/bin/ Modified: trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/install/build.xml trunk/distribution/src/main/release/install/deployment.properties trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml trunk/docs/docbook/userguide/src/main/en-US/module/clustering.xml trunk/docs/docbook/userguide/src/main/en-US/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/qa/build.xml trunk/qa/hudson-riftsaw-db.sh trunk/qa/hudson-riftsaw-jboss-as6.sh trunk/qa/hudson-riftsaw-jboss-no-esb.sh trunk/qa/hudson-riftsaw-jboss.sh trunk/qa/hudson-riftsaw-local-as6.sh trunk/qa/hudson-riftsaw-local.sh trunk/qa/hudson-riftsaw-soa-p.sh trunk/qa/hudson-riftsaw-ws.sh trunk/samples/common/base-build.xml 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/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/loan_approval/build.xml trunk/samples/quickstart/order_management/Ordering-ejb/build.xml trunk/samples/quickstart/order_management/Ordering-war/build.xml trunk/samples/quickstart/order_management/build.xml trunk/samples/quickstart/secure_invoke/build.xml trunk/samples/quickstart/secure_service/build.xml trunk/samples/quickstart/simple_invoke/build.xml trunk/samples/quickstart/while_wait/build.xml trunk/stress-tests/build.xml trunk/stress-tests/src/test/resources/performance/build.xml Log: RIFTSAW-395 - change property name from _ to . format and remove the bin scripts. Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/distribution/src/main/assembly/bin.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -126,12 +126,6 @@ </fileSet> <fileSet> - <directory>src/main/release/bin</directory> - <outputDirectory>bin</outputDirectory> - <fileMode>755</fileMode> - </fileSet> - - <fileSet> <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory> <outputDirectory>docs/gettingstartedguide</outputDirectory> </fileSet> Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/distribution/src/main/release/install/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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}"/> <condition property="as.version" value="6" > <available file="${server.dir}/deployers/weld.deployer"/> @@ -26,7 +26,7 @@ <property name="jbossesb-bpel-old" value="riftsaw.esb" /> <property name="jbossesb-bpel" value="riftsaw-esb.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" /> @@ -43,7 +43,7 @@ </condition> <condition property="clustering.support"> - <equals arg1="${org_jboss_as_config}" arg2="all" /> + <equals arg1="${org.jboss.as.config}" arg2="all" /> </condition> <condition property="is.as6"> @@ -68,9 +68,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> @@ -242,8 +242,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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/distribution/src/main/release/install/deployment.properties 2011-06-28 13:01:09 UTC (rev 1400) @@ -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.9) -org_jboss_esb_home=/var/local/jbossesb-4.9 +org.jboss.esb.home=/var/local/jbossesb-4.9 # database # (e.g. hsql postgres mysql) Modified: trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -200,7 +200,7 @@ <title>Upgrade web service for JBoss AS</title> <para> Upgrading the web service stack for JBoss AS is now required. The following command: - <command>ant deploy -Ddatabase=... -Dws.stack=... -Dws.version=... -Dorg_jboss_as_config=...</command> + <command>ant deploy -Ddatabase=... -Dws.stack=... -Dws.version=... -Dorg.jboss.as.config=...</command> will help you download the web service stack, and then upgrade it for JBoss AS, while deploying RiftSaw. <itemizedlist> <listitem> @@ -210,7 +210,7 @@ Available ws.version options: '3.4.0.GA' or higher. default value is '3.1.2.GA' </listitem> <listitem> - Available org_jboss_as_config options: all, default, or standard. default value is 'default' + Available org.jboss.as.config options: all, default, or standard. default value is 'default' </listitem> </itemizedlist> OR you could go to the jbossws download page <ulink url="http://jboss.org/jbossws/downloads.html">http://jboss.o... to get the specific distro that you want, and doing the upgrade according to $jbossws/docs/Install.txt Modified: trunk/docs/docbook/userguide/src/main/en-US/module/clustering.xml =================================================================== --- trunk/docs/docbook/userguide/src/main/en-US/module/clustering.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/docs/docbook/userguide/src/main/en-US/module/clustering.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -28,7 +28,7 @@ <para> There are two ways to install a clustered version of riftsaw. The first approach is to simply - set the <emphasis>org_jboss_as_config</emphasis> property in the + set the <emphasis>org.jboss.as.config</emphasis> property in the <filename>${RiftSaw}/install/deployment.properties</filename> file to <emphasis>all</emphasis> before deploying riftsaw into the JBossAS server. </para> Modified: trunk/docs/docbook/userguide/src/main/en-US/module/deploy.xml =================================================================== --- trunk/docs/docbook/userguide/src/main/en-US/module/deploy.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/docs/docbook/userguide/src/main/en-US/module/deploy.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -105,9 +105,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> @@ -116,9 +116,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> @@ -127,14 +127,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> @@ -155,15 +155,15 @@ <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> <echo>Shutting down server version ${as.version} with parameters ${shutdown.parameters}</echo> <java classname="org.jboss.Shutdown" fork="true" failonerror="false" resultproperty="shutdown.rc"> <arg line="${shutdown.parameters}"/> <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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_approval_service/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_simple_esb_proxy_invoke2/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_144/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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/qa/build.xml =================================================================== --- trunk/qa/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/qa/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -37,22 +37,22 @@ <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="db2driver.url" value = "http://www.qa.jboss.com/jdbc-drivers/maven2/com/ibm/db2jcc/3.58.82/db2jcc-3.58.82.jar" /> <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_as_config.. ${org_jboss_as_config}" /> + <echo message="org.jboss.esb.home .. ${org.jboss.esb.home}" /> + <echo message="org.jboss.as.config.. ${org.jboss.as.config}" /> <echo message="===============================" /> <condition property="is.jboss.distro.available"> @@ -129,7 +129,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="copy.db.drivers" /> @@ -143,8 +143,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> @@ -219,12 +219,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> @@ -251,15 +251,15 @@ <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> <echo>Shutting down server version ${as.version} with parameters ${shutdown.parameters}</echo> <java classname="org.jboss.Shutdown" fork="true" failonerror="false" resultproperty="shutdown.rc"> <arg line="${shutdown.parameters}"/> <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/qa/hudson-riftsaw-db.sh =================================================================== --- trunk/qa/hudson-riftsaw-db.sh 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/qa/hudson-riftsaw-db.sh 2011-06-28 13:01:09 UTC (rev 1400) @@ -23,7 +23,7 @@ STARTUP_TIME="6" TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit tests Modified: trunk/qa/hudson-riftsaw-jboss-as6.sh =================================================================== --- trunk/qa/hudson-riftsaw-jboss-as6.sh 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/qa/hudson-riftsaw-jboss-as6.sh 2011-06-28 13:01:09 UTC (rev 1400) @@ -24,7 +24,7 @@ WS_VERSION="3.1.2.GA" # so we don't overwrite the cxf 3.4.1 installed with as6 WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Djboss.filename=jboss-as-distribution-${JBOSS_VERSION}.zip -Das.version=6 -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djboss.version=$JBOSS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY -Dtestesb=false" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Djboss.filename=jboss-as-distribution-${JBOSS_VERSION}.zip -Das.version=6 -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djboss.version=$JBOSS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY -Dtestesb=false" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: trunk/qa/hudson-riftsaw-jboss-no-esb.sh =================================================================== --- trunk/qa/hudson-riftsaw-jboss-no-esb.sh 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/qa/hudson-riftsaw-jboss-no-esb.sh 2011-06-28 13:01:09 UTC (rev 1400) @@ -20,7 +20,7 @@ WS_VERSION="3.4.0.GA" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY -Dtestesb=false" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY -Dtestesb=false" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: trunk/qa/hudson-riftsaw-jboss.sh =================================================================== --- trunk/qa/hudson-riftsaw-jboss.sh 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/qa/hudson-riftsaw-jboss.sh 2011-06-28 13:01:09 UTC (rev 1400) @@ -21,7 +21,7 @@ WS_VERSION="3.1.2.GA" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: trunk/qa/hudson-riftsaw-local-as6.sh =================================================================== --- trunk/qa/hudson-riftsaw-local-as6.sh 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/qa/hudson-riftsaw-local-as6.sh 2011-06-28 13:01:09 UTC (rev 1400) @@ -23,7 +23,7 @@ WS_VERSION="3.1.2.GA" # so we don't overwrite the cxf 3.4.1 installed with as6 WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Djboss.filename=jboss-as-distribution-${JBOSS_VERSION}.zip -Das.version=6 -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djboss.version=$JBOSS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY -Dtestesb=false" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Djboss.filename=jboss-as-distribution-${JBOSS_VERSION}.zip -Das.version=6 -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djboss.version=$JBOSS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY -Dtestesb=false" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: trunk/qa/hudson-riftsaw-local.sh =================================================================== --- trunk/qa/hudson-riftsaw-local.sh 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/qa/hudson-riftsaw-local.sh 2011-06-28 13:01:09 UTC (rev 1400) @@ -22,7 +22,7 @@ WS_VERSION="3.1.2.GA" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Ddownload.dir=$DOWNLOAD_DIR -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Ddownload.dir=$DOWNLOAD_DIR -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: trunk/qa/hudson-riftsaw-soa-p.sh =================================================================== --- trunk/qa/hudson-riftsaw-soa-p.sh 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/qa/hudson-riftsaw-soa-p.sh 2011-06-28 13:01:09 UTC (rev 1400) @@ -25,7 +25,7 @@ STARTUP_TIME="6" TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit tests Modified: trunk/qa/hudson-riftsaw-ws.sh =================================================================== --- trunk/qa/hudson-riftsaw-ws.sh 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/qa/hudson-riftsaw-ws.sh 2011-06-28 13:01:09 UTC (rev 1400) @@ -23,7 +23,7 @@ STARTUP_TIME="6" TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME -Dorg_jboss_as_config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR -Dws.version=$WS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg_jboss_esb_home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY -Dtestesb=false" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR -Dws.version=$WS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY -Dtestesb=false" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit test Modified: trunk/samples/common/base-build.xml =================================================================== --- trunk/samples/common/base-build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/common/base-build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -3,12 +3,12 @@ <!-- 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="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="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"> @@ -24,7 +24,7 @@ <fileset dir="${server.client.dir}"> <include name="**/*.jar"/> </fileset> - <fileset dir="${org_jboss_as_home}/lib/endorsed"> + <fileset dir="${org.jboss.as.home}/lib/endorsed"> <include name="**/*.jar"/> </fileset> <fileset dir="../../../modules/bpel-console"> Modified: trunk/samples/esb/bpel_helloworld/build.xml =================================================================== --- trunk/samples/esb/bpel_helloworld/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/esb/bpel_helloworld/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -29,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_helloworld_saml/build.xml =================================================================== --- trunk/samples/esb/bpel_helloworld_saml/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/esb/bpel_helloworld_saml/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -72,8 +72,8 @@ <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"/> Modified: trunk/samples/esb/bpel_loan_fault/build.xml =================================================================== --- trunk/samples/esb/bpel_loan_fault/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/esb/bpel_loan_fault/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -29,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/simple_esb_proxy_invoke/build.xml =================================================================== --- trunk/samples/esb/simple_esb_proxy_invoke/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/esb/simple_esb_proxy_invoke/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -16,8 +16,8 @@ <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"/> Modified: trunk/samples/esb/simple_esb_proxy_invoke2/build.xml =================================================================== --- trunk/samples/esb/simple_esb_proxy_invoke2/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/esb/simple_esb_proxy_invoke2/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -16,8 +16,8 @@ <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"/> Modified: trunk/samples/quickstart/bpel_event_listener/build.xml =================================================================== --- trunk/samples/quickstart/bpel_event_listener/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/quickstart/bpel_event_listener/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -13,7 +13,7 @@ <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"/> Modified: trunk/samples/quickstart/loan_approval/build.xml =================================================================== --- trunk/samples/quickstart/loan_approval/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/quickstart/loan_approval/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -15,7 +15,7 @@ <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"/> Modified: trunk/samples/quickstart/order_management/Ordering-ejb/build.xml =================================================================== --- trunk/samples/quickstart/order_management/Ordering-ejb/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/quickstart/order_management/Ordering-ejb/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -7,8 +7,8 @@ <property name="classes.dir" value="${build.dir}/classes"/> <path id="compile-classpath"> - <fileset dir="${org_jboss_as_home}/client" includes="ejb3-persistence.jar"/> - <fileset dir="${org_jboss_as_home}/client" includes="jboss-javaee.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="ejb3-persistence.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="jboss-javaee.jar"/> </path> <property name="compile-classpath" refid="compile-classpath"/> Modified: trunk/samples/quickstart/order_management/Ordering-war/build.xml =================================================================== --- trunk/samples/quickstart/order_management/Ordering-war/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/quickstart/order_management/Ordering-war/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -7,7 +7,7 @@ <property name="classes.dir" value="${build.dir}/classes"/> <path id="compile-classpath"> - <fileset dir="${org_jboss_as_home}/client" includes="*.jar"/> + <fileset dir="${org.jboss.as.home}/client" includes="*.jar"/> <pathelement path="../Ordering-ejb/build/classes"/> </path> Modified: trunk/samples/quickstart/order_management/build.xml =================================================================== --- trunk/samples/quickstart/order_management/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/quickstart/order_management/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -11,7 +11,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"/> @@ -56,7 +56,7 @@ <target name="preparedb"> <sql url="jdbc:hsqldb:hsql://localhost:54123" driver="org.hsqldb.jdbcDriver" userid="sa" password="" src="sql/items.sql"> <classpath> - <pathelement location="${org_jboss_as_home}/common/lib/hsqldb.jar"/> + <pathelement location="${org.jboss.as.home}/common/lib/hsqldb.jar"/> </classpath> </sql> </target> @@ -67,7 +67,7 @@ SELECT stte FROM bpel_ordering_order WHERE ${orderId} = id; ]]> <classpath> - <pathelement location="${org_jboss_as_home}/common/lib/hsqldb.jar"/> + <pathelement location="${org.jboss.as.home}/common/lib/hsqldb.jar"/> </classpath> </sql> </target> @@ -78,7 +78,7 @@ SELECT * FROM bpel_ordering_order; ]]> <classpath> - <pathelement location="${org_jboss_as_home}/common/lib/hsqldb.jar"/> + <pathelement location="${org.jboss.as.home}/common/lib/hsqldb.jar"/> </classpath> </sql> </target> @@ -89,7 +89,7 @@ SELECT * FROM bpel_ordering_item; ]]> <classpath> - <pathelement location="${org_jboss_as_home}/common/lib/hsqldb.jar"/> + <pathelement location="${org.jboss.as.home}/common/lib/hsqldb.jar"/> </classpath> </sql> </target> Modified: trunk/samples/quickstart/secure_invoke/build.xml =================================================================== --- trunk/samples/quickstart/secure_invoke/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/quickstart/secure_invoke/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -15,7 +15,7 @@ <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"/> Modified: trunk/samples/quickstart/secure_service/build.xml =================================================================== --- trunk/samples/quickstart/secure_service/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/quickstart/secure_service/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -16,7 +16,7 @@ <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"/> Modified: trunk/samples/quickstart/simple_invoke/build.xml =================================================================== --- trunk/samples/quickstart/simple_invoke/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/quickstart/simple_invoke/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -15,7 +15,7 @@ <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"/> Modified: trunk/samples/quickstart/while_wait/build.xml =================================================================== --- trunk/samples/quickstart/while_wait/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/samples/quickstart/while_wait/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -15,7 +15,7 @@ <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"/> Modified: trunk/stress-tests/build.xml =================================================================== --- trunk/stress-tests/build.xml 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/stress-tests/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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 2011-06-27 13:33:47 UTC (rev 1399) +++ trunk/stress-tests/src/test/resources/performance/build.xml 2011-06-28 13:01:09 UTC (rev 1400) @@ -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"/>