Changeset 9402854b2 in vaadin


Ignore:
Timestamp:
12/20/11 11:57:45 (2 years ago)
Author:
Mikael Vappula <mikael@…>
Branches:
5a97058359b0e7d850d6dfca6b8737dff56dc51d, 7.0, 7.1, 7.2
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:
1 edited

Legend:

Unmodified
Added
Removed
  • tests/integration_tests.xml

    r88c19b89 r9402854b2  
    3535        <!-- Upload war to deploy to ssh host --> 
    3636        <target name="integration-test-upload-demo"> 
    37                 <antcontrib:scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" /> 
     37                <scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" /> 
    3838        </target> 
    3939         
     
    330330                </antcontrib:if> 
    331331                 
    332                 <antcontrib:scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" > 
     332                <scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" > 
    333333                        <fileset dir="integration_base_files"> 
    334334                                <include name="*" /> 
    335335                        </fileset> 
    336                 </antcontrib:scp> 
     336                </scp> 
    337337                 
    338338                <!-- trycatch probably not needed any more as it just fails with the original message and doesn't do anything in the finally block --> 
     
    346346                                </antcall> 
    347347 
    348                                 <antcontrib:scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" /> 
     348                                <scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" /> 
    349349                                 
    350350                                <!-- timeout in 15 minutes --> 
Note: See TracChangeset for help on using the changeset viewer.