Skip to content

Commit

Permalink
LPS-43702 SF
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelhashimoto @brianchandotcom
michaelhashimoto authored and brianchandotcom committed Jan 31, 2014
1 parent 435fdeb commit 123fdb1
Show file tree
Hide file tree
Showing 16 changed files with 215 additions and 323 deletions.
4 changes: 4 additions & 0 deletions build-common.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@
<contains string="${os.name}" substring="Windows" casesensitive="false" />
</condition>

<condition property="file.suffix.cmd" value=".cmd" else=".sh">
<contains string="${os.name}" substring="Windows" casesensitive="false" />
</condition>

<condition property="file.suffix.exe" value=".exe" else="">
<contains string="${os.name}" substring="Windows" casesensitive="false" />
</condition>
Expand Down
16 changes: 4 additions & 12 deletions build-test-geronimo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,16 @@

<record action="start" name="log" />

<antcall target="run-simple-server">
<param name="simple.server.dir" value="${app.server.geronimo.dir}" />
<param name="simple.server.bin.dir" value="${app.server.geronimo.bin.dir}" />
<param name="simple.server.deploy.dir" value="${app.server.geronimo.deploy.dir}" />
<param name="simple.server.lib.global.dir" value="${app.server.geronimo.lib.global.dir}" />
<param name="simple.server.portal.dir" value="${app.server.geronimo.portal.dir}" />
<param name="simple.server.start.executable" value="geronimo${file.suffix.bat}" />
<param name="simple.server.start.executable.arg.line" value="run" />
<param name="simple.server.stop.executable" value="geronimo${file.suffix.bat}" />
<param name="simple.server.stop.executable.arg.line" value="stop --user system --password manager" />
</antcall>
<antcall target="run-simple-server" />

<record action="stop" name="log" />

<antcall target="evaluate-logs" />
</target>

<target name="run-selenium-geronimo">
<echo file="app.server.${user.name}.properties">app.server.type=geronimo</echo>

<if>
<not>
<isset property="build.app.server" />
Expand All @@ -41,7 +33,7 @@

<antcall target="start-selenium" />

<antcall target="run-geronimo">
<antcall target="run-geronimo" inheritAll="false">
<param name="test.class" value="${test.name}" />
</antcall>

Expand Down
16 changes: 4 additions & 12 deletions build-test-glassfish.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,16 @@

<record action="start" name="log" />

<antcall target="run-simple-server">
<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}" />
<param name="simple.server.stop.executable.arg.line" value="stop-domain" />
</antcall>
<antcall target="run-simple-server" />

<record action="stop" name="log" />

<antcall target="evaluate-logs" />
</target>

<target name="run-selenium-glassfish">
<echo file="app.server.${user.name}.properties">app.server.type=glassfish</echo>

<if>
<not>
<isset property="build.app.server" />
Expand All @@ -52,7 +44,7 @@

<antcall target="start-selenium" />

<antcall target="run-glassfish">
<antcall target="run-glassfish" inheritAll="false">
<param name="test.class" value="${test.name}" />
</antcall>

Expand Down
20 changes: 7 additions & 13 deletions build-test-jboss-eap.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,19 @@

<record action="start" name="log" />

<antcall target="run-simple-server">
<param name="simple.server.type" value="jboss" />
<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-cli${file.suffix.bat}" />
<param name="simple.server.stop.executable.arg.line" value="--connect command=:shutdown" />
</antcall>
<antcall target="run-simple-server" />

<record action="stop" name="log" />

<antcall target="evaluate-logs" />
</target>

<target name="run-selenium-jboss-eap">
<echo file="app.server.${user.name}.properties">app.server.type=jboss
app.server.jboss.version=6.1.0
app.server.jboss.dir=${app.server.parent.dir}/jboss-eap-6.1
app.server.jboss.zip.name=jboss-eap-6.1.0.zip</echo>

<if>
<not>
<isset property="build.app.server" />
Expand All @@ -42,7 +36,7 @@

<antcall target="start-selenium" />

<antcall target="run-jboss-eap">
<antcall target="run-jboss-eap" inheritAll="false">
<param name="test.class" value="${test.name}" />
</antcall>

Expand Down
17 changes: 4 additions & 13 deletions build-test-jboss.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,16 @@

<record action="start" name="log" />

<antcall target="run-simple-server">
<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-cli${file.suffix.bat}" />
<param name="simple.server.stop.executable.arg.line" value="--connect command=:shutdown" />
<param name="simple.server.type" value="jboss" />
</antcall>
<antcall target="run-simple-server" />

<record action="stop" name="log" />

<antcall target="evaluate-logs" />
</target>

<target name="run-selenium-jboss">
<echo file="app.server.${user.name}.properties">app.server.type=jboss</echo>

<if>
<not>
<isset property="build.app.server" />
Expand All @@ -42,7 +33,7 @@

<antcall target="start-selenium" />

