Changeset 9402854b2 in vaadin

Timestamp:

12/20/11 11:57:45 (17 months ago)

Author:

Mikael Vappula <mikael@…>

Branches:

20b169873dbacf9eb7135a861bc5cf15177225ee, 34e6c60a5a746c0306c3a84ae8d6c21dfd84d878, 2772641acf8f84046e3ac42c8386b65e4f2346f2

Children:

04ce5d5f2

Parents:

88c19b89

git-author:

Mikael Vappula <mikael@…> (12/20/11 11:57:45)

git-committer:

Mikael Vappula <mikael@…> (12/20/11 11:57:45)

Message:

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

File:

• tests/integration_tests.xml (modified) (3 diffs)

tests/integration_tests.xml

@@ -35 +35 @@
         <!-- Upload war to deploy to ssh host -->
         <target name="integration-test-upload-demo">
-                <antcontrib:scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />
+                <scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />
         </target>
         
@@ -330 +330 @@
                 </antcontrib:if>
                 
-                <antcontrib:scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" >
+                <scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" >
                         <fileset dir="integration_base_files">
                                 <include name="*" />
                         </fileset>
-                </antcontrib:scp>
+                </scp>
                 
                 <!-- trycatch probably not needed any more as it just fails with the original message and doesn't do anything in the finally block -->
@@ -346 +346 @@
                                 </antcall>
 
-                                <antcontrib:scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />
+                                <scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />
                                 
                                 <!-- timeout in 15 minutes -->