Author: ron.sigal(a)jboss.com Date: 2009-09-01 15:48:55 -0400 (Tue, 01 Sep 2009) New Revision: 5420 Modified: remoting2/branches/2.x/build.xml Log: JBREM-1101: Added tests.servlet.contenttype; JBREM-1145: added tests.servlet.marshal. Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2009-09-01 19:38:47 UTC (rev 5419) +++ remoting2/branches/2.x/build.xml 2009-09-01 19:48:55 UTC (rev 5420) @@ -1696,6 +1696,8 @@ <antcall target="AS.start"/> <antcall target="tests.servlet" inheritrefs="true"/> <antcall target="tests.servlet.callback" inheritrefs="true"/> + <antcall target="tests.servlet.contenttype" 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.mbeanserver.jboss" inheritrefs="true"/> @@ -1767,6 +1769,66 @@ <delete file="${jboss.deploy.dir}/remoting-servlet-service.xml"/> </target> + <target name="tests.servlet.contenttype"> + <copy file="${servlet.tests.dir}/contenttype/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}/contenttype/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/contenttype/*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" depends="tests.servlet.config"> + <copy file="${servlet.tests.dir}/marshal/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" + 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/*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.config"> <copy file="${servlet.tests.dir}/marshal/config/remoting-servlet-service.xml" todir="${jboss.deploy.dir}" overwrite="true"/> <sleep seconds="2"/>