Author: markt
Date: Sun Dec 14 16:10:10 2014
New Revision: 1645465
URL: http://svn.apache.org/r1645465
Log:
Don't hard-code domain of StoreConfig MBean to 'Catalina' but use the domain
name configured for the associated server.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1645465&r1=1645464&r2=1645465&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Sun Dec 14
16:10:10 2014
@@ -689,7 +689,7 @@ public final class StandardServer extend
* if an exception is reported by the persistence mechanism
*/
public synchronized void storeConfig() throws Exception {
- ObjectName sname = new ObjectName("Catalina:type=StoreConfig");
+ ObjectName sname = new ObjectName(getDomain() + ":type=StoreConfig");
mserver.invoke(sname, "storeConfig", null, null);
}
@@ -709,7 +709,7 @@ public final class StandardServer extend
ObjectName sname = null;
try {
- sname = new ObjectName("Catalina:type=StoreConfig");
+ sname = new ObjectName(getDomain() + ":type=StoreConfig");
if(mserver.isRegistered(sname)) {
mserver.invoke(sname, "store",
new Object[] {context},
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java?rev=1645465&r1=1645464&r2=1645465&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Sun Dec 14 16:10:10 2014
@@ -17,7 +17,6 @@
package org.apache.catalina.storeconfig;
import javax.management.DynamicMBean;
-import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.catalina.Lifecycle;
@@ -48,6 +47,7 @@ public class StoreConfigLifecycleListene
private String storeConfigClass =
"org.apache.catalina.storeconfig.StoreConfig";
private String storeRegistry = null;
+ private ObjectName oname = null;
/*
* register StoreRegistry after Start the complete Server
@@ -60,8 +60,13 @@ public class StoreConfigLifecycleListene
if (event.getSource() instanceof StandardServer) {
createMBean((StandardServer) event.getSource());
}
+ } else if (Lifecycle.AFTER_STOP_EVENT.equals(event.getType())) {
+ if (oname != null) {
+ registry.unregisterComponent(oname);
+ oname = null;
+ }
}
- }
+ }
/**
* create StoreConfig MBean and load StoreRgistry MBeans name is
@@ -86,12 +91,9 @@ public class StoreConfigLifecycleListene
log.error("createMBean load", e);
return;
}
- MBeanServer mserver = MBeanUtils.createServer();
try {
- ObjectName objectName = new ObjectName("Catalina:type=StoreConfig"
);
- if (!mserver.isRegistered(objectName)) {
- registry.registerComponent(storeConfig, objectName,
"StoreConfig");
- }
+ oname = new ObjectName(server.getDomain() + ":type=StoreConfig" );
+ registry.registerComponent(storeConfig, oname, "StoreConfig");
} catch (Exception ex) {
log.error("createMBean register MBean", ex);
}
Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1645465&r1=1645464&r2=1645465&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Sun Dec
14 16:10:10 2014
@@ -42,6 +42,7 @@ import org.apache.catalina.realm.Combine
import org.apache.catalina.realm.NullRealm;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.storeconfig.StoreConfigLifecycleListener;
import org.apache.tomcat.util.modeler.Registry;
/**
@@ -76,6 +77,7 @@ public class TestRegistration extends To
"Tomcat:type=Server",
"Tomcat:type=Service",
"Tomcat:type=StringCache",
+ "Tomcat:type=StoreConfig",
"Tomcat:type=Valve,name=StandardEngineValve",
};
}
@@ -158,6 +160,9 @@ public class TestRegistration extends To
assertEquals("Unexpected: " + onames, 0, onames.size());
final Tomcat tomcat = getTomcatInstance();
+
+ tomcat.getServer().addLifecycleListener(new
StoreConfigLifecycleListener());
+
final File contextDir = new File(getTemporaryDirectory(), "webappFoo");
addDeleteOnTearDown(contextDir);
if (!contextDir.mkdirs() && !contextDir.isDirectory()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
