Author: fhanik
Date: Wed Mar 14 09:30:34 2007
New Revision: 518210
URL: http://svn.apache.org/viewvc?view=rev&rev=518210
Log:
mail.jar and activation.jar are required for a full release. Not optional like
before.
This is a fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=40668
Modified:
tomcat/container/tags/tc5.5.x/TOMCAT_5_5_23/catalina/build.xml
Modified: tomcat/container/tags/tc5.5.x/TOMCAT_5_5_23/catalina/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tags/tc5.5.x/TOMCAT_5_5_23/catalina/build.xml?view=diff&rev=518210&r1=518209&r2=518210
==============================================================================
--- tomcat/container/tags/tc5.5.x/TOMCAT_5_5_23/catalina/build.xml (original)
+++ tomcat/container/tags/tc5.5.x/TOMCAT_5_5_23/catalina/build.xml Wed Mar 14
09:30:34 2007
@@ -59,7 +59,6 @@
<pathelement location="${tomcat-util.jar}"/>
<pathelement location="${tomcat-coyote.jar}"/>
<pathelement location="${jaas.jar}"/>
- <pathelement location="${javagroups.jar}"/>
<pathelement location="${jcert.jar}"/>
<pathelement location="${jmx.jar}"/>
<pathelement location="${jmx-remote.jar}"/>
@@ -636,10 +635,18 @@
</target>
-
+ <target name="check.javamail" unless="compile.javamail">
+ <pathconvert pathsep="${line.separator}"
+ property="printable.classpath"
+ refid="catalina.classpath"/>
+ <echo message="Unable to complete build, mail.jar and activation.jar were
not found in the existing classpath:"/>
+ <echo message="${printable.classpath}"/>
+ <fail unless="compile.javamail" message="Exiting build system, please add
the required jars to your classpath."/>
+ </target>
- <target name="build-catalina-optional" unless="build.tomcat.base">
+ <target name="build-catalina-optional" unless="build.tomcat.base"
depends="check.javamail">
+
<!-- Compile internal server components -->
<javac srcdir="src/share" destdir="${classes.dir}"
debug="${compile.debug}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
