Added GlassFish v3 to integration test servers.

svn changeset:10572/svn branch:6.2

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index d1473768f407cc780b3328e941fbc7692a63fcd9..2e4cafd6952f755808655525c13c403e7162abb7 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -135,15 +135,24 @@
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-jboss-5.0.1" />\r
        </target>\r
        \r
-       <target name="start-glassfish">\r
+       <target name="start-glassfish2">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-2.1.1" />\r
                <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-sampler.html" overwrite="true" />\r
        </target>\r
        \r
-       <target name="stop-glassfish">\r
+       <target name="stop-glassfish2">\r
                <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-glassfish-2.1.1" />\r
        </target>\r
        \r
+       <target name="start-glassfish3">\r
+               <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-3" />\r
+               <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-3-sampler.html" overwrite="true" />\r
+       </target>\r
+       \r
+       <target name="stop-glassfish3">\r
+               <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-glassfish-3" />\r
+       </target>\r
+                       \r
        <!-- Test liferay sampler -->\r
        <target name="test-liferay">\r
                <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-liferay-5.2.3-sampler.html" />\r
@@ -312,12 +321,20 @@
                <antcall target="stop-jboss-5"/>\r
        </target>\r
                \r
-       <target name="glassfish">\r
-               <antcall target="start-glassfish"/>\r
+       <target name="glassfish2">\r
+               <antcall target="start-glassfish2"/>\r
                <antcall target="test-sampler">\r
                        <param name="server-name" value="glassfish-2.1.1" />\r
                </antcall>\r
-               <antcall target="stop-glassfish"/>\r
+               <antcall target="stop-glassfish2"/>\r
+       </target>\r
+       \r
+       <target name="glassfish3">\r
+               <antcall target="start-glassfish3"/>\r
+               <antcall target="test-sampler">\r
+                       <param name="server-name" value="glassfish-3" />\r
+               </antcall>\r
+               <antcall target="stop-glassfish3"/>\r
        </target>\r
        \r
        <target name="liferay">\r
@@ -365,7 +382,8 @@
                                <antcall target="jboss3" />\r
                                <antcall target="jboss4" />\r
                                <antcall target="jboss5" />\r
-                               <antcall target="glassfish" />\r
+                               <antcall target="glassfish2" />\r
+                               <antcall target="glassfish3" />\r
                                <antcall target="liferay" />\r
                                <antcall target="weblogic9" />\r
                                <antcall target="weblogic10" />\r