From ed2ccc02052a76010b4a053aade634c52b40e7f9 Mon Sep 17 00:00:00 2001
From: Kiyoshi Lee <kiyoshi.lee@liferay.com>
Date: Thu, 15 May 2014 16:02:22 -0700
Subject: [PATCH] LPS-46874 - Update scripts to use macrodef to update
 'app.server.${user.name}.properties'

---
 build-dist.xml           | 83 ++++++++++++++++++++++++----------------
 build-test-geronimo.xml  |  4 +-
 build-test-glassfish.xml |  4 +-
 build-test-jboss-eap.xml | 10 +++--
 build-test-jboss.xml     |  4 +-
 build-test-jetty.xml     |  4 +-
 build-test-jonas.xml     |  4 +-
 build-test-resin.xml     |  4 +-
 build-test-tcat.xml      |  4 +-
 build-test-tcserver.xml  |  4 +-
 build-test-tomcat.xml    |  4 +-
 build-test-weblogic.xml  |  4 +-
 build-test-websphere.xml |  4 +-
 build-test.xml           |  6 ++-
 14 files changed, 94 insertions(+), 49 deletions(-)

diff --git a/build-dist.xml b/build-dist.xml
index aa16e6ed09b2d2..4b6bf49e3f939a 100644
--- a/build-dist.xml
+++ b/build-dist.xml
@@ -51,11 +51,13 @@
 	<target name="build-dist-geronimo">
 		<antcall target="unzip-geronimo" />
 
-		<echo file="app.server.${user.name}.properties">app.server.type=geronimo</echo>
+		<app-server-update>
+			app.server.type=geronimo
+		</app-server-update>
 
 		<antcall target="deploy" inheritAll="false" />
 
-		<delete file="app.server.${user.name}.properties" />
+		<app-server-reset />
 
 		<antcall target="deploy-plugins">
 			<param name="deployer.dest.dir" value="${app.server.geronimo.deploy.dir}" />
@@ -67,11 +69,13 @@
 	<target name="build-dist-glassfish">
 		<antcall target="unzip-glassfish" />
 
-		<echo file="app.server.${user.name}.properties">app.server.type=glassfish</echo>
+		<app-server-update>
+			app.server.type=glassfish
+		</app-server-update>
 
 		<ant target="deploy" inheritAll="false" />
 
-		<delete file="app.server.${user.name}.properties" />
+		<app-server-reset />
 
 		<antcall target="deploy-plugins">
 			<param name="deployer.dest.dir" value="${app.server.glassfish.deploy.dir}" />
@@ -83,13 +87,15 @@
 	<target name="build-dist-jboss">
 		<antcall target="unzip-jboss" />
 
-		<echo file="app.server.${user.name}.properties">app.server.type=jboss</echo>
+		<app-server-update>
+			app.server.type=jboss
+		</app-server-update>
 
 		<delete dir="${project.dir}/portal-web/classes" />
 
 		<ant target="deploy" inheritAll="false" />
 
-		<delete file="app.server.${user.name}.properties" />
+		<app-server-reset />
 
 		<if>
 			<equals arg1="${app.server.jboss.major.version}" arg2="5" />
@@ -111,11 +117,13 @@
 	</target>
 
 	<target name="build-dist-jboss-eap-6.0">
-		<echo file="app.server.${user.name}.properties">app.server.type=jboss
-app.server.jboss.version=6.0.1
-app.server.jboss.dir=${app.server.parent.dir}/jboss-eap-6.0
-app.server.jboss.zip.name=jboss-eap-6.0.1.zip
-app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-eap-6.0.1.zip</echo>
+		<app-server-update>
+			app.server.type=jboss
+			app.server.jboss.version=6.0.1
+			app.server.jboss.dir=${app.server.parent.dir}/jboss-eap-6.0
+			app.server.jboss.zip.name=jboss-eap-6.0.1.zip
+			app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-eap-6.0.1.zip
+		</app-server-update>
 
 		<antcall target="unzip-jboss" inheritAll="false" />
 
@@ -123,7 +131,7 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 
 		<ant target="deploy" inheritAll="false" />
 
