remm 2003/01/30 06:24:43
Modified: catalina/src/share/org/apache/catalina Container.java
catalina/src/share/org/apache/catalina/core
ContainerBase.java StandardWrapper.java
catalina/src/share/org/apache/catalina/mbeans
StandardContextMBean.java mbeans-descriptors.xml
Log:
- Add JMX access to fields and objects needed by the mapper.
Revision Changes Path
1.2 +10 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Container.java
Index: Container.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Container.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Container.java 18 Jul 2002 16:47:36 -0000 1.1
+++ Container.java 30 Jan 2003 14:24:43 -0000 1.2
@@ -231,6 +231,12 @@
/**
+ * Return an object which may be utilized for mapping to this component.
+ */
+ public Object getMappingObject();
+
+
+ /**
* Return the Cluster with which this Container is associated. If there is
* no associated Cluster, return the Cluster associated with our parent
* Container (if any); otherwise return <code>null</code>.
1.5 +10 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Index: ContainerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContainerBase.java 27 Jan 2003 23:35:47 -0000 1.4
+++ ContainerBase.java 30 Jan 2003 14:24:43 -0000 1.5
@@ -517,6 +517,15 @@
}
+
+ /**
+ * Return an object which may be utilized for mapping to this component.
+ */
+ public Object getMappingObject() {
+ return this;
+ }
+
+
/**
* Return the Cluster with which this Container is associated. If there is
* no associated Cluster, return the Cluster associated with our parent
1.15 +12 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StandardWrapper.java 29 Jan 2003 12:42:20 -0000 1.14
+++ StandardWrapper.java 30 Jan 2003 14:24:43 -0000 1.15
@@ -839,6 +839,14 @@
/**
+ * FIXME: Fooling introspection ...
+ */
+ public Wrapper findMappingObject() {
+ return (Wrapper) getMappingObject();
+ }
+
+
+ /**
* Load and initialize an instance of this servlet, if there is not already
* at least one initialized instance. This can be used, for example, to
* load servlets that are marked in the deployment descriptor to be loaded
1.3 +25 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
Index: StandardContextMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardContextMBean.java 10 Aug 2002 17:19:44 -0000 1.2
+++ StandardContextMBean.java 30 Jan 2003 14:24:43 -0000 1.3
@@ -214,6 +214,27 @@
}
+
+ /**
+ * Return the naming resources associated with this web application.
+ */
+ public javax.naming.directory.DirContext getStaticResources() {
+
+ return ((StandardContext)this.resource).getResources();
+
+ }
+
+
+ /**
+ * Return the naming resources associated with this web application.
+ */
+ public String[] getWelcomeFiles() {
+
+ return ((StandardContext)this.resource).findWelcomeFiles();
+
+ }
+
+
// ------------------------------------------------------------- Operations
1.16 +15 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mbeans-descriptors.xml 10 Dec 2002 18:12:51 -0000 1.15
+++ mbeans-descriptors.xml 30 Jan 2003 14:24:43 -0000 1.16
@@ -1981,6 +1981,10 @@
description="The managed resource this MBean is associated with"
type="java.lang.Object"/>
+ <attribute name="mappingObject"
+ description="The object used for mapping"
+ type="java.lang.Object"/>
+
<attribute name="override"
description="The DefaultContext override flag for this web
application"
@@ -2000,6 +2004,11 @@
type="java.lang.String[]"
writeable="false"/>
+ <attribute name="staticResources"
+ description="Static resources associated with the context."
+ type="javax.naming.directory.DirContext"
+ writeable="false"/>
+
<attribute name="swallowOutput"
description="Flag to set to cause the system.out and system.err
to be redirected to the logger when executing a servlet"
@@ -2009,6 +2018,11 @@
description="Create a JNDI naming context for this application?"
is="true"
type="boolean"/>
+
+ <attribute name="welcomeFiles"
+ description="The welcome files for this context"
+ type="java.lang.String[]"
+ writeable="false"/>
<attribute name="workDir"
description="The pathname to the work directory for this context"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
