Author: markt
Date: Tue Feb 9 09:25:35 2010
New Revision: 907983
URL: http://svn.apache.org/viewvc?rev=907983&view=rev
Log:
Speed up a clean build slightly and provide Eclipse with a permanent location
for the web services libraries
Modified:
tomcat/trunk/.classpath
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
Modified: tomcat/trunk/.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/.classpath?rev=907983&r1=907982&r2=907983&view=diff
==============================================================================
--- tomcat/trunk/.classpath (original)
+++ tomcat/trunk/.classpath Tue Feb 9 09:25:35 2010
@@ -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>
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=907983&r1=907982&r2=907983&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Feb 9 09:25:35 2010
@@ -54,9 +54,17 @@
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
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=907983&r1=907982&r2=907983&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Feb 9 09:25:35 2010
@@ -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}"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
