Renamed ant targets for integration tests

svn changeset:13428/svn branch:6.3

diff --git a/build/build.xml b/build/build.xml
index 28de65b33055ad97a5e426154830f2e49e520cc3..2652fb4748138825b6b2de426ce903df8893939a 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -1206,7 +1206,7 @@
        <property name="demo.war" location="${result-path}/${product-file}-demo-${version.full}.war" />
 
         <!-- Run the separate test script. -->
-        <ant antfile="tests/integration_tests.xml" target="all" inheritall="false" inheritrefs="true">
+        <ant antfile="tests/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="true">
               <!-- This is provided so that the test script can copy the -->
               <!-- "tests" classes after unpacking the package.          -->
                      <property name="output-dir" value="${output-dir}"/>

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index cfda8abf159f5e4546dfa138264a232710260dab..c8438eec037f9302902c61130132bf4700d8dc4f 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>\r
 \r
-<project name="Test sampler deployment" basedir="." default="all">\r
+<project name="Test sampler deployment" basedir="." default="integration-test-all">\r
     \r
        <!-- Test with these browsers -->\r
        <property name="test_browsers" value="winxp-firefox36" />\r
@@ -33,12 +33,12 @@
        </taskdef>\r
        \r
        <!-- Upload war to deploy to ssh host -->\r
-       <target name="upload-demo">\r
+       <target name="integration-test-upload-demo">\r
                <scp file="${demo.war}" todir="${user}@${sshHost}:demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />\r
        </target>\r
        \r
        <!-- Run sampler deployment test -->\r
-       <target name="test-sampler">\r
+       <target name="integration-test-sampler">\r
                <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />\r
                <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />\r
                \r
@@ -55,107 +55,107 @@
        </target>\r
        \r
        <!-- Start and stop methods for servers -->\r
-       <target name="start-tomcat-4">\r
+       <target name="integration-test-start-tomcat-4">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-4.1.40" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-4.1.40-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-tomcat-4">\r
+       <target name="integration-test-stop-tomcat-4">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-tomcat-4.1.40" />\r
        </target>\r
        \r
-       <target name="start-tomcat-5">\r
+       <target name="integration-test-start-tomcat-5">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-5.5.28" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-5.5.28-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-tomcat-5">\r
+       <target name="integration-test-stop-tomcat-5">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-tomcat-5.5.28" />\r
        </target>\r
        \r
-       <target name="start-tomcat-6">\r
+       <target name="integration-test-start-tomcat-6">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-6.0.20" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-6.0.20-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-tomcat-6">\r
+       <target name="integration-test-stop-tomcat-6">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-tomcat-6.0.20" />\r
        </target>\r
        \r
-       <target name="start-jetty-5">\r
+       <target name="integration-test-start-jetty-5">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-5.1.15" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-5.1.15-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-jetty-5">\r
+       <target name="integration-test-stop-jetty-5">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-jetty-5.1.15" />\r
        </target>\r
 \r
-       <target name="start-jetty-6">\r
+       <target name="integration-test-start-jetty-6">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-6.1.22" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-6.1.22-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-jetty-6">\r
+       <target name="integration-test-stop-jetty-6">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-jetty-6.1.22" />\r
        </target>\r
        \r
-       <target name="start-jetty-7">\r
+       <target name="integration-test-start-jetty-7">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-7.0.0" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-7.0.0-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-jetty-7">\r
+       <target name="integration-test-stop-jetty-7">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-jetty-7.0.0" />\r
        </target>\r
        \r
-       <target name="start-jboss-3">\r
+       <target name="integration-test-start-jboss-3">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-3.2.8" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-3.2.8-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-jboss-3">\r
+       <target name="integration-test-stop-jboss-3">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-jboss-3.2.8" />\r
        </target>\r
        \r
-       <target name="start-jboss-4">\r
+       <target name="integration-test-start-jboss-4">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-4.2.3" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-4.2.3-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-jboss-4">\r
+       <target name="integration-test-stop-jboss-4">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-jboss-4.2.3" />\r
        </target>\r
        \r
-       <target name="start-jboss-5">\r
+       <target name="integration-test-start-jboss-5">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-5.0.1" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-5.0.1-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-jboss-5">\r
+       <target name="integration-test-stop-jboss-5">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-jboss-5.0.1" />\r
        </target>\r
        \r
