LPS-23023 Source formatting

iamsyedali · Nov 15, 2011 · 1b841d4 · 1b841d4
1 parent 9e121d1
commit 1b841d4
Show file tree

Hide file tree

Showing 14 changed files with 114 additions and 117 deletions.
diff --git a/build-test-geronimo.xml b/build-test-geronimo.xml
@@ -4,7 +4,7 @@
 	<import file="build-test.xml" />
 
 	<target name="run-geronimo">
-		<record name="log" action="start" />
+		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
 			<param name="simple.server.dir" value="${app.server.geronimo.dir}" />
@@ -18,7 +18,7 @@
 			<param name="simple.server.stop.executable.arg.line" value="stop --user system --password manager" />
 		</antcall>
 
-		<record name="log" action="stop" />
+		<record action="stop" name="log" />
 
 		<antcall target="evaluate-logs" />
 	</target>

diff --git a/build-test-glassfish.xml b/build-test-glassfish.xml
@@ -4,7 +4,7 @@
 	<import file="build-test.xml" />
 
 	<target name="run-glassfish">
-		<record name="log" action="start" />
+		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
 			<param name="simple.server.dir" value="${app.server.glassfish.dir}" />
@@ -18,7 +18,7 @@
 			<param name="simple.server.stop.executable.arg.line" value="stop-domain" />
 		</antcall>
 
-		<record name="log" action="stop" />
+		<record action="stop" name="log" />
 
 		<antcall target="evaluate-logs" />
 	</target>

diff --git a/build-test-jboss.xml b/build-test-jboss.xml
@@ -4,7 +4,7 @@
 	<import file="build-test.xml" />
 
 	<target name="run-jboss">
-		<record name="log" action="start" />
+		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
 			<param name="simple.server.dir" value="${app.server.jboss.dir}" />
@@ -18,7 +18,7 @@
 			<param name="simple.server.stop.executable.arg.line" value="--connect command=:shutdown" />
 		</antcall>
 
-		<record name="log" action="stop" />
+		<record action="stop" name="log" />
 
 		<antcall target="evaluate-logs" />
 	</target>

diff --git a/build-test-jetty.xml b/build-test-jetty.xml
@@ -4,7 +4,7 @@
 	<import file="build-test.xml" />
 
 	<target name="run-jetty">
-		<record name="log" action="start" />
+		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
 			<param name="simple.server.dir" value="${app.server.jetty.dir}" />
@@ -18,7 +18,7 @@
 			<param name="simple.server.stop.executable.arg.line" value="" />
 		</antcall>
 
-		<record name="log" action="stop" />
+		<record action="stop" name="log" />
 
 		<antcall target="evaluate-logs" />
 	</target>

diff --git a/build-test-jonas.xml b/build-test-jonas.xml
@@ -4,7 +4,7 @@
 	<import file="build-test.xml" />
 
 	<target name="run-jonas">
-		<record name="log" action="start" />
+		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
 			<param name="simple.server.dir" value="${app.server.jonas.dir}" />
@@ -18,7 +18,7 @@
 			<param name="simple.server.stop.executable.arg.line" value="stop" />
 		</antcall>
 
-		<record name="log" action="stop" />
+		<record action="stop" name="log" />
 
 		<antcall target="evaluate-logs" />
 	</target>

diff --git a/build-test-tomcat.xml b/build-test-tomcat.xml
@@ -228,7 +228,7 @@ web.server.display.node=true</echo>
 	</target>
 
 	<target name="run-tomcat">
-		<record name="log" action="start" />
+		<record action="start" name="log" />
 
 		<antcall target="run-simple-server">
 			<param name="simple.server.dir" value="${app.server.tomcat.dir}" />
@@ -241,7 +241,7 @@ web.server.display.node=true</echo>
 			<param name="simple.server.stop.executable" value="shutdown${file.suffix.bat}" />
 		</antcall>
 
-		<record name="log" action="stop" />
+		<record action="stop" name="log" />
 
 		<antcall target="evaluate-logs" />
 	</target>

diff --git a/build-test-weblogic-10.3.xml b/build-test-weblogic-10.3.xml
@@ -305,7 +305,7 @@
 			</then>
 		</if>
 
-		<record name="log" action="start" />
+		<record action="start" name="log" />
 
 		<antcall target="start-selenium" />
 
@@ -319,7 +319,7 @@
 			<arg line="${vm.drive}\${vm.host}\${vm.host}.vmx stop hard" />
 		</exec>
 
-		<record name="log" action="stop" />
+		<record action="stop" name="log" />
 
 		<antcall target="evaluate-logs" />
 	</target>

diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.5.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.5.xml
@@ -22,8 +22,8 @@
 			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
 			<param name="legacy.theme.ids" value="classic,controlpanel" />
 			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.plugin.portlets.ee}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
 		</antcall>
@@ -35,8 +35,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
 		</antcall>
 
@@ -48,8 +48,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
 		</antcall>
 
@@ -70,8 +70,8 @@
 			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
 			<param name="legacy.theme.ids" value="classic,controlpanel" />
 			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.plugin.portlets.ee}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
 		</antcall>
@@ -83,8 +83,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
 		</antcall>
 
@@ -96,8 +96,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
 		</antcall>
 	</target>
@@ -121,8 +121,8 @@
 			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
 			<param name="legacy.theme.ids" value="classic,controlpanel" />
 			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.plugin.portlets.ee}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
 		</antcall>
@@ -134,8 +134,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
 		</antcall>
 
@@ -147,8 +147,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
 		</antcall>
 
@@ -176,8 +176,8 @@
 			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
 			<param name="legacy.theme.ids" value="classic,controlpanel" />
 			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.plugin.portlets.ee}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
 		</antcall>
@@ -189,8 +189,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
 		</antcall>
 
@@ -202,8 +202,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
 		</antcall>
 
@@ -231,8 +231,8 @@
 			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
 			<param name="legacy.theme.ids" value="classic,controlpanel" />
 			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.plugin.portlets.ee}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
 		</antcall>
@@ -244,8 +244,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
 		</antcall>
 
@@ -257,8 +257,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
 		</antcall>
 
@@ -286,8 +286,8 @@
 			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
 			<param name="legacy.theme.ids" value="classic,controlpanel" />
 			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.plugin.portlets.ee}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
 		</antcall>
@@ -299,8 +299,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
 		</antcall>
 
@@ -312,8 +312,8 @@
 		</antcall>
 
 		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.plugin.portlets}
 			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
 		</antcall>