Author: markt
Date: Wed Aug 11 17:55:14 2010
New Revision: 984495
URL: http://svn.apache.org/viewvc?rev=984495&view=rev
Log:
Enable off-line building of extrsa - moves commons-logging libs to standard
Tomcat lib download process
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=984495&r1=984494&r2=984495&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Aug 11 17:55:14 2010
@@ -55,14 +55,46 @@ 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
# Mirror, was used when there were problems with the main SF downloads site
# base-sf.loc=http://sunet.dl.sourceforge.net
# ----- 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
-
+# 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.vesion=4.1.3
+avalon-framework.home=${base.path}/avalon-framework-${avalon-framework.vesion}
+avalon-framework.loc=${base-maven1.loc}/avalon-framework/jars/avalon-framework-${avalon-framework.vesion}.jar
+avalon-framework.jar=${avalon-framework.home}/avalon-framework-${avalon-framework.vesion}.jar
+
+# ----- log4j (required by commons logging) -----
+log4j.vesion=1.2.12
+log4j.home=${base.path}/log4j-${log4j.vesion}
+log4j.loc=${base-maven1.loc}/log4j/jars/log4j-${log4j.vesion}.jar
+log4j.jar=${log4j.home}/log4j-${log4j.vesion}.jar
+
+# ----- logkit (required by commons logging) -----
+logkit.vesion=1.0.1
+logkit.home=${base.path}/logkit-${logkit.vesion}
+logkit.loc=${base-maven1.loc}/logkit/jars/logkit-${logkit.vesion}.jar
+logkit.jar=${logkit.home}/logkit-${logkit.vesion}.jar
+
+# ----- servletapi (required by commons logging) -----
+servletapi.vesion=2.3
+servletapi.home=${base.path}/servletapi-${servletapi.vesion}
+servletapi.loc=${base-maven1.loc}/servletapi/jars/servletapi-${servletapi.vesion}.jar
+servletapi.jar=${servletapi.home}/servletapi-${servletapi.vesion}.jar
+
# ----- Webservices - JAX RPC -----
jaxrpc-lib.version=1.1-rc4
jaxrpc-lib.home=${base.path}/jaxrpc-${jaxrpc-lib.version}
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=984495&r1=984494&r2=984495&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Aug 11 17:55:14 2010
@@ -1022,56 +1022,89 @@
<mkdir dir="${tomcat.extras.sources}"/>
<mkdir dir="${tomcat.embed}"/>
<mkdir dir="${tomcat.embed.sources}"/>
+ <mkdir dir="${tomcat.extras}/logging"/>
<mkdir dir="${tomcat.extras}/webservices"/>
</target>
- <target name="extras-commons-logging"
- depends="extras-prepare,compile,build-manifests"
- description="Build JULI for log4j extras package">
+ <target name="extras-commons-logging-prepare"
+ depends="extras-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>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${servletapi.loc}"/>
+ <param name="destfile" value="${servletapi.jar}"/>
+ <param name="destdir" value="${servletapi.home}"/>
</antcall>
- <gunzip src="${tomcat.extras}/logging/commons-logging-src.tar.gz"
+
+ </target>
+
+ <target name="extras-commons-logging"
+ depends="extras-commons-logging-prepare,compile,build-manifests"
+ 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-extras.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" />
@@ -1098,7 +1131,7 @@
</antcall>
<jarIt jarfile="${tomcat-juli-adapters.jar}"
-
filesDir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes"
+
filesDir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes"
filesId="files.tomcat-extras-juli-adapters" />
<antcall target="md5sum">
<param name="file" value="${tomcat-juli-adapters.jar}" />
@@ -1107,7 +1140,7 @@
<!-- Source JARs -->
<jar jarfile="${tomcat-juli-extras-src.jar}"
manifest="${tomcat.manifests}/default.manifest" >
- <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java">
+ <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java">
<include name="org/apache/juli/logging/*.java" />
<include name="org/apache/juli/logging/impl/LogFactoryImpl*.java" />
<include name="org/apache/juli/logging/impl/WeakHashtable*.java" />
@@ -1130,7 +1163,7 @@
fullpath="META-INF/LICENSE" />
</jar>
<jarIt jarfile="${tomcat-juli-adapters-src.jar}"
-
filesDir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java"
+
filesDir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java"
filesId="files.tomcat-extras-juli-adapters" />
</target>
@@ -1215,7 +1248,7 @@
<jar jarfile="${tomcat-embed-log4j.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/*.class" />
<!-- Javadoc and i18n exclusions -->
@@ -1236,7 +1269,7 @@
<jar jarfile="${tomcat-embed-log4j-src.jar}"
manifest="${tomcat.manifests}/default.manifest" >
- <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java">
+ <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java">
<include name="org/apache/juli/logging/*.java" />
<include name="org/apache/juli/logging/impl/*.java" />
<!-- Javadoc and i18n exclusions -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
