Author: ron.sigal(a)jboss.com
Date: 2009-05-16 19:58:28 -0400 (Sat, 16 May 2009)
New Revision: 5250
Modified:
remoting2/branches/2.2/build.xml
Log:
JBREM-1102: Broke org.jboss.tests.remoting.transport.servlet.marshal into
...marshal.config and ...marshal.noconfig.
Modified: remoting2/branches/2.2/build.xml
===================================================================
--- remoting2/branches/2.2/build.xml 2009-05-16 23:52:54 UTC (rev 5249)
+++ remoting2/branches/2.2/build.xml 2009-05-16 23:58:28 UTC (rev 5250)
@@ -989,7 +989,8 @@
<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.marshal.config"
inheritrefs="true"/>
+ <antcall target="tests.servlet.marshal.noconfig"
inheritrefs="true"/>
<antcall target="tests.servlet.nopreservelines"
inheritrefs="true"/>
<antcall target="tests.servlet.preservelines"
inheritrefs="true"/>
<antcall target="tests.servlet.ssl" inheritrefs="true"/>
@@ -1056,15 +1057,15 @@
<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="4"/>
<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">
@@ -1078,7 +1079,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/config/*TestClient.class"/>
</fileset>
</batchtest>
</junit>
@@ -1086,6 +1087,36 @@
<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="4"/>
+ <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}"/>
+ <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/noconfig/*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.nopreservelines">
<copy
file="${servlet.tests.dir}/nopreservelines/remoting-servlet-service.xml"
todir="${jboss.deploy.dir}" overwrite="true"/>
<sleep seconds="4"/>
Show replies by date