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 build.xml buildTest.xml
Date Thu, 21 Nov 2002 18:48:48 GMT
dims        2002/11/21 10:48:48

  Modified:    java     build.xml buildTest.xml
  Log:
  Cleanup build to not exec the security functional tests if security jars are not present.
  
  Revision  Changes    Path
  1.213     +2 -3      xml-axis/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/build.xml,v
  retrieving revision 1.212
  retrieving revision 1.213
  diff -u -r1.212 -r1.213
  --- build.xml	19 Nov 2002 19:29:37 -0000	1.212
  +++ build.xml	21 Nov 2002 18:48:48 -0000	1.213
  @@ -278,11 +278,10 @@
       <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}" dir="${axis.home}"
antfile="buildTest.xml" target="functional-tests"/>
     </target>
   
  -  <target name="functional-tests-secure-only" depends="buildFunctional" description="secure
functional tests">
  -    <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}" dir="${axis.home}"
antfile="buildTest.xml" target="functional-tests-secure-only">
  +  <target name="functional-tests-secure" depends="buildFunctional" description="secure
functional tests">
  +    <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}" dir="${axis.home}"
antfile="buildTest.xml" target="functional-tests-secure">
         <property name="junit.present" value="${junit.present}"/>
       </ant>
  -
     </target>
   
     <!-- All tests -->
  
  
  
  1.44      +3 -8      xml-axis/java/buildTest.xml
  
  Index: buildTest.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/buildTest.xml,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- buildTest.xml	17 Oct 2002 20:41:09 -0000	1.43
  +++ buildTest.xml	21 Nov 2002 18:48:48 -0000	1.44
  @@ -227,24 +227,19 @@
         httpStopTarget="stop-functional-test-http-server" />
   
       <!-- now run security test -->
  -    <runaxisfunctionaltests
  -      url="http://localhost:8088"
  -      tcpServerTarget="start-functional-test-tcp-server"
  -      httpServerTarget="start-functional-test-http-server-secure"
  -      testTarget="junit-functional-secure"
  -      httpStopTarget="stop-functional-test-http-server-secure" />
  +    <antcall target="functional-tests-secure"/>
   
     </target>
   
     <!-- =================================================================== -->
     <!-- Run secure functional tests ONLY                                    -->
     <!-- =================================================================== -->
  -  <target name="functional-tests-secure-only" if="junit.present">
  +  <target name="functional-tests-secure" if="security.present">
   
       <runaxisfunctionaltests
         url="http://localhost:8088"
         tcpServerTarget="start-functional-test-tcp-server"
  -      httpServerTarget="start-functional-test-http-server"
  +      httpServerTarget="start-functional-test-http-server-secure"
         testTarget="junit-functional-secure"
         httpStopTarget="stop-functional-test-http-server-secure" />
   
  
  
  

Mime
View raw message