Speed up a clean build slightly and provide Eclipse with a permanent location for...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@907983 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.classpath b/.classpath
index 382c13f..77fee74 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry excluding="**/.svn/**|org/apache/naming/factory/webservices/" kind="src" path="java"/>
+       <classpathentry kind="src" path="java"/>
        <classpathentry kind="src" path="test"/>
        <classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -8,8 +8,8 @@
        <classpathentry kind="var" path="TOMCAT_LIBS_BASE/json-20080701/json.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
        <classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
-       <classpathentry kind="lib" path="output/extras/webservices/jaxrpc.jar"/>
-       <classpathentry kind="lib" path="output/extras/webservices/wsdl4j.jar"/>
        <classpathentry kind="var" path="TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/tomcat-dbcp.jar" sourcepath="/TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/src/java"/>
+       <classpathentry kind="var" path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
+       <classpathentry kind="var" path="TOMCAT_LIBS_BASE/wsdl4j-1.6.1/wsdl4j-1.6.1.jar"/>
        <classpathentry kind="output" path=".settings/output"/>
 </classpath>

diff --git a/build.properties.default b/build.properties.default
index 0de162a..1a34fc1 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -54,9 +54,17 @@ base-sf.loc=http://downloads.sourceforge.net
 commons-logging-version=1.1.1
 commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
 
-# ----- Webservices -----
-jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
-wsdl4j-src.loc=http://repo1.maven.org/maven2/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar
+# ----- Webservices - JAX RPC -----
+jaxrpc-lib.version=1.1-rc4
+jaxrpc-lib.home=${base.path}/jaxrpc-${jaxrpc-lib.version}
+jaxrpc-lib.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/${jaxrpc-lib.version}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
+jaxrpc-lib.jar=${jaxrpc-lib.home}/geronimo-spec-jaxrpc-${jaxrpc-lib.version}.jar
+
+# ----- Webservices - WSDL4J -----
+wsdl4j-lib.version=1.6.1
+wsdl4j-lib.home=${base.path}/wsdl4j-${wsdl4j-lib.version}
+wsdl4j-lib.loc=http://repo1.maven.org/maven2/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
+wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
 
 # ----- Eclipse JDT, version 3.2 or later -----
 jdt.home=${base.path}/eclipse/plugins

diff --git a/build.xml b/build.xml
index 9fc312e..a8e6737 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -969,17 +969,22 @@
           description="Build web services extras package">
 
     <antcall target="downloadfile">
-      <param name="sourcefile" value="${jaxrpc-src.loc}"/>
-      <param name="destfile" value="${tomcat.extras}/webservices/jaxrpc.jar"/>
-      <param name="destdir" value="${tomcat.extras}/webservices/"/>
+      <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+      <param name="destfile" value="${jaxrpc-lib.jar}"/>
+      <param name="destdir" value="${jaxrpc-lib.home}"/>
     </antcall>
 
     <antcall target="downloadfile">
-      <param name="sourcefile" value="${wsdl4j-src.loc}"/>
-      <param name="destfile" value="${tomcat.extras}/webservices/wsdl4j.jar"/>
-      <param name="destdir" value="${tomcat.extras}/webservices/"/>
+      <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
+      <param name="destfile" value="${wsdl4j-lib.jar}"/>
+      <param name="destdir" value="${wsdl4j-lib.home}"/>
     </antcall>
 
+    <copy file="${jaxrpc-lib.jar}"
+          tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
+    <copy file="${wsdl4j-lib.jar}"
+          tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
+
     <!-- Compile web services classes components -->
     <javac srcdir="java" destdir="${tomcat.classes}"
            debug="${compile.debug}"