[jboss-cvs] JBossRemoting ...
Ron Sigal
ron_sigal at yahoo.com
Fri Oct 26 03:42:46 EDT 2007
User: rsigal
Date: 07/10/26 03:42:46
Modified: JBossRemoting Tag: remoting_2_x build.xml
Log:
JBREM-713: Only do jbossweb tests for jdk 1.5.
Revision Changes Path
No revision
No revision
1.88.2.18 +62 -58 JBossRemoting/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/build.xml,v
retrieving revision 1.88.2.17
retrieving revision 1.88.2.18
diff -u -b -r1.88.2.17 -r1.88.2.18
--- build.xml 24 Oct 2007 01:00:08 -0000 1.88.2.17
+++ build.xml 26 Oct 2007 07:42:46 -0000 1.88.2.18
@@ -9,7 +9,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.88.2.17 2007/10/24 01:00:08 rsigal Exp $ -->
+<!-- $Id: build.xml,v 1.88.2.18 2007/10/26 07:42:46 rsigal Exp $ -->
<project default="most" name="JBossRemoting">
@@ -649,78 +649,82 @@
<antcall target="tests.functional.serialization.jboss.http" inheritrefs="true"/>
</target>
- <target name="tests.functional.http.core" depends="configure">
- <antcall target="tests.functional.serialization.java.http.core" inheritrefs="true"/>
- <antcall target="tests.functional.serialization.jboss.http.core" inheritrefs="true"/>
- </target>
-
<target name="tests.functional.serialization.java.http">
- <antcall target="tests.functional.main.http" inheritrefs="true">
- <param name="remoting.metadata.key" value="remoting.metadata"/>
- <param name="metadata" value="serializationtype=java"/>
- <param name="jboss-junit-configuration" value="java_serialization-jbossweb"/>
- <param name="classpath" value="tests.classpath"/>
- <param name="version" value="jbossweb"/>
+ <antcall target="test.functional.http.jbossweb">
+ <param name="serialization" value="java"/>
</antcall>
- <!--
- <antcall target="tests.functional.main.http" inheritrefs="true">
- <param name="remoting.metadata.key" value="remoting.metadata"/>
- <param name="metadata" value="serializationtype=java"/>
- <param name="jboss-junit-configuration" value="java_serialization-tomcat"/>
- <param name="classpath" value="tests.classpath.tomcat"/>
- <param name="version" value="tomcat"/>
+ <antcall target="test.functional.http.tomcat">
+ <param name="serialization" value="java"/>
</antcall>
- -->
</target>
<target name="tests.functional.serialization.jboss.http" if="isJDK5">
+ <antcall target="test.functional.http.jbossweb">
+ <param name="serialization" value="jboss"/>
+ </antcall>
+ <antcall target="test.functional.http.tomcat">
+ <param name="serialization" value="jboss"/>
+ </antcall>
+ </target>
+
+ <target name="tests.functional.http.jbossweb" if="isJDK5">
<antcall target="tests.functional.main.http" inheritrefs="true">
<param name="remoting.metadata.key" value="remoting.metadata"/>
- <param name="metadata" value="serializationtype=jboss"/>
- <param name="jboss-junit-configuration" value="jboss_serialization-jbossweb"/>
+ <param name="metadata" value="serializationtype=${serialization}"/>
+ <param name="jboss-junit-configuration" value="java_${serialization)-jbossweb"/>
<param name="classpath" value="tests.classpath"/>
<param name="version" value="jbossweb"/>
</antcall>
- <!--
+ </target>
+
+ <target name="tests.functional.http.tomcat">
<antcall target="tests.functional.main.http" inheritrefs="true">
<param name="remoting.metadata.key" value="remoting.metadata"/>
- <param name="metadata" value="serializationtype=jboss"/>
- <param name="jboss-junit-configuration" value="jboss_serialization-tomcat"/>
+ <param name="metadata" value="serializationtype=${serialization}"/>
+ <param name="jboss-junit-configuration" value="java_${serialization}-tomcat"/>
<param name="classpath" value="tests.classpath.tomcat"/>
<param name="version" value="tomcat"/>
</antcall>
- -->
+ </target>
+
+ <target name="tests.functional.http.core" depends="configure">
+ <antcall target="tests.functional.serialization.java.http.core" inheritrefs="true"/>
+ <antcall target="tests.functional.serialization.jboss.http.core" inheritrefs="true"/>
</target>
<target name="tests.functional.serialization.java.http.core">
- <antcall target="tests.functional.main.http.core" inheritrefs="true">
- <param name="remoting.metadata.key" value="remoting.metadata"/>
- <param name="metadata" value="serializationtype=java"/>
- <param name="jboss-junit-configuration" value="java_serialization-jbossweb"/>
- <param name="classpath" value="tests.classpath"/>
- <param name="version" value="jbossweb"/>
+ <antcall target="test.functional.http.jbossweb.core">
+ <param name="serialization" value="java"/>
</antcall>
- <antcall target="tests.functional.main.http.core" inheritrefs="true">
- <param name="remoting.metadata.key" value="remoting.metadata"/>
- <param name="metadata" value="serializationtype=java"/>
- <param name="jboss-junit-configuration" value="java_serialization-tomcat"/>
- <param name="classpath" value="tests.classpath.tomcat"/>
- <param name="version" value="tomcat"/>
+ <antcall target="test.functional.http.tomcat.core">
+ <param name="serialization" value="java"/>
</antcall>
</target>
<target name="tests.functional.serialization.jboss.http.core" if="isJDK5">
+ <antcall target="test.functional.http.jbossweb.core">
+ <param name="serialization" value="jboss"/>
+ </antcall>
+ <antcall target="test.functional.http.tomcat.core">
+ <param name="serialization" value="jboss"/>
+ </antcall>
+ </target>
+
+ <target name="tests.functional.http.jbossweb.core" if="isJDK5">
<antcall target="tests.functional.main.http.core" inheritrefs="true">
<param name="remoting.metadata.key" value="remoting.metadata"/>
- <param name="metadata" value="serializationtype=jboss"/>
- <param name="jboss-junit-configuration" value="jboss_serialization-jbossweb"/>
+ <param name="metadata" value="serializationtype=${serialization}"/>
+ <param name="jboss-junit-configuration" value="java_${serialization)-jbossweb"/>
<param name="classpath" value="tests.classpath"/>
<param name="version" value="jbossweb"/>
</antcall>
+ </target>
+
+ <target name="tests.functional.http.tomcat.core">
<antcall target="tests.functional.main.http.core" inheritrefs="true">
<param name="remoting.metadata.key" value="remoting.metadata"/>
- <param name="metadata" value="serializationtype=jboss"/>
- <param name="jboss-junit-configuration" value="jboss_serialization-tomcat"/>
+ <param name="metadata" value="serializationtype=${serialization}"/>
+ <param name="jboss-junit-configuration" value="java_${serialization}-tomcat"/>
<param name="classpath" value="tests.classpath.tomcat"/>
<param name="version" value="tomcat"/>
</antcall>
More information about the jboss-cvs-commits
mailing list