Return-Path: 
 <axis-dev-return-2567-apmail-xml-axis-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-axis-dev-archive@xml.apache.org
Received: (qmail 9007 invoked by uid 500); 7 Sep 2001 14:45:35 -0000
Mailing-List: contact axis-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: axis-dev@xml.apache.org
list-help: <mailto:axis-dev-help@xml.apache.org>
list-unsubscribe: <mailto:axis-dev-unsubscribe@xml.apache.org>
list-post: <mailto:axis-dev@xml.apache.org>
Delivered-To: mailing list axis-dev@xml.apache.org
Received: (qmail 8973 invoked from network); 7 Sep 2001 14:45:34 -0000
Message-ID: <3B98DD9C.9886172D@apache.org>
Date: Fri, 07 Sep 2001 10:45:48 -0400
From: Berin Loritsch <bloritsch@apache.org>
X-Mailer: Mozilla 4.75 [en] (Windows NT 5.0; U)
X-Accept-Language: en
MIME-Version: 1.0
To: Axis Development <axis-dev@xml.apache.org>
Subject: Another patch
Content-Type: multipart/mixed;
 boundary="------------FF98F6E0F6E0611589469196"
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

This is a multi-part message in MIME format.
--------------FF98F6E0F6E0611589469196
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I have the functional tests running now.
Thanks for applying the previous patch.

This patch goes against current CVS (i.e.
against the patch I previously sent).
--------------FF98F6E0F6E0611589469196
Content-Type: text/plain; charset=us-ascii;
 name="cvs.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cvs.diff"

Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/build.xml,v
retrieving revision 1.39
diff -u -b -r1.39 build.xml
--- build.xml	2001/09/06 03:12:14	1.39
+++ build.xml	2001/09/07 14:38:30
@@ -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" />
@@ -194,6 +198,7 @@
     <pathelement location="${build.dir}" />
     <pathelement location="${build.dest}" />
     <pathelement path="${java.class.path}" />
+    <path refid="classpath"/>
   </path>
 
   <target name="buildTest" if="junit.present" depends="compile">
Index: test/build_ant.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/build_ant.xml,v
retrieving revision 1.1
diff -u -b -r1.1 build_ant.xml
--- test/build_ant.xml	2001/05/31 09:25:13	1.1
+++ test/build_ant.xml	2001/09/07 14:39:41
@@ -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>
 

--------------FF98F6E0F6E0611589469196--