costin 01/12/16 21:24:09
Modified: src/share/org/apache/tomcat/modules/config ApacheConfig.java
JservConfig.java NSConfig.java TrustedLoader.java
Log:
Another gcj change ( result of my old experiment to compile tomcat to native code ).
We have a final string that will be set later - in theory it should be ok, as it's
set
only once ( again my understanding of JLS ).
Revision Changes Path
1.30 +3 -3
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java
Index: ApacheConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ApacheConfig.java 2001/12/17 02:30:48 1.29
+++ ApacheConfig.java 2001/12/17 05:24:09 1.30
@@ -1,4 +1,4 @@
-/* $Id: ApacheConfig.java,v 1.29 2001/12/17 02:30:48 larryi Exp $
+/* $Id: ApacheConfig.java,v 1.30 2001/12/17 05:24:09 costin Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -149,7 +149,7 @@
@author Costin Manolache
@author Larry Isaacs
@author Mel Martinez
- @version $Revision: 1.29 $ $Date: 2001/12/17 02:30:48 $
+ @version $Revision: 1.30 $ $Date: 2001/12/17 05:24:09 $
*/
public class ApacheConfig extends BaseJkConfig {
@@ -162,7 +162,7 @@
/** default mod_jk log file location */
public static final String JK_LOG_LOCATION = "logs/mod_jk.log";
/** default location of mod_jk Apache plug-in. */
- public static final String MOD_JK;
+ public static String MOD_JK;
//set up some defaults based on OS type
static{
1.5 +2 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/JservConfig.java
Index: JservConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/JservConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JservConfig.java 2001/08/19 22:47:04 1.4
+++ JservConfig.java 2001/12/17 05:24:09 1.5
@@ -122,7 +122,7 @@
@author Costin Manolache
@author Larry Isaacs
@author Mel Martinez
- @version $Revision: 1.4 $ $Date: 2001/08/19 22:47:04 $
+ @version $Revision: 1.5 $ $Date: 2001/12/17 05:24:09 $
*/
public class JservConfig extends BaseInterceptor {
@@ -131,7 +131,7 @@
/** default mod_jserv log file location */
public static final String JSERV_LOG_LOCATION = "logs/mod_jserv.log";
/** default location of mod_jserv Apache plug-in. */
- public static final String MOD_JSERV;
+ public static String MOD_JSERV;
public static final String AJPV12="ajpv12";
//set up some defaults based on OS type
1.9 +2 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/NSConfig.java
Index: NSConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/NSConfig.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NSConfig.java 2001/12/17 02:30:48 1.8
+++ NSConfig.java 2001/12/17 05:24:09 1.9
@@ -133,7 +133,7 @@
@author Costin Manolache
@author Larry Isaacs
@author Gal Shachor
- @version $Revision: 1.8 $
+ @version $Revision: 1.9 $
*/
public class NSConfig extends BaseJkConfig {
@@ -141,7 +141,7 @@
public static final String NS_CONFIG = "/conf/auto/obj.conf";
public static final String NSAPI_LOG_LOCATION = "/logs/nsapi_redirect.log";
/** default location of nsapi plug-in. */
- public static final String NSAPI_REDIRECTOR;
+ public static String NSAPI_REDIRECTOR;
//set up some defaults based on OS type
static{
1.4 +9 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/TrustedLoader.java
Index: TrustedLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/TrustedLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TrustedLoader.java 2001/07/29 00:45:53 1.3
+++ TrustedLoader.java 2001/12/17 05:24:09 1.4
@@ -107,6 +107,7 @@
{
if( state!=ContextManager.STATE_CONFIG ) return;
+ if( debug>0 ) log("TrustedLoader: " + state );
Enumeration ctxsE= cm.getContexts();
while( ctxsE.hasMoreElements() ) {
Context context=(Context)ctxsE.nextElement();
@@ -133,12 +134,15 @@
loaderHelper.contextInit( context );
Vector modV=new Vector();
+ if(debug>0) log("loadInterceptors in a dummy classloader for setup " +
context + " " +
+ context.isTrusted() + " " + context.getDocBase());
loadInterceptors( context, modules, modV );
cm.setNote( "trustedLoader.currentContext", context );
// Now add all modules to cm
for( int i=0; i< modV.size(); i++ ) {
BaseInterceptor bi=(BaseInterceptor)modV.elementAt( i );
+ if(debug>0) log( "Add dummy module, for configuration " +
context.getDocBase() + " " + context);
cm.addInterceptor( bi );
allModules.addElement( bi );
}
@@ -154,6 +158,8 @@
// like a reload, the modules will be removed and added back
if( ! ctx.isTrusted() ) return;
+ if(debug>0) log("contextInit " + ctx + " " + cm.getState());
+
File modules=getModuleFile( ctx );
if( modules==null ) return;
@@ -163,6 +169,7 @@
private void reInitModules( Context ctx, File modules )
throws TomcatException
{
+ if(debug>0) log("reInit " + modules );
// remove modules
for( int i=0; i< allModules.size(); i++ ) {
BaseInterceptor bi=(BaseInterceptor)allModules.elementAt( i );
@@ -172,6 +179,7 @@
// The real loader is set.
Vector modV=new Vector();
+ if( debug > 0 ) log( "Loading the real module " + ctx + " " + modules);
loadInterceptors( ctx, modules, modV );
cm.setNote( "trustedLoader.currentContext", ctx );
@@ -205,7 +213,7 @@
XmlMapper xh=new XmlMapper();
xh.setClassLoader( ctx.getClassLoader());
- xh.setDebug( debug );
+ //xh.setDebug( debug );
// no backward compat rules. The file must be self-contained,
// with <module> definition and the module itself
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