-		<delete file="app.server.${user.name}.properties" />
+		<app-server-reset />
 
 		<antcall target="deploy-plugins">
 			<param name="deployer.dest.dir" value="${app.server.jboss.deploy.dir}" />
@@ -133,11 +141,13 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 	</target>
 
 	<target name="build-dist-jboss-eap-6.1">
-		<echo file="app.server.${user.name}.properties">app.server.type=jboss
-app.server.jboss.version=6.1.0
-app.server.jboss.dir=${app.server.parent.dir}/jboss-eap-6.1
-app.server.jboss.zip.name=jboss-eap-6.1.0.zip
-app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-eap-6.1.0.zip</echo>
+		<app-server-update>
+			app.server.type=jboss
+			app.server.jboss.version=6.1.0
+			app.server.jboss.dir=${app.server.parent.dir}/jboss-eap-6.1
+			app.server.jboss.zip.name=jboss-eap-6.1.0.zip
+			app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-eap-6.1.0.zip
+		</app-server-update>
 
 		<antcall target="unzip-jboss" inheritAll="false" />
 
@@ -145,7 +155,7 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 
 		<ant target="deploy" inheritAll="false" />
 
-		<delete file="app.server.${user.name}.properties" />
+		<app-server-reset />
 
 		<antcall target="deploy-plugins">
 			<param name="deployer.dest.dir" value="${app.server.jboss.deploy.dir}" />
@@ -157,13 +167,15 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 	<target name="build-dist-jetty">
 		<antcall target="unzip-jetty" />
 
-		<echo file="app.server.${user.name}.properties">app.server.type=jetty</echo>
+		<app-server-update>
+			app.server.type=jetty
+		</app-server-update>
 
 		<delete dir="${project.dir}/portal-web/classes" />
 
 		<ant target="deploy" inheritAll="false" />
 
-		<delete file="app.server.${user.name}.properties" />
+		<app-server-reset />
 
 		<antcall target="deploy-plugins">
 			<param name="deployer.dest.dir" value="${app.server.jetty.deploy.dir}" />
@@ -175,13 +187,15 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 	<target name="build-dist-jonas">
 		<antcall target="unzip-jonas" />
 
-		<echo file="app.server.${user.name}.properties">app.server.type=jonas</echo>
+		<app-server-update>
+			app.server.type=jonas
+		</app-server-update>
 
 		<delete dir="${project.dir}/portal-web/classes" />
 
 		<ant target="deploy" inheritAll="false" />
 
-		<delete file="app.server.${user.name}.properties" />
+		<app-server-reset />
 
 		<antcall target="deploy-plugins">
 			<param name="deployer.dest.dir" value="${app.server.jonas.deploy.dir}" />
@@ -274,13 +288,15 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 	<target name="build-dist-resin">
 		<antcall target="unzip-resin" />
 
-		<echo file="app.server.${user.name}.properties">app.server.type=resin</echo>
+		<app-server-update>
+			app.server.type=resin
+		</app-server-update>
 
 		<delete dir="${project.dir}/portal-web/classes" />
 
 		<ant target="deploy" inheritAll="false" />
 
-		<delete file="app.server.${user.name}.properties" />
+		<app-server-reset />
 
 		<antcall target="deploy-plugins">
 			<param name="deployer.dest.dir" value="${app.server.resin.deploy.dir}" />
@@ -297,12 +313,11 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 	</target>
 
 	<target name="build-dist-tcat">
-		<echo file="app.server.${user.name}.properties">
+		<app-server-update>
 			app.server.type=tomcat
-
 			app.server.tomcat.version=7.0.39
 			app.server.tomcat.zip.url=http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.39/bin/apache-tomcat-7.0.39.zip
-		</echo>
+		</app-server-update>
 
 		<antcall target="build-dist-tomcat" inheritAll="false">
 			<param name="tomcat.keep.app.server.properties" value="true" />
@@ -355,7 +370,7 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 			<param name="app.server.tcat.zip.name" value="${app.server.tcat.zip.name}" />
 		</antcall>
 
-		<delete file="app.server.${user.name}.properties" />
+		<app-server-reset />
 	</target>
 
 	<target name="build-dist-tcat-admin">
@@ -511,13 +526,15 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 	<target name="build-dist-tcserver">
 		<antcall target="unzip-tcserver" />
 