<antcall target="run-jboss">
<antcall target="run-jboss" inheritAll="false">
<param name="test.class" value="${test.name}" />
</antcall>

Expand Down
16 changes: 4 additions & 12 deletions build-test-jetty.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,16 @@

<record action="start" name="log" />

<antcall target="run-simple-server">
<param name="simple.server.dir" value="${app.server.jetty.dir}" />
<param name="simple.server.bin.dir" value="${app.server.jetty.bin.dir}" />
<param name="simple.server.deploy.dir" value="${app.server.jetty.deploy.dir}" />
<param name="simple.server.lib.global.dir" value="${app.server.jetty.lib.global.dir}" />
<param name="simple.server.portal.dir" value="${app.server.jetty.portal.dir}" />
<param name="simple.server.start.executable" value="run${file.suffix.bat}" />
<param name="simple.server.start.executable.arg.line" value="" />
<param name="simple.server.stop.executable" value="shutdown${file.suffix.bat}" />
<param name="simple.server.stop.executable.arg.line" value="" />
</antcall>
<antcall target="run-simple-server" />

<record action="stop" name="log" />

<antcall target="evaluate-logs" />
</target>

<target name="run-selenium-jetty">
<echo file="app.server.${user.name}.properties">app.server.type=jetty</echo>

<if>
<not>
<isset property="build.app.server" />
Expand Down Expand Up @@ -77,7 +69,7 @@

<antcall target="start-selenium" />

<antcall target="run-jetty">
<antcall target="run-jetty" inheritAll="false">
<param name="test.class" value="${test.name}" />
</antcall>

Expand Down
16 changes: 4 additions & 12 deletions build-test-jonas.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,16 @@

<record action="start" name="log" />

<antcall target="run-simple-server">
<param name="simple.server.dir" value="${app.server.jonas.dir}" />
<param name="simple.server.bin.dir" value="${app.server.jonas.bin.dir}" />
<param name="simple.server.deploy.dir" value="${app.server.jonas.deploy.dir}" />
<param name="simple.server.lib.global.dir" value="${app.server.jonas.lib.global.dir}" />
<param name="simple.server.portal.dir" value="${app.server.jonas.portal.dir}" />
<param name="simple.server.start.executable" value="jonas${file.suffix.bat}" />
<param name="simple.server.start.executable.arg.line" value="start" />
<param name="simple.server.stop.executable" value="jonas${file.suffix.bat}" />
<param name="simple.server.stop.executable.arg.line" value="stop" />
</antcall>
<antcall target="run-simple-server" />

<record action="stop" name="log" />

<antcall target="evaluate-logs" />
</target>

<target name="run-selenium-jonas">
<echo file="app.server.${user.name}.properties">app.server.type=jonas</echo>

<if>
<not>
<isset property="build.app.server" />
Expand All @@ -52,7 +44,7 @@

<antcall target="start-selenium" />

<antcall target="run-jonas">
<antcall target="run-jonas" inheritAll="false">
<param name="test.class" value="${test.name}" />
</antcall>

Expand Down
8 changes: 4 additions & 4 deletions build-test-plugins.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<equals arg1="${app.server.type}" arg2="websphere" />
<then>
<echo file="${lp.plugins.dir}/build.${user.name}.properties">app.server.type=websphere
app.server.dir=${simple.server.dir}
app.server.dir=${app.server.dir}
app.server.deploy.dir=${app.server.dir}/profiles/liferay/wsadmin-deploy
app.server.lib.global.dir=${app.server.dir}/lib/ext
app.server.portal.dir=${app.server.dir}/profiles/liferay/installedApps/liferay-cell/liferay-portal.ear/liferay-portal.war
Expand All @@ -18,9 +18,9 @@ auto.deploy.dir=${liferay.home}/deploy
plugins.includes=${plugins.includes}</echo>
</then>
<else>
<echo file="${lp.plugins.dir}/build.${user.name}.properties">app.server.dir=${simple.server.dir}
app.server.lib.global.dir=${simple.server.lib.global.dir}
app.server.portal.dir=${simple.server.portal.dir}
<echo file="${lp.plugins.dir}/build.${user.name}.properties">app.server.dir=${app.server.dir}
app.server.lib.global.dir=${app.server.lib.global.dir}
app.server.portal.dir=${app.server.portal.dir}

auto.deploy.dir=${liferay.home}/deploy

Expand Down
16 changes: 4 additions & 12 deletions build-test-resin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,16 @@
<target name="run-resin">
<antcall target="clean-up-logs" />

<antcall target="run-simple-server">
<param name="simple.server.dir" value="${app.server.resin.dir}" />
<param name="simple.server.bin.dir" value="${app.server.resin.bin.dir}" />
<param name="simple.server.deploy.dir" value="${app.server.resin.deploy.dir}" />
<param name="simple.server.lib.global.dir" value="${app.server.resin.lib.global.dir}" />
<param name="simple.server.portal.dir" value="${app.server.resin.portal.dir}" />
<param name="simple.server.start.executable" value="start${file.suffix.bat}" />
<param name="simple.server.start.executable.arg.line" value="" />
<param name="simple.server.stop.executable" value="stop${file.suffix.bat}" />
<param name="simple.server.stop.executable.arg.line" value="" />
</antcall>
<antcall target="run-simple-server" />

