[jboss-cvs] JBossRemoting ...

[Ron Sigal]

  User: rsigal  
  Date: 07/10/31 03:11:57

  Modified:    JBossRemoting  Tag: remoting_2_x build.xml
  Log:
  JBREM-713:  (1) Use jbossweb with jdk 1.5 and tomcat with jdk 14; (2) fixed some test names.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.88.2.22 +10 -6     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.21
  retrieving revision 1.88.2.22
  diff -u -b -r1.88.2.21 -r1.88.2.22
  --- build.xml	27 Oct 2007 04:43:14 -0000	1.88.2.21
  +++ build.xml	31 Oct 2007 07:11:57 -0000	1.88.2.22
  @@ -9,7 +9,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.88.2.21 2007/10/27 04:43:14 rsigal Exp $ -->
  +<!-- $Id: build.xml,v 1.88.2.22 2007/10/31 07:11:57 rsigal Exp $ -->
   
   <project default="most" name="JBossRemoting">
   
  @@ -79,7 +79,8 @@
         <path id="third_party.classpath">
            <fileset dir="${lib.dir}">
               <include name="**/*.jar"/>
  -         	<exclude name="apache-tomcat/*.jar"/>
  +         	<exclude name="apache-tomcat/*.jar" if="isJDK5"/>
  +         	<exclude name="jbossweb/*.jar" if="isJDK4"/>
            </fileset>
         </path>
   
  @@ -671,7 +672,7 @@
         <antcall target="tests.functional.main.http" inheritrefs="true">
            <param name="remoting.metadata.key" value="remoting.metadata"/>
            <param name="metadata" value="serializationtype=${serialization}"/>
  -         <param name="jboss-junit-configuration" value="java_${serialization}-jbossweb"/>
  +         <param name="jboss-junit-configuration" value="${serialization}_serialization_jbossweb"/>
         	<param name="classpath" value="tests.classpath"/>
         	<param name="version" value="jbossweb"/>
         </antcall>
  @@ -681,7 +682,7 @@
         <antcall target="tests.functional.main.http" inheritrefs="true">
            <param name="remoting.metadata.key" value="remoting.metadata"/>
            <param name="metadata" value="serializationtype=${serialization}"/>
  -         <param name="jboss-junit-configuration" value="java_${serialization}-tomcat"/>
  +         <param name="jboss-junit-configuration" value="${serialization}_serialization_tomcat"/>
         	<param name="classpath" value="tests.classpath.tomcat"/>
            <param name="version" value="tomcat"/>
         </antcall>
  @@ -714,7 +715,7 @@
         <antcall target="tests.functional.main.http.core" inheritrefs="true">
            <param name="remoting.metadata.key" value="remoting.metadata"/>
            <param name="metadata" value="serializationtype=${serialization}"/>
  -         <param name="jboss-junit-configuration" value="java_${serialization}_jbossweb"/>
  +         <param name="jboss-junit-configuration" value="${serialization}_serialization_jbossweb"/>
         	<param name="classpath" value="tests.classpath"/>
         	<param name="version" value="jbossweb"/>
         </antcall>
  @@ -724,7 +725,7 @@
         <antcall target="tests.functional.main.http.core" inheritrefs="true">
            <param name="remoting.metadata.key" value="remoting.metadata"/>
            <param name="metadata" value="serializationtype=${serialization}"/>
  -         <param name="jboss-junit-configuration" value="java_${serialization}-tomcat"/>
  +         <param name="jboss-junit-configuration" value="${serialization}_serialization_tomcat"/>
         	<param name="classpath" value="tests.classpath.tomcat"/>
            <param name="version" value="tomcat"/>
         </antcall>
  @@ -968,6 +969,9 @@
         <condition property="isJDK5">
            <equals arg1="${ant.java.version}" arg2="1.5"/>
         </condition>
  +      <condition property="isJDK4">
  +         <equals arg1="${ant.java.version}" arg2="1.4"/>
  +      </condition>
      </target>
   
      <!-- This section is for quick smoke test of java vs. jboss serialization -->