-		<echo file="app.server.${user.name}.properties">app.server.type=tcserver</echo>
+		<app-server-update>
+			app.server.type=tcserver
+		</app-server-update>
 
 		<delete dir="${project.dir}/portal-web/classes" />
 
 		<antcall target="all" inheritAll="false" />
 
-		<delete file="app.server.${user.name}.properties" />
+		<app-server-reset />
 
 		<antcall target="deploy-plugins">
 			<param name="deployer.dest.dir" value="${app.server.tcserver.deploy.dir}" />
@@ -535,7 +552,9 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 			<else>
 				<antcall target="unzip-tomcat" />
 
-				<echo file="app.server.${user.name}.properties">app.server.type=tomcat</echo>
+				<app-server-update>
+					app.server.type=tomcat
+				</app-server-update>
 			</else>
 		</if>
 
@@ -548,7 +567,7 @@ app.server.jboss.zip.url=http://mirrors/www.jboss.org/jbossas/downloads/jboss-ea
 				<equals arg1="${tomcat.keep.app.server.properties}" arg2="true" />
 			</not>
 			<then>
-				<delete file="app.server.${user.name}.properties" />
+				<app-server-reset />
 			</then>
 		</if>
 
diff --git a/build-test-geronimo.xml b/build-test-geronimo.xml
index c8b049fa17b58b..40a2b4f3cc4257 100644
--- a/build-test-geronimo.xml
+++ b/build-test-geronimo.xml
@@ -16,7 +16,9 @@
 	</target>
 
 	<target name="run-selenium-geronimo">
-		<echo file="app.server.${user.name}.properties">app.server.type=geronimo</echo>
+		<app-server-update>
+			app.server.type="geronimo"
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test-glassfish.xml b/build-test-glassfish.xml
index cd3ab42bc064f1..bf471c2d7abaf4 100644
--- a/build-test-glassfish.xml
+++ b/build-test-glassfish.xml
@@ -16,7 +16,9 @@
 	</target>
 
 	<target name="run-selenium-glassfish">
-		<echo file="app.server.${user.name}.properties">app.server.type=glassfish</echo>
+		<app-server-update>
+			app.server.type="glassfish"
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test-jboss-eap.xml b/build-test-jboss-eap.xml
index d7177197fe9385..40fced1488e53f 100644
--- a/build-test-jboss-eap.xml
+++ b/build-test-jboss-eap.xml
@@ -16,10 +16,12 @@
 	</target>
 
 	<target name="run-selenium-jboss-eap">
-		<echo file="app.server.${user.name}.properties">app.server.type=jboss
-app.server.jboss.version=${app.server.jboss.version}
-app.server.jboss.dir=${app.server.parent.dir}/jboss-eap-${app.server.jboss.major.version}
-app.server.jboss.zip.name=jboss-eap-${app.server.jboss.version}.zip</echo>
+		<app-server-update>
+			app.server.type=jboss
+			app.server.jboss.version=${app.server.jboss.version}
+			app.server.jboss.dir=${app.server.parent.dir}/jboss-eap-${app.server.jboss.major.version}
+			app.server.jboss.zip.name=jboss-eap-${app.server.jboss.version}.zip
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test-jboss.xml b/build-test-jboss.xml
index 5d44bec89bc90c..0c1b9da5facdf1 100644
--- a/build-test-jboss.xml
+++ b/build-test-jboss.xml
@@ -16,7 +16,9 @@
 	</target>
 
 	<target name="run-selenium-jboss">
-		<echo file="app.server.${user.name}.properties">app.server.type=jboss</echo>
+		<app-server-update>
+			app.server.type=jboss
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test-jetty.xml b/build-test-jetty.xml
index e174fd08ffe5be..3b61e7468a41cf 100644
--- a/build-test-jetty.xml
+++ b/build-test-jetty.xml
@@ -16,7 +16,9 @@
 	</target>
 
 	<target name="run-selenium-jetty">
-		<echo file="app.server.${user.name}.properties">app.server.type=jetty</echo>
+		<app-server-update>
+			app.server.type=jetty
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test-jonas.xml b/build-test-jonas.xml
index 51230cc38cb2db..5c8f32811d7d96 100644
--- a/build-test-jonas.xml
+++ b/build-test-jonas.xml
@@ -16,7 +16,9 @@
 	</target>
 
 	<target name="run-selenium-jonas">