-       <target name="start-glassfish2">\r
+       <target name="integration-test-start-glassfish2">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-2.1.1" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-sampler.html" overwrite="true" />\r
        </target>\r
        \r
-       <target name="stop-glassfish2">\r
+       <target name="integration-test-stop-glassfish2">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-glassfish-2.1.1" />\r
        </target>\r
        \r
-       <target name="start-glassfish3">\r
+       <target name="integration-test-start-glassfish3">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-3" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-3-sampler.html" overwrite="true" />\r
        </target>\r
        \r
-       <target name="stop-glassfish3">\r
+       <target name="integration-test-stop-glassfish3">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-glassfish-3" />\r
        </target>\r
                        \r
        <!-- Test liferay sampler -->\r
-       <target name="test-liferay">\r
+       <target name="integration-test-test-liferay">\r
                <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-liferay-5.2.3-sampler.html" />\r
                <pathconvert pathsep=" " property="test-liferay" refid="html-test-files" />\r
                \r
@@ -171,7 +171,7 @@
        </target>\r
        \r
        <!-- "deploy" sampler to liferay -->\r
-       <target name="init-liferay">\r
+       <target name="integration-test-init-liferay">\r
                <fileset dir="integration-testscripts" id="html-test-files" includes="Add_Sampler_to_Liferay.html" />\r
                <pathconvert pathsep=" " property="init-liferay" refid="html-test-files" />\r
                \r
@@ -186,17 +186,17 @@
                </subant>\r
        </target>\r
        \r
-       <target name="start-liferay">\r
+       <target name="integration-test-start-liferay">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-5.2.3" />\r
                <copy file="integration-testscripts/sampler_deployment_liferay.html" tofile="integration-testscripts/integration-test-liferay-5.2.3-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-liferay">\r
+       <target name="integration-test-stop-liferay">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-5.2.3" />\r
        </target>\r
        \r
        <!-- Run sampler deployment test for WebLogic server -->\r
-       <target name="test-weblogic">\r
+       <target name="integration-test-test-weblogic">\r
                <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />\r
                <pathconvert pathsep=" " property="test-weblogic" refid="html-test-files" />\r
                \r
@@ -211,26 +211,26 @@
                </subant>\r
        </target>\r
        \r
-       <target name="start-weblogic9">\r
+       <target name="integration-test-start-weblogic9">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-9.2" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-9.2-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-weblogic9">\r
+       <target name="integration-test-stop-weblogic9">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-weblogic-9.2" />\r
        </target>\r
        \r
-       <target name="start-weblogic10">\r
+       <target name="integration-test-start-weblogic10">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-10.3" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-10.3-sampler.html" overwrite="true" />\r
        </target>\r
 \r
-       <target name="stop-weblogic10">\r
+       <target name="integration-test-stop-weblogic10">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-weblogic-10.3" />\r
        </target>\r
        \r
        <!-- Run sampler deployment test on GAE -->\r
-       <target name="test-GAE">\r
+       <target name="integration-test-test-GAE">\r
                <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-GAE-sampler.html" />\r
                <pathconvert pathsep=" " property="test-GAE" refid="html-test-files" />\r
                \r
@@ -245,172 +245,172 @@
                </subant>\r
        </target>\r
                \r
-       <target name="deploy-to-GAE">\r
+       <target name="integration-test-deploy-to-GAE">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} deploy-to-GAE" />\r
        </target>\r
                        \r
        <!-- Server setup, test and teardown targets. -->\r
-       <target name="tomcat4">\r
-               <antcall target="start-tomcat-4"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-tomcat4">\r
+               <antcall target="integration-test-start-tomcat-4"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="tomcat-4.1.40" />\r
                </antcall>\r
-               <antcall target="stop-tomcat-4"/>\r
+               <antcall target="integration-test-stop-tomcat-4"/>\r
        </target>\r
        \r
-       <target name="tomcat5">\r
-               <antcall target="start-tomcat-5"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-tomcat5">\r
+               <antcall target="integration-test-start-tomcat-5"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="tomcat-5.5.28" />\r
                </antcall>\r
-               <antcall target="stop-tomcat-5"/>\r
+               <antcall target="integration-test-stop-tomcat-5"/>\r
        </target>       \r
        \r
