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/startup Tomcat.java
Date Wed, 01 Mar 2000 01:26:21 GMT
costin      00/02/29 17:26:21

  Modified:    src/share/org/apache/tomcat/context DefaultCMSetter.java
               src/share/org/apache/tomcat/startup Tomcat.java
  Log:
  - FIX: no error if WEB-INF doesn't have a classes subdir
  - FIX: tomcat stop will no longer load contexts, it only needs connectors.
  
  Revision  Changes    Path
  1.20      +3 -1      jakarta-tomcat/src/share/org/apache/tomcat/context/DefaultCMSetter.java
  
  Index: DefaultCMSetter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/DefaultCMSetter.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- DefaultCMSetter.java	2000/02/27 03:07:49	1.19
  +++ DefaultCMSetter.java	2000/03/01 01:26:20	1.20
  @@ -163,7 +163,9 @@
               ContextManager cm = context.getContextManager();
   	    dir = new File(cm.getHome(), base + "/WEB-INF/classes");
           }
  -	loader.addRepository( dir );
  +	if( dir.exists() ) {
  +	    loader.addRepository( dir );
  +	}
   
   	File f =  new File(base + "/WEB-INF/lib");
   	Vector jars = new Vector();
  
  
  
  1.16      +8 -3      jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
  
  Index: Tomcat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Tomcat.java	2000/03/01 00:31:20	1.15
  +++ Tomcat.java	2000/03/01 01:26:20	1.16
  @@ -55,12 +55,16 @@
   	xh.addRule( "ContextManager/RequestInterceptor", xh.setParent("setContextManager") );
   	xh.addRule( "ContextManager/RequestInterceptor", xh.addChild( "addRequestInterceptor",
   								      "org.apache.tomcat.core.RequestInterceptor" ) );
  -	
  +
    	xh.addRule( "ContextManager/Context", xh.objectCreate("org.apache.tomcat.core.Context"));
   	xh.addRule( "ContextManager/Context", xh.setParent( "setContextManager") );
   	xh.addRule( "ContextManager/Context", xh.setProperties() );
   	xh.addRule( "ContextManager/Context", xh.addChild( "addContext", null ) );
   
  +    }
  +
  +    void setConnectorHelper( XmlMapper xh ) {
  +
   	xh.addRule( "ContextManager/Connector", xh.objectCreate(null, "className"));
   	xh.addRule( "ContextManager/Connector", xh.setParent( "setContextManager") );
   	xh.addRule( "ContextManager/Connector", xh.addChild( "addServerConnector", "org.apache.tomcat.core.ServerConnector")
);
  @@ -97,6 +101,7 @@
   	xh.setDebug( 0 );
   	ContextManager cm=new ContextManager();
   	setHelper( xh );
  +	setConnectorHelper( xh );
   	setLogHelper( xh );
   
   	File f=new File(cm.getHome(), configFile);
  @@ -142,8 +147,8 @@
   	XmlMapper xh=new XmlMapper();
   	xh.setDebug( 0 );
   	ContextManager cm=new ContextManager();
  -	setHelper( xh );
  -	// no log helper - we don't want stop to override the logs
  +	setConnectorHelper( xh );
  +	// read only connector information out of server.xml
   
   	File f=new File(cm.getHome(), configFile);
   
  
  
  

Mime
View raw message