You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by di...@apache.org on 2004/08/31 08:21:53 UTC

cvs commit: ws-fx/wss4j build.xml maven.xml project.xml

dims        2004/08/30 23:21:53

  Modified:    wss4j    build.xml maven.xml project.xml
  Log:
  Fix "maven dist"
  
  Revision  Changes    Path
  1.19      +1 -7      ws-fx/wss4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/build.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.xml	30 Aug 2004 09:22:57 -0000	1.18
  +++ build.xml	31 Aug 2004 06:21:52 -0000	1.19
  @@ -347,13 +347,7 @@
       <target name="compile.tests"
           depends="compile.interops"
           if="junit.present">
  -        <!--
  -        <ant dir="${dir.test}/secconv"
  -            antfile="build.xml"
  -            target="compile"
  -            inheritAll="false">
  -        </ant>
  -        -->
  +
           <javac srcdir="${dir.test}" destdir="${build.classes}" debug="on">
               <classpath refid="classpath.test"/>
               <exclude name="**/secconv/*.java"/>
  
  
  
  1.3       +19 -1     ws-fx/wss4j/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	8 Apr 2004 14:56:06 -0000	1.2
  +++ maven.xml	31 Aug 2004 06:21:52 -0000	1.3
  @@ -31,9 +31,12 @@
   
           <property name="dir.wss4j" value="."/>
           <property name="dir.interop" value="${dir.wss4j}/interop"/>
  +        <property name="dir.interop2" value="${dir.wss4j}/test"/>
           <property name="dir.work" value="${dir.wss4j}/target/work"/>
           <property name="server" value="org/apache/ws/axis/oasis/ping"/>
           <property name="client" value="org/apache/ws/axis/oasis"/>
  +        <property name="server2" value="secconv/scenarios/ping/impl"/>
  +        <property name="client2" value="secconv/scenarios/ping"/>
   
           <mkdir dir="${dir.work}"/>
   
  @@ -47,6 +50,21 @@
                   namespace="http://xmlsoap.org/Ping"
                   package="org.apache.ws.axis.oasis.ping"/>
           </axis-wsdl2java>
  +
  +        <axis-wsdl2java
  +            output="${dir.work}"
  +            serverSide="yes"
  +            testcase="no"
  +            verbose="no"
  +            url="${dir.interop2}/secconv/scenarios/ping.wsdl">
  +            <mapping
  +                namespace="http://xmlsoap.org/Ping"
  +                package="secconv.scenarios.ping.impl"/>
  +        </axis-wsdl2java>
  +
  +  	    <delete file="${dir.work}/${server2}/PingBindingImpl.java" />
  +  	    <delete file="${dir.work}/${client2}/PWCallback.java" />
  +  	    <delete file="${dir.work}/${client2}/WSConvScenario1.java" />
   
           <copy todir="target/classes" overwrite="yes">
             <fileset dir="${dir.interop}/${server}">
  
  
  
  1.4       +3 -1      ws-fx/wss4j/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	8 Apr 2004 14:56:06 -0000	1.3
  +++ project.xml	31 Aug 2004 06:21:53 -0000	1.4
  @@ -96,6 +96,8 @@
           <include>**/*PackageTests*.java</include>
         </includes>
         <excludes>
  +          <exclude>**/wssec/PackageTests.java</exclude>
  +          <exclude>**/interop/PackageTests.java</exclude>
             <exclude>**/TestScenario7.java</exclude>
         </excludes>
       </unitTest>
  @@ -179,7 +181,7 @@
           <report>maven-pmd-plugin</report>
           <report>maven-jdepend-plugin</report>
           <report>maven-changelog-plugin</report>
  -        <report>maven-statcvs-plugin</report>
  +        <!-- <report>maven-statcvs-plugin</report> -->
           <report>maven-file-activity-plugin</report>
           <report>maven-developer-activity-plugin</report>
           <report>maven-jxr-plugin</report>