Ant scp task is not in ant contrib, reverted faulty namespace decl.

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 84d34264186b3a358d76d382a1d1fd49e4d5f099..338d48ae5c07c18b2c62e42e78dca7a32c837c9c 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -34,7 +34,7 @@
 \r
        <!-- Upload war to deploy to ssh host -->\r
        <target name="integration-test-upload-demo">\r
-               <antcontrib:scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />\r
+               <scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />\r
        </target>\r
        \r
        <!-- Run basic integration test test -->\r
@@ -329,11 +329,11 @@
                        </then>\r
                </antcontrib:if>\r
                \r
-               <antcontrib:scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" >\r
+               <scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" >\r
                        <fileset dir="integration_base_files">\r
                                <include name="*" />\r
                        </fileset>\r
-               </antcontrib:scp>\r
+               </scp>\r
                \r
                <!-- trycatch probably not needed any more as it just fails with the original message and doesn't do anything in the finally block -->\r
                <antcontrib:trycatch property="error_message">\r
@@ -345,7 +345,7 @@
                                        <param name="message" value="${lock-output}" />\r
                                </antcall>\r
 \r
-                               <antcontrib:scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />\r
+                               <scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />\r
                                \r
                                <!-- timeout in 15 minutes -->\r
                                <sshexec host="${target-host}" outputproperty="start-output" timeout="900000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml startup-and-deploy" failonerror="false" />\r