axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seib...@apache.org
Subject cvs commit: xml-axis/java/xmls path_refs.xml targets.xml
Date Fri, 16 Aug 2002 20:43:13 GMT
seibert     2002/08/16 13:43:13

  Modified:    java/samples/addr buildComponent.xml
               java/samples/jaxrpc buildComponent.xml
               java/test/session buildComponent.xml
               java/test/wsdl buildComponent.xml
               java/test/wsdl/arrays buildComponent.xml
               java/test/wsdl/datatypes buildComponent.xml
               java/test/wsdl/extensibility buildComponent.xml
               java/test/wsdl/filegen buildComponent.xml
               java/test/wsdl/getPort buildComponent.xml
               java/test/wsdl/inheritance buildComponent.xml
               java/test/wsdl/inout buildComponent.xml
               java/test/wsdl/interop buildComponent.xml
               java/test/wsdl/multibinding buildComponent.xml
               java/test/wsdl/multiref buildComponent.xml
               java/test/wsdl/multithread buildComponent.xml
               java/test/wsdl/opStyles buildComponent.xml
               java/test/wsdl/parameterOrder buildComponent.xml
               java/test/wsdl/qualify buildComponent.xml
               java/test/wsdl/qualify2 buildComponent.xml
               java/test/wsdl/refattr buildComponent.xml
               java/test/wsdl/roundtrip buildComponent.xml
               java/test/wsdl/sequence buildComponent.xml
               java/test/wsdl/types buildComponent.xml
               java/xmls path_refs.xml targets.xml
  Log:
  Now I build EVERYTHING that the original buildTest and samples targets built
  Should make passing the tests easier, huh?
  
  Revision  Changes    Path
  1.2       +11 -3     xml-axis/java/samples/addr/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/addr/buildComponent.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buildComponent.xml	22 Jul 2002 20:14:22 -0000	1.1
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.2
  @@ -21,7 +21,8 @@
   <target name="copy"/>
   
   <target name="compile">
  -  <javac srcdir="." destdir="${build.dest}" debug="${debug}">
  +
  +  <javac srcdir="${axis.home}" destdir="${build.dest}" debug="${debug}">
       <classpath>
           <path refid="classpath"/>
       </classpath>
  @@ -31,8 +32,8 @@
       <exclude name="**/old/**/*.java" />
     </javac>
   
  -    <wsdl2java url="samples/addr/AddressBook.wsdl"
  -               output="build/work"
  +    <wsdl2java url="${axis.home}/samples/addr/AddressBook.wsdl"
  +               output="${build.dir}/work"
                  deployscope="session"
                  serverSide="yes"
                  skeletonDeploy="yes"
  @@ -42,6 +43,13 @@
                  testcase="no">
           <mapping namespace="urn:AddressFetcher2" package="samples.addr"/>
       </wsdl2java>
  +
  +    <copy todir="${build.dir}/work/samples/addr" overwrite="yes">
  +      <fileset dir="${axis.home}/samples/addr">
  +        <include name="Main.java"/>
  +	<include name="DOMUtils.java"/>
  +      </fileset>
  +    </copy>
   
       <!-- Compile the echo sample generated java files -->
       <javac srcdir="${build.dir}/work" destdir="${build.dest}" debug="${debug}">
  
  
  
  1.3       +6 -0      xml-axis/java/samples/jaxrpc/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/jaxrpc/buildComponent.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- buildComponent.xml	1 Aug 2002 18:17:00 -0000	1.2
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.3
  @@ -49,6 +49,12 @@
                  testcase="no">
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/samples/jaxrpc/hello" overwrite="yes">
  +      <fileset dir="${axis.home}/samples/jaxrpc/hello">
  +        <include name="ServerHandler.java"/>
  +      </fileset>
  +    </copy>
  +
       <!-- Compile the echo sample generated java files -->
       <javac srcdir="${build.dir}/work" destdir="${build.dest}" debug="${debug}">
         <classpath refid="classpath" />
  
  
  
  1.3       +1 -1      xml-axis/java/test/session/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/session/buildComponent.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- buildComponent.xml	7 Aug 2002 20:22:12 -0000	1.2
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.3
  @@ -31,7 +31,7 @@
       <classpath>
           <path refid="classpath"/>
       </classpath>
  -    <include name="$(componentName}/*.java"/>
  +    <include name="${componentName}/*.java"/>
     </javac>
   </target>
   
  
  
  
  1.4       +2 -0      xml-axis/java/test/wsdl/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/buildComponent.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildComponent.xml	13 Aug 2002 22:05:30 -0000	1.3
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.4
  @@ -25,6 +25,7 @@
   
   <target name="compile" depends="copy">
     <echo message="Compiling test.wsdl"/>
  +<!--
     <javac srcdir="${axis.home}" destdir="${build.dest}" debug="${debug}">
       <classpath>
           <path refid="classpath"/>
  @@ -36,6 +37,7 @@
       <exclude name="test/wsdl/interop3/**/*.java" />
       <exclude name="test/wsdl/Wsdl2javaTestSuite.java" unless="servlet.present"/>
     </javac>
  +-->
   </target>
   
   <target name="run" />
  
  
  
  1.5       +15 -5     xml-axis/java/test/wsdl/arrays/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/arrays/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:13 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.5
  @@ -31,20 +31,30 @@
                  output="${axis.home}/build/work"
                  deployscope="session"
                  serverSide="yes"
  +               skeletonDeploy="yes"
                  noimports="no"
                  verbose="no"
                  testcase="no">
           <mapping namespace="urn:ArrayTest2" package="test.wsdl.arrays"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/arrays" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/arrays">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/arrays">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/arrays">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/arrays/*.java" />
  -    </javac>
  -
  -    <javac srcdir="${axis.home}/" destdir="${build.dest}"
  -           debug="${debug}">
         <include name="test/wsdl/arrays/*.java" />
       </javac>
   
  
  
  
  1.5       +15 -5     xml-axis/java/test/wsdl/datatypes/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/datatypes/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:13 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.5
  @@ -31,18 +31,28 @@
                  output="${axis.home}/build/work"
                  deployscope="session"
                  serverSide="yes"
  +               skeletonDeploy="yes"
                  testcase="yes">
           <mapping namespace="urn:dataTypes" package="test.wsdl.datatypes"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/datatypes" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/datatypes">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/datatypes">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/datatypes">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/datatypes/*.java" />
  -    </javac>
  -
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
         <include name="test/wsdl/datatypes/*.java" />
       </javac>
   
  
  
  
  1.4       +0 -4      xml-axis/java/test/wsdl/extensibility/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/extensibility/buildComponent.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildComponent.xml	7 Aug 2002 20:22:13 -0000	1.3
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.4
  @@ -50,10 +50,6 @@
         <include name="test/wsdl/extensibility/*.java" />
       </javac>
   
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
  -      <include name="test/wsdl/extensibility/*.java" />
  -    </javac>
   </target>
   
   <target name="run" >
  
  
  
  1.5       +15 -4     xml-axis/java/test/wsdl/filegen/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/filegen/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:13 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.5
  @@ -45,16 +45,27 @@
           <mapping namespace="http://test.com/reference" package="test.wsdl.filegenAll"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/filegen" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/filegen">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/filegen">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/filegen">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
         <include name="test/wsdl/filegen/*.java" />
  +      <include name="test/wsdl/filegenAll/*.java" />
       </javac>
   
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
  -      <include name="test/wsdl/filegen/*.java" />
  -    </javac>
   </target>
   
   <target name="run" >
  
  
  
  1.4       +14 -4     xml-axis/java/test/wsdl/getPort/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/getPort/buildComponent.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildComponent.xml	7 Aug 2002 19:46:10 -0000	1.3
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.4
  @@ -34,16 +34,26 @@
                  testcase="no">
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/getPort" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/getPort">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/getPort">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/getPort">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
         <include name="test/wsdl/getPort/*.java" />
       </javac>
   
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
  -      <include name="test/wsdl/getPort/*.java" />
  -    </javac>
   </target>
   
   <target name="run" >
  
  
  
  1.5       +14 -5     xml-axis/java/test/wsdl/inheritance/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/inheritance/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:14 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.5
  @@ -94,17 +94,26 @@
           <mapping namespace="urn:InheritanceTest3" package="test.wsdl.inheritance"/>
       </java2wsdl>
   
  +    <copy todir="${build.dir}/work/test/wsdl/inheritance" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/inheritance">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/inheritance">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/inheritance">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
         <include name="test/wsdl/inheritance/*.java" />
       </javac>
       
  -     <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
  -      <classpath refid="classpath" />
  -      <include name="test/wsdl/inheritance/*.java" />
  -    </javac>
   </target>
   
   <target name="run" >
  
  
  
  1.5       +18 -6     xml-axis/java/test/wsdl/inout/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/inout/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:14 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:12 -0000	1.5
  @@ -14,6 +14,8 @@
   
   <property name="axis.home" location="../../.." />
   <property name="componentName" value="test/wsdl/inout" />
  +<property name="extraServices" value="work/test/wsdl/**" />
  +
           &properties;
           &paths;
           &taskdefs;
  @@ -38,21 +40,31 @@
           <mapping namespace="http://www.apache.org/inout" package="test.wsdl.inout"/>
       </wsdl2java>
   
  -    <javac srcdir="${build.dir}/work" destdir="${build.dest}"
  -           debug="${debug}">
  -      <classpath refid="classpath" />
  -      <include name="test/wsdl/inout/*.java" />
  -    </javac>
  +    <copy todir="${build.dir}/work/test/wsdl/inout" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/inout">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/inout">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/inout">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
   
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/include/*.java" />
  +      <include name="test/wsdl/inout/*.java" />
  +      <include name="test/wsdl/inout/**/*.java" />
       </javac>
   
       <javac srcdir="${axis.home}" destdir="${build.dest}"
              debug="${debug}">
         <include name="test/wsdl/inout/*.java" />
  +      <include name="test/wsdl/inout/**/*.java" />
       </javac>
   </target>
   
  
  
  
  1.5       +151 -13   xml-axis/java/test/wsdl/interop/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/interop/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	14 Aug 2002 20:57:21 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.5
  @@ -21,15 +21,19 @@
   
     <target name="clean" />
     
  -  <target name="copy" depends="setenv"/>
  +  <target name="copy" depends="setenv">
  +     <ant antfile="${axis.home}/samples/echo/buildComponent.xml" target="compile" />
  +     <ant antfile="${axis.home}/samples/jaxrpc/buildComponent.xml" target="compile" />
  +  </target>
   
     <target name="compile" depends="copy" >
       <!-- Use this to check the classpath if the ANT Task fails... -->
   
  -    <!--
  -    <property name="test-classpath.property" refid="classpath"/>
  -    <echo message="Classpath for wsdl2java task : ${test-classpath.property}"/>
  -    -->
  +    <copy todir="${build.dir}/work/samples" overwrite="yes">
  +      <fileset dir="${samples.dir}">
  +        <include name="**/userguide/example6/"/>
  +      </fileset>
  +    </copy>
   
       <copy todir="${build.dir}/classes" overwrite="yes">
         <fileset dir="${test.dir}/wsdl/_import">
  @@ -41,18 +45,25 @@
           <include name="**/userguide/example6/"/>
         </fileset>
       </copy>
  -<!-- mseibert
  -    <javac srcdir="${build.dir}/work" destdir="${build.dest}"
  +
  +    <!-- Compile the sample code -->
  +    <javac srcdir="${axis.home}" destdir="${build.dest}"
              debug="${debug}">
  -      <classpath refid="classpath" />
  -      <include name="**/*.java" />
  -      <exclude name="test/wsdl/interop3/**/*.java" />
  +      <classpath>
  +        <pathelement location="${build.lib}/${name}.jar"/>
  +        <pathelement location="${build.lib}/${jaxrpc}.jar"/>
  +        <pathelement location="${build.lib}/${saaj}.jar"/>
  +        <path refid="classpath"/>
  +      </classpath>
  +      <include name="samples/userguide/example6/*.java" />
  +      <exclude name="samples/userguide/example6/Main.java" />
  +      <exclude name="samples/userguide/example6/*Impl.java" />
  +      <exclude name="samples/userguide/example6/*TestCase.java" />
       </javac>
    
       <echo message="Running WSDL2Java and Java2WSDL Emitters"/>
  --->
  +
       <!-- WidgetPrice Java to WSDL Samples -->
  -<!-- mseibert
       <java2wsdl output="${axis.home}/build/work/samples/userguide/example6/WidgetPrice.wsdl"
                  className= "samples.userguide.example6.WidgetPrice"
                  namespace="urn:Example6"
  @@ -70,7 +81,60 @@
           <mapping namespace="urn:Example6" package="samples.userguide.example6"/>
       </wsdl2java>
   
  --->
  +    <!-- Import Test 1:  some namespace->package mappings from the -->
  +    <!--                 command line, some generated, some from   -->
  +    <!--                 NStoPkg.properties.                       -->
  +    <wsdl2java url="${axis.home}/test/wsdl/_import/Import.wsdl"
  +               output="${axis.home}/build/work"
  +               deployscope="none"
  +               serverSide="yes"
  +               skeletonDeploy="yes"
  +               noimports="no"
  +               verbose="no"
  +               testcase="yes">
  +        <mapping namespace="urn:import" package="test.wsdl.import"/>
  +        <mapping namespace="urn:importBinding1" package="test.wsdl.import.binding1"/>
  +        <mapping namespace="urn:importBinding2" package="test.wsdl.import.binding2"/>
  +    </wsdl2java>
  +
  +    <!-- Import Test 2:  all namespace->package mappings from the -->
  +    <!--                 command line.                            -->
  +    <wsdl2java url="${axis.home}/test/wsdl/_import/Import.wsdl"
  +               output="${axis.home}/build/work"
  +               deployscope="none"
  +               serverSide="yes"
  +               skeletonDeploy="yes"
  +               noimports="no"
  +               verbose="no"
  +               testcase="yes">
  +        <mapping namespace="urn:import" package="test.import2"/>
  +        <mapping namespace="urn:importBinding1" package="test.import2.binding1"/>
  +        <mapping namespace="urn:importBinding2" package="test.import2.binding2"/>
  +        <mapping namespace="urn:types.import.test" package="test.import2.types"/>
  +        <mapping namespace="urn:iface.import.test" package="test.import2.iface"/>
  +        <mapping namespace="urn:messages.import.test" package="test.import2.messages"/>
  +    </wsdl2java>
  +
  +    <!-- Import Test 3:  all namespace->package mappings from the -->
  +    <!--                 command line.  Make sure an xsd:import   -->
  +    <!--                 statement inside a schema inside a type  -->
  +    <!--                 works properly.                          -->
  +    <wsdl2java url="${axis.home}/test/wsdl/_import/ImportMessagesXSDImport.wsdl"
  +               output="${axis.home}/build/work"
  +               noimports="no">
  +        <mapping namespace="urn:types.import.test" package="test.import.test3"/>
  +    </wsdl2java>
  +
  +    <!-- Another import test:  relative references via ../.. -->
  +    <wsdl2java url="${axis.home}/test/wsdl/import2/service1/service2/testimport.wsdl"
  +               output="${axis.home}/build/work"
  +               serverSide="yes"
  +               skeletonDeploy="yes"
  +               noimports="no">
  +        <mapping namespace="http://test.globus.org/importtest" package="test.wsdl.import2"/>
  +        <mapping namespace="http://test.globus.org/interface" package="test.wsdl.import2.interface"/>
  +        <mapping namespace="http://test.globus.org/types" package="test.wsdl.import2.types"/>
  +    </wsdl2java>
   
       <!-- SOAPBuilders Interoperability Lab "Round 1" -->
       <!--     http://www.xmethods.net/ilab/           -->
  @@ -78,6 +142,7 @@
                  output="${axis.home}/build/work"
                  deployscope="none"
                  serverSide="yes"
  +               skeletonDeploy="yes"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -90,6 +155,7 @@
                  output="${axis.home}/build/work"
                  deployscope="none"
                  serverSide="yes"
  +               skeletonDeploy="yes"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -100,6 +166,7 @@
                  output="${axis.home}/build/work"
                  deployscope="none"
                  serverSide="yes"
  +               skeletonDeploy="yes"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -124,6 +191,7 @@
                  testcase="no"
                  deployscope="none"
                  serverSide="yes"
  +               skeletonDeploy="yes"
                  verbose="no"
                  noimports="no">
           <mapping namespace="http://soapinterop.org/" package="mssoapinterop.interopb"/>
  @@ -177,6 +245,7 @@
       <javac srcdir="${build.dir}/work" destdir="${build.dest}" debug="on">
         <classpath refid="classpath" />
         <include name="test/wsdl/interop3/import1/*.java" />
  +      <include name="test/wsdl/interop3/import1/**/*.java" />
       </javac>
       <!-- Step 3:  see test/wsdl/interop3/Import1TestCase.java -->
       <!-- Step 5:  see test/wsdl/interop3/Import1TestCase.java -->
  @@ -189,12 +258,19 @@
           <mapping namespace="http://soapinterop.org/" package="test.wsdl.interop3.import1"/>
           <mapping namespace="http://soapinterop.org/definitions/" package="test.wsdl.interop3.import1.definitions"/>
       </java2wsdl>
  +
       <wsdl2java url="${axis.home}/build/work/test/wsdl/interop3/import1.wsdl"
                  output="${axis.home}/build/work"
                  serverSide="yes">
           <mapping namespace="http://soapinterop.org/" package="test.wsdl.interop3.import1.step6"/>
           <mapping namespace="http://soapinterop.org/definitions/" package="test.wsdl.interop3.import1.step6.definitions"/>
       </wsdl2java>
  +
  +    <javac srcdir="${build.dir}/work" destdir="${build.dest}" debug="on">
  +      <classpath refid="classpath" />
  +      <include name="test/wsdl/interop3/import1/step6/**/*.java" />
  +    </javac>
  +
       <!-- Step 7:  see test/wsdl/interop3/Import1TestCase.java -->
       <!-- Step 8:  see test/wsdl/interop3/Import1TestCase.java -->
       <!-- SOAP Builder's round III web services -->
  @@ -361,6 +437,28 @@
                  testcase="no">
           <mapping namespace="http://www.PerfectXML.com/NETWebSvcs/BookService" package="test.wsdl.literal"/>
       </wsdl2java>
  +
  +    <!-- jaxrpc sample -->
  +    <wsdl2java url="${axis.home}/samples/jaxrpc/hello/HelloWorld.wsdl"
  +               output="${axis.home}/build/work"
  +               serverSide="yes"
  +               testcase="no">
  +    </wsdl2java>
  +
  +    <!-- jaxrpc sample -->
  +    <wsdl2java url="${axis.home}/samples/jaxrpc/hello/HelloWorld.wsdl"
  +               output="${axis.home}/build/work"
  +               serverSide="yes"
  +               testcase="no">
  +    </wsdl2java>
  +
  +    <!-- Testcase for Bug 10612 - AXIS doesn't support xml includes -->
  +    <wsdl2java url="${axis.home}/test/wsdl/import3/MultiImpIncl/wsdl/MultiImp.wsdl"
  +               output="${axis.home}/build/work"
  +               serverSide="yes"
  +               testcase="no">
  +    </wsdl2java>
  +
       <!-- The following WSDL are BAD.  We're keeping them here so we can -->
       <!-- check periodically to see whether the owner has fixed them.    -->
       <!-- Real-time Quote Server from http://www.xmltoday.com/examples/soap/realtime.psp -->
  @@ -420,6 +518,46 @@
                  noimports="no">
       </wsdl2java>
       -->
  +
  +    <copy todir="${build.dir}/work/test/wsdl/interop3" overwrite="yes">
  +      <fileset dir="${test.dir}/wsdl/interop3">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${test.dir}/wsdl/interop3">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${test.dir}/wsdl/interop3">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +      <fileset dir="${test.dir}/wsdl/interop3">
  +        <include name="sequence/SequenceInfo.java"/>
  +      </fileset>
  +    </copy>
  +
  +    <copy todir="${build.dir}/work/samples" overwrite="yes">
  +      <fileset dir="${samples.dir}">
  +        <include name="**/*BindingImpl.java"/>
  +      </fileset>
  +      <fileset dir="${samples.dir}">
  +        <include name="**/*TestCase.java"/>
  +      </fileset>
  +    </copy>
  +
  +    <javac srcdir="${build.dir}/work" destdir="${build.dest}"
  +           debug="${debug}">
  +      <classpath refid="classpath" />
  +      <include name="com/**/*.java" />
  +      <include name="mssoapinterop/**/*.java" />
  +      <include name="net/**/*.java" />
  +      <include name="org/**/*.java" />
  +      <include name="interop/**/*.java" />
  +      <include name="samples/**/*.java" />
  +      <include name="test/**/*.java" />
  +      <exclude name="test/wsdl/interop3/**/*.java" />
  +    </javac>
  +
     </target>
   
   <target name="run" >
  
  
  
  1.5       +13 -1     xml-axis/java/test/wsdl/multibinding/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/multibinding/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:14 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.5
  @@ -34,7 +34,19 @@
                  testcase="yes">
       </wsdl2java>
   
  -    <copy file="${test.dir}/wsdl/multibinding/VerifyFilesTestCase.java" tofile="${build.dir}/build/work/test/wsdl/multibinding/VerifyFilesTestCase.java"/>
  +    <copy todir="${build.dir}/work/test/wsdl/multibinding" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/multibinding">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/multibinding">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/multibinding">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
   
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
  
  
  
  1.5       +14 -5     xml-axis/java/test/wsdl/multiref/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/multiref/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:14 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.5
  @@ -38,17 +38,26 @@
           <mapping namespace="urn:MultiRefTest2" package="test.wsdl.multiref"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/multiref" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/multiref">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/multiref">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/multiref">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
         <include name="test/wsdl/multiref/*.java" />
       </javac>
   
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
  -      <classpath refid="classpath" />
  -      <include name="test/wsdl/multiref/*.java" />
  -    </javac>
   </target>
   
   <target name="run" >
  
  
  
  1.4       +16 -1     xml-axis/java/test/wsdl/multithread/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/multithread/buildComponent.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildComponent.xml	7 Aug 2002 20:22:14 -0000	1.3
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.4
  @@ -29,8 +29,23 @@
   </target>
   
   <target name="compile" depends="copy">
  -  <echo message="Compilig test.wsdl.multithread"/>
  +  <echo message="Compiling test.wsdl.multithread"/>
  +
       <!-- Multithread Test -->
  +    <copy todir="${build.dir}/work/test/wsdl/multithread" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/multithread">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/multithread">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/multithread">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
     <javac srcdir="${axis.home}" destdir="${build.dest}" debug="${debug}">
       <classpath>
           <path refid="classpath"/>
  
  
  
  1.5       +14 -4     xml-axis/java/test/wsdl/opStyles/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/opStyles/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:14 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.5
  @@ -35,16 +35,26 @@
                  testcase="yes">
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/opStyles" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/opStyles">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/opStyles">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/opStyles">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
         <include name="test/wsdl/opStyles/*.java" />
       </javac>
   
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
  -      <include name="test/wsdl/opStyles/*.java" />
  -    </javac>
   </target>
   
   <target name="run" >
  
  
  
  1.5       +14 -4     xml-axis/java/test/wsdl/parameterOrder/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/parameterOrder/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:14 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.5
  @@ -33,16 +33,26 @@
                  testcase="yes">
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/parameterOrder" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/parameterOrder">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/parameterOrder">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/parameterOrder">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
         <include name="test/wsdl/parameterOrder/*.java" />
       </javac>
   
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
  -      <include name="test/wsdl/parameterOrder/*.java" />
  -    </javac>
   </target>
   
   <target name="run" >
  
  
  
  1.4       +14 -4     xml-axis/java/test/wsdl/qualify/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/qualify/buildComponent.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildComponent.xml	7 Aug 2002 20:22:14 -0000	1.3
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.4
  @@ -34,16 +34,26 @@
           <mapping namespace="urn:qualifyTest" package="test.wsdl.qualify"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/qualify" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/qualify">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/qualify">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/qualify">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
         <include name="test/wsdl/qualify/*.java" />
       </javac>
   
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
  -      <include name="test/wsdl/qualify/*.java" />
  -    </javac>
   </target>
   
   <target name="run" >
  
  
  
  1.4       +14 -4     xml-axis/java/test/wsdl/qualify2/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/qualify2/buildComponent.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildComponent.xml	7 Aug 2002 20:22:14 -0000	1.3
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.4
  @@ -34,16 +34,26 @@
           <mapping namespace="urn:attributeQualify" package="test.wsdl.qualify2"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/qualify2" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/qualify2">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/qualify2">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/qualify2">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
         <include name="test/wsdl/qualify2/*.java" />
       </javac>
   
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
  -      <include name="test/wsdl/qualify2/*.java" />
  -    </javac>
   </target>
   
   <target name="run" >
  
  
  
  1.5       +16 -5     xml-axis/java/test/wsdl/refattr/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/refattr/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:15 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.5
  @@ -26,11 +26,13 @@
   
   <target name="compile" depends="copy">
     <echo message="Compilig test.wsdl.refattr"/>
  +
       <!-- RefAttr Test -->
       <wsdl2java url="${axis.home}/test/wsdl/refattr/refattr.wsdl"
                  output="${axis.home}/build/work"
                  deployscope="session"
                  serverSide="yes"
  +               skeletonDeploy="yes"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -38,14 +40,23 @@
           <mapping namespace="urn:ref.types" package="test.wsdl.refattr"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/refattr" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/refattr">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/refattr">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/refattr/">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/refattr/*.java" />
  -    </javac>
  -
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
         <include name="test/wsdl/refattr/*.java" />
       </javac>
   
  
  
  
  1.5       +10 -8     xml-axis/java/test/wsdl/roundtrip/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/roundtrip/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:15 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.5
  @@ -66,6 +66,7 @@
                  useInheritedMethods="false"
                  namespace="http://roundtrip.wsdl.test"
                  namespaceImpl="http://roundtrip.wsdl.test"
  +               typeMappingVersion="1.2"
                  location="http://localhost:8080/axis/services/RoundtripTest"
                  locationImport="file://build/work/test/wsdl/roundtrip/RoundtripIntf.wsdl">
           <mapping namespace="http://roundtrip.wsdl.test" package="test.wsdl.roundtrip"/>
  @@ -77,6 +78,7 @@
                  className= "test.wsdl.roundtrip.RoundtripPortType"
                  useInheritedMethods="false"
                  namespace="http://roundtrip.wsdl.test"
  +               typeMappingVersion="1.2"
                  location="http://localhost:8080/axis/services/RoundtripTest">
           <mapping namespace="http://roundtrip.wsdl.test" package="test.wsdl.roundtrip"/>
       </java2wsdl>
  @@ -89,6 +91,7 @@
                  className= "test.wsdl.roundtrip.RoundtripPortType"
                  useInheritedMethods="false"
                  namespace="http://roundtrip.wsdl.test"
  +               typeMappingVersion="1.2"
                  location="http://localhost:8080/axis/services/RoundtripTest2">
           <mapping namespace="http://roundtrip.wsdl.test" package="test.wsdl.roundtrip"/>
       </java2wsdl>
  @@ -107,20 +110,19 @@
           <mapping namespace="http://roundtrip.wsdl.test" package="test.wsdl.roundtrip"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/roundtrip" overwrite="yes">
  +      <fileset dir="${test.dir}/wsdl/roundtrip">
  +        <include name="RoundtripTestServiceTestCase.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
         <include name="test/wsdl/roundtrip/*.java" />
         <include name="test/wsdl/roundtrip/**/*.java" />
       </javac>
  -<!--
  -    <javac srcdir="${axis.home}/" destdir="${build.dest}"
  -           debug="${debug}">
  -      <classpath refid="classpath" />
  -      <include name="test/wsdl/roundtrip/*.java" />
  -      <include name="test/wsdl/roundtrip/**/*.java" />
  -    </javac>
  --->
  +
   </target>
   
   <target name="run" >
  
  
  
  1.6       +15 -0     xml-axis/java/test/wsdl/sequence/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/sequence/buildComponent.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- buildComponent.xml	7 Aug 2002 20:22:15 -0000	1.5
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.6
  @@ -44,6 +44,21 @@
           <include name="deploy.wsdd"/>
         </fileset>
       </copy>
  +
  +    <copy todir="${build.dir}/work/test/wsdl/sequence" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/sequence">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/sequence">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/sequence">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <!-- Compile Java -->
       <javac srcdir="${build.dir}/work" destdir="${build.dest}" debug="${debug}">
         <classpath refid="classpath" />
  
  
  
  1.5       +14 -4     xml-axis/java/test/wsdl/types/buildComponent.xml
  
  Index: buildComponent.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/types/buildComponent.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildComponent.xml	7 Aug 2002 20:22:15 -0000	1.4
  +++ buildComponent.xml	16 Aug 2002 20:43:13 -0000	1.5
  @@ -35,6 +35,20 @@
                  testcase="yes">
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/types" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/types">
  +        <include name="**/*Impl.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/types">
  +        <include name="**/*TestCase.java"/>
  +        <exclude name="**/EmptySATestCase.java"/>
  +        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  +      </fileset>
  +      <fileset dir="${axis.home}/test/wsdl/types">
  +        <include name="**/Main.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  @@ -42,10 +56,6 @@
         <include name="test/wsdl/types/**/*.java" />
       </javac>
   
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
  -      <include name="test/wsdl/types/*.java" />
  -    </javac>
   </target>
   
   <target name="run" >
  
  
  
  1.3       +4 -3      xml-axis/java/xmls/path_refs.xml
  
  Index: path_refs.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/xmls/path_refs.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- path_refs.xml	23 Jul 2002 01:33:12 -0000	1.2
  +++ path_refs.xml	16 Aug 2002 20:43:13 -0000	1.3
  @@ -10,10 +10,11 @@
           <include name="*.jar"/>
       </fileset>
       <pathelement path="${java.class.path}"/>
  -    <pathelement location="${test.dir}/foreachTask/bsf.jar" />
  -    <pathelement location="${test.dir}/foreachTask/js.jar" />
       <pathelement location="${build.dest}" />
  +<!--
       <pathelement location="${build.dir}/work" />
  -    <pathelement location="${ant.home}/lib" />
  +-->
  +    <pathelement location="${test.dir}/foreachTask/bsf.jar" />
  +    <pathelement location="${test.dir}/foreachTask/js.jar" />
     </path>
   
  
  
  
  1.13      +7 -0      xml-axis/java/xmls/targets.xml
  
  Index: targets.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/xmls/targets.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- targets.xml	16 Aug 2002 15:19:57 -0000	1.12
  +++ targets.xml	16 Aug 2002 20:43:13 -0000	1.13
  @@ -307,6 +307,13 @@
     <!-- Prepares the JUnit functional test -->
     <!-- =================================================================== -->
     <target name="component-junit-functional-prepare" if="junit.present">
  +
  +    <!-- first, put the JWS where the functional test can see it -->
  +    <mkdir dir="${axis.home}/build/jws" />
  +    <copy file="${axis.home}samples/stock/StockQuoteService.jws" todir="${axis.home}/build/jws" />
  +    <copy file="${axis.home}/test/functional/AltStockQuoteService.jws" todir="${axis.home}/build/jws" />
  +    <copy file="${axis.home}/test/functional/GlobalTypeTest.jws" todir="${axis.home}/build/jws"/>
  +
             <mkdir dir="${test.functional.reportdir}" />
             <path id="deploy.xml.files">
                   <fileset dir="${build.dir}">
  
  
  

Mime
View raw message