-		<echo file="app.server.${user.name}.properties">app.server.type=jonas</echo>
+		<app-server-update>
+			app.server.type=jonas
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test-resin.xml b/build-test-resin.xml
index e779095e062caf..74923b60913f60 100644
--- a/build-test-resin.xml
+++ b/build-test-resin.xml
@@ -14,7 +14,9 @@
 	</target>
 
 	<target name="run-selenium-resin">
-		<echo file="app.server.${user.name}.properties">app.server.type=resin</echo>
+		<app-server-update>
+			app.server.type=resin
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test-tcat.xml b/build-test-tcat.xml
index cb9029220d8c0f..4c71e4dbd80998 100644
--- a/build-test-tcat.xml
+++ b/build-test-tcat.xml
@@ -4,7 +4,9 @@
 	<import file="build-test.xml" />
 
 	<target name="run-selenium-tcat">
-		<echo file="app.server.${user.name}.properties">app.server.type=tomcat</echo>
+		<app-server-update>
+			app.server.type=tomcat
+		</app-server-update>
 
 		<echo file="test.${user.name}.properties" append="true">
 			tcat.enabled=true
diff --git a/build-test-tcserver.xml b/build-test-tcserver.xml
index 3f5aeed267b510..8844b257efea31 100644
--- a/build-test-tcserver.xml
+++ b/build-test-tcserver.xml
@@ -4,7 +4,9 @@
 	<import file="build-test.xml" />
 
 	<target name="run-selenium-tcserver">
-		<echo file="app.server.${user.name}.properties">app.server.type=tcserver</echo>
+		<app-server-update>
+			app.server.type=tcserver
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test-tomcat.xml b/build-test-tomcat.xml
index 9b9c6068c11a64..05f875bbec081f 100644
--- a/build-test-tomcat.xml
+++ b/build-test-tomcat.xml
@@ -4,7 +4,9 @@
 	<import file="build-test.xml" />
 
 	<target name="run-selenium-tomcat">
-		<echo file="app.server.${user.name}.properties">app.server.type=tomcat</echo>
+		<app-server-update>
+			app.server.type=tomcat
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test-weblogic.xml b/build-test-weblogic.xml
index 8872bb4739acde..19f0ea552b45c6 100644
--- a/build-test-weblogic.xml
+++ b/build-test-weblogic.xml
@@ -4,7 +4,9 @@
 	<import file="build-test.xml" />
 
 	<target name="run-selenium-weblogic">
-		<echo file="app.server.${user.name}.properties">app.server.type=weblogic</echo>
+		<app-server-update>
+			app.server.type=weblogic
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test-websphere.xml b/build-test-websphere.xml
index 3088f3f6b0f9ce..e2c408654fae6c 100644
--- a/build-test-websphere.xml
+++ b/build-test-websphere.xml
@@ -4,7 +4,9 @@
 	<import file="build-test.xml" />
 
 	<target name="run-selenium-websphere">
-		<echo file="app.server.${user.name}.properties">app.server.type=websphere</echo>
+		<app-server-update>
+			app.server.type=websphere
+		</app-server-update>
 
 		<if>
 			<not>
diff --git a/build-test.xml b/build-test.xml
index 5780dd416061f5..ef7ebbc6c980e1 100644
--- a/build-test.xml
+++ b/build-test.xml
@@ -2181,13 +2181,15 @@ plugins.includes=marketplace-portlet</echo>
 			<elseif>
 				<equals arg1="${test.build.bundle.weblogic}" arg2="true" />
 				<then>
-					<echo file="app.server.${user.name}.properties">app.server.type=weblogic</echo>
+					<app-server-update>
+						app.server.type=weblogic
+					</app-server-update>
 
 					<ant antfile="build-dist.xml" target="unzip-weblogic" inheritAll="false" />
 
 					<antcall target="deploy" inheritAll="false" />
 
-					<delete file="app.server.${user.name}.properties" />
+					<app-server-reset />
 				</then>
 			</elseif>
 		</if>