axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject cvs commit: xml-axis/java/test build_ant.xml
Date Fri, 07 Sep 2001 15:04:30 GMT
rubys       01/09/07 08:04:30

  Modified:    java     build.xml
               java/test build_ant.xml
  Log:
  Allow functional tests to be run without requiring log4j to be in the
  classpath.  Also includes a number of cosmetic improvements.
  Submitted by:	Berin Loritsch <bloritsch@apache.org>
  
  Revision  Changes    Path
  1.41      +15 -11    xml-axis/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/build.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- build.xml	2001/09/07 14:30:47	1.40
  +++ build.xml	2001/09/07 15:04:30	1.41
  @@ -63,22 +63,22 @@
     <property name="samples.dir" value="./samples"/>
   
     <property name="wsdl4j.jar" value="../../wsdl4j/build/lib/wsdl4j.jar"/>
  -  <property name="log4j-core.jar" value="./lib/log4j-core.jar"/>
  +  <property name="log4j-core.jar" value="lib/log4j-core.jar"/>
   
     <property name="packages" value="org.*"/>
   
     <property name="build.file" value="build.xml"/>
   
  -  <property name="build.dir" value="./build"/>
  -  <property name="build.dest" value="./build/classes"/>
  -  <property name="build.lib" value="./build/lib"/>
  -  <property name="build.samples" value="./build/classes/samples"/>
  -  <property name="build.javadocs" value="./build/javadocs"/>
  -  <property name="build.webapp" value="./build/webapps/axis"/>
  +  <property name="build.dir" value="build"/>
  +  <property name="build.dest" value="build/classes"/>
  +  <property name="build.lib" value="build/lib"/>
  +  <property name="build.samples" value="build/classes/samples"/>
  +  <property name="build.javadocs" value="build/javadocs"/>
  +  <property name="build.webapp" value="build/webapps/axis"/>
   
  -  <property name="webapp" value="./webapps/axis"/>
  +  <property name="webapp" value="webapps/axis"/>
   
  -  <property name="dist.dir" value="./axis-1_0"/>
  +  <property name="dist.dir" value="axis-1_0"/>
   
     <property name="test.functional.usefile" value="true"/>
   
  @@ -91,7 +91,7 @@
       <pathelement location="${junit.jar}"/>
       <pathelement location="${wsdl4j.jar}"/>
       <pathelement location="${log4j-core.jar}"/>
  -    <fileset dir="./lib">
  +    <fileset dir="lib">
        <include name="*.jar"/>
       </fileset>
       <pathelement path="${java.class.path}"/>
  @@ -177,7 +177,11 @@
     <!-- =================================================================== -->
     <target name="samples" depends="compile">
       <javac srcdir="." destdir="${build.dest}"
  -           classpath="${build.lib}/${name}.jar" debug="${debug}">
  +           debug="${debug}">
  +      <classpath>
  +        <pathelement location="${build.lib}/${name}.jar"/>
  +        <path refid="classpath"/>
  +      </classpath>
         <include name="samples/**/*.java" />
         <exclude name="samples/**/*SMTP*.java" unless="smtp.present" />
         <exclude name="**/old/**/*.java" />
  
  
  
  1.2       +2 -1      xml-axis/java/test/build_ant.xml
  
  Index: build_ant.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/build_ant.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build_ant.xml	2001/05/31 09:25:13	1.1
  +++ build_ant.xml	2001/09/07 15:04:30	1.2
  @@ -27,6 +27,7 @@
       <pathelement location="${build.dir}" />
       <pathelement location="${build.dest}" />
       <pathelement path="${java.class.path}" />
  +    <pathelement location="${log4j-core.jar}"/>
     </path>
   
     <!--
  @@ -50,7 +51,7 @@
       <javac srcdir="${basedir}"
         destdir="${ant.dir}">
         <include name="test/functional/ant/*.java" />
  -      <classpath refid="test-classpath" />
  +      <classpath refid="test-classpath"/>
       </javac>
     </target>
   
  
  
  

Mime
View raw message