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/test/wsdl/wrapped build.xml
Date Thu, 05 Sep 2002 18:27:38 GMT
seibert     2002/09/05 11:27:38

  Modified:    java/test/wsdl/addrNoImplSEI build.xml
               java/test/wsdl/arrays build.xml
               java/test/wsdl/attachments build.xml
               java/test/wsdl/clash build.xml
               java/test/wsdl/datatypes build.xml
               java/test/wsdl/echo build.xml
               java/test/wsdl/extensibility build.xml
               java/test/wsdl/faults build.xml
               java/test/wsdl/filegen build.xml
               java/test/wsdl/getPort build.xml
               java/test/wsdl/include build.xml
               java/test/wsdl/inheritance build.xml
               java/test/wsdl/inout build.xml
               java/test/wsdl/interop build.xml
               java/test/wsdl/jaxrpchandler build.xml
               java/test/wsdl/literal build.xml
               java/test/wsdl/marrays build.xml
               java/test/wsdl/multibinding build.xml
               java/test/wsdl/multiref build.xml
               java/test/wsdl/multithread build.xml
               java/test/wsdl/names build.xml
               java/test/wsdl/nested build.xml
               java/test/wsdl/omit build.xml
               java/test/wsdl/opStyles build.xml
               java/test/wsdl/parameterOrder build.xml
               java/test/wsdl/polymorphism build.xml
               java/test/wsdl/qualify build.xml
               java/test/wsdl/qualify2 build.xml
               java/test/wsdl/ram build.xml
               java/test/wsdl/refattr build.xml
               java/test/wsdl/roundtrip build.xml
               java/test/wsdl/sequence build.xml
               java/test/wsdl/types build.xml
               java/test/wsdl/wrapped build.xml
  Log:
  Reworked simpler copies.  In light of Rich's discovery yesterday that the
  *TestCase.java files that were being executed as the tests were NOT the
  checked in ones, but rather the generated ones
  
  This has now been fixed
  
  Revision  Changes    Path
  1.6       +7 -4      xml-axis/java/test/wsdl/addrNoImplSEI/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/addrNoImplSEI/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	29 Aug 2002 21:17:58 -0000	1.5
  +++ build.xml	5 Sep 2002 18:27:36 -0000	1.6
  @@ -63,8 +63,7 @@
       <!-- Run WSDL2Java on the new wsdl to generate client side and other artifacts -->
       <!-- Replace the generated Impl with the original Impl that does not implement the
SEI -->
       <!--   Compile and run test. -->
  -    <delete dir="${build.dir}/classes/test/wsdl/addrNoImplSEI"/>
  -    <delete dir="${build.dir}/work/test/wsdl/addrNoImplSEI"/>
  +
       <wsdl2java url="${axis.home}/test/wsdl/addrNoImplSEI/AddressBook.wsdl"
                  output="${axis.home}/build/work"
                  deployscope="session"
  @@ -118,12 +117,16 @@
                  testcase="no">
           <mapping namespace="urn:AddrNoImplSEI" package="test.wsdl.addrNoImplSEI"/>
       </wsdl2java>
  +
       <!-- Copy over original classes -->
       <copy todir="${build.dir}/work/test/wsdl/addrNoImplSEI" overwrite="yes">
  -      <fileset dir="${test.dir}/wsdl/addrNoImplSEI">
  -        <include name="*.java"/>
  +      <fileset dir="${axis.home}/test/wsdl/addrNoImplSEI">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +        <include name="Main.java"/>
         </fileset>
       </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
           <classpath refid="classpath" />
  
  
  
  1.4       +2 -9      xml-axis/java/test/wsdl/arrays/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/arrays/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:53 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:36 -0000	1.4
  @@ -66,15 +66,8 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +7 -0      xml-axis/java/test/wsdl/attachments/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/attachments/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:53 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:36 -0000	1.4
  @@ -59,6 +59,13 @@
                  testcase="yes">
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/attachments" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/attachments">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  
  
  
  1.4       +7 -2      xml-axis/java/test/wsdl/clash/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/clash/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:53 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:36 -0000	1.4
  @@ -49,7 +49,7 @@
   </target>
   
   <target name="copy" depends="setenv,clean">
  -    <ant inheritAll="true" antfile="${axis.home}/buildTest.xml" target="filegen"/>
  +    <ant antfile="${axis.home}/test/wsdl/filegen/build.xml" target="compile"/>
   </target>
   
   <target name="compile" depends="copy">
  @@ -61,7 +61,12 @@
                  serverSide="yes">
       </wsdl2java>
   
  -    <copy file="${test.dir}/wsdl/clash/VerifyFilesTestCase.java" tofile="${build.dir}/work/test/wsdl/clash/VerifyFilesTestCase.java"
