tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ContextManager.java
Date Tue, 22 Aug 2000 06:10:41 GMT
costin      00/08/21 23:10:40

  Modified:    .        build.xml
               src/share/org/apache/tomcat/core ContextManager.java
  Log:
  - More work on the tomcat modules.
  
  If you do "ant clean-classes tomcat-XXX " you'll be able to verify
  all "wrong" deps.
  
  The right set of dependencies is:
  - tomcat-util -> nothing
  - tomcat-core -> tomcat-util
  - facadeXXX -> tomcat-util, tomcat-core
  - modules -> tomcat-util, tomcat-core,
               individual APIs ( including jasper, jaas, etc)
  - tomcat-config -> all
  - tomcat ( the starter ) -> nothing ( maybe make it part of tomcat-util ?)
  
  Some of the modules should have individual top-level directories:
  
  - tomcat-util: general-purpose and reusable components ( util and logging),
  we want to encourage people to reuse them.
  
  - facadeXXX: each facade represents a "profile", no one is special. We want
  different implementations ( with various optimizations and security levels,
  it's allways a trade-off and we should be able to choose which one
  based on application requirements). This will include servlet 2.2, 2.3, 2.4,etc.
  
  - share: ( the current one): core, modules
  
  I don't know about session managers - I hope we'll see some activity
  in this area ( I have some cool ideas, maybe next year)
  
  Revision  Changes    Path
  1.65      +135 -23   jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- build.xml	2000/08/22 03:34:19	1.64
  +++ build.xml	2000/08/22 06:10:37	1.65
  @@ -2,8 +2,8 @@
   
   <!-- Emacs indentation & editting support
       <antstructure output="ant.dtd"/>
  +<!DOCTYPE ant SYSTEM "ant.dtd" >
   -->
  -<!-- !DOCTYPE ant SYSTEM "ant.dtd" -->
   
   
   <project name="Tomcat" default="main" basedir=".">
  @@ -89,8 +89,33 @@
       <chmod perm="+x" file="${tomcat.build}/bin/shutdown.sh"/>
     </target>
   
  -  <!-- ==================== Build tomcat ==================== -->
  +  <!-- ==================== Tomcat util ==================== -->
  +  <!-- Independent ( stand alone ) utilities -->
   
  +  <target name="tomcat_util" depends="init" >
  +    <javac destdir="${tomcat.build}/classes"
  +      debug="${debug}" 
  +      optimize="${optimize}"
  +      deprecation="off"
  +      srcdir="src/share" >
  +      <classpath>
  +	<!-- XXX move serlvet-specific code to helper -->
  +	<pathelement location="${servlet22.jar}" />
  +      </classpath>
  +      <include name="org/apache/tomcat/util/**" />    
  +      <include name="org/apache/tomcat/logging/**" />    
  +      <exclude name="**/util/net/SSLSocketFactory.java"
  + 	       unless="jsse.present" />
  +    </javac>
  +    <jar jarfile="${tomcat.build}/lib/tomcat_util.jar"
  +      basedir="${tomcat.build}/classes" > 
  +      <include name="org/apache/tomcat/util/**" />    
  +      <include name="org/apache/tomcat/logging/**" />    
  +    </jar>
  +  </target>
  +
  +  <!-- ==================== Tomcat core ==================== -->
  +
     <target name="tomcat_core" depends="init" >
       <javac destdir="${tomcat.build}/classes"
         debug="${debug}" 
  @@ -99,19 +124,46 @@
         srcdir="src/share" >
         <classpath>
   	<pathelement location="${servlet22.jar}" />
  +	<pathelement location="${tomcat.build}/lib/tomcat_util.jar" />
         </classpath>
         <include name="org/apache/tomcat/core/**" />    
  +      <include name="org/apache/tomcat/loader/**" />    
  +      <exclude name="org/apache/tomcat/loader/AdaptiveClassLoader12.java" 
  +               unless="jdk12.present"/>
  +    </javac>
  +    <copydir src="src/share/org/apache/tomcat" 
  +             dest="${tomcat.build}/classes/org/apache/tomcat">
  +      <include name="**/*.properties" />
  +      <include name="**/*.dtd" />
  +    </copydir>
  +    <jar jarfile="${tomcat.build}/lib/tomcat_core.jar"
  +      basedir="${tomcat.build}/classes" > 
  +      <include name="org/apache/tomcat/core/**" />    
         <include name="org/apache/tomcat/util/**" />    
         <include name="org/apache/tomcat/startup/**" />    
         <include name="org/apache/tomcat/loader/**" />    
  -      <exclude name="**/org/apache/tomcat/util/net/SSLSocketFactory.java"
  -	unless="jsse.present" />
  -      <exclude name="org/apache/tomcat/startup/EmbededTomcat.java" 
  -	unless="jdk12.present"/>
  -      <exclude name="org/apache/tomcat/loader/AdaptiveClassLoader12.java" 
  -	unless="jdk12.present"/>
  +    </jar>
  +  </target>
  +
  +  <!-- ==================== Tomcat config ==================== -->
  +
  +  <target name="tomcat_config" depends="init" >
  +    <javac destdir="${tomcat.build}/classes"
  +      debug="${debug}" 
  +      optimize="${optimize}"
  +      deprecation="off"
  +      srcdir="src/share" >
  +      <classpath>
  +	<pathelement location="${servlet22.jar}" />
  +      </classpath>
  +      <include name="org/apache/tomcat/startup/**" />    
  +      <include name="org/apache/tomcat/helper/**" />    
  +      <!-- servlet-version specific code 
  +      <exclude name="**/EmbededTomcat.java" />
  +       -->
       </javac>
  -    <copydir src="src/share" dest="${tomcat.build}/classes">
  +    <copydir src="src/share/org/apache/tomcat" 
  +             dest="${tomcat.build}/classes/org/apache/tomcat">
         <include name="**/*.properties" />
         <include name="**/*.dtd" />
       </copydir>
  @@ -124,6 +176,44 @@
       </jar>
     </target>
   
  +  <!-- ==================== Servlet 22 (default) implementation ========== -->
  +  <target name="facade22" depends="init" >
  +    <javac destdir="${tomcat.build}/classes"
  +      debug="${debug}" 
  +      optimize="${optimize}"
  +      deprecation="off"
  +      srcdir="src/facade22" >
  +      <classpath>
  +	<pathelement location="${servlet22.jar}" />
  +      </classpath>
  +      <include name="org/apache/tomcat/facade22/**" />    
  +    </javac>
  +    <jar jarfile="${tomcat.build}/lib/facade22.jar"
  +      basedir="${tomcat.build}/classes" > 
  +      <include name="org/apache/tomcat/facade/**" /> 
  +    </jar>
  +  </target>
  +
  +  <!-- ==================== Servlet 23 (default) implementation ========== -->
  +  <target name="facade23" depends="init" >
  +    <javac destdir="${tomcat.build}/classes"
  +      debug="${debug}" 
  +      optimize="${optimize}"
  +      deprecation="off"
  +      srcdir="src/facade23" >
  +      <classpath>
  +	<pathelement location="${servlet23.jar}" />
  +      </classpath>
  +      <include name="org/apache/tomcat/facade23/**" />    
  +    </javac>
  +    <jar jarfile="${tomcat.build}/lib/facade23.jar"
  +      basedir="${tomcat.build}/classes" > 
  +      <include name="org/apache/tomcat/facade23/**" /> 
  +    </jar>
  +  </target>
  +
  +
  +  <!-- ====================  "Standard" interceptors  ========== -->
     <target name="tomcat_modules" depends="init" >
       <javac destdir="${tomcat.build}/classes"
         srcdir="src/share"
  @@ -142,8 +232,32 @@
         <exclude name="org/apache/tomcat/context/PolicyInterceptor.java" 
   	unless="jdk12.present"/>
       </javac>
  +    <jar jarfile="${tomcat.build}/lib/tomcat_modules.jar"
  +      basedir="${tomcat.build}/classes" > 
  +      <include name="org/apache/tomcat/context/**" /> 
  +      <include name="org/apache/tomcat/request/**" /> 
  +    </jar>
     </target>
   
  +  <!-- ====================  Jasper ( 1.0 )  ========== -->
  +  <target name="jasper" depends="init" >
  +    <javac destdir="${tomcat.build}/classes"
  +      srcdir="src/share"
  +      debug="${debug}" 
  +      optimize="${optimize}"
  +      deprecation="off" >
  +      <classpath>
  +	<pathelement location="${servlet22.jar}" />
  +      </classpath>
  +      <include name="org/apache/jasper/**" />    
  +    </javac>
  +    <jar jarfile="${tomcat.build}/lib/jasper.jar"
  +      basedir="${tomcat.build}/classes"
  +      includes="org/apache/jasper/**"
  +     />
  +  </target>
  +
  +  <!-- ==================== Old "compile all" ==================== -->
     <target name="tomcat-compile" >
       <javac srcdir="src/share" destdir="${tomcat.build}/classes"
         classpath="${servlet22.jar};${jaxp}/jaxp.jar" 
  @@ -174,7 +288,8 @@
       </copydir>
     </target>
   
  -  <target name="tomcat-jars" >
  +  <!-- ==================== Old "jar all" ========== -->
  +  <target name="tomcat-jars" depends="jasper">
       <!-- create tomcat jar files -->
       <jar jarfile="${tomcat.build}/lib/webserver.jar"
         basedir="${tomcat.build}/classes" > 
  @@ -191,20 +306,9 @@
         <include name="org/apache/tomcat/startup/Main.class" /> 
         <include name="org/apache/tomcat/util/SimpleClassLoader**" /> 
       </jar>
  -    <jar jarfile="${tomcat.build}/lib/facade22.jar"
  -      basedir="${tomcat.build}/classes" > 
  -      <include name="org/apache/tomcat/facade/**" /> 
  -    </jar>
  -    <jar jarfile="${tomcat.build}/lib/jasper.jar"
  -      basedir="${tomcat.build}/classes"
  -      includes="org/apache/jasper/**"/>
  -  </target>
  -
  -  <target name="tomcat" depends="prepare,tomcat-compile,tomcat-jars">
     </target>
   
  -
  -  <!-- Build J2EE integration code -->
  +  <!-- ==================== J2EE integration ========== -->
     <target name="j2ee" depends="tomcat,tomcat-j2ee.jar" />
     <target name="j2ee-dist" depends="tomcat,tomcat-j2ee.jar" />
   
  @@ -346,8 +450,16 @@
         includes="**"/>
     </target>
     
  +
  +  <!-- ==================== Admin & agreagate ==================== -->
  +   
  +  <target name="tomcat" depends="prepare,tomcat-compile,tomcat-jars">
  +  </target>
  +
  +  <target name="clean-classes" depends="init">
  +    <deltree dir="${tomcat.build}/classes/org"/>
  +  </target>
   
  -  <!-- ==================== Admin ==================== -->
     <target name="clean" depends="init">
       <deltree dir="${tomcat.build}"/>
       <deltree dir="${tomcat.home}"/>
  
  
  
  1.120     +3 -3      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.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- ContextManager.java	2000/08/18 03:42:14	1.119
  +++ ContextManager.java	2000/08/22 06:10:39	1.120
  @@ -71,7 +71,6 @@
   import java.io.*;
   import java.net.*;
   import java.util.*;
  -import org.apache.tomcat.service.PoolTcpConnector;
   
   //import java.security.*;
   
  @@ -976,8 +975,9 @@
   	*/
   	if( t instanceof IllegalStateException ) {
   	    ctx.log("IllegalStateException in " + req, t);
  -	} else if( t instanceof org.apache.jasper.JasperException ) {
  -	    ctx.log("JasperException in " + req, t);
  +	    // Nothing special in jasper exception treatement, no deps
  +	    //} else if( t instanceof org.apache.jasper.JasperException ) {
  +	    // 	    ctx.log("JasperException in " + req, t);
   	} else if( t instanceof IOException ) {
   	    if( ((IOException)t).getMessage().equals("Broken pipe"))
   	    {
  
  
  

Mime
View raw message