-       <target name="tomcat6">\r
-               <antcall target="start-tomcat-6"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-tomcat6">\r
+               <antcall target="integration-test-start-tomcat-6"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="tomcat-6.0.20" />\r
                </antcall>\r
-               <antcall target="stop-tomcat-6"/>\r
+               <antcall target="integration-test-stop-tomcat-6"/>\r
        </target>\r
        \r
-       <target name="jetty5">\r
-               <antcall target="start-jetty-5"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-jetty5">\r
+               <antcall target="integration-test-start-jetty-5"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="jetty-5.1.15" />\r
                </antcall>\r
-               <antcall target="stop-jetty-5"/>\r
+               <antcall target="integration-test-stop-jetty-5"/>\r
        </target>\r
        \r
-       <target name="jetty6">\r
-               <antcall target="start-jetty-6"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-jetty6">\r
+               <antcall target="integration-test-start-jetty-6"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="jetty-6.1.22" />\r
                </antcall>\r
-               <antcall target="stop-jetty-6"/>\r
+               <antcall target="integration-test-stop-jetty-6"/>\r
        </target>\r
        \r
-       <target name="jetty7">\r
-               <antcall target="start-jetty-7"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-jetty7">\r
+               <antcall target="integration-test-start-jetty-7"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="jetty-7.0.0" />\r
                </antcall>\r
-               <antcall target="stop-jetty-7"/>\r
+               <antcall target="integration-test-stop-jetty-7"/>\r
        </target>\r
        \r
-       <target name="jboss3">\r
-               <antcall target="start-jboss-3"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-jboss3">\r
+               <antcall target="integration-test-start-jboss-3"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="jboss-3.2.8" />\r
                </antcall>\r
-               <antcall target="stop-jboss-3"/>\r
+               <antcall target="integration-test-stop-jboss-3"/>\r
        </target>\r
        \r
-       <target name="jboss4">\r
-               <antcall target="start-jboss-4"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-jboss4">\r
+               <antcall target="integration-test-start-jboss-4"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="jboss-4.2.3" />\r
                </antcall>\r
-               <antcall target="stop-jboss-4"/>\r
+               <antcall target="integration-test-stop-jboss-4"/>\r
        </target>\r
        \r
-       <target name="jboss5">\r
-               <antcall target="start-jboss-5"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-jboss5">\r
+               <antcall target="integration-test-start-jboss-5"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="jboss-5.0.1" />\r
                </antcall>\r
-               <antcall target="stop-jboss-5"/>\r
+               <antcall target="integration-test-stop-jboss-5"/>\r
        </target>\r
                \r
-       <target name="glassfish2">\r
-               <antcall target="start-glassfish2"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-glassfish2">\r
+               <antcall target="integration-test-start-glassfish2"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="glassfish-2.1.1" />\r
                </antcall>\r
-               <antcall target="stop-glassfish2"/>\r
+               <antcall target="integration-test-stop-glassfish2"/>\r
        </target>\r
        \r
-       <target name="glassfish3">\r
-               <antcall target="start-glassfish3"/>\r
-               <antcall target="test-sampler">\r
+       <target name="integration-test-glassfish3">\r
+               <antcall target="integration-test-start-glassfish3"/>\r
+               <antcall target="integration-test-sampler">\r
                        <param name="server-name" value="glassfish-3" />\r
                </antcall>\r
-               <antcall target="stop-glassfish3"/>\r
+               <antcall target="integration-test-stop-glassfish3"/>\r
        </target>\r
        \r
-       <target name="liferay">\r
-               <antcall target="start-liferay" />\r
-               <antcall target="init-liferay" />\r
-               <antcall target="test-liferay" />\r
-               <antcall target="stop-liferay" />\r
+       <target name="integration-test-liferay">\r
+               <antcall target="integration-test-start-liferay" />\r
+               <antcall target="integration-test-init-liferay" />\r
+               <antcall target="integration-test-test-liferay" />\r
+               <antcall target="integration-test-stop-liferay" />\r
        </target>\r
        \r
-       <target name="weblogic9">\r
-               <antcall target="start-weblogic9"/>\r
-               <antcall target="test-weblogic">\r
+       <target name="integration-test-weblogic9">\r
+               <antcall target="integration-test-start-weblogic9"/>\r
+               <antcall target="integration-test-test-weblogic">\r
                        <param name="server-name" value="weblogic-9.2" />\r
                </antcall>\r