/>
  +    <copy todir="${build.dir}/work/test/wsdl/clash" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/clash">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
   
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
  
  
  
  1.4       +2 -9      xml-axis/java/test/wsdl/datatypes/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/datatypes/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:53 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:36 -0000	1.4
  @@ -64,15 +64,8 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +7 -5      xml-axis/java/test/wsdl/echo/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/echo/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:36 -0000	1.4
  @@ -62,14 +62,16 @@
           <mapping namespace="http://types.echo.services" package="test.wsdl.echo"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/echo" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/echo">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/echo/*.java" />
  -    </javac>
  -
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
         <include name="test/wsdl/echo/*.java" />
       </javac>
   </target>
  
  
  
  1.4       +7 -0      xml-axis/java/test/wsdl/extensibility/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/extensibility/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -70,6 +70,13 @@
           <mapping namespace="urn:ExtensibilityQuery" package="test.wsdl.extensibility"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/extensibility" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/extensibility">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  
  
  
  1.4       +7 -5      xml-axis/java/test/wsdl/faults/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/faults/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -63,14 +63,16 @@
           <mapping namespace="http://test.com/wsdl/faults" package="test.wsdl.faults"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/faults" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/faults">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/faults/*.java" />
  -    </javac>
  -
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
         <include name="test/wsdl/faults/*.java" />
       </javac>
   </target>
  
  
  
  1.4       +6 -12     xml-axis/java/test/wsdl/filegen/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/filegen/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -43,9 +43,10 @@
           &targets;
   
   <target name="clean">
  -    <echo message="Removing ${build.dir}/classes/${componentName} and ${build.dir}/work/${componentName}"
/>
  -    <delete dir="${build.dir}/classes/${componentName}"/>
  -    <delete dir="${build.dir}/work/${componentName}"/>
  +    <echo message="Removing ${build.dir}/**/test/wsdl/filegen" />
  +    <echo message="componentName is ${componentName}"/>
  +    <delete dir="${build.dir}/classes/test/wsdl/filegen"/>
  +    <delete dir="${build.dir}/work/test/wsdl/filegen"/>
   </target>
   
   <target name="copy" depends="setenv,clean"/>
  @@ -73,15 +74,8 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +2 -9      xml-axis/java/test/wsdl/getPort/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/getPort/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -62,15 +62,8 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +6 -5      xml-axis/java/test/wsdl/include/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/include/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -61,11 +61,12 @@
           <mapping namespace="urn:AddressFetcher2" package="test.wsdl.include"/>
       </wsdl2java>
   
  -    <javac srcdir="${build.dir}/work" destdir="${build.dest}"
  -           debug="${debug}">
  -      <classpath refid="classpath" />
  -      <include name="test/wsdl/include/*.java" />
  -    </javac>
  +    <copy todir="${build.dir}/work/test/wsdl/include" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/include">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
   
       <javac srcdir="${axis.home}" destdir="${build.dest}"
              debug="${debug}">
  
  
  
  1.4       +2 -9      xml-axis/java/test/wsdl/inheritance/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/inheritance/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -122,15 +122,8 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +2 -15     xml-axis/java/test/wsdl/inout/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/inout/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -68,27 +68,14 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <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>
  
  
  
  1.4       +3 -13     xml-axis/java/test/wsdl/interop/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/interop/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -545,20 +545,10 @@
       </wsdl2java>
       -->
   
  -    <copy todir="${build.dir}/work/test/wsdl/interop3" overwrite="yes">
  -      <fileset dir="${test.dir}/wsdl/interop3">
  +    <copy todir="${build.dir}/work/test/wsdl/interop" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/interop">
  +        <include name="*TestCase.java"/>
           <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>
   
  
  
  
  1.2       +5 -4      xml-axis/java/test/wsdl/jaxrpchandler/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/jaxrpchandler/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	4 Sep 2002 14:55:30 -0000	1.1
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.2
  @@ -63,16 +63,17 @@
   
       <copy todir="${build.dir}/work/test/wsdl/jaxrpchandler" overwrite="yes">
         <fileset dir="${axis.home}/test/wsdl/jaxrpchandler">
  -        <include name="**/*.java"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +	<include name="*Handler.java"/>
         </fileset>
       </copy>
   
  -
  -  <javac srcdir="${build.dir}/work" destdir="${build.dest}" debug="${debug}">
  +  <javac srcdir="${build.dir}/work/test/wsdl/jaxrpchandler" destdir="${build.dest}"
