costin 00/11/29 22:17:13
Modified: . build.xml
src/share/org/apache/tomcat/core ContextManager.java
src/share/org/apache/tomcat/modules/session
SimpleSessionStore.java
src/share/org/apache/tomcat/startup Main.java
Log:
Fix the build for JDK1.1
Since it's expected that the optimizations will use more JDK1.2 features
( in optional modules, of course :-) we want to make sure that tomcat's
core remains usable on JDK1.1 and the optimized code is indeed optional.
The rule is simple - no JDK1.2 specific code in core, in the basic modules
or in utils used by basic modules ( if you do, the nightly build should
catch it ).
Use
<exclude name="org/apache../MyJdk12Class.java" unless="jdk12.present" />
for all the 1.2 modules ( and make sure they are not enabled by default
in server.xml )
XXX need an exclude/unless for server.xml
Revision Changes Path
1.96 +8 -5 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- build.xml 2000/11/12 17:30:04 1.95
+++ build.xml 2000/11/30 06:17:11 1.96
@@ -206,7 +206,7 @@
</target>
<!-- ==================== Webdav ========== -->
- <target name="dav" depends="init">
+ <target depends="init" if="jdk12.present" name="dav">
<javac destdir="${tomcat.build}/classes" debug="${debug}"
optimize="${optimize}" deprecation="off" srcdir="src/webdav">
<classpath>
<pathelement location="${servlet22.jar}"/>
@@ -238,6 +238,7 @@
<include name="org/apache/tomcat/modules/**"/>
<exclude name="org/apache/tomcat/request/Jdk12Interceptor.java"
unless="jdk12.present"/>
<exclude name="org/apache/tomcat/context/LoaderInterceptor1.java"
unless="jdk12.present"/>
+ <exclude name="org/apache/tomcat/context/LoaderInterceptor12.java"
unless="jdk12.present"/>
<exclude name="org/apache/tomcat/context/PolicyInterceptor.java"
unless="jdk12.present"/>
</javac>
<jar jarfile="${tomcat.build}/lib/tomcat_modules.jar"
basedir="${tomcat.build}/classes">
@@ -256,6 +257,8 @@
<pathelement location="${servlet22.jar}"/>
</classpath>
<include name="org/apache/jasper/**"/>
+ <exclude name="org/apache/jasper/servlet/JasperLoader12.java"
+ unless="jdk12.present"/>
</javac>
<copy todir="${tomcat.build}/classes/org/apache/jasper">
<fileset dir="src/share/org/apache/jasper">
@@ -352,15 +355,15 @@
<copy todir="${tomcat.dist}">
<fileset dir="${tomcat.build}"/>
</copy>
- <copy todir="${tomcat.dist}/src/org">
+ <!-- copy todir="${tomcat.dist}/src/org">
<fileset dir="src/share/org"/>
- </copy>
+ </copy -->
<copy tofile="${tomcat.dist}/lib/jaxp.jar" file="${jaxp}/jaxp.jar"/>
<copy tofile="${tomcat.dist}/lib/parser.jar" file="${jaxp}/parser.jar"/>
<copy tofile="${tomcat.dist}/lib/servlet.jar" file="${servlet.jar}"/>
- <copy todir="${tomcat.dist}/src/org">
+ <!-- copy todir="${tomcat.dist}/src/org">
<fileset dir="src/facade22/org"/>
- </copy>
+ </copy -->
<!-- Add Tomcat internal javadoc -->
<mkdir dir="${tomcat.dist}/webapps/ROOT/javadoc"/>
1.151 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ContextManager.java 2000/11/30 04:58:40 1.150
+++ ContextManager.java 2000/11/30 06:17:12 1.151
@@ -940,7 +940,7 @@
// public final String getRandomClass() {
// XXX XXX @deprecated - use interceptor properties
public final void setRandomClass(String randomClass) {
- System.setProperty(RANDOM_CLASS_PROPERTY, randomClass);
+ System.getProperties().put(RANDOM_CLASS_PROPERTY, randomClass);
}
1.4 +2 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/session/SimpleSessionStore.java
Index: SimpleSessionStore.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/session/SimpleSessionStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleSessionStore.java 2000/11/22 00:21:24 1.3
+++ SimpleSessionStore.java 2000/11/30 06:17:12 1.4
@@ -115,7 +115,8 @@
public final void setRandomClass(String randomClass) {
this.randomClass=randomClass;
- System.setProperty(ContextManager.RANDOM_CLASS_PROPERTY, randomClass);
+ System.getProperties().
+ put(ContextManager.RANDOM_CLASS_PROPERTY, randomClass);
}
1.14 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Main.java 2000/11/02 21:45:05 1.13
+++ Main.java 2000/11/30 06:17:13 1.14
@@ -159,7 +159,7 @@
// log( "Path2 " + f1 );
h = f1.getCanonicalPath();
//log( "Guessed " + h + " from " + path );
- System.setProperty( "tomcat.home", h );
+ System.getProperties().put( "tomcat.home", h );
return h;
} catch( Exception ex ) {
ex.printStackTrace();
