You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2001/09/07 17:04:30 UTC

cvs commit: xml-axis/java/test build_ant.xml

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 <bl...@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>
   
  
  
  

Re: cvs commit: xml-axis/java/test build_ant.xml

Posted by Berin Loritsch <bl...@apache.org>.
Berin Loritsch wrote:
> 
> rubys@apache.org wrote:
> >
> > 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 <bl...@apache.org>
> 
> Thanks.  I am of the belief that a build file should be as self
> sufficient as possible.  A user shouldn't have to mess with their
> environment just to get things to compile.  I don't mind having
> inter-project dependancies as long as they are well documented.

Speaking of which, is there a reason the Servlet jar is not included in
CVS?

It looks like I missed a couple things, so I am sending in one more
diff (last one for build.xml for a little while) and the servlet jar
that is included in the xml-cocoon lib directory.  It helps Axis to
be more self sufficient.  There aren't any licensing issues with
the Servlet.jar file, as there might be with the wsdl4j.jar file.

The build file should be self sufficient after this change.

Re: cvs commit: xml-axis/java/test build_ant.xml

Posted by Berin Loritsch <bl...@apache.org>.
rubys@apache.org wrote:
> 
> 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 <bl...@apache.org>

Thanks.  I am of the belief that a build file should be as self
sufficient as possible.  A user shouldn't have to mess with their
environment just to get things to compile.  I don't mind having
inter-project dependancies as long as they are well documented.