cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup NamingRuleSet.java
craigmcc02/05/02 16:10:13
Modified:catalina/src/share/org/apache/catalina/mbeans
StandardServerMBean.java
catalina/src/share/org/apache/catalina/startup
NamingRuleSet.java
Log:
Work around the lack of an o.a.c.deploy.ContextResourceEnvRef for now.
Revision ChangesPath
1.18 +29 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java
Index: StandardServerMBean.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- StandardServerMBean.java 2 May 2002 22:14:45 - 1.17
+++ StandardServerMBean.java 2 May 2002 23:10:13 - 1.18
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java,v
1.17 2002/05/02 22:14:45 craigmcc Exp $
- * $Revision: 1.17 $
- * $Date: 2002/05/02 22:14:45 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java,v
1.18 2002/05/02 23:10:13 craigmcc Exp $
+ * $Revision: 1.18 $
+ * $Date: 2002/05/02 23:10:13 $
*
*
*
@@ -120,7 +120,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.17 $ $Date: 2002/05/02 22:14:45 $
+ * @version $Revision: 1.18 $ $Date: 2002/05/02 23:10:13 $
*/
public class StandardServerMBean extends BaseModelMBean {
@@ -1188,6 +1188,31 @@
writer.print("");
+}
+
+// Store nested elements
+String[] eresources = resources.findResourceEnvRefs();
+for (int i = 0; i < eresources.length; i++) {
+for (int j = 0; j < indent; j++) {
+writer.print(' ');
+}
+writer.println("");
+for (int j = 0; j < indent + 2; j++) {
+writer.print(' ');
+}
+writer.print("");
+writer.print(eresources[i]);
+writer.println("");
+for (int j = 0; j < indent + 2; j++) {
+writer.print(' ');
+}
+writer.print("");
+writer.print(resources.findResourceEnvRef(eresources[i]));
+writer.println("");
+for (int j = 0; j < indent; j++) {
+writer.print(' ');
+}
+writer.println("");
}
// Store nested elements
1.3 +9 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/NamingRuleSet.java
Index: NamingRuleSet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/NamingRuleSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NamingRuleSet.java2 May 2002 22:14:45 - 1.2
+++ NamingRuleSet.java2 May 2002 23:10:13 - 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/NamingRuleSet.java,v
1.2 2002/05/02 22:14:45 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/02 22:14:45 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/NamingRuleSet.java,v
1.3 2002/05/02 23:10:13 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/02 23:10:13 $
*
*
*
@@ -82,7 +82,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.2 $ $Date: 2002/05/02 22:14:45 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/02 23:10:13 $
*/
public class NamingRuleSet extends RuleSetBase {
@@ -168,6 +168,11 @@
digester.addSetNext(prefix + "Resource",
"addResource",
"org.apache.catalina.deploy.ContextResource");
+
+digester.addCallMethod(prefix + "ResourceEnvRef",
+ "addResourceEnvRef", 2);
+digester.addCallParam(prefix + "ResourceEnvRef/name", 0);
+digester.addCallParam(prefix + "ResourceEnvRef/type", 1);
digester.addObjectCreate(prefix + "ResourceParams",
"org.apache.catalina.deploy.ResourceParams");
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup NamingRuleSet.java
craigmcc02/05/02 15:14:45
Modified:catalina/src/share/org/apache/catalina/core
StandardEngine.java StandardHost.java
catalina/src/share/org/apache/catalina/mbeans
StandardServerMBean.java
catalina/src/share/org/apache/catalina/startup
NamingRuleSet.java
Log:
Refactor storing of resource related information (under
and elements) into a shared common method.
Remaining issues for 100% reproducible configuration:
* StandardDefaultContext needs to be refactored to use a NamingResources
instance underneath (like StandardContext does) in order to save
resource definitions nested inside .
* Need to create o.a.c.deploy.ContextResourceEnvRef and the associated
handling of elements so that such things can be
registered and saved in naming resources.
* Currently, resources that are defined only in web.xml (such as
settings) are saved to server.xml as well, instead of
only the things that originally came from server.xml. Generally,
this is benign (because updating values in web.xml will override
the stored values), but we should really only be saving the stuff
that was originally configured here.
Once these items are addressed, changes made via the admin webapp (or other
dynamic changes, such as applications deployed via the manager webapp) will
be persisted across Tomcat restarts.
Revision ChangesPath
1.15 +12 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StandardEngine.java 6 Mar 2002 06:49:11 - 1.14
+++ StandardEngine.java 2 May 2002 22:14:45 - 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
1.14 2002/03/06 06:49:11 craigmcc Exp $
- * $Revision: 1.14 $
- * $Date: 2002/03/06 06:49:11 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
1.15 2002/05/02 22:14:45 craigmcc Exp $
+ * $Revision: 1.15 $
+ * $Date: 2002/05/02 22:14:45 $
*
*
*
@@ -86,7 +86,7 @@
* fully qualified host name of that virtual host.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.14 $ $Date: 2002/03/06 06:49:11 $
+ * @version $Revision: 1.15 $ $Date: 2002/05/02 22:14:45 $
*/
public class StandardEngine
@@ -217,6 +217,14 @@
support.firePropertyChange("defaultContext",
oldDefaultContext, this.defaultContext);
+}
+
+
+/**
+ * Retrieve the DefaultContext for new web applications.
+ */
+public DefaultContext getDefaultContext() {
+return (this.defaultContext);
}
1.27 +12 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- StandardHost.java 20 Mar 2002 12:29:55 - 1.26
+++ StandardHost.java 2 May 2002 22:14:45 - 1.27
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
1.26 2002/03/20 12:29:55 glenn Exp $
- * $Revision: 1.26 $
- * $Date: 2002/03/20 12:29:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
1.27 2002/05/02 22:14:45 craigmcc Exp $
+ * $Revision: 1.27 $
+ * $Date: 2002/05/02 22:14:45 $
*
*
*
@@ -95,7 +95,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.26 $ $Date: 2002/03/20 12:29:55 $
+ * @version $Revision: 1.27 $ $Date: 2002/05/02 22:14:45 $
*/
public class StandardHost
@@ -309,6 +309,14 @@
support.firePropertyChange("defaultContext",
oldDefaultContext, this.defaultContext);
+}
+
+
+/**
+ * Retrieve the DefaultContext for new web applications.
+ */
+public DefaultContext getDefaultContext() {
+return (this.defaultContext);
}
1.17 +319 -183
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbean
