From b0ff4d65f73a2c02f306c4a739368862853e353c Mon Sep 17 00:00:00 2001
From: Brian Chan <brian.chan@liferay.com>
Date: Sat, 30 Nov 2013 09:16:43 -0800
Subject: [PATCH] LPS-40913 WAR: macrodef stub, and looping

---
 build-common-plugins.xml | 11 ++++-------
 build-common.xml         | 18 ++++++++++++++++++
 build.xml                | 13 ++++++++-----
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/build-common-plugins.xml b/build-common-plugins.xml
index e156b0ccf41a..248d83c332e2 100644
--- a/build-common-plugins.xml
+++ b/build-common-plugins.xml
@@ -102,12 +102,9 @@
 	</target>
 
 	<target name="war">
-		<antcall target="loop-modules">
-			<param name="loop.modules.cmd" value="war-module" />
-		</antcall>
-	</target>
-
-	<target name="war-module">
-		<ant dir="${module.name}" target="war" inheritAll="false" />
+		<loop-modules
+			loop.modules.cmd="war-macro"
+			loop.modules.dir="."
+		/>
 	</target>
 </project>
\ No newline at end of file
diff --git a/build-common.xml b/build-common.xml
index 34a72ee19310..6c917410caa5 100644
--- a/build-common.xml
+++ b/build-common.xml
@@ -244,6 +244,14 @@ Error-Prone was automatically installed. Please rerun your task.
 								/>
 							</then>
 						</elseif>
+						<elseif>
+							<equals arg1="@{macrodef.name}" arg2="war-macro" />
+							<then>
+								<war-macro
+									module.dir="@{module.dir}"
+								/>
+							</then>
+						</elseif>
 					</if>
 				</else>
 			</if>
@@ -1347,6 +1355,16 @@ Please find a solution that does not require portal-impl.jar.
 		</sequential>
 	</macrodef>
 
+	<macrodef name="war-macro">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+		</sequential>
+	</macrodef>
+
 	<target name="create">
 		<if>
 			<or>
diff --git a/build.xml b/build.xml
index 8ddecac26fda..21e024c955f0 100644
--- a/build.xml
+++ b/build.xml
@@ -233,11 +233,14 @@
 	</target>
 
 	<target name="war">
-		<ant dir="hooks" target="war" inheritAll="false" />
-		<ant dir="layouttpl" target="war" inheritAll="false" />
-		<ant dir="portlets" target="war" inheritAll="false" />
-		<ant dir="themes" target="war" inheritAll="false" />
-		<ant dir="webs" target="war" inheritAll="false" />
+		<for list="hooks,layouttpl,portlets,shared,themes,webs" param="loop.modules.dir">
+			<sequential>
+				<loop-modules
+					loop.modules.cmd="war-macro"
+					loop.modules.dir="@{loop.modules.dir}"
+				/>
+			</sequential>
+		</for>
 	</target>
 
 	<target name="zip-portal">