LPS-55630 Rename

brianchandotcom · May 19, 2015 · f4854f8 · f4854f8
1 parent 2f7263c
commit f4854f8
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/build-common-java.xml b/build-common-java.xml
@@ -31,7 +31,7 @@
 		<attribute default="project.classpath" name="javac.classpathref" />
 		<attribute default="classes" name="javac.destdir" />
 		<attribute default="src" name="javac.srcdir" />
-		<element name="post-compile" optional="true" />
+		<element name="compile-java-post" optional="true" />
 
 		<sequential>
 			<if>
@@ -86,7 +86,7 @@
 						</then>
 					</if>
 
-					<post-compile />
+					<compile-java-post />
 
 					<echo file="@{javac.destdir}/.touch"></echo>
 				</then>
@@ -101,8 +101,8 @@
 	</macrodef>
 
 	<macrodef name="jar-marco-cmd">
-		<element name="pre-jar" optional="true" />
-		<element name="post-jar" optional="true" />
+		<element name="jar-pre" optional="true" />
+		<element name="jar-post" optional="true" />
 
 		<sequential>
 			<if>
@@ -114,7 +114,7 @@
 				<then>
 					<compile-java />
 
-					<pre-jar />
+					<jar-pre />
 
 					<if>
 						<available file="bnd.bnd" />
@@ -152,7 +152,7 @@
 						</else>
 					</if>
 
-					<post-jar />
+					<jar-post />
 				</then>
 			</if>
 		</sequential>

diff --git a/portal-impl/build.xml b/portal-impl/build.xml
@@ -27,7 +27,7 @@
 	<macrodef name="jar-marco">
 		<sequential>
 			<jar-marco-cmd>
-				<pre-jar>
+				<jar-pre>
 					<ant dir="../util-bridges" target="jar" inheritAll="false" />
 					<ant dir="../util-java" target="jar" inheritAll="false" />
 					<ant dir="../util-taglib" target="jar" inheritAll="false" />
@@ -61,7 +61,7 @@
 							</if>
 						</sequential>
 					</for>
-				</pre-jar>
+				</jar-pre>
 			</jar-marco-cmd>
 		</sequential>
 	</macrodef>

diff --git a/util-bridges/build.xml b/util-bridges/build.xml
@@ -26,10 +26,10 @@
 	<macrodef name="jar-marco">
 		<sequential>
 			<jar-marco-cmd>
-				<post-jar>
+				<jar-post>
 					<copy file="${jar.file}.jar" todir="${portal-impl.classes.dir}/com/liferay/portal/deploy/dependencies" preservelastmodified="true" />
 					<copy file="${project.dir}/lib/portal/portals-bridges.jar" todir="${portal-impl.classes.dir}/com/liferay/portal/deploy/dependencies" preservelastmodified="true" />
-				</post-jar>
+				</jar-post>
 			</jar-marco-cmd>
 		</sequential>
 	</macrodef>

diff --git a/util-java/build.xml b/util-java/build.xml
@@ -11,9 +11,9 @@
 	<macrodef name="jar-marco">
 		<sequential>
 			<jar-marco-cmd>
-				<post-jar>
+				<jar-post>
 					<copy file="${jar.file}.jar" todir="${portal-impl.classes.dir}/com/liferay/portal/deploy/dependencies" preservelastmodified="true" />
-				</post-jar>
+				</jar-post>
 			</jar-marco-cmd>
 		</sequential>
 	</macrodef>

diff --git a/util-slf4j/build.xml b/util-slf4j/build.xml
@@ -12,9 +12,9 @@
 	<macrodef name="jar-marco">
 		<sequential>
 			<jar-marco-cmd>
-				<post-jar>
+				<jar-post>
 					<copy file="${jar.file}.jar" todir="${portal-impl.classes.dir}/com/liferay/portal/deploy/dependencies" preservelastmodified="true" />
-				</post-jar>
+				</jar-post>
 			</jar-marco-cmd>
 		</sequential>
 	</macrodef>

diff --git a/util-taglib/build.xml b/util-taglib/build.xml
@@ -10,7 +10,7 @@
 	<macrodef name="compile-java">
 		<sequential>
 			<compile-java-cmd>
-				<post-compile>
+				<compile-java-post>
 					<copy file="classes/META-INF/aui.tld" overwrite="true" tofile="classes/META-INF/liferay-aui.tld" preservelastmodified="true" />
 
 					<replace file="classes/META-INF/liferay-aui.tld">
@@ -36,15 +36,15 @@
 						<replacetoken><![CDATA[<uri>http://java.sun.com/portlet</uri>]]></replacetoken>
 						<replacevalue><![CDATA[<uri>http://java.sun.com/portlet_2_0</uri>]]></replacevalue>
 					</replace>
-				</post-compile>
+				</compile-java-post>
 			</compile-java-cmd>
 		</sequential>
 	</macrodef>
 
 	<macrodef name="jar-marco">
 		<sequential>
 			<jar-marco-cmd>
-				<post-jar>
+				<jar-post>
 					<copy file="${jar.file}.jar" todir="${portal-impl.classes.dir}/com/liferay/portal/deploy/dependencies" preservelastmodified="true" />
 
 					<copy todir="${portal-impl.classes.dir}/com/liferay/portal/deploy/dependencies" preservelastmodified="true">
@@ -56,7 +56,7 @@
 					<copy overwrite="true" todir="${project.dir}/portal-web/docroot/WEB-INF/tld" preservelastmodified="true">
 						<fileset dir="classes/META-INF" includes="*.tld" />
 					</copy>
-				</post-jar>
+				</jar-post>
 			</jar-marco-cmd>
 		</sequential>
 	</macrodef>