From 88c19b89795fbeb8c244a493d0b8a3ce1e428127 Mon Sep 17 00:00:00 2001
From: Mikael Vappula <mikael@vaadin.com>
Date: Tue, 20 Dec 2011 13:30:06 +0200
Subject: [PATCH] Added xml namespace declaration for tasks in ant contrib

---
 tests/integration_tests.xml | 45 +++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index c96c93bbe4..84d3426418 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="Vaadin Integration Tests" basedir="." default="integration-test-all">
+<project xmlns:antcontrib="antlib:net.sf.antcontrib"
+	name="Vaadin Integration Tests" basedir="." default="integration-test-all">
 
     <!-- Import common targets  -->
     <import file="../build/common.xml" />
@@ -33,7 +34,7 @@
 
 	<!-- Upload war to deploy to ssh host -->
 	<target name="integration-test-upload-demo">
-		<scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />
+		<antcontrib: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 -->
@@ -260,7 +261,7 @@
 	<target name="integration-test-all" depends="common.init-deps">
 		
 		<parallel>
-			<trycatch property="tried">
+			<antcontrib:trycatch property="tried">
 				<try>
 					<!-- Still running GAE test from the old server which requires its own lock -->
 					<echo message="Getting lock" />
@@ -281,7 +282,7 @@
 				<catch>
 					<echo message="Uploading of demo.war failed. ${tried}" />
 				</catch>
-			</trycatch>
+			</antcontrib:trycatch>
 							
 			<antcall target="integration-test-liferay6" />
 			<antcall target="integration-test-liferay6ee" />
@@ -312,30 +313,30 @@
 		<property name="target-host" value="${target-server}.devnet.vaadin.com" />
 		<property name="target-port" value="8080" />
 		
-		<if>
+		<antcontrib:if>
 			<isset property="startDelay" />
 			<then>
-				<math result="sleepTime" datatype="int">
+				<antcontrib:math result="sleepTime" datatype="int">
 					<op op="rint">
 						<op op="*">
 							<num value="${startDelay}"/>
 							<op op="random"/>
 						</op>
 					</op>
-				</math>
+				</antcontrib:math>
 				<echo>Delaying startup of ${target-server} with ${sleepTime} seconds</echo>		
 				<sleep seconds="${sleepTime}" />
 			</then>
-		</if>
+		</antcontrib:if>
 		
-		<scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" >
+		<antcontrib:scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" >
 			<fileset dir="integration_base_files">
 				<include name="*" />
 			</fileset>
-		</scp>
+		</antcontrib:scp>
 		
 		<!-- trycatch probably not needed any more as it just fails with the original message and doesn't do anything in the finally block -->
-		<trycatch property="error_message">
+		<antcontrib:trycatch property="error_message">
 			<try>
 				<!-- timeout in one hour (remote end should timeout in 55 minutes) -->
 				<sshexec host="${target-host}" outputproperty="lock-output" timeout="3600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="chmod +x *.sh; ant -f deploy.xml get-lock" />
@@ -344,7 +345,7 @@
 					<param name="message" value="${lock-output}" />
 				</antcall>
 
-				<scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />
+				<antcontrib: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" />
@@ -388,7 +389,7 @@
 			<catch>
 				<fail message="${error_message}" />
 			</catch>
-		</trycatch>
+		</antcontrib:trycatch>
 	</target>
 	
 	<target name="echo-prefix">
@@ -398,18 +399,18 @@
 	
 	<target name="run-generic-integration-test">
 		<concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat>
-		<trycatch property="tried">
+		<antcontrib:trycatch property="tried">
 			<try>
 				<antcall target="do-run-generic-test" />
 			</try>
 			<catch>
-				<antcallback target="teamcity-escape" return="tried-escaped">
+				<antcontrib:antcallback target="teamcity-escape" return="tried-escaped">
 					<param name="returnTo" value="tried-escaped" />
 					<param name="message" value="${tried}" />
-				</antcallback>
+				</antcontrib:antcallback>
 				<concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']</concat>
 			</catch>
-		</trycatch>
+		</antcontrib:trycatch>
 		<concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>
 	</target>	
 
@@ -418,16 +419,16 @@
 		
 		<!-- Should also perform other escaping (\u0085, \u2028 and \u2029) - see http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity -->
 		<!-- Immutable properties -> needs to create a new one every time -->
-		<propertyregex property="details-escaped1" input="${message}" regexp="['|\[\]]" replace="|\0" global="true" defaultValue="${message}" />
-		<propertyregex property="details-escaped2" input="${details-escaped1}" regexp="\n" replace="|n" global="true" defaultValue="${details-escaped1}" />
-		<propertyregex property="details-escaped3" input="${details-escaped2}" regexp="\r" replace="|r" global="true" defaultValue="${details-escaped2}" />
+		<antcontrib:propertyregex property="details-escaped1" input="${message}" regexp="['|\[\]]" replace="|\0" global="true" defaultValue="${message}" />
+		<antcontrib:propertyregex property="details-escaped2" input="${details-escaped1}" regexp="\n" replace="|n" global="true" defaultValue="${details-escaped1}" />
+		<antcontrib:propertyregex property="details-escaped3" input="${details-escaped2}" regexp="\r" replace="|r" global="true" defaultValue="${details-escaped2}" />
 		
 		<property name="${returnTo}" value="${details-escaped3}" />
 	</target>
 	
 	<target name="run-integration-test">
 		<concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat>
-		<trycatch property="tried">
+		<antcontrib:trycatch property="tried">
 			<try>
 				<antcall target="integration-test-${target-server}" />
 			</try>
@@ -438,7 +439,7 @@
 				</antcallback>
 				<concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']"</concat>
 			</catch>
-		</trycatch>
+		</antcontrib:trycatch>
 		<concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>
 	</target>
 	
-- 
2.39.5