10:05 a.m.
Author: ron.sigal(a)jboss.com
Date: 2009-05-17 04:05:24 -0400 (Sun, 17 May 2009)
New Revision: 5269
Modified:
remoting2/branches/2.x/build.xml
Log:
(1) JBREM-1135: Updated version to 2.5.2; (2) JBREM-1102: split up servlet marshalling
tests; (3) JBREM-1133, JBREM-1134: add latest versions to versioning test suite, and added
lease tests to versioning test suite.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2009-05-17 08:00:26 UTC (rev 5268)
+++ remoting2/branches/2.x/build.xml 2009-05-17 08:05:24 UTC (rev 5269)
@@ -225,9 +225,9 @@
<!-- Module name(s) & version -->
<property name="module.name" value="remoting"/>
<property name="module.Name" value="JBoss Remoting"/>
- <property name="module.version" value="2.5.1"/>
+ <property name="module.version" value="2.5.2"/>
<!-- extension is for the file suffix to use for dtribution build -->
- <property name="module.version.extension"
value="2_5_1"/>
+ <property name="module.version.extension"
value="2_5_2"/>
<property name="implementation.url"
value="http://www.jboss.org/products/remoting"/>
<property name="root.dir" value="${basedir}"/>
@@ -1696,12 +1696,14 @@
<antcall target="AS.start"/>
<antcall target="tests.servlet" inheritrefs="true"/>
<antcall target="tests.servlet.callback"
inheritrefs="true"/>
- <antcall target="tests.servlet.marshal"
inheritrefs="true"/>
- <antcall target="tests.servlet.mbeanserver.jboss"
inheritrefs="true"/>
+ <antcall target="tests.servlet.marshal.config"
inheritrefs="true"/>
+ <antcall target="tests.servlet.marshal.noconfig"
inheritrefs="true"/>
+ <antcall target="tests.servlet.mbeanserver.jboss"
inheritrefs="true"/>
<antcall target="tests.servlet.multihome"
inheritrefs="true"/>
<antcall target="tests.servlet.nopreservelines"
inheritrefs="true"/>
<antcall target="tests.servlet.preservelines"
inheritrefs="true"/>
<antcall target="tests.servlet.ssl" inheritrefs="true"/>
+ <antcall target="tests.servlet.ssl.multihome"
inheritrefs="true"/>
<antcall target="AS.shutdown"/>
</target>
@@ -1715,7 +1717,7 @@
</copy>
<copy file="${servlet.tests.dir}/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF"
overwrite="true"/>
- <sleep seconds="2"/>
+ <sleep seconds="4"/>
<junit printsummary="true" fork="yes"
includeantruntime="true">
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1745,7 +1747,7 @@
</copy>
<copy file="${servlet.tests.dir}/callback/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF"
overwrite="true"/>
- <sleep seconds="2"/>
+ <sleep seconds="4"/>
<junit printsummary="true" fork="yes"
includeantruntime="true">
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1765,17 +1767,47 @@
<delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
</target>
- <target name="tests.servlet.marshal">
- <copy file="${servlet.tests.dir}/marshal/remoting-servlet-service.xml"
todir="${jboss.deploy.dir}" overwrite="true"/>
+ <target name="tests.servlet.marshal.config">
+ <copy
file="${servlet.tests.dir}/marshal/config/remoting-servlet-service.xml"
todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="2"/>
<copy todir="${jboss.deploy.dir}">
<fileset dir="${output.lib.dir}">
<include name="servlet-invoker.war/**"/>
</fileset>
</copy>
- <copy file="${servlet.tests.dir}/marshal/WEB-INF/web.xml"
+ <copy file="${servlet.tests.dir}/marshal/config/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF"
overwrite="true"/>
+ <sleep seconds="4"/>
+ <junit printsummary="true" fork="yes"
includeantruntime="true">
+ <jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+ <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+ <classpath>
+ <path refid="tests.classpath"/>
+ <pathelement
location="${output.lib.dir}/jboss-remoting-tests.jar"/>
+ </classpath>
+ <formatter
classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-java_serialization.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}"
haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include
name="**/remoting/transport/servlet/marshal/config/*TestClient.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <delete dir="${jboss.deploy.dir}/servlet-invoker.war"/>
+ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
+ </target>
+
+ <target name="tests.servlet.marshal.noconfig">
+ <copy
file="${servlet.tests.dir}/marshal/noconfig/remoting-servlet-service.xml"
todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="2"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/marshal/noconfig/WEB-INF/web.xml"
+ todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF"
overwrite="true"/>
+ <sleep seconds="4"/>
<junit printsummary="true" fork="yes"
includeantruntime="true">
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1787,7 +1819,7 @@
extension="-java_serialization.xml"/>
<batchtest fork="yes" todir="${output.tests.results}"
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
- <include
name="**/remoting/transport/servlet/marshal/*TestClient.class"/>
+ <include
name="**/remoting/transport/servlet/marshal/noconfig/*TestClient.class"/>
</fileset>
</batchtest>
</junit>
@@ -1805,7 +1837,7 @@
</copy>
<copy file="${servlet.tests.dir}/mbeanserver/jboss/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF"
overwrite="true"/>
- <sleep seconds="2"/>
+ <sleep seconds="4"/>
<junit printsummary="true" fork="yes"
includeantruntime="true">
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1839,6 +1871,7 @@
<!--param name="java.opts"
value="-Djavax.management.builder.initial=org.jboss.system.server.jmx.MBeanServerBuilderImpl
-Djboss.platform.mbeanserver -Dcom.sun.management.jmxremote"/-->
<param name="java.opts" value="
-Djboss.platform.mbeanserver"/>
</antcall>
+ <sleep seconds="4"/>
<junit printsummary="true" fork="yes"
includeantruntime="true">
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1867,7 +1900,7 @@
</copy>
<copy file="${servlet.tests.dir}/multihome/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF"
overwrite="true"/>
- <sleep seconds="2"/>
+ <sleep seconds="4"/>
<junit printsummary="true" fork="yes"
includeantruntime="true">
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1897,7 +1930,7 @@
</copy>
<copy file="${servlet.tests.dir}/nopreservelines/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF"
overwrite="true"/>
- <sleep seconds="2"/>
+ <sleep seconds="4"/>
<junit printsummary="true" fork="yes"
includeantruntime="true">
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1927,7 +1960,7 @@
</copy>
<copy file="${servlet.tests.dir}/preservelines/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF"
overwrite="true"/>
- <sleep seconds="2"/>
+ <sleep seconds="4"/>
<junit printsummary="true" fork="yes"
includeantruntime="true">
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1957,7 +1990,7 @@
</copy>
<copy file="${servlet.tests.dir}/ssl/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF"
overwrite="true"/>
- <sleep seconds="2"/>
+ <sleep seconds="5"/>
<junit printsummary="true" fork="yes"
includeantruntime="true">
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -1987,7 +2020,7 @@
</copy>
<copy file="${servlet.tests.dir}/multihome/WEB-INF/web.xml"
todir="${jboss.deploy.dir}/servlet-invoker.war/WEB-INF"
overwrite="true"/>
- <sleep seconds="2"/>
+ <sleep seconds="5"/>
<junit printsummary="true" fork="yes"
includeantruntime="true">
<jvmarg
value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
<jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
@@ -2125,6 +2158,25 @@
</antcall>
<!--
******************************************************************************** -->
+
+ <!-- Current <- -> 2.5.1 -->
+ <antcall target="download.version">
+ <param name="version" value="2.5.1"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports"
inheritrefs="true">
+ <param name="jboss-junit-configuration"
value="2_5_1-client"/>
+ <param name="client.classpath"
value="${etc.dir}/lib/2.5.1/jboss-remoting.jar${extended.classpath}"/>
+ <param name="server.classpath"
value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="check_content_type" value="true"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports"
inheritrefs="true">
+ <param name="jboss-junit-configuration"
value="2_5_1-server"/>
+ <param name="server.classpath"
value="${etc.dir}/lib/2.5.1/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.classpath"
value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="check_content_type" value="true"/>
+ </antcall>
+
+ <!--
******************************************************************************** -->
<!-- Current <- -> 2.5.0.SP2 -->
<antcall target="download.version">
<param name="version" value="2.5.0.SP2"/>
@@ -2213,7 +2265,61 @@
<param name="client.classpath"
value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
<param name="check_content_type" value="true"/>
</antcall>
-
+
+ <!--
******************************************************************************** -->
+ <!-- Current <- -> 2.2.3 -->
+ <antcall target="download.version">
+ <param name="version" value="2.2.3"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports_pre_2.4"
inheritrefs="true">
+ <param name="jboss-junit-configuration"
value="2_2_3"/>
+ <param name="client.classpath"
value="${etc.dir}/lib/2.2.3/jboss-remoting.jar${old.extended.classpath}"/>
+ <param name="server.classpath"
value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.pre_2_0_compatible" value=""/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value="2"/>
+ <param name="check_connection" value="false"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports_pre_2.4"
inheritrefs="true">
+ <param name="jboss-junit-configuration"
value="2_2_3-server"/>
+ <param name="server.classpath"
value="${etc.dir}/lib/2.2.3/jboss-remoting.jar${old.extended.classpath}"/>
+ <param name="client.classpath"
value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.pre_2_0_compatible" value=""/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value="2"/>
+ <param name="server.version" value=""/>
+ <param name="check_connection" value="false"/>
+ <param name="check_content_type" value="true"/>
+ </antcall>
+
+ <!--
******************************************************************************** -->
+ <!-- Current <- -> 2.2.2.SP11 -->
+ <antcall target="download.version">
+ <param name="version" value="2.2.2.SP11"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports_pre_2.4"
inheritrefs="true">
+ <param name="jboss-junit-configuration"
value="2_2_2_SP11-client"/>
+ <param name="client.classpath"
value="${etc.dir}/lib/2.2.2.SP11/jboss-remoting.jar${old.extended.classpath}"/>
+ <param name="server.classpath"
value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.pre_2_0_compatible" value=""/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value=""/>
+ <param name="server.version" value="2"/>
+ <param name="check_connection" value="false"/>
+ </antcall>
+ <antcall target="tests.versioning.all_transports_pre_2.4"
inheritrefs="true">
+ <param name="jboss-junit-configuration"
value="2_2_2_SP11-server"/>
+ <param name="server.classpath"
value="${etc.dir}/lib/2.2.2.SP11/jboss-remoting.jar${old.extended.classpath}"/>
+ <param name="client.classpath"
value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/>
+ <param name="client.pre_2_0_compatible" value=""/>
+ <param name="server.pre_2_0_compatible" value=""/>
+ <param name="client.version" value="2"/>
+ <param name="server.version" value=""/>
+ <param name="check_connection" value="false"/>
+ <param name="check_content_type" value="true"/>
+ </antcall>
+
<!--
******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP10 -->
<antcall target="download.version">
@@ -2719,6 +2825,7 @@
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
<include
name="**/remoting/versioning/transport/**/*TestCase.class"/>
+ <include
name="**/remoting/versioning/lease/**/*TestCase.class"/>
<exclude name="**/multiplex/**"/>
</fileset>
</batchtest>
@@ -2758,6 +2865,7 @@
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
<include
name="**/remoting/versioning/transport/**/*TestCase.class"/>
+ <include
name="**/remoting/versioning/lease/**/*TestCase.class"/>
<exclude
name="**/VersionRMISerializableMarshallerTestCase.class"/>
<exclude name="**/multiplex/**"/>
</fileset>