From 0ff92b1b4da7824890d1e808290e498954517ce5 Mon Sep 17 00:00:00 2001
From: michaelhashimoto <michael.hashimoto@liferay.com>
Date: Wed, 16 Nov 2011 12:56:07 -0800
Subject: [PATCH] LPS-23023

---
 build-test-geronimo.xml                                  | 2 ++
 build-test-glassfish.xml                                 | 2 ++
 build-test-jboss.xml                                     | 2 ++
 build-test-jetty.xml                                     | 2 ++
 build-test-jonas.xml                                     | 2 ++
 build-test-tomcat.xml                                    | 2 ++
 build-test-weblogic-10.3.xml                             | 2 ++
 build-test-websphere-6.1.xml                             | 2 ++
 build-test-websphere-7.0.xml                             | 2 ++
 build-test.xml                                           | 9 +++++++--
 .../portalweb/portal/evaluatelog/EvaluateLogTest.java    | 3 ++-
 11 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/build-test-geronimo.xml b/build-test-geronimo.xml
index 5e0ee9f1b7e3ac..3017ddc69969f7 100644
--- a/build-test-geronimo.xml
+++ b/build-test-geronimo.xml
@@ -4,6 +4,8 @@
 	<import file="build-test.xml" />
 
 	<target name="run-geronimo">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
diff --git a/build-test-glassfish.xml b/build-test-glassfish.xml
index 28941379d88a29..c4827e901910bd 100644
--- a/build-test-glassfish.xml
+++ b/build-test-glassfish.xml
@@ -4,6 +4,8 @@
 	<import file="build-test.xml" />
 
 	<target name="run-glassfish">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
diff --git a/build-test-jboss.xml b/build-test-jboss.xml
index ab9913a741eaae..79cb83077c1f44 100644
--- a/build-test-jboss.xml
+++ b/build-test-jboss.xml
@@ -4,6 +4,8 @@
 	<import file="build-test.xml" />
 
 	<target name="run-jboss">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
diff --git a/build-test-jetty.xml b/build-test-jetty.xml
index 1162fd5cbe3091..7e44970dfdd2cd 100644
--- a/build-test-jetty.xml
+++ b/build-test-jetty.xml
@@ -4,6 +4,8 @@
 	<import file="build-test.xml" />
 
 	<target name="run-jetty">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
diff --git a/build-test-jonas.xml b/build-test-jonas.xml
index fdd3bbba5ea6f9..ce1f54192d1ba9 100644
--- a/build-test-jonas.xml
+++ b/build-test-jonas.xml
@@ -4,6 +4,8 @@
 	<import file="build-test.xml" />
 
 	<target name="run-jonas">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
diff --git a/build-test-tomcat.xml b/build-test-tomcat.xml
index 1f71e72d9f1e45..71a0e4d88b8fb8 100644
--- a/build-test-tomcat.xml
+++ b/build-test-tomcat.xml
@@ -228,6 +228,8 @@ web.server.display.node=true</echo>
 	</target>
 
 	<target name="run-tomcat">
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
diff --git a/build-test-weblogic-10.3.xml b/build-test-weblogic-10.3.xml
index b90e8b300a4858..4660c81b825a07 100644
--- a/build-test-weblogic-10.3.xml
+++ b/build-test-weblogic-10.3.xml
@@ -190,6 +190,8 @@
 
 		<antcall target="start-selenium" />
 
+		<antcall target="clean-up-logs" />
+
 		<record action="start" name="log" />
 
 		<antcall target="run-weblogic-10.3">
diff --git a/build-test-websphere-6.1.xml b/build-test-websphere-6.1.xml
index d25b7d296b92b9..7e7c1f4a7cac63 100644
--- a/build-test-websphere-6.1.xml
+++ b/build-test-websphere-6.1.xml
@@ -241,6 +241,8 @@ $AdminConfig save</echo>
 			<arg line="-pw ${vm.password} ${vm.username}@${vm.host} cmd.exe /c C:\Progra~1\IBM\WebSphere\AppServer\profiles\AppSrv01\bin\stopServer.bat server1" />
 		</exec>
 
+		<antcall target="clean-up-logs" />
+
 		<exec executable="${pscp.executable}">
 			<arg line="-pw ${vm.password} ${vm.username}@${vm.host}:Progra~1/IBM/WebSphere/AppServer/profiles/AppSrv01/logs/server1/SystemOut.log log" />
 		</exec>
diff --git a/build-test-websphere-7.0.xml b/build-test-websphere-7.0.xml
index fa8db293984aaa..96c56951ffa5de 100644
--- a/build-test-websphere-7.0.xml
+++ b/build-test-websphere-7.0.xml
@@ -250,6 +250,8 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-tunnel-web')<
 			<arg line="-pw ${vm.password} ${vm.username}@${vm.host} cmd.exe /c C:\Progra~1\IBM\WebSphere\AppServer\profiles\AppSrv01\bin\stopServer.bat server1" />
 		</exec>
 
+		<antcall target="clean-up-logs" />
+
 		<exec executable="${pscp.executable}">
 			<arg line="-pw ${vm.password} ${vm.username}@${vm.host}:Progra~1/IBM/WebSphere/AppServer/profiles/AppSrv01/logs/server1/SystemOut.log log" />
 		</exec>
diff --git a/build-test.xml b/build-test.xml
index 4b402d25f0a6df..aad24ab2878d80 100644
--- a/build-test.xml
+++ b/build-test.xml
@@ -1754,6 +1754,11 @@
 		</delete>
 	</target>
 
+	<target name="clean-up-logs">
+		<delete file="log" />
+		<delete file="portal-web/test-ant-scripts/log" />
+	</target>
+
 	<target name="clean-up-java-processes">
 		<loadfile property="java.processes.old.content" srcfile="java-processes" />
 
@@ -1874,7 +1879,7 @@
 		<if>
 			<available file="portal-web/test-ant-scripts/log" />
 			<then>
-				<move file="portal-web/test-ant-scripts/log" todir="."/>
+				<move file="portal-web/test-ant-scripts/log" todir="." />
 			</then>
 		</if>
 
@@ -1902,7 +1907,7 @@
 			</then>
 		</if>
 
-		<delete file="log" />
+		<antcall target="clean-up-logs" />
 	</target>
 
 	<target name="execute-remote-command">
diff --git a/portal-web/test/com/liferay/portalweb/portal/evaluatelog/EvaluateLogTest.java b/portal-web/test/com/liferay/portalweb/portal/evaluatelog/EvaluateLogTest.java
index 6cb6270cb267c8..80a9736aaf3462 100644
--- a/portal-web/test/com/liferay/portalweb/portal/evaluatelog/EvaluateLogTest.java
+++ b/portal-web/test/com/liferay/portalweb/portal/evaluatelog/EvaluateLogTest.java
@@ -51,7 +51,8 @@ private boolean evaluateLog() throws Exception {
 			}
 
 			if (line.matches(
-					"The web application \\[.*\\] appears to have started")) {
+					".*The web application \\[.*\\] appears to have started " +
+					"a thread.*")) {
 
 				if (line.contains("[AWT-Windows]")) {
 					continue;