Test Fixes - plugins

remibajart · Oct 3, 2011 · aaf4a33 · aaf4a33
1 parent e5ff309
commit aaf4a33
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 12 deletions.
diff --git a/build-test-glassfish.xml b/build-test-glassfish.xml
@@ -5,11 +5,11 @@
 
 	<target name="run-glassfish">
 		<antcall target="run-simple-server">
-			<param name="simple.server.dir" value="${app.server.parent.dir}/glassfish-${app.server.glassfish.version}" />
-			<param name="simple.server.bin.dir" value="${app.server.glassfish.dir}/bin" />
-			<param name="simple.server.deploy.dir" value="${app.server.glassfish.instance.dir}/autodeploy" />
-			<param name="simple.server.lib.global.dir" value="${app.server.glassfish.instance.dir}/lib" />
-			<param name="simple.server.portal.dir" value="${app.server.glassfish.portal.dir}/WEB-INF/lib" />
+			<param name="simple.server.dir" value="${app.server.glassfish.dir}" />
+			<param name="simple.server.bin.dir" value="${app.server.glassfish.bin.dir}" />
+			<param name="simple.server.deploy.dir" value="${app.server.glassfish.deploy.dir}" />
+			<param name="simple.server.lib.global.dir" value="${app.server.glassfish.lib.global.dir}" />
+			<param name="simple.server.portal.dir" value="${app.server.glassfish.instance.dir}/applications/liferay-portal" />
 			<param name="simple.server.start.executable" value="asadmin${file.suffix.bat}" />
 			<param name="simple.server.start.executable.arg.line" value="start-domain -v" />
 			<param name="simple.server.stop.executable" value="asadmin${file.suffix.bat}" />

diff --git a/build-test-jboss.xml b/build-test-jboss.xml
@@ -5,11 +5,11 @@
 
 	<target name="run-jboss">
 		<antcall target="run-simple-server">
-			<param name="simple.server.dir" value="${app.server.parent.dir}/jboss-${app.server.jboss.version}" />
-			<param name="simple.server.bin.dir" value="${app.server.parent.dir}/jboss-${app.server.jboss.version}/bin" />
-			<param name="simple.server.deploy.dir" value="${app.server.parent.dir}/jboss-${app.server.jboss.version}/server/default/deploy" />
-			<param name="simple.server.lib.global.dir" value="${app.server.parent.dir}/jboss-${app.server.jboss.version}/server/default/lib" />
-			<param name="simple.server.portal.dir" value="${app.server.parent.dir}/jboss-${app.server.jboss.version}/server/default/deploy/ROOT.war" />
+			<param name="simple.server.dir" value="${app.server.jboss.dir}" />
+			<param name="simple.server.bin.dir" value="${app.server.jboss.bin.dir}" />
+			<param name="simple.server.deploy.dir" value="${app.server.jboss.deploy.dir}" />
+			<param name="simple.server.lib.global.dir" value="${app.server.jboss.lib.global.dir}" />
+			<param name="simple.server.portal.dir" value="${app.server.jboss.portal.dir}" />
 			<param name="simple.server.start.executable" value="standalone${file.suffix.bat}" />
 			<param name="simple.server.start.executable.arg.line" value="" />
 			<param name="simple.server.stop.executable" value="jboss-admin${file.suffix.bat}" />

diff --git a/build-test.xml b/build-test.xml
@@ -2930,10 +2930,42 @@ executable ZIP file.
 		<delete includeemptydirs="true" failonerror="false">
 			<fileset
 				dir="${simple.server.deploy.dir}"
-				excludes="*.rar,*.sar/**,*.xml,.autodeploystatus/**,liferay-portal.war/**,security/**,ROOT/**,ROOT.war/**,tunnel-web/**,tunnel-web.war/**"
+				excludes=",*.dodeploy,*.rar,*.sar/**,*.xml,.autodeploystatus/**,liferay-portal.war/**,security/**,ROOT/**,ROOT.war/**,tunnel-web/**,tunnel-web.war/**"
 			/>
 		</delete>
 
+		<if>
+			<and>
+				<contains string="${simple.server.dir}" substring="glassfish" />
+				<or>
+					<isset property="hook.plugins.includes" />
+					<isset property="layouttpl.plugins.includes" />
+					<isset property="portlet.plugins.includes" />
+					<isset property="theme.plugins.includes" />
+					<isset property="web.plugins.includes" />
+				</or>
+			</and>
+			<then>
+				<parallel>
+					<exec dir="${simple.server.bin.dir}" executable="${simple.server.start.executable}" resolveexecutable="true">
+						<arg line="${simple.server.start.executable.arg.line}" />
+					</exec>
+
+					<sequential>
+						<waitfor>
+							<http url="http://localhost:8080/web/guest" />
+						</waitfor>
+
+						<sleep seconds="60" />
+
+						<exec dir="${simple.server.bin.dir}" executable="${simple.server.stop.executable}" resolveexecutable="true">
+							<arg line="${simple.server.stop.executable.arg.line}" />
+						</exec>
+					</sequential>
+				</parallel>
+			</then>
+		</if>
+
 		<if>
 			<isset property="hook.plugins.includes" />
 			<then>
@@ -3030,7 +3062,7 @@ executable ZIP file.
 
 				<if>
 					<or>
-						<equals arg1="${simple.server.start.executable.arg.line}" arg2="start-domain -v" />
+						<contains string="${simple.server.dir}" substring="glassfish" />
 						<isset property="hook.plugins.includes" />
 						<isset property="portlet.plugins.includes" />
 						<isset property="theme.plugins.includes" />