Author: markt
Date: Mon Sep 27 12:55:18 2010
New Revision: 1001717
URL: http://svn.apache.org/viewvc?rev=1001717&view=rev
Log:
Enable the off-line building of the extras package
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1001717&r1=1001716&r2=1001717&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 27 12:55:18 2010
@@ -138,13 +138,6 @@ PATCHES PROPOSED TO BACKPORT:
but from debugging it looks that it is called by Tomcat code only
(JspServlet).
-* Allow off-line building of the extras packages. Also saves downloading deps
- every build
- http://people.apache.org/~markt/patches/2010-08-23-offline-extras-tc6.patch
- +1: markt, rjung, kkolinko
- -1:
- rjung: s/vesion/version/g
-
* When a cluster node disappears when using the backup manager, handle the
failed ping message rather than propagating the exception (which just logs
the
stack trace but doesn't do anything to deal with the failure)
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1001717&r1=1001716&r2=1001717&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Sep 27 12:55:18 2010
@@ -46,14 +46,54 @@ compile.debug=true
base-commons.loc=http://archive.apache.org/dist/commons
base-tomcat.loc=http://archive.apache.org/dist/tomcat
base-sf.loc=http://downloads.sourceforge.net
+base-maven1.loc=http://repo1.maven.org/maven
# ----- Commons Logging, version 1.1 or later -----
-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
+# If this version is updated, check the versions required for the deps
+# - avalon-framework
+# - log4j
+# - logkit
+# - servletapi
+commons-logging.version=1.1.1
+commons-logging.home=${base.path}/commons-logging-${commons-logging.version}
+commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
+commons-logging-src.tar.gz=${commons-logging.home}/commons-logging-${commons-logging.version}-src.tar.gz
+
+# ----- Avalon Framework (required by commons logging) -----
+avalon-framework.version=4.1.3
+avalon-framework.home=${base.path}/avalon-framework-${avalon-framework.version}
+avalon-framework.loc=${base-maven1.loc}/avalon-framework/jars/avalon-framework-${avalon-framework.version}.jar
+avalon-framework.jar=${avalon-framework.home}/avalon-framework-${avalon-framework.version}.jar
+
+# ----- log4j (required by commons logging) -----
+log4j.version=1.2.12
+log4j.home=${base.path}/log4j-${log4j.version}
+log4j.loc=${base-maven1.loc}/log4j/jars/log4j-${log4j.version}.jar
+log4j.jar=${log4j.home}/log4j-${log4j.version}.jar
+
+# ----- logkit (required by commons logging) -----
+logkit.version=1.0.1
+logkit.home=${base.path}/logkit-${logkit.version}
+logkit.loc=${base-maven1.loc}/logkit/jars/logkit-${logkit.version}.jar
+logkit.jar=${logkit.home}/logkit-${logkit.version}.jar
+
+# ----- servletapi (required by commons logging) -----
+servletapi.version=2.3
+servletapi.home=${base.path}/servletapi-${servletapi.version}
+servletapi.loc=${base-maven1.loc}/servletapi/jars/servletapi-${servletapi.version}.jar
+servletapi.jar=${servletapi.home}/servletapi-${servletapi.version}.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 -----
# When updating this, also need to update:
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=1001717&r1=1001716&r2=1001717&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Mon Sep 27 12:55:18 2010
@@ -100,57 +100,93 @@
<target name="prepare">
<mkdir dir="${tomcat.extras}"/>
+ <mkdir dir="${tomcat.extras}/logging"/>
+ <mkdir dir="${tomcat.extras}/webservices"/>
</target>
<target name="clean">
<delete dir="${tomcat.extras}"/>
</target>
- <target name="commons-logging">
+ <target name="commons-logging-prepare"
+ depends="prepare"
+ description="Prepare to build web services extras package">
<antcall target="downloadfile">
<param name="sourcefile" value="${commons-logging-src.loc}"/>
- <param name="destfile"
value="${tomcat.extras}/logging/commons-logging-src.tar.gz"/>
- <param name="destdir" value="${tomcat.extras}/logging/"/>
+ <param name="destfile" value="${commons-logging-src.tar.gz}"/>
+ <param name="destdir" value="${commons-logging.home}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${avalon-framework.loc}"/>
+ <param name="destfile" value="${avalon-framework.jar}"/>
+ <param name="destdir" value="${avalon-framework.home}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${log4j.loc}"/>
+ <param name="destfile" value="${log4j.jar}"/>
+ <param name="destdir" value="${log4j.home}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${logkit.loc}"/>
+ <param name="destfile" value="${logkit.jar}"/>
+ <param name="destdir" value="${logkit.home}"/>
</antcall>
- <gunzip src="${tomcat.extras}/logging/commons-logging-src.tar.gz"
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${servletapi.loc}"/>
+ <param name="destfile" value="${servletapi.jar}"/>
+ <param name="destdir" value="${servletapi.home}"/>
+ </antcall>
+
+ </target>
+
+ <target name="commons-logging"
+ depends="commons-logging-prepare"
+ description="Build JULI for log4j extras package">
+
+ <gunzip src="${commons-logging-src.tar.gz}"
dest="${tomcat.extras}/logging/commons-logging-src.tar"/>
<untar src="${tomcat.extras}/logging/commons-logging-src.tar"
dest="${tomcat.extras}/logging/"/>
- <replace
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons"
+ <replace
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/commons"
encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
value="org.apache.juli" />
</replace>
- <mkdir
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/juli"
/>
- <move
todir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/juli">
- <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons"
/>
+ <mkdir
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/juli"
/>
+ <move
todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/juli">
+ <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/commons"
/>
</move>
- <replace
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
+ <replace
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src"
encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
value="org.apache.juli" />
<replacefilter token="org/apache/commons/"
value="org/apache/juli/" />
</replace>
- <copy
tofile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
-
file="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build.xml"
/>
+ <copy
tofile="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build2.xml"
+
file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml"
/>
- <ant
antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
-
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
- target="getlibs" />
- <copy
todir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src">
- <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/lib"
/>
+ <copy
todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
+ <fileset file="${avalon-framework.jar}" />
+ <fileset file="${log4j.jar}" />
+ <fileset file="${logkit.jar}" />
+ <fileset file="${servletapi.jar}" />
</copy>
- <ant
antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
-
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
+
+ <ant
antfile="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build2.xml"
+
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src"
target="compile" />
<jar jarfile="${tomcat-juli.jar}"
manifest="${tomcat.manifests}/default.manifest" >
- <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes">
+ <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes">
<include name="org/apache/juli/logging/*.class" />
<include name="org/apache/juli/logging/impl/LogFactoryImpl*.class" />
<include name="org/apache/juli/logging/impl/WeakHashtable*.class" />
@@ -178,7 +214,7 @@
<jar jarfile="${tomcat-juli-adapters.jar}"
manifest="${tomcat.manifests}/default.manifest" >
- <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes">
+ <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes">
<include name="org/apache/juli/logging/impl/**.class" />
<exclude name="org/apache/juli/logging/impl/WeakHashtable*.class" />
<exclude name="org/apache/juli/logging/impl/LogFactoryImpl.class" />
@@ -196,22 +232,32 @@
</antcall>
</target>
- <target name="webservices">
-
- <mkdir dir="${tomcat.extras}/webservices"/>
+ <target name="webservices-prepare"
+ depends="prepare"
+ description="Prepare to 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" />
+ </target>
+
+ <target name="webservices"
+ depends="webservices-prepare"
+ description="Build web services extras package">
+
<!-- Classpath -->
<path id="tomcat.webservices.classpath">
<pathelement path="${tomcat.classpath}"/>
@@ -269,7 +315,7 @@
</target>
<target name="extras"
- depends="prepare,commons-logging,webservices,jmx-remote">
+ depends="commons-logging,webservices,jmx-remote">
</target>
<!-- Download and dependency building -->
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1001717&r1=1001716&r2=1001717&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Sep 27 12:55:18 2010
@@ -50,6 +50,9 @@
Switch to using the Eclipse compiler JAR directly rather than creating
it from the larger JDT download. (markt)
</update>
+ <add>
+ Allow the off-line building of the extras package. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
