Changed key.file to sshkey.file

Changed integration-tests target to 'all'

svn changeset:9975/svn branch:6.2

diff --git a/build/build.xml b/build/build.xml
index 386b8bdf8d42322b33d988796343f19867df4493..981ed91c9a81b26b2369762cb316503c2eb9ea68 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -1430,20 +1430,20 @@
         <!-- Parameters for the test.xml script. -->
         <fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined."/>
         <fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined."/>
-        <fail unless="key.file" message="The 'key.file' property must be defined."/>
+        <fail unless="sshkey.file" message="The 'sshkey.file' property must be defined."/>
 
         <!-- Empty passphrase if no passphrase defined -->
         <property name="passphrase" value="" />
 
         <!-- Run the separate test script. -->
-        <ant antfile="tests/integration_tests.xml" target="tomcat4" inheritall="false" inheritrefs="true">
+        <ant antfile="tests/integration_tests.xml" target="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}"/>
 
                      <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}"/>
                      <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/>
-                         <property name="key.file" value="${key.file}" />
+                         <property name="sshkey.file" value="${sshkey.file}" />
                          <property name="passphrase" value="${passphrase}" />
                      <property name="demo.war" value="${result-path}/${product-file}-demo-${version.full}.war"/>
         </ant>

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index f00d9e0de1238f913df3a5621f0af83f58ad76f4..4de7fd9511d9b65310f6de9ab2da23da9009d9dd 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -8,8 +8,8 @@
        <!-- Target deploying demo.war -->\r
        <property name="sshHost" value="rndtestlinux.office.itmill.com" />\r
        \r
-       <!-- Key file to use -->\r
-       <property name="key.file" value="id_rsa" />\r
+       <!-- Path to key file -->\r
+       <property name="sshkey.file" value="id_rsa" />\r
        \r
        <!-- path and name for demo.war to be deployed -->\r
        <property name="demo.war" value="demo.war"/>\r
@@ -27,7 +27,7 @@
        \r
        <!-- Upload war to deploy to ssh host -->\r
        <target name="upload-demo">\r
-               <scp file="${demo.war}" todir="${user}@${sshHost}:servers/demo.war" keyfile="${key.file}" passphrase="${passphrase}" />\r
+               <scp file="${demo.war}" todir="${user}@${sshHost}:servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />\r
        </target>\r
        \r
        <!-- Run sampler deployment test -->\r
@@ -48,7 +48,7 @@
        \r
        <!-- Start and stop methods for servers -->\r
        <target name="start-tomcat-4">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-tomcat-4.1.40" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -59,11 +59,11 @@
        </target>\r
 \r
        <target name="stop-tomcat-4">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-tomcat-4.1.40" />\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
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-tomcat-5.5.28" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -74,11 +74,11 @@
        </target>\r
 \r
        <target name="stop-tomcat-5">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-tomcat-5.5.28" />\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
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-tomcat-6.0.20" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -89,11 +89,11 @@
        </target>\r
 \r
        <target name="stop-tomcat-6">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-tomcat-6.0.20" />\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
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jetty-5.1.15" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -104,11 +104,11 @@
        </target>\r
 \r
        <target name="stop-jetty-5">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jetty-5.1.15" />\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
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jetty-6.1.22" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -119,11 +119,11 @@
        </target>\r
 \r
        <target name="stop-jetty-6">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jetty-6.1.22" />\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
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jetty-7.0.0" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -134,11 +134,11 @@
        </target>\r
 \r
        <target name="stop-jetty-7">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jetty-7.0.0" />\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
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jboss-3.2.8" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -149,11 +149,11 @@
        </target>\r
 \r
        <target name="stop-jboss-3">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jboss-3.2.8" />\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
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jboss-4.2.3" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -164,11 +164,11 @@
        </target>\r
 \r
        <target name="stop-jboss-4">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jboss-4.2.3" />\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
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jboss-5.0.1" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -179,11 +179,11 @@
        </target>\r
 \r
        <target name="stop-jboss-5">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jboss-5.0.1" />\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-glassfish">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-glassfish-2.1.1" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -194,7 +194,7 @@
        </target>\r
        \r
        <target name="stop-glassfish">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-glassfish-2.1.1" />\r
+               <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-glassfish-2.1.1" />\r
        </target>\r
        \r
        <!-- Test liferay sampler -->\r
@@ -230,11 +230,11 @@
        </target>\r
        \r
        <target name="start-liferay">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-liferay-5.2.3" />\r
+               <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-5.2.3" />\r
        </target>\r
 \r
        <target name="stop-liferay">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-liferay-5.2.3" />\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
@@ -254,7 +254,7 @@
        </target>\r
        \r
        <target name="start-weblogic9">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-weblogic-9.2" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -265,11 +265,11 @@
        </target>\r
 \r
        <target name="stop-weblogic9">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-weblogic-9.2" />\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
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-weblogic-10.3" />\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/sampler_deployment.html" overwrite="true">\r
                        <filterchain>\r
                                <replacetokens>\r
@@ -280,7 +280,7 @@
        </target>\r
 \r
        <target name="stop-weblogic10">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-weblogic-10.3" />\r
+               <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-weblogic-10.3" />\r
        </target>\r
        \r
        <!-- Server setup, test and teardown targets. -->\r
@@ -363,7 +363,7 @@
        \r
        <!-- Remove demo.war -->\r
        <target name="clean">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} clean" />\r
+               <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} clean" />\r
        </target>\r
        \r
        <!-- Remove old screenshots if any -->\r