cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java ServerLifecycleListener.java
remm2003/03/14 08:04:09
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java ServerLifecycleListener.java
Log:
- Revert all changes to 4.1.22.
- Development should occur in the 5.0 branch, esp since 4.1.23 will happen
sooner rather than later.
- Please verify to check that I'm not making any mistakes.
Revision ChangesPath
1.43 +237 -175
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- MBeanFactory.java 11 Mar 2003 14:12:47 - 1.42
+++ MBeanFactory.java 14 Mar 2003 16:04:08 - 1.43
@@ -184,129 +184,6 @@
/**
- * Add Logger.
- *
- * @logger logger to be added
- * @parent parent object name
- * @host hostname object name for context logger
- *
- * @exception Exception if an MBean cannot be created or registered
- */
-private void addLogger(Logger logger, String parent, String hostname)
-throws Exception {
-
-// Add the new instance to its parent component
-ObjectName pname = new ObjectName(parent);
-String type = pname.getKeyProperty("type");
-Server server = ServerFactory.getServer();
-if (type == null) {
-ObjectName hname = new ObjectName(hostname);
-String serviceName = hname.getKeyProperty("service");
-Service service = server.findService(serviceName);
-Engine engine = (Engine) service.getContainer();
-Host host = (Host) engine.findChild(hname.getKeyProperty("host"));
-String name = pname.getKeyProperty("name");
-String path = name.substring(name.lastIndexOf('/'));
-String pathStr = getPathStr(path);
-Context context = (Context) host.findChild(pathStr);
-context.setLogger(logger);
-} else {
-String serviceName = pname.getKeyProperty("service");
-Service service = server.findService(serviceName);
-Engine engine = (Engine) service.getContainer();
-if (type.equals("Engine")) {
-engine.setLogger(logger);
-} else if (type.equals("Host")) {
-Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-host.setLogger(logger);
-}
-}
-}
-
-
-/**
- * Add Realm.
- *
- * @logger realm to be added
- * @parent parent object name
- * @host hostname object name for context realm
- *
- * @exception Exception if an MBean cannot be created or registered
- */
-private void addRealm(Realm realm, String parent, String hostname)
-throws Exception {
-
-// Add the new instance to its parent component
-ObjectName pname = new ObjectName(parent);
-String type = pname.getKeyProperty("type");
-Server server = ServerFactory.getServer();
-if (type == null) {
-ObjectName hname = new ObjectName(hostname);
-String serviceName = hname.getKeyProperty("service");
-Service service = server.findService(serviceName);
-Engine engine = (Engine) service.getContainer();
-Host host = (Host) engine.findChild(hname.getKeyProperty("host"));
-String name = pname.getKeyProperty("name");
-String path = name.substring(name.lastIndexOf('/'));
-String pathStr = getPathStr(path);
-Context context = (Context) host.findChild(pathStr);
-context.setRealm(realm);
-} else {
-String serviceName = pname.getKeyProperty("service");
-Service service = server.findService(serviceName);
-Engine engine = (Engine) service.getContainer();
-if (type.equals("Engine")) {
-engine.setRealm(realm);
-} else if (type.equals("Host")) {
-Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-host.setRealm(realm);
-}
-}
-}
-
-
-/**
- * Add Valve.
- *
- * @valve valve to be added
- * @parent parent object name
- * @host hostname object name for context realm
- *
- * @exception Exception if an MBean cannot be created or registered
- */
-private void addValve(Valve valve, String parent, String hostname)
-throws Exception {
-
-// Add the new instance to its parent compone
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java ServerLifecycleListener.java
Amy Roh wrote: > It makes sense to use different domain names instead of using service > name. It'll take lots of code change in admin to change all the > objectnames to get rid of service name though. *sigh* I think a bit of grep can do the magic :-) It's not a big hurry. I'll start changing the code that looks up objects to use query instead of exact name - so it'll work in both cases. And probably I'll switch first in embed - which doesn't yet work with /admin anyway ( since there is no Server and a lot of things are created differently ) > Would it work if I have more than one service with the same host name > and path because there is no way to distinguish between these two > different contexts currently? mbeans-descriptors.xml has all the Sure. That's how load balancing would work. The real issue about "multiple engines in the same VM" is management of clusters. I don't plan to start 2 tomcats in the same VM ( but some people may want to ), but to use a JMX proxy ( like the one that exposes mod_jk C side as mbeans ) and have a sort of "virtual" tomcat instance. The domain name is the key. > components default to the same domain "Catalina". I wonder if bugzilla > 17749 is related to the problem. The default in mbeans-descriptors should never be used ( and it shouldn't be there in the first place ). As we move on with cleaning up the JMX registration and make the component more JMX-aware - each component will know its JMX domain and register childs in the same domain ( or locate other components in the same domain ). We just need to do it slowly. Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java ServerLifecycleListener.java
Amy Roh wrote:
>> [EMAIL PROTECTED] wrote:
>>
>> > amyroh 2003/03/10 19:25:52
>> >
>> > Modified:catalina/src/share/org/apache/catalina/mbeans
>> > MBeanFactory.java ServerLifecycleListener.java
>> > Log:
>> > Set to use JSR77 names as default.
>>
>> Please make sure tomcat 5 is also updated.
>
> Of course I was planning to do so. ;-)
>
> Question:
> Is there a way to get the service name from jsr77 context name?
> Currently, it's not included in its object name
We could expose it as an attribute if you need it ( short term ).
Don't ask me - I didn't wrote JSR77, just implemented it for tomcat :-)
The service name should just go away - we should stop using it in all names.
The DOMAIN in the JMX name should be identical with the Engine name and the
service name.
The only purpose of service name is to allow multiple tomcat instances in
the same JVM. The only sane way to support this is by using a different JMX
domain name for different instances.
In particular ( if you look at the mod_jk proxy ) it should be possible to
create proxies for remote tomcat instances - they would appear in the JMX
space as if they were engines in the same VM, so admin could work on a whole
cluster ( well, not easily - but doable ).
Having a Service name that is different from the Engine name doesn't make
sense IMO, it just creates confusion. Given that Service is not used in
Embeded, the name of the service shouldn't even matter - no code should
ever care or touch Server or Service interfaces, since the code would break
in Embeded. The only use of Service and Server should be in standalone,
when starting tomcat.
BTW, the use of the static field and ServerFactory is pretty bad IMO -
in tomcat5 at least we should just use JMX and get the server by name
( using the domain name of the current component, and the defined name
of the component ).
For now - just avoid using the Server/Service where you can, and assume a
single name will be used - and it'll match the domain name.
Costin
>
> Thanks,
> Amy
>
>>
>> I would do it in reverse - first tc5 and then backport.
>>
>>
>> Costin
>>
>>
>> >
>> > Revision ChangesPath
>> > 1.41 +11 -8
>> >
>>
>
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactor
> y.java
>> >
>> > Index: MBeanFactory.java
>> > ===
>> > RCS file:
>> >
>>
>
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/M
> BeanFactory.java,v
>> > retrieving revision 1.40 retrieving revision 1.41
>> > diff -u -r1.40 -r1.41
>> > --- MBeanFactory.java 19 Sep 2002 22:55:48 - 1.40
>> > +++ MBeanFactory.java 11 Mar 2003 03:25:52 - 1.41
>> > @@ -1227,13 +1227,16 @@
>> > *
>> > * @exception Exception if a component cannot be removed
>> > */
>> > -public void removeContext(String name) throws Exception {
>> > +public void removeContext(String name, String pname) throws
>> > Exception {
>> >
>> >// Acquire a reference to the component to be removed
>> >ObjectName oname = new ObjectName(name);
>> > -String serviceName = oname.getKeyProperty("service");
>> > -String hostName = oname.getKeyProperty("host");
>> > -String contextName =
> getPathStr(oname.getKeyProperty("path"));
>> > +ObjectName poname = new ObjectName(pname);
>> > +String serviceName = poname.getKeyProperty("service");
>> > +String hostName = poname.getKeyProperty("host");
>> > +String pathname = oname.getKeyProperty("name");
>> > +String path = pathname.substring(pathname.lastIndexOf('/'));
>> > +String contextName = getPathStr(path);
>> >Server server = ServerFactory.getServer();
>> >Service service = server.findService(serviceName);
>> >Engine engine = (Engine) service.getContainer();
>> >
>> >
>> >
>> > 1.38 +5 -4
>> >
>>
>
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifec
> ycleListener.java
>> >
>> > Index: ServerLifecycleListener.java
>> > ===
>> > RCS file:
>> >
>>
>
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/S
> erverLifecycleListener.java,v
>> > retrieving revision 1.37 retrieving revision 1.38
>> > diff -u -r1.37 -r1.38
>> > --- ServerLifecycleListener.java12 Feb 2003 22:11:27 -
> 1.37
>> > +++ ServerLifecycleListener.java11 Mar 2003 03:25:52 -
> 1.38
>> > @@ -367,6 +367,7 @@
>> >
>> >try {
>> >
>> > +setJsr77Names(true);
>> >MBeanFactory factory = new MBeanFactory();
>> >createMBeans(factory);
>> >createMBeans(ServerFactory.getServer());
>>
>>
>>
>> -
>> T
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java ServerLifecycleListener.java
> [EMAIL PROTECTED] wrote:
>
> > amyroh 2003/03/10 19:25:52
> >
> > Modified:catalina/src/share/org/apache/catalina/mbeans
> > MBeanFactory.java ServerLifecycleListener.java
> > Log:
> > Set to use JSR77 names as default.
>
> Please make sure tomcat 5 is also updated.
Of course I was planning to do so. ;-)
Question:
Is there a way to get the service name from jsr77 context name? Currently,
it's not included in its object name.
Thanks,
Amy
>
> I would do it in reverse - first tc5 and then backport.
>
>
> Costin
>
>
> >
> > Revision ChangesPath
> > 1.41 +11 -8
> >
>
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactor
y.java
> >
> > Index: MBeanFactory.java
> > ===
> > RCS file:
> >
>
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/M
BeanFactory.java,v
> > retrieving revision 1.40 retrieving revision 1.41
> > diff -u -r1.40 -r1.41
> > --- MBeanFactory.java 19 Sep 2002 22:55:48 - 1.40
> > +++ MBeanFactory.java 11 Mar 2003 03:25:52 - 1.41
> > @@ -1227,13 +1227,16 @@
> > *
> > * @exception Exception if a component cannot be removed
> > */
> > -public void removeContext(String name) throws Exception {
> > +public void removeContext(String name, String pname) throws
> > Exception {
> >
> >// Acquire a reference to the component to be removed
> >ObjectName oname = new ObjectName(name);
> > -String serviceName = oname.getKeyProperty("service");
> > -String hostName = oname.getKeyProperty("host");
> > -String contextName =
getPathStr(oname.getKeyProperty("path"));
> > +ObjectName poname = new ObjectName(pname);
> > +String serviceName = poname.getKeyProperty("service");
> > +String hostName = poname.getKeyProperty("host");
> > +String pathname = oname.getKeyProperty("name");
> > +String path = pathname.substring(pathname.lastIndexOf('/'));
> > +String contextName = getPathStr(path);
> >Server server = ServerFactory.getServer();
> >Service service = server.findService(serviceName);
> >Engine engine = (Engine) service.getContainer();
> >
> >
> >
> > 1.38 +5 -4
> >
>
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifec
ycleListener.java
> >
> > Index: ServerLifecycleListener.java
> > ===
> > RCS file:
> >
>
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/S
erverLifecycleListener.java,v
> > retrieving revision 1.37 retrieving revision 1.38
> > diff -u -r1.37 -r1.38
> > --- ServerLifecycleListener.java12 Feb 2003 22:11:27 -
1.37
> > +++ ServerLifecycleListener.java11 Mar 2003 03:25:52 -
1.38
> > @@ -367,6 +367,7 @@
> >
> >try {
> >
> > +setJsr77Names(true);
> >MBeanFactory factory = new MBeanFactory();
> >createMBeans(factory);
> >createMBeans(ServerFactory.getServer());
>
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java ServerLifecycleListener.java
[EMAIL PROTECTED] wrote:
> amyroh 2003/03/10 19:25:52
>
> Modified:catalina/src/share/org/apache/catalina/mbeans
> MBeanFactory.java ServerLifecycleListener.java
> Log:
> Set to use JSR77 names as default.
Please make sure tomcat 5 is also updated.
I would do it in reverse - first tc5 and then backport.
Costin
>
> Revision ChangesPath
> 1.41 +11 -8
>
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
>
> Index: MBeanFactory.java
> ===
> RCS file:
>
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
> retrieving revision 1.40 retrieving revision 1.41
> diff -u -r1.40 -r1.41
> --- MBeanFactory.java 19 Sep 2002 22:55:48 - 1.40
> +++ MBeanFactory.java 11 Mar 2003 03:25:52 - 1.41
> @@ -1227,13 +1227,16 @@
> *
> * @exception Exception if a component cannot be removed
> */
> -public void removeContext(String name) throws Exception {
> +public void removeContext(String name, String pname) throws
> Exception {
>
>// Acquire a reference to the component to be removed
>ObjectName oname = new ObjectName(name);
> -String serviceName = oname.getKeyProperty("service");
> -String hostName = oname.getKeyProperty("host");
> -String contextName = getPathStr(oname.getKeyProperty("path"));
> +ObjectName poname = new ObjectName(pname);
> +String serviceName = poname.getKeyProperty("service");
> +String hostName = poname.getKeyProperty("host");
> +String pathname = oname.getKeyProperty("name");
> +String path = pathname.substring(pathname.lastIndexOf('/'));
> +String contextName = getPathStr(path);
>Server server = ServerFactory.getServer();
>Service service = server.findService(serviceName);
>Engine engine = (Engine) service.getContainer();
>
>
>
> 1.38 +5 -4
>
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
>
> Index: ServerLifecycleListener.java
> ===
> RCS file:
>
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
> retrieving revision 1.37 retrieving revision 1.38
> diff -u -r1.37 -r1.38
> --- ServerLifecycleListener.java12 Feb 2003 22:11:27 - 1.37
> +++ ServerLifecycleListener.java11 Mar 2003 03:25:52 - 1.38
> @@ -367,6 +367,7 @@
>
>try {
>
> +setJsr77Names(true);
>MBeanFactory factory = new MBeanFactory();
>createMBeans(factory);
>createMBeans(ServerFactory.getServer());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
amyroh 2003/03/11 06:12:48
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
Update create/remove/edit for context, logger, realm, and valve to
support the new jsr77 name for context.
Revision ChangesPath
1.42 +168 -233
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- MBeanFactory.java 11 Mar 2003 03:25:52 - 1.41
+++ MBeanFactory.java 11 Mar 2003 14:12:47 - 1.42
@@ -184,6 +184,129 @@
/**
+ * Add Logger.
+ *
+ * @logger logger to be added
+ * @parent parent object name
+ * @host hostname object name for context logger
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+private void addLogger(Logger logger, String parent, String hostname)
+throws Exception {
+
+// Add the new instance to its parent component
+ObjectName pname = new ObjectName(parent);
+String type = pname.getKeyProperty("type");
+Server server = ServerFactory.getServer();
+if (type == null) {
+ObjectName hname = new ObjectName(hostname);
+String serviceName = hname.getKeyProperty("service");
+Service service = server.findService(serviceName);
+Engine engine = (Engine) service.getContainer();
+Host host = (Host) engine.findChild(hname.getKeyProperty("host"));
+String name = pname.getKeyProperty("name");
+String path = name.substring(name.lastIndexOf('/'));
+String pathStr = getPathStr(path);
+Context context = (Context) host.findChild(pathStr);
+context.setLogger(logger);
+} else {
+String serviceName = pname.getKeyProperty("service");
+Service service = server.findService(serviceName);
+Engine engine = (Engine) service.getContainer();
+if (type.equals("Engine")) {
+engine.setLogger(logger);
+} else if (type.equals("Host")) {
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+host.setLogger(logger);
+}
+}
+}
+
+
+/**
+ * Add Realm.
+ *
+ * @logger realm to be added
+ * @parent parent object name
+ * @host hostname object name for context realm
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+private void addRealm(Realm realm, String parent, String hostname)
+throws Exception {
+
+// Add the new instance to its parent component
+ObjectName pname = new ObjectName(parent);
+String type = pname.getKeyProperty("type");
+Server server = ServerFactory.getServer();
+if (type == null) {
+ObjectName hname = new ObjectName(hostname);
+String serviceName = hname.getKeyProperty("service");
+Service service = server.findService(serviceName);
+Engine engine = (Engine) service.getContainer();
+Host host = (Host) engine.findChild(hname.getKeyProperty("host"));
+String name = pname.getKeyProperty("name");
+String path = name.substring(name.lastIndexOf('/'));
+String pathStr = getPathStr(path);
+Context context = (Context) host.findChild(pathStr);
+context.setRealm(realm);
+} else {
+String serviceName = pname.getKeyProperty("service");
+Service service = server.findService(serviceName);
+Engine engine = (Engine) service.getContainer();
+if (type.equals("Engine")) {
+engine.setRealm(realm);
+} else if (type.equals("Host")) {
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+host.setRealm(realm);
+}
+}
+}
+
+
+/**
+ * Add Valve.
+ *
+ * @valve valve to be added
+ * @parent parent object name
+ * @host hostname object name for context realm
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+private void addValve(Valve valve, String parent, String hostname)
+throws Exception {
+
+// Add the new instance to its parent component
+ObjectName pname = new ObjectName(parent);
+String type = pname.getKeyProperty("type");
+
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java ServerLifecycleListener.java
amyroh 2003/03/10 19:25:52
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java ServerLifecycleListener.java
Log:
Set to use JSR77 names as default.
Revision ChangesPath
1.41 +11 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- MBeanFactory.java 19 Sep 2002 22:55:48 - 1.40
+++ MBeanFactory.java 11 Mar 2003 03:25:52 - 1.41
@@ -1227,13 +1227,16 @@
*
* @exception Exception if a component cannot be removed
*/
-public void removeContext(String name) throws Exception {
+public void removeContext(String name, String pname) throws Exception {
// Acquire a reference to the component to be removed
ObjectName oname = new ObjectName(name);
-String serviceName = oname.getKeyProperty("service");
-String hostName = oname.getKeyProperty("host");
-String contextName = getPathStr(oname.getKeyProperty("path"));
+ObjectName poname = new ObjectName(pname);
+String serviceName = poname.getKeyProperty("service");
+String hostName = poname.getKeyProperty("host");
+String pathname = oname.getKeyProperty("name");
+String path = pathname.substring(pathname.lastIndexOf('/'));
+String contextName = getPathStr(path);
Server server = ServerFactory.getServer();
Service service = server.findService(serviceName);
Engine engine = (Engine) service.getContainer();
1.38 +5 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ServerLifecycleListener.java 12 Feb 2003 22:11:27 - 1.37
+++ ServerLifecycleListener.java 11 Mar 2003 03:25:52 - 1.38
@@ -367,6 +367,7 @@
try {
+setJsr77Names(true);
MBeanFactory factory = new MBeanFactory();
createMBeans(factory);
createMBeans(ServerFactory.getServer());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
remm2002/09/18 03:04:38
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
- Contexts created were not properly configured. Now, they are deployed in the
same way they would be if they were read from server.xml.
Revision ChangesPath
1.39 +9 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- MBeanFactory.java 13 Sep 2002 01:35:22 - 1.38
+++ MBeanFactory.java 18 Sep 2002 10:04:38 - 1.39
@@ -102,6 +102,7 @@
import org.apache.catalina.realm.MemoryRealm;
import org.apache.catalina.realm.UserDatabaseRealm;
import org.apache.catalina.session.StandardManager;
+import org.apache.catalina.startup.ContextConfig;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.catalina.valves.RemoteAddrValve;
import org.apache.catalina.valves.RemoteHostValve;
@@ -825,6 +826,8 @@
path = getPathStr(path);
context.setPath(path);
context.setDocBase(docBase);
+ContextConfig contextConfig = new ContextConfig();
+context.addLifecycleListener(contextConfig);
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
@@ -832,6 +835,8 @@
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+
+// Add context to the host
host.addChild(context);
// Return the corresponding MBean name
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java MBeanUtils.java ServerLifecycleListener.java
amyroh 2002/09/11 07:19:33
Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java MBeanUtils.java
ServerLifecycleListener.java
Log:
Initial check in for DefaultContext support in admin.
Still need to polish and add loader and manager info.
Revision ChangesPath
1.32 +4 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- StandardServer.java 13 Aug 2002 08:08:17 - 1.31
+++ StandardServer.java 11 Sep 2002 14:19:33 - 1.32
@@ -1344,12 +1344,10 @@
}
// Store nested naming resources elements
-/* FIXME - DefaultContext does not have a getNamingResources() method
NamingResources nresources = dcontext.getNamingResources();
if (nresources != null) {
storeNamingResources(writer, indent + 2, nresources);
}
-*/
// Store the ending of this element
for (int i = 0; i < indent; i++) {
1.37 +16 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- MBeanFactory.java 9 Sep 2002 23:39:03 - 1.36
+++ MBeanFactory.java 11 Sep 2002 14:19:33 - 1.37
@@ -316,13 +316,19 @@
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
Server server = ServerFactory.getServer();
-Service service = server.findService(pname.getKeyProperty("service"));
+String serviceName = pname.getKeyProperty("service");
+if (serviceName == null) {
+serviceName = pname.getKeyProperty("name");
+}
+Service service = server.findService(serviceName);
Engine engine = (Engine) service.getContainer();
String hostName = pname.getKeyProperty("host");
if (hostName == null) { //if DefaultContext is nested in Engine
+context.setParent(engine);
engine.addDefaultContext(context);
} else {// if DefaultContext is nested in Host
Host host = (Host) engine.findChild(hostName);
+context.setParent(host);
host.addDefaultContext(context);
}
@@ -826,13 +832,15 @@
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+context.setParent(host);
host.addChild(context);
// Return the corresponding MBean name
ManagedBean managed = registry.findManagedBean("StandardContext");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), context);
-return (oname.toString());
+throw new Exception(oname.toString());
+//return (oname.toString());
}
@@ -885,8 +893,8 @@
*/
public String createStandardHost(String parent, String name,
String appBase, boolean autoDeploy,
- boolean deployXML, boolean liveDeploy,
- boolean unpackWARs)
+ boolean deployXML, boolean liveDeploy,
+ boolean unpackWARs)
throws Exception {
// Create a new StandardHost instance
1.43 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- MBeanUtils.java 14 Jun 2002 13:29:48 - 1.42
+++ MBeanUtils.java 11 Sep 2002 14:19:33 - 1.43
@@ -1103,7 +1103,7 @@
} else if (container instanceof Engine) {
Engine engine = (Engine) container;
Service service = engine.getService();
-name = new ObjectName(domain
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 2002/09/09 12:57:05
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add additonal Host attributes to be set in admin webapp.
Revision ChangesPath
1.35 +13 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- MBeanFactory.java 21 May 2002 20:10:53 - 1.34
+++ MBeanFactory.java 9 Sep 2002 19:57:05 - 1.35
@@ -877,18 +877,26 @@
* @param parent MBean Name of the associated parent component
* @param name Unique name of this Host
* @param appBase Application base directory name
+ * @param autoDeploy Should we auto deploy?
+ * @param deployXML Should we deploy Context XML config files property?
+ * @param liveDeploy Should we live deploy?
* @param unpackWARs Should we unpack WARs when auto deploying?
*
* @exception Exception if an MBean cannot be created or registered
*/
public String createStandardHost(String parent, String name,
- String appBase, boolean unpackWARs)
+ String appBase, boolean autoDeploy,
+ boolean deployXML, boolean liveDeploy,
+ boolean unpackWARs)
throws Exception {
// Create a new StandardHost instance
StandardHost host = new StandardHost();
host.setName(name);
host.setAppBase(appBase);
+host.setAutoDeploy(autoDeploy);
+host.setDeployXML(deployXML);
+host.setLiveDeploy(liveDeploy);
host.setUnpackWARs(unpackWARs);
// Add the new instance to its parent component
1.69 +14 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mbeans-descriptors.xml5 Sep 2002 01:57:19 - 1.68
+++ mbeans-descriptors.xml9 Sep 2002 19:57:05 - 1.69
@@ -2069,9 +2069,22 @@
description="The application root for this Host"
type="java.lang.String"/>
+
+
+
+
+
+
mailto:[EMAIL PROTECTED]>
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
amyroh 02/05/21 13:10:53
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
Fix to create root context with an empty string instead of '/'.
Revision ChangesPath
1.34 +5 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- MBeanFactory.java 7 May 2002 05:52:40 - 1.33
+++ MBeanFactory.java 21 May 2002 20:10:53 - 1.34
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.33 2002/05/07 05:52:40 amyroh Exp $
- * $Revision: 1.33 $
- * $Date: 2002/05/07 05:52:40 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.34 2002/05/21 20:10:53 amyroh Exp $
+ * $Revision: 1.34 $
+ * $Date: 2002/05/21 20:10:53 $
*
*
*
@@ -117,7 +117,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.33 $ $Date: 2002/05/07 05:52:40 $
+ * @version $Revision: 1.34 $ $Date: 2002/05/21 20:10:53 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -816,6 +816,7 @@
// Create a new StandardContext instance
StandardContext context = new StandardContext();
+path = getPathStr(path);
context.setPath(path);
context.setDocBase(docBase);
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
amyroh 02/05/06 22:52:40
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
Check for "/" path and convert to root context.
Revision ChangesPath
1.33 +15 -9
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- MBeanFactory.java 6 May 2002 23:08:31 - 1.32
+++ MBeanFactory.java 7 May 2002 05:52:40 - 1.33
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.32 2002/05/06 23:08:31 craigmcc Exp $
- * $Revision: 1.32 $
- * $Date: 2002/05/06 23:08:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.33 2002/05/07 05:52:40 amyroh Exp $
+ * $Revision: 1.33 $
+ * $Date: 2002/05/07 05:52:40 $
*
*
*
@@ -117,7 +117,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.32 $ $Date: 2002/05/06 23:08:31 $
+ * @version $Revision: 1.33 $ $Date: 2002/05/07 05:52:40 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -925,7 +925,8 @@
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-Context context = (Context) host.findChild(pname.getKeyProperty("path"));
+String pathStr = getPathStr(pname.getKeyProperty("path"));
+Context context = (Context) host.findChild(pathStr);
context.setManager(manager);
// Return the corresponding MBean name
@@ -1106,7 +1107,8 @@
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-Context context = (Context) host.findChild(pname.getKeyProperty("path"));
+String pathStr = getPathStr(pname.getKeyProperty("path"));
+Context context = (Context) host.findChild(pathStr);
context.setLoader(loader);
// Return the corresponding MBean name
@@ -1179,7 +1181,7 @@
ObjectName oname = new ObjectName(name);
String serviceName = oname.getKeyProperty("service");
String hostName = oname.getKeyProperty("host");
-String contextName = oname.getKeyProperty("path");
+String contextName = getPathStr(oname.getKeyProperty("path"));
Server server = ServerFactory.getServer();
Service service = server.findService(serviceName);
Engine engine = (Engine) service.getContainer();
@@ -1229,6 +1231,7 @@
ObjectName oname = new ObjectName(name);
String serviceName = oname.getKeyProperty("service");
String hostName = oname.getKeyProperty("host");
+
String path = oname.getKeyProperty("path");
Server server = ServerFactory.getServer();
Service service = server.findService(serviceName);
@@ -1258,6 +1261,7 @@
}
} else {// logger's container is Context
StandardHost host = (StandardHost) engine.findChild(hostName);
+path = getPathStr(path);
StandardContext context = (StandardContext) host.findChild(path);
Logger logger = context.getLogger();
Container container = logger.getContainer();
@@ -1290,7 +1294,7 @@
ObjectName oname = new ObjectName(name);
String serviceName = oname.getKeyProperty("service");
String hostName = oname.getKeyProperty("host");
-String contextName = oname.getKeyProperty("path");
+String contextName = getPathStr(oname.getKeyProperty("path"));
Server server = ServerFactory.getServer();
Service service = server.findService(serviceName);
Engine engine = (Engine) service.getContainer();
@@ -1316,7 +1320,7 @@
ObjectName oname = new ObjectName(name);
String serviceName = oname.getKeyProperty("service");
String hostName = oname.getKeyProperty("host");
-String contextName = oname.getKeyProperty("path");
+String contextName = getPathStr(oname.getKeyProperty("path"));
Server server = ServerFactory.getServer();
Service service = server.findService(serviceName);
Engine engine = (Engine) service.g
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
amyroh 02/05/03 16:47:28
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
Removes redundant code. Minor JLS formatting.
Patch submitted by Jon Stevens. Thanks Jon.
Revision ChangesPath
1.31 +34 -53
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- MBeanFactory.java 3 May 2002 00:27:17 - 1.30
+++ MBeanFactory.java 3 May 2002 23:47:28 - 1.31
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.30 2002/05/03 00:27:17 amyroh Exp $
- * $Revision: 1.30 $
- * $Date: 2002/05/03 00:27:17 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.31 2002/05/03 23:47:28 amyroh Exp $
+ * $Revision: 1.31 $
+ * $Date: 2002/05/03 23:47:28 $
*
*
*
@@ -117,7 +117,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.30 $ $Date: 2002/05/03 00:27:17 $
+ * @version $Revision: 1.31 $ $Date: 2002/05/03 23:47:28 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -175,11 +175,28 @@
return "Engine";
} else if (type.equals("org.apache.catalina.core.StandardHost")) {
return "Host";
-} else return null;
+} else {
+return null;
+}
}
+
+/**
+ * Little convenience method to remove redundant code
+ * when retrieving the path string
+ *
+ * @param t path string
+ * @return empty string if t==null || t.equals("/")
+ */
+private final String getPathStr(String t) {
+if (t == null || t.equals("/")) {
+return "";
+}
+return t;
+}
+
/**
* Create a new AccessLoggerValve.
*
@@ -201,10 +218,7 @@
Engine engine = (Engine) service.getContainer();
if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-String pathStr = pname.getKeyProperty("path");
-if (pathStr.equals("/")) {
-pathStr = "";
-}
+String pathStr = getPathStr(pname.getKeyProperty("path"));
Context context = (Context) host.findChild(pathStr);
((StandardContext)context).addValve(accessLogger);
} else if (type.equals("Engine")) {
@@ -342,10 +356,7 @@
Engine engine = (Engine) service.getContainer();
if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-String pathStr = pname.getKeyProperty("path");
-if (pathStr.equals("/")) {
-pathStr = "";
-}
+String pathStr = getPathStr(pname.getKeyProperty("path"));
Context context = (Context) host.findChild(pathStr);
context.setLogger(fileLogger);
} else if (type.equals("Engine")) {
@@ -531,10 +542,7 @@
Engine engine = (Engine) service.getContainer();
if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-String pathStr = pname.getKeyProperty("path");
-if (pathStr.equals("/")) {
-pathStr = "";
-}
+String pathStr = getPathStr(pname.getKeyProperty("path"));
Context context = (Context) host.findChild(pathStr);
context.setRealm(realm);
} else if (type.equals("Engine")) {
@@ -574,10 +582,7 @@
Engine engine = (Engine) service.getContainer();
if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-String pathStr = pname.getKeyProperty("path");
-if (pathStr.equals("/")) {
-pathStr = "";
-}
+String pathStr = getPathStr(pname.getKeyProperty("path"));
Context context = (Context) host.findChild(pathStr);
context.setRealm(realm);
} else if (type.equals("Engine")) {
@@ -617,10 +622,7 @@
Engine engine = (Engine) service.getContainer();
if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-String pathStr = pname.getKeyPro
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
amyroh 02/05/02 17:27:17
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
Check "/" when looking for root context.
Revision ChangesPath
1.30 +65 -30
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- MBeanFactory.java 2 May 2002 02:03:15 - 1.29
+++ MBeanFactory.java 3 May 2002 00:27:17 - 1.30
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.29 2002/05/02 02:03:15 amyroh Exp $
- * $Revision: 1.29 $
- * $Date: 2002/05/02 02:03:15 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.30 2002/05/03 00:27:17 amyroh Exp $
+ * $Revision: 1.30 $
+ * $Date: 2002/05/03 00:27:17 $
*
*
*
@@ -117,7 +117,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.29 $ $Date: 2002/05/02 02:03:15 $
+ * @version $Revision: 1.30 $ $Date: 2002/05/03 00:27:17 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -201,8 +201,11 @@
Engine engine = (Engine) service.getContainer();
if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-Context context =
-(Context) host.findChild(pname.getKeyProperty("path"));
+String pathStr = pname.getKeyProperty("path");
+if (pathStr.equals("/")) {
+pathStr = "";
+}
+Context context = (Context) host.findChild(pathStr);
((StandardContext)context).addValve(accessLogger);
} else if (type.equals("Engine")) {
((StandardEngine)engine).addValve(accessLogger);
@@ -339,8 +342,11 @@
Engine engine = (Engine) service.getContainer();
if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-Context context =
-(Context) host.findChild(pname.getKeyProperty("path"));
+String pathStr = pname.getKeyProperty("path");
+if (pathStr.equals("/")) {
+pathStr = "";
+}
+Context context = (Context) host.findChild(pathStr);
context.setLogger(fileLogger);
} else if (type.equals("Engine")) {
engine.setLogger(fileLogger);
@@ -525,8 +531,11 @@
Engine engine = (Engine) service.getContainer();
if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-Context context =
-(Context) host.findChild(pname.getKeyProperty("path"));
+String pathStr = pname.getKeyProperty("path");
+if (pathStr.equals("/")) {
+pathStr = "";
+}
+Context context = (Context) host.findChild(pathStr);
context.setRealm(realm);
} else if (type.equals("Engine")) {
engine.setRealm(realm);
@@ -565,8 +574,11 @@
Engine engine = (Engine) service.getContainer();
if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-Context context =
-(Context) host.findChild(pname.getKeyProperty("path"));
+String pathStr = pname.getKeyProperty("path");
+if (pathStr.equals("/")) {
+pathStr = "";
+}
+Context context = (Context) host.findChild(pathStr);
context.setRealm(realm);
} else if (type.equals("Engine")) {
engine.setRealm(realm);
@@ -605,8 +617,11 @@
Engine engine = (Engine) service.getContainer();
if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-Context context =
-(Context) host.findChild(pname.getKeyProperty("path"));
+String pathStr = pname.getKeyProperty("path");
+if (pathStr.equals("/")) {
+pathStr = "";
+}
+Context context = (Context) host.findChild(pathStr);
context.setRealm(realm);
} else if (type.equals("Engine")) {
engine.setRealm(realm);
@@ -645,8 +660,11 @@
Engine engine =
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java StandardServerMBean.java mbeans-descriptors.xml
amyroh 02/04/29 20:25:22
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java StandardServerMBean.java
mbeans-descriptors.xml
Log:
Add to save the GlobalNamingResources element in Server to
conf/server.xml. Edit mbeans-descriptor to synch with MBeanFactory connector
methods.
Revision ChangesPath
1.27 +11 -11
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- MBeanFactory.java 29 Apr 2002 23:06:26 - 1.26
+++ MBeanFactory.java 30 Apr 2002 03:25:22 - 1.27
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.26 2002/04/29 23:06:26 amyroh Exp $
- * $Revision: 1.26 $
- * $Date: 2002/04/29 23:06:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.27 2002/04/30 03:25:22 amyroh Exp $
+ * $Revision: 1.27 $
+ * $Date: 2002/04/30 03:25:22 $
*
*
*
@@ -117,7 +117,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.26 $ $Date: 2002/04/29 23:06:26 $
+ * @version $Revision: 1.27 $ $Date: 2002/04/30 03:25:22 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -274,7 +274,7 @@
service.addConnector((Connector)retobj);
// Return the corresponding MBean name
-ManagedBean managed = registry.findManagedBean("AjpConnector");
+ManagedBean managed = registry.findManagedBean("CoyoteConnector");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), (Connector)retobj);
return (oname.toString());
@@ -359,7 +359,7 @@
/**
- * Create a new HTTPConnector
+ * Create a new HttpConnector
*
* @param parent MBean Name of the associated parent component
* @param address The IP address on which to bind
@@ -367,7 +367,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
-public String createHTTPConnector(String parent, String address, int port)
+public String createHttpConnector(String parent, String address, int port)
throws Exception {
Object retobj = null;
@@ -405,7 +405,7 @@
service.addConnector((Connector)retobj);
// Return the corresponding MBean name
-ManagedBean managed = registry.findManagedBean("HttpConnector");
+ManagedBean managed = registry.findManagedBean("CoyoteConnector");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), (Connector)retobj);
return (oname.toString());
@@ -414,7 +414,7 @@
/**
- * Create a new HTTPSConnector
+ * Create a new HttpsConnector
*
* @param parent MBean Name of the associated parent component
* @param address The IP address on which to bind
@@ -422,7 +422,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
-public String createHTTPSConnector(String parent, String address, int port)
+public String createHttpsConnector(String parent, String address, int port)
throws Exception {
Object retobj = null;
@@ -474,7 +474,7 @@
service.addConnector((Connector)retobj);
// Return the corresponding MBean name
-ManagedBean managed = registry.findManagedBean("HttpsConnector");
+ManagedBean managed = registry.findManagedBean("CoyoteConnector");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), (Connector)retobj);
return (oname.toString());
1.11 +84 -5
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StandardServerMBean.java 27 Apr 2002 05:09:03 - 1.10
+++ StandardServerMBean.java 30 Apr 2002 03:25:22 - 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java,v
1.10 2002/04/27 05:09:03 craigmcc Exp
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/04/29 16:06:27
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Modify Connector MBeans descriptors and operations.
Now MBeans for HttpConnector, HttpsConnector, and AjpConnector implement
CoyoteConnector and set different properties according to the connector type.
Use reflection to avoid circular dependency.
Revision ChangesPath
1.26 +96 -87
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- MBeanFactory.java 15 Apr 2002 20:57:06 - 1.25
+++ MBeanFactory.java 29 Apr 2002 23:06:26 - 1.26
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.25 2002/04/15 20:57:06 amyroh Exp $
- * $Revision: 1.25 $
- * $Date: 2002/04/15 20:57:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.26 2002/04/29 23:06:26 amyroh Exp $
+ * $Revision: 1.26 $
+ * $Date: 2002/04/29 23:06:26 $
*
*
*
@@ -117,7 +117,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.25 $ $Date: 2002/04/15 20:57:06 $
+ * @version $Revision: 1.26 $ $Date: 2002/04/29 23:06:26 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -220,7 +220,7 @@
}
/**
- * Create a new Ajp13Connector
+ * Create a new AjpConnector
*
* @param parent MBean Name of the associated parent component
* @param address The IP address on which to bind
@@ -228,70 +228,14 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
-public String createAjp13Connector(String parent, String address, int port)
+public String createAjpConnector(String parent, String address, int port)
throws Exception {
Object retobj = null;
try {
-// Create a new AjpConnector instance
-// use reflection to avoid j-t-c compile-time circular dependencies
-Class cls = Class.forName("org.apache.ajp.tomcat4.Ajp13Connector");
-Constructor ct = cls.getConstructor(null);
-retobj = ct.newInstance(null);
-Class partypes1 [] = new Class[1];
-// Set address
-String str = new String();
-partypes1[0] = str.getClass();
-Method meth1 = cls.getMethod("setAddress", partypes1);
-Object arglist1[] = new Object[1];
-arglist1[0] = address;
-meth1.invoke(retobj, arglist1);
-// Set port number
-Class partypes2 [] = new Class[1];
-partypes2[0] = Integer.TYPE;
-Method meth2 = cls.getMethod("setPort", partypes2);
-Object arglist2[] = new Object[1];
-arglist2[0] = new Integer(port);
-meth2.invoke(retobj, arglist2);
-
-} catch (Exception e) {
-throw new MBeanException(e);
-}
-
-// Add the new instance to its parent component
-ObjectName pname = new ObjectName(parent);
-Server server = ServerFactory.getServer();
-Service service = server.findService(pname.getKeyProperty("name"));
-service.addConnector((Connector)retobj);
-
-// Return the corresponding MBean name
-ManagedBean managed = registry.findManagedBean("Ajp13Connector");
-ObjectName oname =
-MBeanUtils.createObjectName(managed.getDomain(), (Connector)retobj);
-return (oname.toString());
-
-}
-
-
-/**
- * Create a new CoyoteConnector
- *
- * @param parent MBean Name of the associated parent component
- * @param address The IP address on which to bind
- * @param port TCP port number to listen on
- *
- * @exception Exception if an MBean cannot be created or registered
- */
-public String createCoyoteConnector(String parent, String address, int port)
-throws Exception {
-
-Object retobj = null;
-
-try {
-
-// Create a new CoyoteConnector instance
+// Create a new CoyoteConnector instance for AJP
// use reflection to avoid j-t-c compile-time circular dependencies
Class cls = Class.forName("org.apache.coyote.tomcat4.CoyoteConnector");
Constructor ct = cls.
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
amyroh 02/04/15 13:57:06
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
Minor changes to be consistent with MBeanUtils.createObjectNames().
Revision ChangesPath
1.25 +40 -61
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- MBeanFactory.java 9 Apr 2002 23:54:35 - 1.24
+++ MBeanFactory.java 15 Apr 2002 20:57:06 - 1.25
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.24 2002/04/09 23:54:35 amyroh Exp $
- * $Revision: 1.24 $
- * $Date: 2002/04/09 23:54:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.25 2002/04/15 20:57:06 amyroh Exp $
+ * $Revision: 1.25 $
+ * $Date: 2002/04/15 20:57:06 $
*
*
*
@@ -117,7 +117,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.24 $ $Date: 2002/04/09 23:54:35 $
+ * @version $Revision: 1.25 $ $Date: 2002/04/15 20:57:06 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -196,18 +196,17 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-String tname = findObjectName(type);
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
-if (tname.equals("StandardContext")) {
+if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
(Context) host.findChild(pname.getKeyProperty("path"));
((StandardContext)context).addValve(accessLogger);
-} else if (tname.equals("Engine")) {
+} else if (type.equals("Engine")) {
((StandardEngine)engine).addValve(accessLogger);
-} else if (tname.equals("Host")) {
+} else if (type.equals("Host")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
((StandardHost)host).addValve(accessLogger);
}
@@ -348,7 +347,6 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-String tname = findObjectName(type);
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
@@ -385,19 +383,17 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-// String tname = findObjectName(type);
-String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
-if (tname.equals("Context")) {
+if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
(Context) host.findChild(pname.getKeyProperty("path"));
context.setLogger(fileLogger);
-} else if (tname.equals("Engine")) {
+} else if (type.equals("Engine")) {
engine.setLogger(fileLogger);
-} else if (tname.equals("Host")) {
+} else if (type.equals("Host")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
host.setLogger(fileLogger);
}
@@ -493,19 +489,17 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-// String tname = findObjectName(type);
-String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
-if (tname.equals("Context")) {
+if (type.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java MBeanUtils.java
amyroh 02/04/09 16:54:35
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java MBeanUtils.java
Log:
Add check for "null" string address as part of MBean name for connector since
MBean nomenclature doesn't like empty string. In the case of address is null,
it needs to check for string("null") address as part of MBean name for connector.
Add null check for service property to avoid NPE. The "service" property for
connector shouldn't be null, however, it's currently not set.
Revision ChangesPath
1.24 +12 -12
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- MBeanFactory.java 5 Apr 2002 00:03:03 - 1.23
+++ MBeanFactory.java 9 Apr 2002 23:54:35 - 1.24
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.23 2002/04/05 00:03:03 amyroh Exp $
- * $Revision: 1.23 $
- * $Date: 2002/04/05 00:03:03 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.24 2002/04/09 23:54:35 amyroh Exp $
+ * $Revision: 1.24 $
+ * $Date: 2002/04/09 23:54:35 $
*
*
*
@@ -117,7 +117,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.23 $ $Date: 2002/04/05 00:03:03 $
+ * @version $Revision: 1.24 $ $Date: 2002/04/09 23:54:35 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -1107,31 +1107,31 @@
Service service = server.findService(serviceName);
String port = oname.getKeyProperty("port");
String address = oname.getKeyProperty("address");
-if (address==null) {
-address = "";
-}
-
+
Connector conns[] = (Connector[]) service.findConnectors();
for (int i = 0; i < conns.length; i++) {
Class cls = conns[i].getClass();
Method getAddrMeth = cls.getMethod("getAddress", null);
Object addrObj = getAddrMeth.invoke(conns[i], null);
-String connAddress = new String();
+String connAddress = null;
if (addrObj != null) {
connAddress = addrObj.toString();
-}
+}
Method getPortMeth = cls.getMethod("getPort", null);
Object portObj = getPortMeth.invoke(conns[i], null);
String connPort = new String();
if (portObj != null) {
connPort = portObj.toString();
}
-if (address.equals(connAddress) && port.equals(connPort)) {
+if (((address.equals("null")) && (connAddress==null)) &&
port.equals(connPort)) {
+service.removeConnector(conns[i]);
+break;
+} else if (address.equals(connAddress) && port.equals(connPort)) {
// Remove this component from its parent component
service.removeConnector(conns[i]);
break;
-}
+}
}
}
1.32 +26 -14
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- MBeanUtils.java 3 Apr 2002 22:22:57 - 1.31
+++ MBeanUtils.java 9 Apr 2002 23:54:35 - 1.32
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.31 2002/04/03 22:22:57 amyroh Exp $
- * $Revision: 1.31 $
- * $Date: 2002/04/03 22:22:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.32 2002/04/09 23:54:35 amyroh Exp $
+ * $Revision: 1.32 $
+ * $Date: 2002/04/09 23:54:35 $
*
*
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.31 $ $Date: 2002/04/03 22:22:57 $
+ * @version $Revision: 1.32 $ $Date: 2002/04/09 23:54:35 $
*/
public class MBeanUtils {
@@ -679,18 +679,24 @@
ObjectName name = null;
if (connector instanceof HttpConnector) {
Htt
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
amyroh 02/04/04 16:03:04
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
Modify removeConnector() to handle Ajp13Connector and CoyoteConnector.
Revision ChangesPath
1.23 +25 -31
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MBeanFactory.java 4 Apr 2002 20:17:47 - 1.22
+++ MBeanFactory.java 5 Apr 2002 00:03:03 - 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.22 2002/04/04 20:17:47 amyroh Exp $
- * $Revision: 1.22 $
- * $Date: 2002/04/04 20:17:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.23 2002/04/05 00:03:03 amyroh Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/04/05 00:03:03 $
*
*
*
@@ -63,7 +63,8 @@
package org.apache.catalina.mbeans;
-import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -116,7 +117,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.22 $ $Date: 2002/04/04 20:17:47 $
+ * @version $Revision: 1.23 $ $Date: 2002/04/05 00:03:03 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -1013,7 +1014,7 @@
MBeanUtils.createObjectName(managed.getDomain(), logger);
return (oname.toString());
}
-
+
/**
* Create a new UserDatabaseRealm.
@@ -1109,34 +1110,27 @@
if (address==null) {
address = "";
}
+
Connector conns[] = (Connector[]) service.findConnectors();
for (int i = 0; i < conns.length; i++) {
-if (conns[i] instanceof
-org.apache.catalina.connector.http10.HttpConnector) {
-String connAddress =
-
((org.apache.catalina.connector.http10.HttpConnector)conns[i]).getAddress();
-if (connAddress == null) {
-connAddress = "";
-}
-int p =
((org.apache.catalina.connector.http10.HttpConnector)conns[i]).getPort();
-String connPort = "" + p;
-if (address.equals(connAddress) && port.equals(connPort)) {
-// Remove this component from its parent component
-service.removeConnector(conns[i]);
-break;
-}
-} else if (conns[i] instanceof
-org.apache.catalina.connector.http.HttpConnector) {
-String connAddress =
-
((org.apache.catalina.connector.http.HttpConnector)conns[i]).getAddress();
-int p =
((org.apache.catalina.connector.http.HttpConnector)conns[i]).getPort();
-String connPort = "" + p;
-if (address.equals(connAddress) && port.equals(connPort)) {
-// Remove this component from its parent component
-service.removeConnector(conns[i]);
-break;
-}
+Class cls = conns[i].getClass();
+Method getAddrMeth = cls.getMethod("getAddress", null);
+Object addrObj = getAddrMeth.invoke(conns[i], null);
+String connAddress = new String();
+if (addrObj != null) {
+connAddress = addrObj.toString();
+}
+Method getPortMeth = cls.getMethod("getPort", null);
+Object portObj = getPortMeth.invoke(conns[i], null);
+String connPort = new String();
+if (portObj != null) {
+connPort = portObj.toString();
+}
+if (address.equals(connAddress) && port.equals(connPort)) {
+// Remove this component from its parent component
+service.removeConnector(conns[i]);
+break;
}
}
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/04/04 12:17:47
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add createAjp13Connector() and createCoyoteConnector() using relfection
to avoid j-t-c compile-time circular dependencies.
Revision ChangesPath
1.22 +116 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MBeanFactory.java 26 Mar 2002 01:23:25 - 1.21
+++ MBeanFactory.java 4 Apr 2002 20:17:47 - 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.21 2002/03/26 01:23:25 manveen Exp $
- * $Revision: 1.21 $
- * $Date: 2002/03/26 01:23:25 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.22 2002/04/04 20:17:47 amyroh Exp $
+ * $Revision: 1.22 $
+ * $Date: 2002/04/04 20:17:47 $
*
*
*
@@ -63,6 +63,7 @@
package org.apache.catalina.mbeans;
+import java.lang.reflect.*;
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -115,7 +116,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.21 $ $Date: 2002/03/26 01:23:25 $
+ * @version $Revision: 1.22 $ $Date: 2002/04/04 20:17:47 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -214,6 +215,117 @@
ManagedBean managed = registry.findManagedBean("AccessLogValve");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), accessLogger);
+return (oname.toString());
+
+}
+
+/**
+ * Create a new Ajp13Connector
+ *
+ * @param parent MBean Name of the associated parent component
+ * @param address The IP address on which to bind
+ * @param port TCP port number to listen on
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public String createAjp13Connector(String parent, String address, int port)
+throws Exception {
+
+Object retobj = null;
+
+try {
+
+// Create a new AjpConnector instance
+// use reflection to avoid j-t-c compile-time circular dependencies
+Class cls = Class.forName("org.apache.ajp.tomcat4.Ajp13Connector");
+Constructor ct = cls.getConstructor(null);
+retobj = ct.newInstance(null);
+Class partypes1 [] = new Class[1];
+// Set address
+String str = new String();
+partypes1[0] = str.getClass();
+Method meth1 = cls.getMethod("setAddress", partypes1);
+Object arglist1[] = new Object[1];
+arglist1[0] = address;
+meth1.invoke(retobj, arglist1);
+// Set port number
+Class partypes2 [] = new Class[1];
+partypes2[0] = Integer.TYPE;
+Method meth2 = cls.getMethod("setPort", partypes2);
+Object arglist2[] = new Object[1];
+arglist2[0] = new Integer(port);
+meth2.invoke(retobj, arglist2);
+
+} catch (Exception e) {
+throw new MBeanException(e);
+}
+
+// Add the new instance to its parent component
+ObjectName pname = new ObjectName(parent);
+Server server = ServerFactory.getServer();
+Service service = server.findService(pname.getKeyProperty("name"));
+service.addConnector((Connector)retobj);
+
+// Return the corresponding MBean name
+ManagedBean managed = registry.findManagedBean("Ajp13Connector");
+ObjectName oname =
+MBeanUtils.createObjectName(managed.getDomain(), (Connector)retobj);
+return (oname.toString());
+
+}
+
+
+/**
+ * Create a new CoyoteConnector
+ *
+ * @param parent MBean Name of the associated parent component
+ * @param address The IP address on which to bind
+ * @param port TCP port number to listen on
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public String createCoyoteConnector(String parent, String address, int port)
+throws Exception {
+
+Object retobj = null;
+
+try {
+
+// Create a new CoyoteConnector instance
+// use reflection to av
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
manveen 02/03/25 17:23:26
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
fix for createWebappLoader, createStandardManager, create*Realms.
Revision ChangesPath
1.21 +19 -18
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MBeanFactory.java 22 Mar 2002 19:27:26 - 1.20
+++ MBeanFactory.java 26 Mar 2002 01:23:25 - 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.20 2002/03/22 19:27:26 amyroh Exp $
- * $Revision: 1.20 $
- * $Date: 2002/03/22 19:27:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.21 2002/03/26 01:23:25 manveen Exp $
+ * $Revision: 1.21 $
+ * $Date: 2002/03/26 01:23:25 $
*
*
*
@@ -63,7 +63,6 @@
package org.apache.catalina.mbeans;
-
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -116,7 +115,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.20 $ $Date: 2002/03/22 19:27:26 $
+ * @version $Revision: 1.21 $ $Date: 2002/03/26 01:23:25 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -273,13 +272,12 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-// FIX ME
// String tname = findObjectName(type);
String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
-if (tname.equals("StandardContext")) {
+if (tname.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
(Context) host.findChild(pname.getKeyProperty("path"));
@@ -382,11 +380,12 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-String tname = findObjectName(type);
+// String tname = findObjectName(type);
+String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
-if (tname.equals("StandardContext")) {
+if (tname.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
(Context) host.findChild(pname.getKeyProperty("path"));
@@ -423,11 +422,12 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-String tname = findObjectName(type);
+// String tname = findObjectName(type);
+String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
-if (tname.equals("StandardContext")) {
+if (tname.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
(Context) host.findChild(pname.getKeyProperty("path"));
@@ -464,11 +464,12 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-String tname = findObjectName(type);
+// String tname = findObjectName(type);
+String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
-if (tname.equals("StandardContext")) {
+if (tname.equals("Context")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
(Context) host.findChild(pname.getKeyProperty("path"));
@@ -839,7 +840,8 @@
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java MBeanUtils.java
amyroh 02/03/22 11:27:27
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java MBeanUtils.java
Log:
Fix createObjectName for Host. It should be "host=" instead of "name=".
Revision ChangesPath
1.20 +8 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MBeanFactory.java 22 Mar 2002 02:42:42 - 1.19
+++ MBeanFactory.java 22 Mar 2002 19:27:26 - 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.19 2002/03/22 02:42:42 manveen Exp $
- * $Revision: 1.19 $
- * $Date: 2002/03/22 02:42:42 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.20 2002/03/22 19:27:26 amyroh Exp $
+ * $Revision: 1.20 $
+ * $Date: 2002/03/22 19:27:26 $
*
*
*
@@ -116,7 +116,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.19 $ $Date: 2002/03/22 02:42:42 $
+ * @version $Revision: 1.20 $ $Date: 2002/03/22 19:27:26 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -287,7 +287,7 @@
} else if (tname.equals("Engine")) {
engine.setLogger(fileLogger);
} else if (tname.equals("Host")) {
-Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
host.setLogger(fileLogger);
}
@@ -847,7 +847,7 @@
} else if (tname.equals("Engine")) {
engine.setLogger(logger);
} else if (tname.equals("Host")) {
-Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
host.setLogger(logger);
}
@@ -890,7 +890,7 @@
} else if (tname.equals("Engine")) {
engine.setLogger(logger);
} else if (tname.equals("Host")) {
-Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
host.setLogger(logger);
}
@@ -931,7 +931,7 @@
} else if (tname.equals("Engine")) {
engine.setRealm(realm);
} else if (tname.equals("Host")) {
-Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
host.setRealm(realm);
}
1.30 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- MBeanUtils.java 8 Mar 2002 19:01:32 - 1.29
+++ MBeanUtils.java 22 Mar 2002 19:27:26 - 1.30
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.29 2002/03/08 19:01:32 craigmcc Exp $
- * $Revision: 1.29 $
- * $Date: 2002/03/08 19:01:32 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.30 2002/03/22 19:27:26 amyroh Exp $
+ * $Revision: 1.30 $
+ * $Date: 2002/03/22 19:27:26 $
*
*
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.29 $ $Date: 2002/03/08 19:01:32 $
+ * @version $Revision: 1.30 $ $Date: 2002/03/22 19:27:26 $
*/
public class MBeanUtils {
@@ -855,7 +855,7 @@
ObjectName name = null;
Engine engine = (Engine)host.getParent();
Service service = engine.getService();
-name = new ObjectName(domain + ":type=Host,name=" +
+name = new ObjectName(domain + ":type=Host,host=" +
host.getName() + ",service=" +
service.getName());
return (name);
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
manveen 02/03/21 18:42:42
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
fix for createUserDatabaseRealm
Revision ChangesPath
1.19 +9 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- MBeanFactory.java 22 Mar 2002 01:21:55 - 1.18
+++ MBeanFactory.java 22 Mar 2002 02:42:42 - 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.18 2002/03/22 01:21:55 manveen Exp $
- * $Revision: 1.18 $
- * $Date: 2002/03/22 01:21:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.19 2002/03/22 02:42:42 manveen Exp $
+ * $Revision: 1.19 $
+ * $Date: 2002/03/22 02:42:42 $
*
*
*
@@ -116,7 +116,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.18 $ $Date: 2002/03/22 01:21:55 $
+ * @version $Revision: 1.19 $ $Date: 2002/03/22 02:42:42 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -287,7 +287,7 @@
} else if (tname.equals("Engine")) {
engine.setLogger(fileLogger);
} else if (tname.equals("Host")) {
-Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
host.setLogger(fileLogger);
}
@@ -918,7 +918,8 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-String tname = findObjectName(type);
+//String tname = findObjectName(type);
+String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
@@ -930,12 +931,12 @@
} else if (tname.equals("Engine")) {
engine.setRealm(realm);
} else if (tname.equals("Host")) {
-Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
host.setRealm(realm);
}
// Return the corresponding MBean name
-ManagedBean managed = registry.findManagedBean("UserDatabseRealm");
+ManagedBean managed = registry.findManagedBean("UserDatabaseRealm");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), realm);
return (oname.toString());
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
manveen 02/03/21 17:21:56
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
Fix for create*Logger's.
Revision ChangesPath
1.18 +14 -9
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MBeanFactory.java 21 Mar 2002 21:19:10 - 1.17
+++ MBeanFactory.java 22 Mar 2002 01:21:55 - 1.18
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.17 2002/03/21 21:19:10 amyroh Exp $
- * $Revision: 1.17 $
- * $Date: 2002/03/21 21:19:10 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.18 2002/03/22 01:21:55 manveen Exp $
+ * $Revision: 1.18 $
+ * $Date: 2002/03/22 01:21:55 $
*
*
*
@@ -116,7 +116,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.17 $ $Date: 2002/03/21 21:19:10 $
+ * @version $Revision: 1.18 $ $Date: 2002/03/22 01:21:55 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -273,7 +273,9 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-String tname = findObjectName(type);
+// FIX ME
+// String tname = findObjectName(type);
+String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
@@ -832,7 +834,8 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-String tname = findObjectName(type);
+// String tname = findObjectName(type);
+String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
@@ -844,7 +847,7 @@
} else if (tname.equals("Engine")) {
engine.setLogger(logger);
} else if (tname.equals("Host")) {
-Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
host.setLogger(logger);
}
@@ -873,7 +876,9 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
-String tname = findObjectName(type);
+// FIX ME
+//String tname = findObjectName(type);
+String tname = type;
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
@@ -885,7 +890,7 @@
} else if (tname.equals("Engine")) {
engine.setLogger(logger);
} else if (tname.equals("Host")) {
-Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+Host host = (Host) engine.findChild(pname.getKeyProperty("name"));
host.setLogger(logger);
}
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/03/21 13:19:10
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add createUserDatabaseRealm().
Revision ChangesPath
1.17 +46 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MBeanFactory.java 19 Mar 2002 21:36:56 - 1.16
+++ MBeanFactory.java 21 Mar 2002 21:19:10 - 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.16 2002/03/19 21:36:56 amyroh Exp $
- * $Revision: 1.16 $
- * $Date: 2002/03/19 21:36:56 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.17 2002/03/21 21:19:10 amyroh Exp $
+ * $Revision: 1.17 $
+ * $Date: 2002/03/21 21:19:10 $
*
*
*
@@ -99,6 +99,7 @@
import org.apache.catalina.realm.JDBCRealm;
import org.apache.catalina.realm.JNDIRealm;
import org.apache.catalina.realm.MemoryRealm;
+import org.apache.catalina.realm.UserDatabaseRealm;
import org.apache.catalina.session.StandardManager;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.catalina.valves.RemoteAddrValve;
@@ -115,7 +116,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.16 $ $Date: 2002/03/19 21:36:56 $
+ * @version $Revision: 1.17 $ $Date: 2002/03/21 21:19:10 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -894,8 +895,49 @@
MBeanUtils.createObjectName(managed.getDomain(), logger);
return (oname.toString());
}
+
+
+/**
+ * Create a new UserDatabaseRealm.
+ *
+ * @param parent MBean Name of the associated parent component
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public String createUserDatabaseRealm(String parent)
+throws Exception {
+ // Create a new UserDatabaseRealm instance
+UserDatabaseRealm realm = new UserDatabaseRealm();
+
+// Add the new instance to its parent component
+ObjectName pname = new ObjectName(parent);
+String type = pname.getKeyProperty("type");
+String tname = findObjectName(type);
+Server server = ServerFactory.getServer();
+Service service = server.findService(pname.getKeyProperty("service"));
+Engine engine = (Engine) service.getContainer();
+if (tname.equals("StandardContext")) {
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+Context context =
+(Context) host.findChild(pname.getKeyProperty("path"));
+context.setRealm(realm);
+} else if (tname.equals("Engine")) {
+engine.setRealm(realm);
+} else if (tname.equals("Host")) {
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+host.setRealm(realm);
+}
+
+// Return the corresponding MBean name
+ManagedBean managed = registry.findManagedBean("UserDatabseRealm");
+ObjectName oname =
+MBeanUtils.createObjectName(managed.getDomain(), realm);
+return (oname.toString());
+
+}
+
/**
* Create a new Web Application Loader.
*
1.43 +10 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mbeans-descriptors.xml19 Mar 2002 21:36:56 - 1.42
+++ mbeans-descriptors.xml21 Mar 2002 21:19:10 - 1.43
@@ -6,7 +6,7 @@
@@ -1233,6 +1233,15 @@
+
+
+
+
mailto:[EMAIL PROTECTED]>
For additional commands, e-mail:
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
- Original Message -
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Wednesday, March 20, 2002 6:36 AM
Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
> amyroh 02/03/19 13:36:56
>
> Modified:catalina/src/share/org/apache/catalina/mbeans
> MBeanFactory.java mbeans-descriptors.xml
> Log:
> Add createWebappLoader() and removeLoader().
>
> Revision ChangesPath
> 1.16 +75 -16
>jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
>
> Index: MBeanFactory.java
> ===
> RCS file:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
>
> retrieving revision 1.15
> retrieving revision 1.16
> diff -u -r1.15 -r1.16
> --- MBeanFactory.java 19 Mar 2002 21:14:54 - 1.15
> +++ MBeanFactory.java 19 Mar 2002 21:36:56 - 1.16
> @@ -1,7 +1,7 @@
>/*
> - * $Header:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
> 1.15 2002/03/19 21:14:54 amyroh Exp $
> - * $Revision: 1.15 $
> - * $Date: 2002/03/19 21:14:54 $
> + * $Header:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
> 1.16 2002/03/19 21:36:56 amyroh Exp $
> + * $Revision: 1.16 $
> + * $Date: 2002/03/19 21:36:56 $
> *
> *
> *
> @@ -75,6 +75,7 @@
>import org.apache.catalina.DefaultContext;
>import org.apache.catalina.Engine;
>import org.apache.catalina.Host;
> +import org.apache.catalina.Loader;
>import org.apache.catalina.Logger;
>import org.apache.catalina.Manager;
>import org.apache.catalina.Realm;
> @@ -91,6 +92,7 @@
>import org.apache.catalina.core.StandardHost;
>import org.apache.catalina.core.StandardServer;
>import org.apache.catalina.core.StandardService;
> +import org.apache.catalina.loader.WebappLoader;
>import org.apache.catalina.logger.FileLogger;
>import org.apache.catalina.logger.SystemErrLogger;
>import org.apache.catalina.logger.SystemOutLogger;
> @@ -113,7 +115,7 @@
> * org.apache.catalina.core.StandardServer component.
> *
> * @author Amy Roh
> - * @version $Revision: 1.15 $ $Date: 2002/03/19 21:14:54 $
> + * @version $Revision: 1.16 $ $Date: 2002/03/19 21:36:56 $
> */
>
>public class MBeanFactory extends BaseModelMBean {
> @@ -199,7 +201,7 @@
>if (tname.equals("StandardContext")) {
>Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
>Context context =
> -(Context) host.findChild(pname.getKeyProperty("context"));
> +(Context) host.findChild(pname.getKeyProperty("path"));
>((StandardContext)context).addValve(accessLogger);
>} else if (tname.equals("Engine")) {
>((StandardEngine)engine).addValve(accessLogger);
> @@ -277,7 +279,7 @@
>if (tname.equals("StandardContext")) {
>Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
>Context context =
> -(Context) host.findChild(pname.getKeyProperty("context"));
> +(Context) host.findChild(pname.getKeyProperty("path"));
>context.setLogger(fileLogger);
>} else if (tname.equals("Engine")) {
>engine.setLogger(fileLogger);
> @@ -384,7 +386,7 @@
>if (tname.equals("StandardContext")) {
>Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
>Context context =
> -(Context) host.findChild(pname.getKeyProperty("context"));
> +(Context) host.findChild(pname.getKeyProperty("path"));
>context.setRealm(realm);
>} else if (tname.equals("Engine")) {
>engine.setRealm(realm);
> @@ -425,7 +427,7 @@
>if (tname.equals("StandardContext")) {
>Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
>Context context =
> -(Context) host.findChild(pname.getKeyProperty("context"
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/03/19 13:36:56
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add createWebappLoader() and removeLoader().
Revision ChangesPath
1.16 +75 -16
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MBeanFactory.java 19 Mar 2002 21:14:54 - 1.15
+++ MBeanFactory.java 19 Mar 2002 21:36:56 - 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.15 2002/03/19 21:14:54 amyroh Exp $
- * $Revision: 1.15 $
- * $Date: 2002/03/19 21:14:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.16 2002/03/19 21:36:56 amyroh Exp $
+ * $Revision: 1.16 $
+ * $Date: 2002/03/19 21:36:56 $
*
*
*
@@ -75,6 +75,7 @@
import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
+import org.apache.catalina.Loader;
import org.apache.catalina.Logger;
import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
@@ -91,6 +92,7 @@
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.core.StandardServer;
import org.apache.catalina.core.StandardService;
+import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.logger.FileLogger;
import org.apache.catalina.logger.SystemErrLogger;
import org.apache.catalina.logger.SystemOutLogger;
@@ -113,7 +115,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.15 $ $Date: 2002/03/19 21:14:54 $
+ * @version $Revision: 1.16 $ $Date: 2002/03/19 21:36:56 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -199,7 +201,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host.findChild(pname.getKeyProperty("path"));
((StandardContext)context).addValve(accessLogger);
} else if (tname.equals("Engine")) {
((StandardEngine)engine).addValve(accessLogger);
@@ -277,7 +279,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host.findChild(pname.getKeyProperty("path"));
context.setLogger(fileLogger);
} else if (tname.equals("Engine")) {
engine.setLogger(fileLogger);
@@ -384,7 +386,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host.findChild(pname.getKeyProperty("path"));
context.setRealm(realm);
} else if (tname.equals("Engine")) {
engine.setRealm(realm);
@@ -425,7 +427,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host.findChild(pname.getKeyProperty("path"));
context.setRealm(realm);
} else if (tname.equals("Engine")) {
engine.setRealm(realm);
@@ -466,7 +468,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host.findChild(pname.getKeyProperty("path"));
context.setRealm(realm);
} else if (tname.equals("Engine")) {
engine.setRealm(realm);
@@ -507,7 +509,7 @@
if (tname.equals("StandardContext")) {
Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
Context context =
-(Context) host.findChild(pname.getKeyProperty("context"));
+(Context) host
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/03/19 13:14:54
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add removeManager() and removeRealm().
Revision ChangesPath
1.15 +100 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MBeanFactory.java 18 Mar 2002 20:25:15 - 1.14
+++ MBeanFactory.java 19 Mar 2002 21:14:54 - 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.14 2002/03/18 20:25:15 amyroh Exp $
- * $Revision: 1.14 $
- * $Date: 2002/03/18 20:25:15 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.15 2002/03/19 21:14:54 amyroh Exp $
+ * $Revision: 1.15 $
+ * $Date: 2002/03/19 21:14:54 $
*
*
*
@@ -76,6 +76,8 @@
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Logger;
+import org.apache.catalina.Manager;
+import org.apache.catalina.Realm;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
@@ -111,7 +113,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.14 $ $Date: 2002/03/18 20:25:15 $
+ * @version $Revision: 1.15 $ $Date: 2002/03/19 21:14:54 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -235,8 +237,13 @@
Server server = ServerFactory.getServer();
Service service = server.findService(pname.getKeyProperty("service"));
Engine engine = (Engine) service.getContainer();
-Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
-host.addDefaultContext(context);
+String hostName = pname.getKeyProperty("host");
+if (hostName == null) { //if DefaultContext is nested in Engine
+engine.addDefaultContext(context);
+} else {// if DefaultContext is nested in Host
+Host host = (Host) engine.findChild(hostName);
+host.addDefaultContext(context);
+}
// Return the corresponding MBean name
ManagedBean managed = registry.findManagedBean("DefaultContext");
@@ -1053,6 +1060,93 @@
}
+/**
+ * Remove an existing Manager.
+ *
+ * @param name MBean Name of the comonent to remove
+ *
+ * @exception Exception if a component cannot be removed
+ */
+public void removeManager(String name) throws Exception {
+
+// Acquire a reference to the component to be removed
+ObjectName oname = new ObjectName(name);
+String serviceName = oname.getKeyProperty("service");
+String hostName = oname.getKeyProperty("host");
+String contextName = oname.getKeyProperty("path");
+Server server = ServerFactory.getServer();
+Service service = server.findService(serviceName);
+Engine engine = (Engine) service.getContainer();
+Host host = (Host) engine.findChild(hostName);
+Context context = (Context) host.findChild(contextName);
+
+// Remove this component from its parent component
+context.setManager(null);
+
+}
+
+
+/**
+ * Remove an existing Realm.
+ *
+ * @param name MBean Name of the comonent to remove
+ *
+ * @exception Exception if a component cannot be removed
+ */
+public void removeRealm(String name) throws Exception {
+
+// Acquire a reference to the component to be removed
+ObjectName oname = new ObjectName(name);
+String serviceName = oname.getKeyProperty("service");
+String hostName = oname.getKeyProperty("host");
+String path = oname.getKeyProperty("path");
+Server server = ServerFactory.getServer();
+Service service = server.findService(serviceName);
+StandardEngine engine = (StandardEngine) service.getContainer();
+if (hostName == null) { // if realm's container is Engine
+Realm realm = engine.getRealm();
+Container container = realm.getContainer();
+if (container instanceof StandardEngine) {
+String sname =
+((StandardEngine)container).getService().getName();
+if (sname.equals(serviceName)) {
+engine
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/03/18 12:25:15
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Add removeLogger() method to MBeanFactory.
Revision ChangesPath
1.14 +66 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MBeanFactory.java 15 Mar 2002 00:45:28 - 1.13
+++ MBeanFactory.java 18 Mar 2002 20:25:15 - 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.13 2002/03/15 00:45:28 manveen Exp $
- * $Revision: 1.13 $
- * $Date: 2002/03/15 00:45:28 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.14 2002/03/18 20:25:15 amyroh Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/03/18 20:25:15 $
*
*
*
@@ -75,6 +75,7 @@
import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
+import org.apache.catalina.Logger;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
@@ -110,7 +111,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.13 $ $Date: 2002/03/15 00:45:28 $
+ * @version $Revision: 1.14 $ $Date: 2002/03/18 20:25:15 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -988,6 +989,67 @@
// Remove this component from its parent component
engine.removeChild(host);
+}
+
+
+/**
+ * Remove an existing Logger.
+ *
+ * @param name MBean Name of the comonent to remove
+ *
+ * @exception Exception if a component cannot be removed
+ */
+public void removeLogger(String name) throws Exception {
+
+// Acquire a reference to the component to be removed
+ObjectName oname = new ObjectName(name);
+String serviceName = oname.getKeyProperty("service");
+String hostName = oname.getKeyProperty("host");
+String path = oname.getKeyProperty("path");
+Server server = ServerFactory.getServer();
+Service service = server.findService(serviceName);
+StandardEngine engine = (StandardEngine) service.getContainer();
+if (hostName == null) { // if logger's container is Engine
+Logger logger = engine.getLogger();
+Container container = logger.getContainer();
+if (container instanceof StandardEngine) {
+String sname =
+((StandardEngine)container).getService().getName();
+if (sname.equals(serviceName)) {
+engine.setLogger(null);
+}
+}
+} else if (path == null) { // if logger's container is Host
+StandardHost host = (StandardHost) engine.findChild(hostName);
+Logger logger = host.getLogger();
+Container container = logger.getContainer();
+if (container instanceof StandardHost) {
+String hn = ((StandardHost)container).getName();
+StandardEngine se =
+(StandardEngine) ((StandardHost)container).getParent();
+String sname = se.getService().getName();
+if (sname.equals(serviceName) && hn.equals(hostName)) {
+host.setLogger(null);
+}
+}
+} else {// logger's container is Context
+StandardHost host = (StandardHost) engine.findChild(hostName);
+StandardContext context = (StandardContext) host.findChild(path);
+Logger logger = context.getLogger();
+Container container = logger.getContainer();
+if (container instanceof StandardContext) {
+String pathName = ((StandardContext)container).getName();
+StandardHost sh =
+(StandardHost)((StandardContext)container).getParent();
+String hn = sh.getName();;
+StandardEngine se = (StandardEngine)sh.getParent();
+String sname = se.getService().getName();
+if ((sname.equals(serviceName) && hn.equals(hostName)) &&
+pathName.equals(path)) {
+context.setLogger(null);
+}
+}
+
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
manveen 02/03/14 16:45:28
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
The key property representing the hostName in a host mBean objectName is "name"
Revision ChangesPath
1.13 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MBeanFactory.java 8 Mar 2002 23:59:26 - 1.12
+++ MBeanFactory.java 15 Mar 2002 00:45:28 - 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.12 2002/03/08 23:59:26 amyroh Exp $
- * $Revision: 1.12 $
- * $Date: 2002/03/08 23:59:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.13 2002/03/15 00:45:28 manveen Exp $
+ * $Revision: 1.13 $
+ * $Date: 2002/03/15 00:45:28 $
*
*
*
@@ -110,7 +110,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.12 $ $Date: 2002/03/08 23:59:26 $
+ * @version $Revision: 1.13 $ $Date: 2002/03/15 00:45:28 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -979,7 +979,7 @@
// Acquire a reference to the component to be removed
ObjectName oname = new ObjectName(name);
String serviceName = oname.getKeyProperty("service");
-String hostName = oname.getKeyProperty("host");
+String hostName = oname.getKeyProperty("name");
Server server = ServerFactory.getServer();
Service service = server.findService(serviceName);
Engine engine = (Engine) service.getContainer();
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml
amyroh 02/03/08 15:59:26
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
Log:
Clean up remove operations for NPE.
Revision ChangesPath
1.12 +23 -13
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MBeanFactory.java 8 Mar 2002 22:01:07 - 1.11
+++ MBeanFactory.java 8 Mar 2002 23:59:26 - 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.11 2002/03/08 22:01:07 amyroh Exp $
- * $Revision: 1.11 $
- * $Date: 2002/03/08 22:01:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.12 2002/03/08 23:59:26 amyroh Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/03/08 23:59:26 $
*
*
*
@@ -110,7 +110,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.11 $ $Date: 2002/03/08 22:01:07 $
+ * @version $Revision: 1.12 $ $Date: 2002/03/08 23:59:26 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -895,38 +895,45 @@
*
* @exception Exception if a component cannot be removed
*/
-public void removeConnector(String name, String serviceName) throws Exception {
+public void removeConnector(String name) throws Exception {
// Acquire a reference to the component to be removed
ObjectName oname = new ObjectName(name);
Server server = ServerFactory.getServer();
+String serviceName = oname.getKeyProperty("service");
Service service = server.findService(serviceName);
String port = oname.getKeyProperty("port");
String address = oname.getKeyProperty("address");
+if (address==null) {
+address = "";
+}
Connector conns[] = (Connector[]) service.findConnectors();
for (int i = 0; i < conns.length; i++) {
if (conns[i] instanceof
org.apache.catalina.connector.http10.HttpConnector) {
-String addr =
+String connAddress =
((org.apache.catalina.connector.http10.HttpConnector)conns[i]).getAddress();
+if (connAddress == null) {
+connAddress = "";
+}
int p =
((org.apache.catalina.connector.http10.HttpConnector)conns[i]).getPort();
-Integer portInt = new Integer(p);
-if (address.equals(addr) &&
-port.equals(portInt.toString())) {
+String connPort = "" + p;
+if (address.equals(connAddress) && port.equals(connPort)) {
// Remove this component from its parent component
service.removeConnector(conns[i]);
+break;
}
} else if (conns[i] instanceof
org.apache.catalina.connector.http.HttpConnector) {
-String addr =
+String connAddress =
((org.apache.catalina.connector.http.HttpConnector)conns[i]).getAddress();
int p =
((org.apache.catalina.connector.http.HttpConnector)conns[i]).getPort();
-Integer portInt = new Integer(p);
-if (address.equals(addr) &&
-port.equals(portInt.toString())) {
+String connPort = "" + p;
+if (address.equals(connAddress) && port.equals(connPort)) {
// Remove this component from its parent component
service.removeConnector(conns[i]);
+break;
}
}
}
@@ -1034,6 +1041,7 @@
if (sname.equals(serviceName) &&
sequence.equals(sequenceInt.toString())){
engine.removeValve(valves[i]);
+break;
}
}
}
@@ -1051,6 +1059,7 @@
if ((sname.equals(serviceName) && hn.equals(hostName)) &&
sequence.equals(sequenceInt.toString())){
host.removeValve(valves[i]);
+break;
}
}
}
@@ -1072,6 +1081,7 @@
pathName
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java StandardContextMBean.java StandardEngineMBean.java StandardHostMBean.java StandardServiceMBean.java mbeans-descriptors.xml
amyroh 02/03/08 14:01:08
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java StandardContextMBean.java
StandardEngineMBean.java StandardHostMBean.java
StandardServiceMBean.java mbeans-descriptors.xml
Log:
Add removeConnector and removeValve.
Revision ChangesPath
1.11 +128 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MBeanFactory.java 8 Mar 2002 06:58:17 - 1.10
+++ MBeanFactory.java 8 Mar 2002 22:01:07 - 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.10 2002/03/08 06:58:17 amyroh Exp $
- * $Revision: 1.10 $
- * $Date: 2002/03/08 06:58:17 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.11 2002/03/08 22:01:07 amyroh Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/03/08 22:01:07 $
*
*
*
@@ -78,6 +78,7 @@
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
+import org.apache.catalina.Valve;
import org.apache.catalina.authenticator.SingleSignOn;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardServer;
@@ -98,6 +99,7 @@
import org.apache.catalina.valves.RemoteAddrValve;
import org.apache.catalina.valves.RemoteHostValve;
import org.apache.catalina.valves.RequestDumperValve;
+import org.apache.catalina.valves.ValveBase;
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
@@ -108,7 +110,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.10 $ $Date: 2002/03/08 06:58:17 $
+ * @version $Revision: 1.11 $ $Date: 2002/03/08 22:01:07 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -885,6 +887,54 @@
/**
+ * Remove an existing Connector.
+ *
+ * @param name MBean Name of the comonent to remove
+ *
+ * @param serviceName Service name of the connector to remove
+ *
+ * @exception Exception if a component cannot be removed
+ */
+public void removeConnector(String name, String serviceName) throws Exception {
+
+// Acquire a reference to the component to be removed
+ObjectName oname = new ObjectName(name);
+Server server = ServerFactory.getServer();
+Service service = server.findService(serviceName);
+String port = oname.getKeyProperty("port");
+String address = oname.getKeyProperty("address");
+Connector conns[] = (Connector[]) service.findConnectors();
+
+for (int i = 0; i < conns.length; i++) {
+if (conns[i] instanceof
+org.apache.catalina.connector.http10.HttpConnector) {
+String addr =
+
((org.apache.catalina.connector.http10.HttpConnector)conns[i]).getAddress();
+int p =
((org.apache.catalina.connector.http10.HttpConnector)conns[i]).getPort();
+Integer portInt = new Integer(p);
+if (address.equals(addr) &&
+port.equals(portInt.toString())) {
+// Remove this component from its parent component
+service.removeConnector(conns[i]);
+}
+} else if (conns[i] instanceof
+org.apache.catalina.connector.http.HttpConnector) {
+String addr =
+
((org.apache.catalina.connector.http.HttpConnector)conns[i]).getAddress();
+int p =
((org.apache.catalina.connector.http.HttpConnector)conns[i]).getPort();
+Integer portInt = new Integer(p);
+if (address.equals(addr) &&
+port.equals(portInt.toString())) {
+// Remove this component from its parent component
+service.removeConnector(conns[i]);
+}
+}
+}
+
+}
+
+
+/**
* Remove an existing Context.
*
* @param name MBean Name of the comonent to remove
@@ -897,7 +947,7 @@
ObjectName oname = new ObjectName(name);
String serviceName = oname.getKeyProperty("service");
String hostName = oname.g
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java StandardContextMBean.java StandardEngineMBean.java StandardHostMBean.java mbeans-descriptors.xml
amyroh 02/03/07 22:58:17
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java StandardContextMBean.java
StandardEngineMBean.java StandardHostMBean.java
mbeans-descriptors.xml
Log:
Update removeXxxx and addXxxx to MBeanFactory. Clean up the rest of the
StandardMBeans.
Revision ChangesPath
1.10 +30 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MBeanFactory.java 8 Mar 2002 00:42:14 - 1.9
+++ MBeanFactory.java 8 Mar 2002 06:58:17 - 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.9 2002/03/08 00:42:14 amyroh Exp $
- * $Revision: 1.9 $
- * $Date: 2002/03/08 00:42:14 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.10 2002/03/08 06:58:17 amyroh Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/03/08 06:58:17 $
*
*
*
@@ -108,7 +108,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.9 $ $Date: 2002/03/08 00:42:14 $
+ * @version $Revision: 1.10 $ $Date: 2002/03/08 06:58:17 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -881,6 +881,32 @@
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), logger);
return (oname.toString());
+}
+
+
+/**
+ * Remove an existing Context.
+ *
+ * @param name MBean Name of the comonent to remove
+ *
+ * @exception Exception if a component cannot be removed
+ */
+public void removeContext(String name) throws Exception {
+
+// Acquire a reference to the component to be removed
+ObjectName oname = new ObjectName(name);
+String serviceName = oname.getKeyProperty("service");
+String hostName = oname.getKeyProperty("host");
+String contextName = oname.getKeyProperty("context");
+Server server = ServerFactory.getServer();
+Service service = server.findService(serviceName);
+Engine engine = (Engine) service.getContainer();
+Host host = (Host) engine.findChild(hostName);
+Context context = (Context) host.findChild(contextName);
+
+// Remove this component from its parent component
+host.removeChild(context);
+
}
1.4 +4 -115
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
Index: StandardContextMBean.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StandardContextMBean.java 29 Jan 2002 23:10:49 - 1.3
+++ StandardContextMBean.java 8 Mar 2002 06:58:17 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java,v
1.3 2002/01/29 23:10:49 amyroh Exp $
- * $Revision: 1.3 $
- * $Date: 2002/01/29 23:10:49 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java,v
1.4 2002/03/08 06:58:17 amyroh Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/03/08 06:58:17 $
*
*
*
@@ -82,7 +82,7 @@
* org.apache.catalina.core.StandardContext component.
*
* @author Amy Roh
- * @version $Revision: 1.3 $ $Date: 2002/01/29 23:10:49 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/08 06:58:17 $
*/
public class StandardContextMBean extends BaseModelMBean {
@@ -120,28 +120,6 @@
/**
- * Add a new Valve to those assoicated with this Context
- *
- * @param valve MBean Name of the Valve to be added
- *
- * @exception Exception if an MBean cannot be created or registered
- */
-public void addValve(String valve)
-throws Exception {
-
-StandardContext context = (StandardContext) this.resource;
-ObjectName oname = new ObjectName(valve);
-Object obj = mserver.getAttribute(oname, "managedResource");
-Valve valveObj = null;
-if (obj instanceof Valve) {
-valveObj = (Valve) obj;
-}
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java StandardServerMBean.java StandardServiceMBean.java
amyroh 02/03/07 16:42:14
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java StandardServerMBean.java
StandardServiceMBean.java
Log:
Update createXxxx using new logic. Clean up StandardSererMBean and
StandardServiceMBean since now removeXxx operations are moved to MBeanFactory.
Revision ChangesPath
1.9 +291 -243
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MBeanFactory.java 7 Mar 2002 02:48:53 - 1.8
+++ MBeanFactory.java 8 Mar 2002 00:42:14 - 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.8 2002/03/07 02:48:53 craigmcc Exp $
- * $Revision: 1.8 $
- * $Date: 2002/03/07 02:48:53 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.9 2002/03/08 00:42:14 amyroh Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/03/08 00:42:14 $
*
*
*
@@ -69,8 +69,10 @@
import javax.management.ObjectName;
import javax.management.ObjectInstance;
import javax.management.RuntimeOperationsException;
+import org.apache.catalina.Connector;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Server;
@@ -106,7 +108,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.8 $ $Date: 2002/03/07 02:48:53 $
+ * @version $Revision: 1.9 $ $Date: 2002/03/08 00:42:14 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -161,9 +163,9 @@
} else if (type.equals("org.apache.catalina.core.StandardDefaultContext")) {
return "DefaultContext";
} else if (type.equals("org.apache.catalina.core.StandardEngine")) {
-return "StandardEngine";
+return "Engine";
} else if (type.equals("org.apache.catalina.core.StandardHost")) {
-return "StandardHost";
+return "Host";
} else return null;
}
@@ -179,26 +181,32 @@
public String createAccessLoggerValve(String parent)
throws Exception {
+// Create a new AccessLogValve instance
+AccessLogValve accessLogger = new AccessLogValve();
+
+// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
String type = pname.getKeyProperty("type");
String tname = findObjectName(type);
-ManagedBean managed = registry.findManagedBean(tname);
-String domain = null;
-if (managed != null)
-domain = managed.getDomain();
-if (domain == null)
-domain = mserver.getDefaultDomain();
-Object obj = mserver.getAttribute(pname, "managedResource");
-Container container = null;
-if (obj instanceof Container) {
-container = (Container) obj;
+Server server = ServerFactory.getServer();
+Service service = server.findService(pname.getKeyProperty("service"));
+Engine engine = (Engine) service.getContainer();
+if (tname.equals("StandardContext")) {
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+Context context =
+(Context) host.findChild(pname.getKeyProperty("context"));
+((StandardContext)context).addValve(accessLogger);
+} else if (tname.equals("Engine")) {
+((StandardEngine)engine).addValve(accessLogger);
+} else if (tname.equals("Host")) {
+Host host = (Host) engine.findChild(pname.getKeyProperty("host"));
+((StandardHost)host).addValve(accessLogger);
}
-AccessLogValve accessLogger = new AccessLogValve();
-accessLogger.setContainer(container);
-ObjectName oname = MBeanUtils.createObjectName(domain, accessLogger);
-MBeanUtils.createMBean(accessLogger);
-accessLogger.setContainer(null);
+// Return the corresponding MBean name
+ManagedBean managed = registry.findManagedBean("AccessLogValve");
+ObjectName oname =
+MBeanUtils.createObjectName(managed.getDomain(), accessLogger);
return (oname.toString());
}
@@ -214,25 +222,23 @@
pub
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java MBeanUtils.java StandardServerMBean.java
amyroh 02/02/07 11:18:40
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java MBeanUtils.java
StandardServerMBean.java
Log:
Change class names so it's compatible with registry object names.
Revision ChangesPath
1.6 +14 -12
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MBeanFactory.java 6 Feb 2002 22:03:54 - 1.5
+++ MBeanFactory.java 7 Feb 2002 19:18:40 - 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.5 2002/02/06 22:03:54 amyroh Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/06 22:03:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.6 2002/02/07 19:18:40 amyroh Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/07 19:18:40 $
*
*
*
@@ -76,6 +76,8 @@
import org.apache.catalina.Service;
import org.apache.catalina.authenticator.SingleSignOn;
import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.core.StandardServer;
+import org.apache.catalina.core.StandardService;
import org.apache.catalina.core.StandardDefaultContext;
import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.core.StandardHost;
@@ -102,7 +104,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.5 $ $Date: 2002/02/06 22:03:54 $
+ * @version $Revision: 1.6 $ $Date: 2002/02/07 19:18:40 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -648,14 +650,14 @@
domain = mserver.getDefaultDomain();
ObjectName pname = new ObjectName(parent);
Object obj = mserver.getAttribute(pname, "managedResource");
-Service service = null;
-if (obj instanceof Service) {
-service = (Service) obj;
+StandardService service = null;
+if (obj instanceof StandardService) {
+service = (StandardService) obj;
}
StandardEngine engine = new StandardEngine();
engine.setService(service);
ObjectName oname = MBeanUtils.createObjectName(domain, service);
-MBeanUtils.createMBean(service);
+MBeanUtils.createMBean(engine);
engine.setService(null);
return (oname.toString());
@@ -739,7 +741,7 @@
* Create a new StandardService.
*
* @param parent MBean Name of the associated parent component
- * @param name Unique name of this Service
+ * @param name Unique name of this StandardService
*
* @exception Exception if an MBean cannot be created or registered
*/
@@ -755,9 +757,9 @@
domain = mserver.getDefaultDomain();
ObjectName pname = new ObjectName(parent);
Object obj = mserver.getAttribute(pname, "managedResource");
-Server server = null;
-if (obj instanceof Server) {
-server = (Server) obj;
+StandardServer server = null;
+if (obj instanceof StandardServer) {
+server = (StandardServer) obj;
}
StandardService service = new StandardService();
service.setName(name);
1.19 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- MBeanUtils.java 4 Feb 2002 20:28:49 - 1.18
+++ MBeanUtils.java 7 Feb 2002 19:18:40 - 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.18 2002/02/04 20:28:49 amyroh Exp $
- * $Revision: 1.18 $
- * $Date: 2002/02/04 20:28:49 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.19 2002/02/07 19:18:40 amyroh Exp $
+ * $Revision: 1.19 $
+ * $Date: 2002/02/07 19:18:40 $
*
*
*
@@ -97,6 +97,7 @@
import org.apache.catalina.UserDatabase;
import org.apache.catalina.Valve;
import org.apache.catalina.connector.http.HttpConnector;
+import org.apache.ca
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java
amyroh 02/02/06 14:03:54
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
Log:
Hard code to look for object names in Registry instead of full mbean names.
Revision ChangesPath
1.5 +85 -35
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MBeanFactory.java 29 Jan 2002 23:10:49 - 1.4
+++ MBeanFactory.java 6 Feb 2002 22:03:54 - 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.4 2002/01/29 23:10:49 amyroh Exp $
- * $Revision: 1.4 $
- * $Date: 2002/01/29 23:10:49 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.5 2002/02/06 22:03:54 amyroh Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/02/06 22:03:54 $
*
*
*
@@ -102,7 +102,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.4 $ $Date: 2002/01/29 23:10:49 $
+ * @version $Revision: 1.5 $ $Date: 2002/02/06 22:03:54 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -145,6 +145,25 @@
// - Operations
+/**
+ * Return the managed bean definition for the specified bean type
+ *
+ * @param type MBean type
+ */
+public String findObjectName(String type) {
+
+if (type.equals("org.apache.catalina.core.StandardContext")) {
+return "StandardContext";
+} else if (type.equals("org.apache.catalina.core.StandardDefaultContext")) {
+return "DefaultContext";
+} else if (type.equals("org.apache.catalina.core.StandardEngine")) {
+return "StandardEngine";
+} else if (type.equals("org.apache.catalina.core.StandardHost")) {
+return "StandardHost";
+} else return null;
+
+}
+
/**
* Create a new AccessLoggerValve.
@@ -156,13 +175,15 @@
public String createAccessLoggerValve(String parent)
throws Exception {
-ManagedBean managed = registry.findManagedBean(parent);
+ObjectName pname = new ObjectName(parent);
+String type = pname.getKeyProperty("type");
+String tname = findObjectName(type);
+ManagedBean managed = registry.findManagedBean(tname);
String domain = null;
if (managed != null)
domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
-ObjectName pname = new ObjectName(parent);
Object obj = mserver.getAttribute(pname, "managedResource");
Container container = null;
if (obj instanceof Container) {
@@ -189,7 +210,8 @@
public String createDefaultContext(String parent)
throws Exception {
-ManagedBean managed = registry.findManagedBean(parent);
+String tname = "StandardHost";
+ManagedBean managed = registry.findManagedBean(tname);
String domain = null;
if (managed != null)
domain = managed.getDomain();
@@ -222,13 +244,15 @@
public String createFileLogger(String parent)
throws Exception {
-ManagedBean managed = registry.findManagedBean(parent);
+ObjectName pname = new ObjectName(parent);
+String type = pname.getKeyProperty("type");
+String tname = findObjectName(type);
+ManagedBean managed = registry.findManagedBean(tname);
String domain = null;
if (managed != null)
domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
-ObjectName pname = new ObjectName(parent);
Object obj = mserver.getAttribute(pname, "managedResource");
Container container = null;
if (obj instanceof Container) {
@@ -257,7 +281,8 @@
public String createHttp10Connector(String parent, String address, int port)
throws Exception {
-ManagedBean managed = registry.findManagedBean(parent);
+String tname = "StandardService";
+ManagedBean managed = registry.findManagedBean(tname);
String domain = null;
if (managed != null)
domain = managed.getDomain();
@@ -295,7 +320,8 @@
public String createHttp11Connector(String parent, String addre
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java StandardContextMBean.java StandardEngineMBean.java StandardHostMBean.java StandardServerMBean.java StandardServiceMBean.java mbeans-descriptors.xml
amyroh 02/01/29 15:10:49
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java StandardContextMBean.java
StandardEngineMBean.java StandardHostMBean.java
StandardServerMBean.java StandardServiceMBean.java
mbeans-descriptors.xml
Log:
Add managedResource as one of properties for Container MBeans so its object
is accessible from other mbeans.
Finish createXxxx and addXxxx for mbeans.
Revision ChangesPath
1.4 +81 -137
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MBeanFactory.java 23 Jan 2002 11:04:07 - 1.3
+++ MBeanFactory.java 29 Jan 2002 23:10:49 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.3 2002/01/23 11:04:07 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2002/01/23 11:04:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
1.4 2002/01/29 23:10:49 amyroh Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/01/29 23:10:49 $
*
*
*
@@ -102,7 +102,7 @@
* org.apache.catalina.core.StandardServer component.
*
* @author Amy Roh
- * @version $Revision: 1.3 $ $Date: 2002/01/23 11:04:07 $
+ * @version $Revision: 1.4 $ $Date: 2002/01/29 23:10:49 $
*/
public class MBeanFactory extends BaseModelMBean {
@@ -162,14 +162,12 @@
domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
-
ObjectName pname = new ObjectName(parent);
-ObjectInstance oinstance = mserver.getObjectInstance(pname);
-// look up the MBean for the owning Container.
-BaseModelMBean containerMBean = null;
-//Container container = containerMBean.getManagedResource();
+Object obj = mserver.getAttribute(pname, "managedResource");
Container container = null;
-
+if (obj instanceof Container) {
+container = (Container) obj;
+}
AccessLogValve accessLogger = new AccessLogValve();
accessLogger.setContainer(container);
ObjectName oname = MBeanUtils.createObjectName(domain, accessLogger);
@@ -197,17 +195,14 @@
domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
-
ObjectName pname = new ObjectName(parent);
-ObjectInstance oinstance = mserver.getObjectInstance(pname);
-// look up the MBean for the owning Host.
-StandardHostMBean hostMBean = null;
-//Host host = hostMBean.getManagedObject();
+Object obj = mserver.getAttribute(pname, "managedResource");
Host host = null;
+if (obj instanceof Host) {
+host = (Host) obj;
+}
StandardDefaultContext context = new StandardDefaultContext();
-
context.setParent(host);
-
ObjectName oname = MBeanUtils.createObjectName(domain, context);
MBeanUtils.createMBean(context);
context.setParent(null);
@@ -216,7 +211,7 @@
}
-
+
/**
* Create a new FileLogger.
*
@@ -233,14 +228,12 @@
domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
-
ObjectName pname = new ObjectName(parent);
-ObjectInstance oinstance = mserver.getObjectInstance(pname);
-// look up the MBean for the owning Container.
-BaseModelMBean containerMBean = null;
-//Container container = containerMBean.getManagedResource();
+Object obj = mserver.getAttribute(pname, "managedResource");
Container container = null;
-
+if (obj instanceof Container) {
+container = (Container) obj;
+}
FileLogger fileLogger = new FileLogger();
fileLogger.setContainer(container);
ObjectName oname = MBeanUtils.createObjectName(domain, fileLogger);
@@ -270,21 +263,17 @@
domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
-
ObjectName pname = new ObjectName(parent);
-ObjectInstance oinstance = mserver.getObjectInstance(pname);
-// look up the MBean for the owning Service.
-StandardServiceMBean serviceMBean = null;
-