debug="${debug}">
       <classpath>
           <path refid="classpath"/>
       </classpath>
  -    <include name="${componentName}/*.java"/>
  +    <include name="*.java"/>
     </javac>
   </target>
   
  
  
  
  1.5       +7 -7      xml-axis/java/test/wsdl/literal/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/literal/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	30 Aug 2002 19:33:55 -0000	1.4
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.5
  @@ -65,18 +65,18 @@
           <mapping namespace="http://www.PerfectXML.com/NETWebSvcs/BookService" package="test.wsdl.literal"/>
       </wsdl2java>
   
  -    <javac srcdir="${build.dir}/work" destdir="${build.dest}"
  -           debug="${debug}">
  -      <classpath refid="classpath" />
  -      <include name="test/wsdl/literal/*.java" />
  -    </javac>
  +    <copy todir="${build.dir}/work/test/wsdl/literal" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/literal">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
   
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  +    <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
         <include name="test/wsdl/literal/*.java" />
       </javac>
  -
   </target>
   
   <target name="run" >
  
  
  
  1.4       +7 -5      xml-axis/java/test/wsdl/marrays/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/marrays/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -72,14 +72,16 @@
           <mapping namespace="urn:MArrayTests" package="test.wsdl.marrays"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/marrays" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/marrays">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/marrays/*.java" />
  -    </javac>
  -
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
         <include name="test/wsdl/marrays/*.java" />
       </javac>
   </target>
  
  
  
  1.4       +2 -9      xml-axis/java/test/wsdl/multibinding/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/multibinding/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -62,15 +62,8 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +3 -9      xml-axis/java/test/wsdl/multiref/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/multiref/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -66,15 +66,9 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +        <include name="Main.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +6 -11     xml-axis/java/test/wsdl/multithread/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/multithread/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -57,26 +57,21 @@
   <target name="compile" depends="copy">
     <echo message="Compiling test.wsdl.multithread"/>
   
  +    <mkdir dir="${build.dir}/work/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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  -  <javac srcdir="${axis.home}" destdir="${build.dest}" debug="${debug}">
  +  <javac srcdir="${build.dir}/work" destdir="${build.dest}" debug="${debug}">
       <classpath>
           <path refid="classpath"/>
       </classpath>
  -    <include name="${componentName}/*.java"/>
  +    <include name="test/wsdl/multithread/*.java"/>
     </javac>
   </target>
   
  
  
  
  1.4       +7 -0      xml-axis/java/test/wsdl/names/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/names/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:54 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -65,6 +65,13 @@
           <mapping namespace="http://test.com/reference" package="test.filegen"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/names" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/names">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  
  
  
  1.4       +7 -5      xml-axis/java/test/wsdl/nested/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/nested/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:37 -0000	1.4
  @@ -62,14 +62,16 @@
           <mapping namespace="urn:Nested" package="test.wsdl.nested"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/nested" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/nested">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/nested/*.java" />
  -    </javac>
  -
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
         <include name="test/wsdl/nested/*.java" />
       </javac>
   </target>
  
  
  
  1.4       +2 -14     xml-axis/java/test/wsdl/omit/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/omit/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -60,26 +60,14 @@
   
       <copy todir="${build.dir}/work/test/wsdl/omit" overwrite="yes">
         <fileset dir="${axis.home}/test/wsdl/omit">
  -        <include name="**/*Impl.java"/>
  -      </fileset>
  -      <fileset dir="${axis.home}/test/wsdl/omit">
  -        <include name="**/*TestCase.java"/>
  -        <exclude name="**/EmptySATestCase.java"/>
  -        <exclude name="**/SalesRankNPrice_ServiceTestCase.java"/>
  -      </fileset>
  -      <fileset dir="${axis.home}/test/wsdl/omit">
  -        <include name="**/Main.java"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/omit/*.java" />
  -    </javac>
  -
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
         <include name="test/wsdl/omit/*.java" />
       </javac>
   </target>
  
  
  
  1.4       +2 -9      xml-axis/java/test/wsdl/opStyles/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/opStyles/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -63,15 +63,8 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +2 -9      xml-axis/java/test/wsdl/parameterOrder/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/parameterOrder/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -61,15 +61,8 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +8 -10     xml-axis/java/test/wsdl/polymorphism/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/polymorphism/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -60,20 +60,18 @@
             <mapping namespace="http://xml.apache.org/axis/PolymorphismTest"
                 package="test.wsdl.polymorphism"/>
         </wsdl2java>
  -      <copy todir="${build.dir}/work/test/wsdl/polymorphism" overwrite="yes">
  -        <fileset dir="${test.dir}/wsdl/polymorphism">
  -          <include name="C.java"/>
  -        </fileset>
  -      </copy>
  +
  +    <copy todir="${build.dir}/work/test/wsdl/polymorphism" overwrite="yes">
  +      <fileset dir="${componentName}">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +         <include name="C.java"/>
  +      </fileset>
  +    </copy>
   
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/polymorphism/*.java" />
  -    </javac>
  -
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
         <include name="test/wsdl/polymorphism/*.java" />
       </javac>
   </target>
  
  
  
  1.4       +2 -9      xml-axis/java/test/wsdl/qualify/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/qualify/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -62,15 +62,8 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +2 -9      xml-axis/java/test/wsdl/qualify2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/qualify2/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -62,15 +62,8 @@
   
       <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +7 -5      xml-axis/java/test/wsdl/ram/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/ram/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -61,14 +61,16 @@
           <mapping namespace="http://ram.uspto.gov" package="test.wsdl.ram"/>
       </wsdl2java>
   
  +    <copy todir="${build.dir}/work/test/wsdl/ram" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/ram">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +      </fileset>
  +    </copy>
  +
       <javac srcdir="${build.dir}/work" destdir="${build.dest}"
              debug="${debug}">
         <classpath refid="classpath" />
  -      <include name="test/wsdl/ram/*.java" />
  -    </javac>
  -
  -    <javac srcdir="${axis.home}" destdir="${build.dest}"
  -           debug="${debug}">
         <include name="test/wsdl/ram/*.java" />
       </javac>
   </target>
  
  
  
  1.4       +3 -9      xml-axis/java/test/wsdl/refattr/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/refattr/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -66,17 +66,11 @@
           <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +3 -3      xml-axis/java/test/wsdl/roundtrip/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/roundtrip/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	4 Sep 2002 19:15:03 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -135,9 +135,9 @@
       </wsdl2java>
   
       <copy todir="${build.dir}/work/test/wsdl/roundtrip" overwrite="yes">
  -      <fileset dir="${test.dir}/wsdl/roundtrip">
  -        <include name="RoundtripTestServiceTestCase.java"/>
  -        <include name="RoundtripTestSoapBindingImpl.java"/>
  +      <fileset dir="${axis.home}/test/wsdl/roundtrip">
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +4 -16     xml-axis/java/test/wsdl/sequence/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/sequence/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -63,25 +63,13 @@
                  testcase="no">
           <mapping namespace="urn:SequenceTest2" package="test.wsdl.sequence"/>
       </wsdl2java>
  -    <!-- Copy modified files to work directory -->
  -    <copy todir="${build.dir}/work/test/wsdl/sequence" overwrite="yes">
  -      <fileset dir="${test.dir}/wsdl/sequence">
  -        <include name="SequenceService.java"/>
  -        <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
  +        <include name="SequenceService.java"/>
  +        <include name="deploy.wsdd"/>
         </fileset>
       </copy>
   
  
  
  
  1.4       +3 -10     xml-axis/java/test/wsdl/types/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/types/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	26 Aug 2002 20:56:55 -0000	1.3
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.4
  @@ -61,17 +61,10 @@
                  testcase="yes">
       </wsdl2java>
   
  -    <copy todir="${build.dir}/work/test/wsdl/types" overwrite="yes">
  +   <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"/>
  +        <include name="*TestCase.java"/>
  +        <include name="*Impl.java"/>
         </fileset>
       </copy>
   
  
  
  
  1.5       +2 -2      xml-axis/java/test/wsdl/wrapped/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/wrapped/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	4 Sep 2002 22:09:53 -0000	1.4
  +++ build.xml	5 Sep 2002 18:27:38 -0000	1.5
  @@ -62,8 +62,8 @@
           <mapping namespace="urn:CityBBB" package="test.wsdl.wrapped"/>
       </wsdl2java>
   
  -    <copy todir="${build.dir}/work/${componentName}" overwrite="yes">
  -      <fileset dir="${axis.home}/${componentName}">
  +    <copy todir="${build.dir}/work/test/wsdl/wrapped" overwrite="yes">
  +      <fileset dir="${axis.home}/test/wsdl/wrapped">
           <include name="*TestCase.java"/>
           <include name="*Impl.java"/>
         </fileset>
  
  
  

Mime
View raw message