[jboss-remoting-commits] JBoss Remoting SVN: r5205 - remoting2/branches/2.2.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Tue May 12 02:45:00 EDT 2009
Author: ron.sigal at jboss.com
Date: 2009-05-12 02:45:00 -0400 (Tue, 12 May 2009)
New Revision: 5205
Modified:
remoting2/branches/2.2/build.xml
Log:
(1) JBREM-1079: Added servlet tests; (2) JBREM-1129, JBREM-1130: added lease versioning tests; (3) JBREM-1131: Updated version to 2.2.2.SP12.
Modified: remoting2/branches/2.2/build.xml
===================================================================
--- remoting2/branches/2.2/build.xml 2009-05-12 06:39:15 UTC (rev 5204)
+++ remoting2/branches/2.2/build.xml 2009-05-12 06:45:00 UTC (rev 5205)
@@ -38,9 +38,9 @@
<!-- Module name(s) & version -->
<property name="module.name" value="remoting"/>
<property name="module.Name" value="JBoss Remoting"/>
- <property name="module.version" value="2.2.2.SP11"/>
+ <property name="module.version" value="2.2.2.SP12"/>
<!-- extension is for the file suffix to use for distribution build -->
- <property name="module.version.extension" value="2_2_2_SP11"/>
+ <property name="module.version.extension" value="2_2_2_SP12"/>
<property name="implementation.url" value="http://www.jboss.org/products/remoting"/>
<property name="root.dir" value="${basedir}"/>
@@ -930,8 +930,8 @@
<copy file="${jboss.deploy.dir}/jboss-web.deployer/server.xml" todir="${basedir}/Save" overwrite="true"/>
<copy file="${output.lib.dir}/jboss-remoting.jar" todir="${jboss.lib.dir}" overwrite="true"/>
<copy file="${output.lib.dir}/jboss-remoting-tests.jar" todir="${jboss.lib.dir}" overwrite="true"/>
- <copy file="${servlet.tests.dir}/server.xml" todir="${jboss.deploy.dir}/jboss-web.deployer"/>
- <copy file="${servlet.tests.dir}/ssl/keystore" tofile="${jboss.conf.dir}/keystore"/>
+ <copy file="${servlet.tests.dir}/server.xml" todir="${jboss.deploy.dir}/jboss-web.deployer" overwrite="true"/>
+ <copy file="${servlet.tests.dir}/ssl/keystore" tofile="${jboss.conf.dir}/keystore" overwrite="true"/>
</target>
<target name="tests.servlet.teardown" depends="tests.servlet.clean">
@@ -990,6 +990,8 @@
<antcall target="tests.servlet" inheritrefs="true"/>
<antcall target="tests.servlet.callback" inheritrefs="true"/>
<antcall target="tests.servlet.marshal" 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="AS.shutdown"/>
</target>
@@ -1016,7 +1018,7 @@
extension="-java_serialization.xml"/>
<batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no">
<fileset dir="${tests.compile.dir}">
- <include name="**/remoting/transport/servlet/**TestClient.class"/>
+ <include name="**/remoting/transport/servlet/*TestClient.class"/>
</fileset>
</batchtest>
</junit>
@@ -1026,15 +1028,15 @@
<target name="tests.servlet.callback">
<copy file="${servlet.tests.dir}/callback/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
- <sleep seconds="2"/>
- <copy todir="${jboss.deploy.dir}">
+ <sleep seconds="4"/>
+ <copy todir="${jboss.deploy.dir}" overwrite="true">
<fileset dir="${output.lib.dir}">
<include name="servlet-invoker.war/**"/>
</fileset>
</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}"/>
@@ -1056,7 +1058,7 @@
<target name="tests.servlet.marshal">
<copy file="${servlet.tests.dir}/marshal/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
- <sleep seconds="2"/>
+ <sleep seconds="4"/>
<copy todir="${jboss.deploy.dir}">
<fileset dir="${output.lib.dir}">
<include name="servlet-invoker.war/**"/>
@@ -1064,7 +1066,7 @@
</copy>
<copy file="${servlet.tests.dir}/marshal/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}"/>
@@ -1084,6 +1086,66 @@
<delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/>
</target>
+ <target name="tests.servlet.nopreservelines">
+ <copy file="${servlet.tests.dir}/nopreservelines/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="4"/>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/nopreservelines/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/nopreservelines/*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.preservelines">
+ <copy file="${servlet.tests.dir}/preservelines/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
+ <sleep seconds="4"/>
+ <copy todir="${jboss.deploy.dir}" overwrite="true">
+ <fileset dir="${output.lib.dir}">
+ <include name="servlet-invoker.war/**"/>
+ </fileset>
+ </copy>
+ <copy file="${servlet.tests.dir}/preservelines/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/preservelines/*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.ssl">
<copy file="${servlet.tests.dir}/ssl/remoting-sslservlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="4"/>
@@ -1094,7 +1156,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}"/>
@@ -1176,7 +1238,7 @@
<target name="tests.versioning.all"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> Current -->
<antcall target="tests.versioning.all_transports" inheritrefs="true">
@@ -1184,8 +1246,31 @@
<param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
<param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
+ <!-- Current <- -> 2.2.2.SP11 -->
+ <antcall target="tests.versioning.all_transports" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_2_2_SP11-client"/>
+ <param name="client.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP11/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <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" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="2_2_2_SP11-server"/>
+ <param name="server.classpath" value="${etc.dir}/lib/remoting_2_2_2_SP11/jboss-remoting.jar"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <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"/>
+ </antcall>
+
+ <!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP10 -->
<antcall target="tests.versioning.all_transports" inheritrefs="true">
<param name="jboss-junit-configuration" value="2_2_2_SP10-client"/>
@@ -1207,7 +1292,7 @@
<param name="server.version" value=""/>
<param name="check_connection" value="false"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 2.2.2.SP9 -->
<antcall target="tests.versioning.all_transports" inheritrefs="true">
@@ -1469,7 +1554,7 @@
<antcall target="tests.versioning.socket" inheritrefs="true">
<param name="version" value="1_4_3_GA"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 1.4.0.final -->
<antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true">
@@ -1481,7 +1566,7 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
</antcall>
-
+
<antcall target="tests.versioning.all_but_socket_and_bisocket" inheritrefs="true">
<param name="jboss-junit-configuration" value="1_4_0_final-server"/>
<param name="server.classpath" value="${etc.dir}/lib/remoting_1_4_0_final/jboss-remoting.jar"/>
@@ -1491,16 +1576,16 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
</antcall>
-
- <!-- 1.4.0.final does not allow turning off socket connection check -->
+
+ <!-- 1.4.0.final does not allow turning off socket connection check -->
<antcall target="tests.versioning.socket.1.4.0" inheritrefs="true">
- <param name="version" value="1_4_0_final"/>
+ <param name="version" value="1_4_0_final"/>
</antcall>
-
+
<!-- ******************************************************************************** -->
<!-- Current <- -> 1.2.1.final -->
<!-- Compatibility is not guaranteed with 1.2.1.final
-
+
<antcall target="tests.versioning.all_but_socket" inheritrefs="true">
<param name="jboss-junit-configuration" value="1_2_1_final-client"/>
<param name="client.classpath" value="${etc.dir}/lib/remoting_1_2_1_final/jboss-remoting.jar"/>
@@ -1510,7 +1595,7 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
</antcall>
-
+
<antcall target="tests.versioning.all_but_socket" inheritrefs="true">
<param name="jboss-junit-configuration" value="1_2_1_final-server"/>
<param name="server.classpath" value="${etc.dir}/lib/remoting_1_2_1_final/jboss-remoting.jar"/>
@@ -1520,9 +1605,9 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
</antcall>
-
+
<antcall target="tests.versioning.socket.1.4.0" inheritrefs="true">
- <param name="version" value="1_2_1_final"/>
+ <param name="version" value="1_2_1_final"/>
</antcall>
-->
</target>
@@ -1597,12 +1682,13 @@
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
<include name="**/remoting/versioning/transport/**/*TestCase.class"/>
- <exclude name="**/remoting/**/multiplex/**/*.class"/>
+ <include name="**/remoting/versioning/lease/**/*TestCase.class"/>
+ <exclude name="**/remoting/**/multiplex/**/*.class"/>
</fileset>
</batchtest>
</junit>
</target>
-
+
<target name="tests.versioning.all_transports_but_bisocket"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
@@ -1627,13 +1713,13 @@
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
<include name="**/remoting/versioning/transport/**/*TestCase.class"/>
- <exclude name="**/remoting/**/bisocket/**/*.class"/>
- <exclude name="**/remoting/**/multiplex/**/*.class"/>
+ <exclude name="**/remoting/**/bisocket/**/*.class"/>
+ <exclude name="**/remoting/**/multiplex/**/*.class"/>
</fileset>
</batchtest>
</junit>
</target>
-
+
<target name="tests.versioning.all_but_socket_and_bisocket"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
@@ -1657,20 +1743,20 @@
haltonfailure="no">
<fileset dir="${tests.compile.dir}">
<include name="**/remoting/versioning/transport/**/*TestCase.class"/>
- <exclude name="**/bisocket/**"/>
- <exclude name="**/socket/**"/>
- <exclude name="**/multiplex/**"/>
+ <exclude name="**/bisocket/**"/>
+ <exclude name="**/socket/**"/>
+ <exclude name="**/multiplex/**"/>
</fileset>
</batchtest>
</junit>
</target>
-
+
<target name="tests.versioning.socket"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
-
+
<antcall target="tests.versioning.socket.1.4.0" inheritrefs="true"/>
-
+
<antcall target="tests.versioning.socket.sub" inheritrefs="true">
<param name="jboss-junit-configuration" value="${version}-client_nocheck"/>
<param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar"/>
@@ -1682,7 +1768,7 @@
<param name="client.check_connection" value="false"/>
<param name="server.check_connection" value="false"/>
</antcall>
-
+
<antcall target="tests.versioning.socket.sub" inheritrefs="true">
<param name="jboss-junit-configuration" value="${version}-server_nocheck"/>
<param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar"/>
@@ -1695,7 +1781,7 @@
<param name="server.check_connection" value="false"/>
</antcall>
</target>
-
+
<target name="tests.versioning.socket.1.4.0"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
@@ -1710,7 +1796,7 @@
<param name="client.check_connection" value="true"/>
<param name="server.check_connection" value="true"/>
</antcall>
-
+
<antcall target="tests.versioning.socket.sub" inheritrefs="true">
<param name="jboss-junit-configuration" value="${version}-client_default"/>
<param name="client.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar"/>
@@ -1732,9 +1818,9 @@
<param name="client.version" value=""/>
<param name="server.version" value=""/>
<param name="client.check_connection" value="true"/>
- <param name="server.check_connection" value="true"/>
+ <param name="server.check_connection" value="true"/>
</antcall>
-
+
<antcall target="tests.versioning.socket.sub" inheritrefs="true">
<param name="jboss-junit-configuration" value="${version}-server_default"/>
<param name="server.classpath" value="${etc.dir}/lib/remoting_${version}/jboss-remoting.jar"/>
@@ -1747,7 +1833,7 @@
<param name="server.check_connection" value=""/>
</antcall>
</target>
-
+
<target name="tests.versioning.socket.sub"
description="Runs remoting fuctional tests with different remoting versions for client and server."
depends="jars, tests.jars">
@@ -1830,8 +1916,42 @@
</batchtest>
</junit>
</target>
-
-
+ <target name="tests.versioning.lease" depends="configure">
+ <antcall target="tests.versioning.lease.sub" inheritrefs="true">
+ <param name="jboss-junit-configuration" value="${module.version.extension}"/>
+ <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar"/>
+ </antcall>
+ </target>
+
+ <target name="tests.versioning.lease.sub"
+ description="Runs remoting fuctional tests with different remoting versions for client and server."
+ depends="jars, tests.jars">
+ <mkdir dir="${output.tests.results}"/>
+ <echo>Running: ${jboss-junit-configuration}</echo>
+ <junit printsummary="true" fork="yes" includeantruntime="true">
+ <classpath>
+ <path refid="third_party.classpath"/>
+ <path refid="tests.version.classpath"/>
+ </classpath>
+ <jvmarg value="-Dclient.path=${client.classpath}"/>
+ <jvmarg value="-Dserver.path=${server.classpath}"/>
+ <jvmarg value="-Dclient.version=2.2"/>
+ <jvmarg value="-Dserver.version=2.2"/>
+ <jvmarg value="-Dclient.pre_2_0_compatible=false"/>
+ <jvmarg value="-Dserver.pre_2_0_compatible=false"/>
+ <jvmarg value="-Dremoting.metadata=check_connection=false"/>
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ extension="-${jboss-junit-configuration}.xml"/>
+ <batchtest fork="yes" todir="${output.tests.results}"
+ haltonfailure="no">
+ <fileset dir="${tests.compile.dir}">
+ <include name="**/remoting/versioning/lease/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
<!-- Tests only the multiplex transport -->
<target name="tests.multiplex" depends="tests.jars">
<mkdir dir="${output.tests.results}"/>
@@ -3020,13 +3140,13 @@
<include name="**"/>
</fileset>
</copy>
-
+
<copy todir="${dist.dir}/docs/guide/html_single">
<fileset dir="${basedir}/docs/guide/build/en/html_single">
<include name="**"/>
</fileset>
</copy>
-
+
<copy todir="${dist.dir}" filtering="no">
<fileset dir="${basedir}/docs">
<include name="README.txt"/>
More information about the jboss-remoting-commits
mailing list