kief 01/04/07 03:26:06
Modified: catalina/src/share/org/apache/catalina/startup Catalina.java
Log:
Applied Bip Thelin's <[EMAIL PROTECTED]> patch to allow the Store
used by Persistent Manager to be set in server.xml.
Revision Changes Path
1.19 +11 -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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Catalina.java 2001/04/05 00:08:47 1.18
+++ Catalina.java 2001/04/07 10:26:05 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.18 2001/04/05 00:08:47 remm Exp $
- * $Revision: 1.18 $
- * $Date: 2001/04/05 00:08:47 $
+ * $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 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* </u>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.18 $ $Date: 2001/04/05 00:08:47 $
+ * @version $Revision: 1.19 $ $Date: 2001/04/07 10:26:05 $
*/
public class Catalina {
@@ -348,6 +348,13 @@
createStartMapperDefaultContext(
"Server/Service/Engine/Host/DefaultContext",
mapper);
+
+ mapper.addRule("Server/Service/Engine/Host/Context/Manager/Store",
+ mapper.objectCreate(null, "className"));
+ mapper.addRule("Server/Service/Engine/Host/Context/Manager/Store",
+ mapper.setProperties());
+ mapper.addRule("Server/Service/Engine/Host/Context/Manager/Store",
+ mapper.addChild("setStore", "org.apache.catalina.Store"));
mapper.addRule("Server/Service/Engine/Host/Listener",
mapper.objectCreate