Revert "LRQA-32553 Sort"

This reverts commit b8354ad.
arboliveira · Oct 10, 2017 · c53b79e · c53b79e
1 parent bb838fe
commit c53b79e
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/build-test.xml b/build-test.xml
@@ -2304,6 +2304,29 @@ tell application "Safari" to quit
 		</sequential>
 	</macrodef>
 
+	<macrodef name="prepare-test-ext-properties">
+		<sequential>
+			<if>
+				<equals arg1="${app.server.type}" arg2="tcserver" />
+				<then>
+					<replace file="${app.server.tcserver.dir}/liferay/conf/catalina.properties">
+						<replacetoken><![CDATA[common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar]]></replacetoken>
+						<replacevalue><![CDATA[common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.home}/lib/ext/global,${catalina.home}/lib/ext/global/*.jar,${catalina.home}/lib/ext,${catalina.home}/lib/ext/*.jar]]></replacevalue>
+					</replace>
+				</then>
+				<elseif>
+					<equals arg1="${app.server.type}" arg2="tomcat" />
+					<then>
+						<replace file="${app.server.tomcat.dir}/conf/catalina.properties">
+							<replacetoken><![CDATA[common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar"]]></replacetoken>
+							<replacevalue><![CDATA[common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","${catalina.home}/lib/ext/global","${catalina.home}/lib/ext/global/*.jar","${catalina.home}/lib/ext","${catalina.home}/lib/ext/*.jar"]]></replacevalue>
+						</replace>
+					</then>
+				</elseif>
+			</if>
+		</sequential>
+	</macrodef>
+
 	<macrodef name="prepare-test-cluster-properties">
 		<sequential>
 			<if>
@@ -2354,29 +2377,6 @@ tell application "Safari" to quit
 		</sequential>
 	</macrodef>
 
-	<macrodef name="prepare-test-ext-properties">
-		<sequential>
-			<if>
-				<equals arg1="${app.server.type}" arg2="tcserver" />
-				<then>
-					<replace file="${app.server.tcserver.dir}/liferay/conf/catalina.properties">
-						<replacetoken><![CDATA[common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar]]></replacetoken>
-						<replacevalue><![CDATA[common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.home}/lib/ext/global,${catalina.home}/lib/ext/global/*.jar,${catalina.home}/lib/ext,${catalina.home}/lib/ext/*.jar]]></replacevalue>
-					</replace>
-				</then>
-				<elseif>
-					<equals arg1="${app.server.type}" arg2="tomcat" />
-					<then>
-						<replace file="${app.server.tomcat.dir}/conf/catalina.properties">
-							<replacetoken><![CDATA[common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar"]]></replacetoken>
-							<replacevalue><![CDATA[common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","${catalina.home}/lib/ext/global","${catalina.home}/lib/ext/global/*.jar","${catalina.home}/lib/ext","${catalina.home}/lib/ext/*.jar"]]></replacevalue>
-						</replace>
-					</then>
-				</elseif>
-			</if>
-		</sequential>
-	</macrodef>
-
 	<macrodef name="print-file">
 		<attribute name="file.name" />