craigmcc 01/04/18 11:59:30
Modified: catalina/src/share/org/apache/catalina/startup Catalina.java
ContextConfig.java EngineConfig.java
HostConfig.java
Log:
Catalina: Restore the recognition of <Logger>, <Realm>, and <Valve>
elements nested inside a <Context>. They were only being recognized
inside a <DefaultContext>.
{Context,Engine,Host}Config: Inherit the debugging detail level of the
owning component to assist in debugging problems like this.
PR: Bugzilla #1370
Submitted by: Larry Karnowski <[EMAIL PROTECTED]>
Revision Changes Path
1.20 +43 -37
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Catalina.java 2001/04/07 10:26:05 1.19
+++ Catalina.java 2001/04/18 18:59:22 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.19 2001/04/07 10:26:05 kief Exp $
- * $Revision: 1.19 $
- * $Date: 2001/04/07 10:26:05 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.20 2001/04/18 18:59:22 craigmcc Exp $
+ * $Revision: 1.20 $
+ * $Date: 2001/04/18 18:59:22 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* </u>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.19 $ $Date: 2001/04/07 10:26:05 $
+ * @version $Revision: 1.20 $ $Date: 2001/04/18 18:59:22 $
*/
public class Catalina {
@@ -454,7 +454,9 @@
"configClass"));
mapper.addRule(prefix + "", mapper.addChild
("addChild", "org.apache.catalina.Container"));
+
createContextCommon(prefix, mapper);
+
}
@@ -474,28 +476,9 @@
mapper.addRule(prefix + "", mapper.setProperties());
mapper.addRule(prefix + "", mapper.addChild
("addDefaultContext",
"org.apache.catalina.core.DefaultContext"));
- mapper.addRule(prefix + "/Logger", mapper.objectCreate
- (null, "className"));
- mapper.addRule(prefix + "/Logger",
- mapper.setProperties());
- mapper.addRule(prefix + "/Logger", mapper.addChild
- ("setLogger", "org.apache.catalina.Logger"));
-
- mapper.addRule(prefix + "/Realm", mapper.objectCreate
- (null, "className"));
- mapper.addRule(prefix + "/Realm",
- mapper.setProperties());
- mapper.addRule(prefix + "/Realm", mapper.addChild
- ("setRealm", "org.apache.catalina.Realm"));
-
- mapper.addRule(prefix + "/Valve", mapper.objectCreate
- (null, "className"));
- mapper.addRule(prefix + "/Valve",
- mapper.setProperties());
- mapper.addRule(prefix + "/Valve", mapper.addChild
- ("addValve", "org.apache.catalina.Valve"));
createContextCommon(prefix, mapper);
+
}
@@ -507,19 +490,6 @@
* @param mapper The mapper we are updating
*/
protected void createContextCommon(String prefix, XmlMapper mapper) {
- mapper.addRule(prefix + "/ResourceParams", mapper.objectCreate
- ("org.apache.catalina.deploy.ResourceParams"));
- mapper.addRule(prefix + "/ResourceParams",
- mapper.setProperties());
- mapper.addRule(prefix + "/ResourceParams", mapper.addChild
- ("addResourceParams",
- "org.apache.catalina.deploy.ResourceParams"));
- mapper.addRule(prefix + "/ResourceParams/parameter",
- mapper.methodSetter("addParameter", 2));
- mapper.addRule(prefix + "/ResourceParams/parameter/name",
- mapper.methodParam(0));
- mapper.addRule(prefix + "/ResourceParams/parameter/value",
- mapper.methodParam(1));
mapper.addRule(prefix + "/Ejb", mapper.objectCreate
("org.apache.catalina.deploy.ContextEjb"));
@@ -557,6 +527,13 @@
mapper.addRule(prefix + "/Loader", mapper.addChild
("setLoader", "org.apache.catalina.Loader"));
+ mapper.addRule(prefix + "/Logger", mapper.objectCreate
+ (null, "className"));
+ mapper.addRule(prefix + "/Logger",
+ mapper.setProperties());
+ mapper.addRule(prefix + "/Logger", mapper.addChild
+ ("setLogger", "org.apache.catalina.Logger"));
+
mapper.addRule(prefix + "/Manager",
mapper.objectCreate
("org.apache.catalina.session.StandardManager",
@@ -574,6 +551,13 @@
("addApplicationParameter",
"org.apache.catalina.deploy.ApplicationParameter"));
+ mapper.addRule(prefix + "/Realm", mapper.objectCreate
+ (null, "className"));
+ mapper.addRule(prefix + "/Realm",
+ mapper.setProperties());
+ mapper.addRule(prefix + "/Realm", mapper.addChild
+ ("setRealm", "org.apache.catalina.Realm"));
+
mapper.addRule(prefix + "/Resource",
mapper.objectCreate
("org.apache.catalina.deploy.ContextResource"));
@@ -584,6 +568,21 @@
("addResource",
"org.apache.catalina.deploy.ContextResource"));
+ mapper.addRule(prefix + "/ResourceParams", mapper.objectCreate
+ ("org.apache.catalina.deploy.ResourceParams"));
+ mapper.addRule(prefix + "/ResourceParams",
+ mapper.setProperties());
+ mapper.addRule(prefix + "/ResourceParams", mapper.addChild
+ ("addResourceParams",
+ "org.apache.catalina.deploy.ResourceParams"));
+
+ mapper.addRule(prefix + "/ResourceParams/parameter",
+ mapper.methodSetter("addParameter", 2));
+ mapper.addRule(prefix + "/ResourceParams/parameter/name",
+ mapper.methodParam(0));
+ mapper.addRule(prefix + "/ResourceParams/parameter/value",
+ mapper.methodParam(1));
+
mapper.addRule(prefix + "/Resources",
mapper.objectCreate
("org.apache.naming.resources.FileDirContext",
@@ -592,6 +591,13 @@
mapper.setProperties());
mapper.addRule(prefix + "/Resources", mapper.addChild
("setResources", "javax.naming.directory.DirContext"));
+
+ mapper.addRule(prefix + "/Valve", mapper.objectCreate
+ (null, "className"));
+ mapper.addRule(prefix + "/Valve",
+ mapper.setProperties());
+ mapper.addRule(prefix + "/Valve", mapper.addChild
+ ("addValve", "org.apache.catalina.Valve"));
mapper.addRule(prefix + "/WrapperLifecycle",
mapper.methodSetter("addWrapperLifecycle", 0));
1.44 +19 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ContextConfig.java 2001/04/05 19:30:40 1.43
+++ ContextConfig.java 2001/04/18 18:59:23 1.44
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.43 2001/04/05 19:30:40 craigmcc Exp $
- * $Revision: 1.43 $
- * $Date: 2001/04/05 19:30:40 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.44 2001/04/18 18:59:23 craigmcc Exp $
+ * $Revision: 1.44 $
+ * $Date: 2001/04/18 18:59:23 $
*
* ====================================================================
*
@@ -102,6 +102,7 @@
import org.apache.catalina.core.ContainerBase;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
+import org.apache.catalina.core.ContainerBase;
import org.apache.catalina.core.DefaultContext;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.deploy.LoginConfig;
@@ -120,7 +121,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.43 $ $Date: 2001/04/05 19:30:40 $
+ * @version $Revision: 1.44 $ $Date: 2001/04/18 18:59:23 $
*/
public final class ContextConfig
@@ -201,6 +202,11 @@
// Identify the context we are associated with
try {
context = (Context) event.getLifecycle();
+ if (context instanceof StandardContext) {
+ int contextDebug = ((StandardContext) context).getDebug();
+ if (contextDebug > this.debug)
+ this.debug = contextDebug;
+ }
} catch (ClassCastException e) {
log(sm.getString("contextConfig.cce", event.getLifecycle()), e);
return;
@@ -825,11 +831,16 @@
authenticatorConfig();
// Dump the contents of this pipeline if requested
- if (debug >= 1) {
+ if ((debug >= 1) && (context instanceof ContainerBase)) {
log("Pipline Configuration:");
- Valve valves[] = ((Pipeline) context).getValves();
- for (int i = 0; i < valves.length; i++) {
- log(" " + valves[i].getInfo());
+ Pipeline pipeline = ((ContainerBase) context).getPipeline();
+ Valve valves[] = null;
+ if (pipeline != null)
+ valves = pipeline.getValves();
+ if (valves != null) {
+ for (int i = 0; i < valves.length; i++) {
+ log(" " + valves[i].getInfo());
+ }
}
log("======================");
}
1.2 +9 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EngineConfig.java
Index: EngineConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EngineConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EngineConfig.java 2000/08/11 23:38:41 1.1
+++ EngineConfig.java 2001/04/18 18:59:24 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EngineConfig.java,v
1.1 2000/08/11 23:38:41 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 23:38:41 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EngineConfig.java,v
1.2 2001/04/18 18:59:24 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/04/18 18:59:24 $
*
* ====================================================================
*
@@ -78,6 +78,7 @@
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
+import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.util.StringManager;
@@ -86,7 +87,7 @@
* of that Engine, and the associated defined contexts.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/11 23:38:41 $
+ * @version $Revision: 1.2 $ $Date: 2001/04/18 18:59:24 $
*/
public final class EngineConfig
@@ -153,6 +154,11 @@
// Identify the engine we are associated with
try {
engine = (Engine) event.getLifecycle();
+ if (engine instanceof StandardEngine) {
+ int engineDebug = ((StandardEngine) engine).getDebug();
+ if (engineDebug > this.debug)
+ this.debug = engineDebug;
+ }
} catch (ClassCastException e) {
log(sm.getString("engineConfig.cce", event.getLifecycle()), e);
return;
1.7 +10 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HostConfig.java 2001/04/10 01:37:08 1.6
+++ HostConfig.java 2001/04/18 18:59:25 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
1.6 2001/04/10 01:37:08 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/04/10 01:37:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
1.7 2001/04/18 18:59:25 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/04/18 18:59:25 $
*
* ====================================================================
*
@@ -85,6 +85,7 @@
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
+import org.apache.catalina.core.StandardHost;
import org.apache.catalina.util.StringManager;
@@ -93,7 +94,7 @@
* of that Host, and the associated defined contexts.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/04/10 01:37:08 $
+ * @version $Revision: 1.7 $ $Date: 2001/04/18 18:59:25 $
*/
public final class HostConfig
@@ -216,6 +217,11 @@
// Identify the host we are associated with
try {
host = (Host) event.getLifecycle();
+ if (host instanceof StandardHost) {
+ int hostDebug = ((StandardHost) host).getDebug();
+ if (hostDebug > this.debug)
+ this.debug = hostDebug;
+ }
} catch (ClassCastException e) {
log(sm.getString("hostConfig.cce", event.getLifecycle()), e);
return;
