LPS-57265 Split up targets for finer tomcat setup (no logical changes)

juliocamarero · Aug 3, 2015 · e60c5e3 · e60c5e3
1 parent 0f56bbd
commit e60c5e3
Show file tree

Hide file tree

Showing 2 changed files with 250 additions and 234 deletions.
diff --git a/build-dist.xml b/build-dist.xml
@@ -13,6 +13,26 @@
 		</else>
 	</if>
 
+	<macrodef name="build-dist-tomcat-bare" >
+		<sequential>
+			<if>
+				<equals arg1="${tomcat.keep.app.server.properties}" arg2="true" />
+				<then>
+					<antcall target="unzip-tomcat" inheritAll="false" />
+				</then>
+				<else>
+					<antcall target="unzip-tomcat" />
+
+					<app-server-properties-update>
+						app.server.type=tomcat
+					</app-server-properties-update>
+				</else>
+			</if>
+
+			<delete dir="${project.dir}/portal-web/classes" />
+		</sequential>
+	</macrodef>
+
 	<macrodef name="download-dynamic-jars">
 		<attribute name="app.server.lib.portal.dir" />
 
@@ -563,21 +583,7 @@
 	</target>
 
 	<target name="build-dist-tomcat">
-		<if>
-			<equals arg1="${tomcat.keep.app.server.properties}" arg2="true" />
-			<then>
-				<antcall target="unzip-tomcat" inheritAll="false" />
-			</then>
-			<else>
-				<antcall target="unzip-tomcat" />
-
-				<app-server-properties-update>
-					app.server.type=tomcat
-				</app-server-properties-update>
-			</else>
-		</if>
-
-		<delete dir="${project.dir}/portal-web/classes" />
+		<build-dist-tomcat-bare />
 
 		<ant target="deploy" inheritAll="false" />
 
@@ -599,6 +605,10 @@
 		</antcall>
 	</target>
 
+	<target name="build-dist-tomcat-bare">
+		<build-dist-tomcat-bare />
+	</target>
+
 	<target name="deploy-plugins">
 		<delete includeemptydirs="true" failonerror="false">
 			<fileset