svn commit: r1030066 - in /webservices/wss4j/branches/1_5_x-fixes: build.xml interop/build.xml

[co...@apache.org]

Author: coheigea
Date: Tue Nov  2 14:40:20 2010
New Revision: 1030066

URL: http://svn.apache.org/viewvc?rev=1030066&view=rev
Log:
A fix for some test failures + warnings with running tests using ant.

Modified:
    webservices/wss4j/branches/1_5_x-fixes/build.xml
    webservices/wss4j/branches/1_5_x-fixes/interop/build.xml

Modified: webservices/wss4j/branches/1_5_x-fixes/build.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/build.xml?rev=1030066&r1=1030065&r2=1030066&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/build.xml (original)
+++ webservices/wss4j/branches/1_5_x-fixes/build.xml Tue Nov  2 14:40:20 2010
@@ -352,7 +352,7 @@ org.apache.ws.axis.security.util
 
     <target name="compile.library" depends="prepare-src">
         <!-- Compile the java code from ${dir.src} into ${build.classes} -->
-        <javac srcdir="${dir.src}" destdir="${build.classes}" debug="on" source="1.3" target="1.3">
+        <javac srcdir="${dir.src}" destdir="${build.classes}" debug="on" source="1.3" target="1.3" includeAntRuntime="false">
             <classpath refid="classpath.library"/>
             <exclude name="**/Merlin.java" unless="merlin.ok"/>
             <exclude name="**/sandbox/**/*.java" if="jdk13.present" />
@@ -370,14 +370,14 @@ org.apache.ws.axis.security.util
         depends="compile.interops"
         if="junit.present">
 
-        <javac srcdir="${dir.test}" destdir="${build.classes}" debug="on" source="1.3" target="1.3">
+        <javac srcdir="${dir.test}" destdir="${build.classes}" debug="on" source="1.3" target="1.3" includeAntRuntime="false">
             <classpath refid="classpath.test"/>
 <!--            <exclude name="**/secconv/**/*.java"/> -->
         </javac>
 
         <mkdir dir="${build.work}"/>
 
-        <javac srcdir="${build.work}" destdir="${build.classes}" debug="on" source="1.3" target="1.3">
+        <javac srcdir="${build.work}" destdir="${build.classes}" debug="on" source="1.3" target="1.3" includeAntRuntime="false">
             <classpath refid="classpath.test"/>
         </javac>
 
@@ -396,7 +396,7 @@ org.apache.ws.axis.security.util
         <javac srcdir="${dir.samples}"
             debug="on"
             source="1.4"
-            destdir="${build.classes}" target="1.4">
+            destdir="${build.classes}" target="1.4" includeAntRuntime="false">
             <classpath refid="classpath.library"/>
         </javac>
         <copy todir="${build.classes}">
@@ -423,7 +423,7 @@ org.apache.ws.axis.security.util
             httpStopTarget="stop-functional-test-http-server"/>
     </target>
 
-    <target name="start-functional-test-http-server" if="junit.present">
+    <target name="start-functional-test-http-server" depends="init" if="junit.present">
         <echo message="Starting http server."/>
         <java classname="org.apache.axis.transport.http.SimpleAxisServer" 
           fork="yes" dir="${build.dir}">
@@ -432,7 +432,7 @@ org.apache.ws.axis.security.util
         </java>
     </target>
 
-    <target name="stop-functional-test-http-server" if="junit.present">
+    <target name="stop-functional-test-http-server" depends="init" if="junit.present">
         <echo message="Stopping http server."/>
         <java classname="org.apache.axis.client.AdminClient" fork="yes">
             <classpath refid="classpath.library"/>
@@ -647,7 +647,7 @@ org.apache.ws.axis.security.util
         <antcall target="undeployWSDD" />
     </target>
     
-    <target name="deployWSDD">
+    <target name="deployWSDD" depends="init">
       <path id="deploy_xml_files">
       <fileset dir="${build.work}">
         <include name="**/deploy.wsdd"/>

Modified: webservices/wss4j/branches/1_5_x-fixes/interop/build.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/interop/build.xml?rev=1030066&r1=1030065&r2=1030066&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/interop/build.xml (original)
+++ webservices/wss4j/branches/1_5_x-fixes/interop/build.xml Tue Nov  2 14:40:20 2010
@@ -85,7 +85,7 @@
         <javac srcdir="${dir.work}" 
                 destdir="${dir.classes}"
                 source="1.4"
-               debug="true">
+               debug="true" includeAntRuntime="false">
           <classpath refid="classpath.libraries" />
           <include name="${server}/*.java" />
           <include name="${client}/*.java" />
@@ -99,4 +99,5 @@
         <delete dir="${dir.work}/${client}"/>
         <delete dir="${dir.classes}/${client}"/>
     </target>
-</project>
\ No newline at end of file
+</project>
+