-               <antcall target="stop-weblogic9"/>\r
+               <antcall target="integration-test-stop-weblogic9"/>\r
        </target>\r
        \r
-       <target name="weblogic10">\r
-               <antcall target="start-weblogic10"/>\r
-               <antcall target="test-weblogic">\r
+       <target name="integration-test-weblogic10">\r
+               <antcall target="integration-test-start-weblogic10"/>\r
+               <antcall target="integration-test-test-weblogic">\r
                        <param name="server-name" value="weblogic-10.3" />\r
                </antcall>\r
-               <antcall target="stop-weblogic10"/>\r
+               <antcall target="integration-test-stop-weblogic10"/>\r
        </target>\r
        \r
-       <target name="GAE">\r
-               <antcall target="deploy-to-GAE"/>\r
-               <antcall target="test-GAE" />\r
+       <target name="integration-test-GAE">\r
+               <antcall target="integration-test-deploy-to-GAE"/>\r
+               <antcall target="integration-test-test-GAE" />\r
        </target>\r
                        \r
        <!-- Upload demo, clean error screenshots and test deployment on all servers -->\r
-       <target name="all">\r
-               <antcall target="upload-demo" />\r
+       <target name="integration-test-all">\r
+               <antcall target="integration-test-upload-demo" />\r
                <echo>Getting lock</echo>\r
-               <antcall target="get-lock" />\r
+               <antcall target="integration-test-get-lock" />\r
                <echo>Got lock</echo>\r
                <trycatch property="tried">\r
                        <try>\r
-                               <antcall target="tomcat4" />\r
-                               <antcall target="tomcat5" />\r
-                               <antcall target="tomcat6" />\r
-                               <antcall target="jetty5" />\r
-                               <antcall target="jetty6" />\r
-                               <antcall target="jetty7" />\r
-                               <antcall target="jboss3" />\r
-                               <antcall target="jboss4" />\r
-                               <antcall target="jboss5" />\r
-                               <antcall target="glassfish2" />\r
-                               <antcall target="glassfish3" />\r
-                               <antcall target="liferay" />\r
-                               <antcall target="weblogic9" />\r
-                               <antcall target="weblogic10" />\r
-                               <antcall target="GAE" />\r
+                               <antcall target="integration-test-tomcat4" />\r
+                               <antcall target="integration-test-tomcat5" />\r
+                               <antcall target="integration-test-tomcat6" />\r
+                               <antcall target="integration-test-jetty5" />\r
+                               <antcall target="integration-test-jetty6" />\r
+                               <antcall target="integration-test-jetty7" />\r
+                               <antcall target="integration-test-jboss3" />\r
+                               <antcall target="integration-test-jboss4" />\r
+                               <antcall target="integration-test-jboss5" />\r
+                               <antcall target="integration-test-glassfish2" />\r
+                               <antcall target="integration-test-glassfish3" />\r
+                               <antcall target="integration-test-liferay" />\r
+                               <antcall target="integration-test-weblogic9" />\r
+                               <antcall target="integration-test-weblogic10" />\r
+                               <antcall target="integration-test-GAE" />\r
                        </try>\r
                        <catch>\r
                                <echo>${tried}</echo>\r
-                               <echo>Running targets: clean and release-lock</echo>\r
+                               <echo>Running targets: integration-test-clean and integration-test-release-lock</echo>\r
                        </catch>\r
                        <finally>\r
-                               <antcall target="clean" />\r
-                               <antcall target="release-lock" />\r
+                               <antcall target="integration-test-clean" />\r
+                               <antcall target="integration-test-release-lock" />\r
                        </finally>\r
                </trycatch>\r
        </target>\r
        \r
-       <target name="get-lock">\r
+       <target name="integration-test-get-lock">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} get-lock" />\r
        </target>\r
        \r
-       <target name="release-lock">\r
+       <target name="integration-test-release-lock">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} release-lock" />\r
        </target>\r
                \r
        <!-- Remove demo.war -->\r
-       <target name="clean">\r
+       <target name="integration-test-clean">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} clean" />\r
        </target>\r
        \r