remm 01/09/08 09:40:48
Modified: catalina/src/share/org/apache/catalina/startup Catalina.java
Log:
- Add rules to be able to add lifecycle listeners on the top level components
of the pipeline through server.xml.
Revision Changes Path
1.31 +28 -4
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Catalina.java 2001/08/27 19:10:25 1.30
+++ Catalina.java 2001/09/08 16:40:48 1.31
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.30 2001/08/27 19:10:25 craigmcc Exp $
- * $Revision: 1.30 $
- * $Date: 2001/08/27 19:10:25 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.31 2001/09/08 16:40:48 remm Exp $
+ * $Revision: 1.31 $
+ * $Date: 2001/09/08 16:40:48 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* </u>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.30 $ $Date: 2001/08/27 19:10:25 $
+ * @version $Revision: 1.31 $ $Date: 2001/09/08 16:40:48 $
*/
public class Catalina {
@@ -290,12 +290,28 @@
mapper.addRule("Server", mapper.addChild
("setServer", "org.apache.catalina.Server"));
+ mapper.addRule("Server/Listener", mapper.objectCreate
+ (null, "className"));
+ mapper.addRule("Server/Listener",
+ mapper.setProperties());
+ mapper.addRule("Server/Listener", mapper.addChild
+ ("addLifecycleListener",
+ "org.apache.catalina.LifecycleListener"));
+
mapper.addRule("Server/Service", mapper.objectCreate
("org.apache.catalina.core.StandardService", "className"));
mapper.addRule("Server/Service", mapper.setProperties());
mapper.addRule("Server/Service", mapper.addChild
("addService", "org.apache.catalina.Service"));
+ mapper.addRule("Server/Service/Listener", mapper.objectCreate
+ (null, "className"));
+ mapper.addRule("Server/Service/Listener",
+ mapper.setProperties());
+ mapper.addRule("Server/Service/Listener", mapper.addChild
+ ("addLifecycleListener",
+ "org.apache.catalina.LifecycleListener"));
+
mapper.addRule("Server/Service/Connector", mapper.objectCreate
("org.apache.catalina.connector.http.HttpConnector",
"className"));
@@ -332,6 +348,14 @@
new SetParentClassLoaderAction(parentClassLoader));
mapper.addRule("Server/Service/Engine", mapper.addChild
("setContainer", "org.apache.catalina.Container"));
+
+ mapper.addRule("Server/Service/Engine/Listener", mapper.objectCreate
+ (null, "className"));
+ mapper.addRule("Server/Service/Engine/Listener",
+ mapper.setProperties());
+ mapper.addRule("Server/Service/Engine/Listener", mapper.addChild
+ ("addLifecycleListener",
+ "org.apache.catalina.LifecycleListener"));
createStartMapperContext("Server/Service/Engine/Context", mapper);
createStartMapperDefaultContext(