<antcall target="copy-log-file" />

<antcall target="evaluate-logs" />
</target>

<target name="run-selenium-resin">
<echo file="app.server.${user.name}.properties">app.server.type=resin</echo>

<if>
<not>
<isset property="build.app.server" />
Expand Down Expand Up @@ -65,7 +57,7 @@

<antcall target="start-selenium" />

<antcall target="run-resin">
<antcall target="run-resin" inheritAll="false">
<param name="test.class" value="${test.name}" />
</antcall>

Expand Down
14 changes: 3 additions & 11 deletions build-test-tomcat.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<import file="build-test.xml" />

<target name="run-selenium-tomcat">
<echo file="app.server.${user.name}.properties">app.server.type=tomcat</echo>

<if>
<not>
<isset property="build.app.server" />
Expand Down Expand Up @@ -42,17 +44,7 @@

<record action="start" name="log" />

<antcall target="run-simple-server">
<param name="simple.server.dir" value="${app.server.tomcat.dir}" />
<param name="simple.server.bin.dir" value="${app.server.tomcat.bin.dir}" />
<param name="simple.server.deploy.dir" value="${app.server.tomcat.deploy.dir}" />
<param name="simple.server.lib.global.dir" value="${app.server.tomcat.lib.global.dir}" />
<param name="simple.server.portal.dir" value="${app.server.tomcat.portal.dir}" />
<param name="simple.server.start.executable" value="catalina${file.suffix.bat}" />
<param name="simple.server.start.executable.arg.line" value="run" />
<param name="simple.server.stop.executable" value="shutdown${file.suffix.bat}" />
<param name="simple.server.stop.executable.arg.line" value="" />
</antcall>
<antcall target="run-simple-server" />

<record action="stop" name="log" />

Expand Down
20 changes: 4 additions & 16 deletions build-test-weblogic.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<import file="build-test.xml" />

<target name="run-selenium-weblogic">
<echo file="app.server.${user.name}.properties">app.server.type=weblogic</echo>

<if>
<not>
<isset property="build.app.server" />
Expand All @@ -23,7 +25,7 @@

<antcall target="start-selenium" />

<antcall target="run-weblogic">
<antcall target="run-weblogic" inheritAll="false">
<param name="test.class" value="${test.name}" />
</antcall>

Expand All @@ -35,21 +37,7 @@

<record action="start" name="log" />

<condition property="file.suffix.cmd" value=".cmd" else=".sh">
<contains string="${os.name}" substring="Windows" casesensitive="false" />
</condition>

<antcall target="run-simple-server">
<param name="simple.server.dir" value="${app.server.weblogic.dir}" />
<param name="simple.server.bin.dir" value="${app.server.weblogic.bin.dir}" />
<param name="simple.server.deploy.dir" value="${app.server.weblogic.deploy.dir}" />
<param name="simple.server.lib.global.dir" value="${app.server.weblogic.lib.global.dir}" />
<param name="simple.server.portal.dir" value="${app.server.weblogic.portal.dir}" />
<param name="simple.server.start.executable" value="../startWebLogic${file.suffix.cmd}" />
<param name="simple.server.start.executable.arg.line" value="" />
<param name="simple.server.stop.executable" value="../stopWebLogic${file.suffix.cmd}" />
<param name="simple.server.stop.executable.arg.line" value="" />
</antcall>
<antcall target="run-simple-server" />

<record action="stop" name="log" />

Expand Down
14 changes: 2 additions & 12 deletions build-test-websphere.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<antcall target="start-selenium" />

<antcall target="run-websphere">
<antcall target="run-websphere" inheritAll="false">
<param name="test.class" value="${test.name}" />
</antcall>

Expand All @@ -37,17 +37,7 @@

<record action="start" name="log" />

<antcall target="run-simple-server">
<param name="simple.server.dir" value="${app.server.websphere.dir}" />
<param name="simple.server.bin.dir" value="${app.server.websphere.bin.dir}" />
<param name="simple.server.deploy.dir" value="${app.server.websphere.deploy.dir}" />
<param name="simple.server.lib.global.dir" value="${app.server.websphere.lib.global.dir}" />
<param name="simple.server.portal.dir" value="${app.server.websphere.portal.dir}" />
<param name="simple.server.start.executable" value="startServer.bat" />
<param name="simple.server.start.executable.arg.line" value="server1" />
<param name="simple.server.stop.executable" value="stopServer.bat" />
<param name="simple.server.stop.executable.arg.line" value="server1" />
</antcall>
<antcall target="run-simple-server" />

<record action="stop" name="log" />

Expand Down
Loading

0 comments on commit 123fdb1

Please sign in to comment.