craigmcc 01/10/26 17:50:05
Modified: catalina build.xml
Log:
Add a kludge to avoid compiling the SSI servlet (and associated utilities)
because the build is currently broken, and I haven't seen the commit
message yet (due to the mail delay) in order to properly revert it.
Once the compile problems are fixed, simply uncomment the <property>
setting for compile.ssi, or include a setting like this in
build.properties:
compile.ssi=true
Revision Changes Path
1.81 +8 -0 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- build.xml 2001/10/26 02:03:28 1.80
+++ build.xml 2001/10/27 00:50:05 1.81
@@ -233,6 +233,9 @@
<equals arg1="${jdk.1.3.present}" arg2="true" />
</or>
</condition>
+<!-- Uncomment this to compile the SSI code
+ <property name="compile.ssi" value="true"/>
+-->
<condition property="compile.tyrex">
<or>
<equals arg1="${full.dist}" arg2="on" />
@@ -417,6 +420,7 @@
<echo message="compile.jta=${compile.jta}" />
<echo message="compile.junit=${compile.junit}" />
<echo message="compile.ldap=${compile.ldap}" />
+ <echo message="compile.ssi=${compile.ssi}" />
<echo message="compile.tyrex=${compile.tyrex}" />
<echo message="--- Distribution flags ---" />
@@ -568,6 +572,10 @@
unless="compile.jmx"/>
<exclude name="org/apache/catalina/net/SSLServerSocketFactory.java"
unless="compile.jsse"/>
+ <exclude name="org/apache/catalina/servlets/SsiInvokerServlet.java"
+ unless="compile.ssi"/>
+ <exclude name="org/apache/catalina/util/ssi/**"
+ unless="compile.ssi"/>
<exclude name="org/apache/catalina/valves/CertificatesValve.java"
unless="compile.jsse"/>
<exclude name="org/apache/naming/factory/MailSessionFactory.java"
