axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-axis/java/test build_functional_tests.xml
Date Fri, 21 Jun 2002 16:35:16 GMT
dims        2002/06/21 09:35:16

  Modified:    java     build.xml
               java/samples/security ClientSigningHandler.java
                        LogHandler.java
               java/test build_functional_tests.xml
  Log:
  - Fix for "all-tests" failure when xml-security is present.
  - Ability to run just the security tests.
  
  Revision  Changes    Path
  1.152     +17 -10    xml-axis/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/build.xml,v
  retrieving revision 1.151
  retrieving revision 1.152
  diff -u -r1.151 -r1.152
  --- build.xml	20 Jun 2002 17:48:22 -0000	1.151
  +++ build.xml	21 Jun 2002 16:35:15 -0000	1.152
  @@ -59,7 +59,7 @@
          (and without typing -D each time it compiles it) -->
     <property file="build.properties"/>
     <property file="${user.home}/build.properties"/>
  -  
  +
     <property name="axis.version" value="beta2+"/>
   
     <property name="name" value="axis"/>
  @@ -70,7 +70,7 @@
     <property name="saaj" value="saaj"/>
   
     <!-- debug flag for ant javac, values are "on" and "off" -->
  -  <property name="debug" value="on"/>  
  +  <property name="debug" value="on"/>
   
     <property name="deprecation" value="true"/>
   
  @@ -106,7 +106,7 @@
     <property name="dist.dir" location="axis-1_0"/>
   
     <property name="test.functional.usefile" value="true"/>
  -  
  +
     <property name="tools.jar" location="${java.home}/../lib/tools.jar"/>
     <property name="axis.lib.dir" location="lib"/>
   
  @@ -318,7 +318,7 @@
                token="#today#" value="${build.time}"/>
       <replace file="${build.dest}/org/apache/axis/utils/axisNLS.properties"
                token="#axisVersion#" value="${axis.version}"/>
  -  
  +
       <jar jarfile="${build.lib}/${name}.jar" basedir="${build.dest}" >
         <include name="org/**" />
         <include name="log4j.properties"/>
  @@ -348,10 +348,10 @@
     <!-- =================================================================== -->
     <!-- Compiles the samples                                                -->
     <!-- =================================================================== -->
  -  <target name="samples" depends="compile" 
  +  <target name="samples" depends="compile"
       description="build the samples">
   
  -  <!-- The interop echo sample depends on the wsdl2java task -->    
  +  <!-- The interop echo sample depends on the wsdl2java task -->
       <javac srcdir="." destdir="${build.dest}"
              debug="${debug}">
         <classpath>
  @@ -399,7 +399,7 @@
                  testcase="no">
           <mapping namespace="urn:AddressFetcher2" package="samples.addr"/>
       </wsdl2java>
  -    
  +
       <!-- Compile the echo sample generated java files -->
       <javac srcdir="${build.dir}/work" destdir="${build.dest}" debug="${debug}">
         <classpath refid="test-classpath" />
  @@ -501,6 +501,13 @@
   
     </target>
   
  +  <target name="functional-tests-secure-only" depends="setenv"
  +    description="functional secure tests without a rebuild;"
  +    >
  +    <ant antfile="test/build_functional_tests.xml" target="functional-tests-secure-only"/>
  +  </target>
  +
  +
     <!-- =================================================================== -->
     <!-- Functional tests, no server (for testing under debugger)            -->
     <!-- =================================================================== -->
  @@ -596,8 +603,8 @@
         <fileset dir="${build.javadocs}"/>
       </copy>
     </target>
  -  
  -  <target name="dist" depends="compile, javadocsdist, samples, junit" 
  +
  +  <target name="dist" depends="compile, javadocsdist, samples, junit"
       description="create the full binary distribution">
       <mkdir dir="${dist.dir}"/>
       <mkdir dir="${dist.dir}/lib"/>
  @@ -640,7 +647,7 @@
     <!-- =================================================================== -->
     <!-- Creates the source distribution                                     -->
     <!-- =================================================================== -->
  -  <target name="srcdist" depends="javadocs" 
  +  <target name="srcdist" depends="javadocs"
         description="Create the source distribution">
       <copy todir="${dist.dir}">
         <fileset dir=".">
  
  
  
  1.6       +4 -0      xml-axis/java/samples/security/ClientSigningHandler.java
  
  Index: ClientSigningHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/security/ClientSigningHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ClientSigningHandler.java	20 Feb 2002 18:59:20 -0000	1.5
  +++ ClientSigningHandler.java	21 Jun 2002 16:35:15 -0000	1.6
  @@ -68,6 +68,10 @@
       static Log log =
               LogFactory.getLog(ClientSigningHandler.class.getName());
   
  +    static {
  +        org.apache.xml.security.Init.init();
  +    }
  +
       public void invoke(MessageContext msgContext) throws AxisFault {
           /** Sign the SOAPEnvelope
            */
  
  
  
  1.8       +4 -0      xml-axis/java/samples/security/LogHandler.java
  
  Index: LogHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/security/LogHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LogHandler.java	29 May 2002 14:30:00 -0000	1.7
  +++ LogHandler.java	21 Jun 2002 16:35:15 -0000	1.8
  @@ -76,6 +76,10 @@
       static Log log =
               LogFactory.getLog(LogHandler.class.getName());
   
  +    static {
  +        org.apache.xml.security.Init.init();
  +    }
  +
       public void invoke(MessageContext msgContext) throws AxisFault {
           try {
               System.out.println("Starting Server verification");
  
  
  
  1.48      +13 -0     xml-axis/java/test/build_functional_tests.xml
  
  Index: build_functional_tests.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/build_functional_tests.xml,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- build_functional_tests.xml	12 Jun 2002 18:41:12 -0000	1.47
  +++ build_functional_tests.xml	21 Jun 2002 16:35:16 -0000	1.48
  @@ -315,6 +315,19 @@
     </target>
   
     <!-- =================================================================== -->
  +  <!-- Run secure functional tests ONLY                                    -->
  +  <!-- =================================================================== -->
  +  <target name="functional-tests-secure-only" if="junit.present">
  +
  +    <runaxisfunctionaltests
  +      url="http://localhost:8088"
  +      startTarget1="start-functional-test-tcp-server"
  +      startTarget2="start-functional-test-http-server"
  +      testTarget="junit-functional-secure"
  +      stopTarget="stop-functional-test-http-server-secure" />
  +  </target>
  +
  +  <!-- =================================================================== -->
     <!-- Runs the JUnit functional tests ONLY -->
     <!-- =================================================================== -->
     <target name="junit-functional-tests-only" if="junit.present" depends="junit-functional-prepare">
  
  
  

Mime
View raw message