diff options
| author | Mikael Vappula <mikael@vaadin.com> | 2011-12-20 13:57:45 +0200 |
|---|---|---|
| committer | Mikael Vappula <mikael@vaadin.com> | 2011-12-20 13:57:45 +0200 |
| commit | 9402854b28c86a67b860866d02a1909a967aa207 (patch) | |
| tree | 69e13a357a205621e51f994c114a6c9757e83623 /tests/integration_tests.xml | |
| parent | 88c19b89795fbeb8c244a493d0b8a3ce1e428127 (diff) | |
| download | vaadin-framework-9402854b28c86a67b860866d02a1909a967aa207.tar.gz vaadin-framework-9402854b28c86a67b860866d02a1909a967aa207.zip | |
Ant scp task is not in ant contrib, reverted faulty namespace decl.
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 84d3426418..338d48ae5c 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -34,7 +34,7 @@ <!-- 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>
<!-- Run basic integration test test -->
@@ -329,11 +329,11 @@ </then>
</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 -->
<antcontrib:trycatch property="error_message">
@@ -345,7 +345,7 @@ <param name="message" value="${lock-output}" />
</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 -->
<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" />
|