Author: jim
Date: Sat Sep 4 19:54:45 2010
New Revision: 992667
URL: http://svn.apache.org/viewvc?rev=992667&view=rev
Log:
Pull JAF and Javamail when needed
Modified:
tomcat/tc5.5.x/trunk/build/build.properties.default
tomcat/tc5.5.x/trunk/build/build.xml
Modified: tomcat/tc5.5.x/trunk/build/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=992667&r1=992666&r2=992667&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.properties.default (original)
+++ tomcat/tc5.5.x/trunk/build/build.properties.default Sat Sep 4 19:54:45 2010
@@ -68,6 +68,10 @@ base-sf.loc=http://switch.dl.sourceforge
# ----- Additional Tomcat files base location -----
base-tomcat.loc=http://archive.apache.org/dist/tomcat
+# ----- Additional Optional-but-Required-for-Release files base location -----
+activation.loc=http://people.apache.org/~jim/tomcat-5.5-opt-jars/jaf-1.1.1/activation.jar
+mail.loc=http://people.apache.org/~jim/tomcat-5.5-opt-jars/javamail-1.4.1/mail.jar
+
# --------------------------------------------------
# REQUIRED LIBRARIES
# --------------------------------------------------
Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=992667&r1=992666&r2=992667&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Sat Sep 4 19:54:45 2010
@@ -2101,11 +2101,28 @@
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
+ <!-- Grab the JAF/Javamail dependencies if doing full release -->
+ <antcall target="fulldist"/>
+
<!-- Build the dependencies that are not yet released -->
<antcall target="build-depends"/>
</target>
+ <target name="fulldist" if="full.dist">
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${mail.loc}"/>
+ <param name="destfile" value="${mail.jar}"/>
+ <param name="destdir" value="${mail.home}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${activation.loc}"/>
+ <param name="destfile" value="${activation.jar}"/>
+ <param name="destdir" value="${activation.home}"/>
+ </antcall>
+ </target>
+
<target name="proxyflags">
<!-- check proxy parameters. -->
<condition property="useproxy">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
