Author: markt
Date: Sun Dec 14 16:14:07 2014
New Revision: 1645466
URL: http://svn.apache.org/r1645466
Log:
Don't hard-code domain of StoreConfig MBean to 'Catalina' but use the domain
name configured for the associated server.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 14 16:14:07 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357,1645455
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357,1645455,1645465
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1645466&r1=1645465&r2=1645466&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardServer.java Sun
Dec 14 16:14:07 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/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java?rev=1645466&r1=1645465&r2=1645466&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Sun Dec 14 16:14:07 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/tc8.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1645466&r1=1645465&r2=1645466&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
Sun Dec 14 16:14:07 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()) {
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1645466&r1=1645465&r2=1645466&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sun Dec 14 16:14:07 2014
@@ -169,6 +169,11 @@
Prevent NPEs being logged during post-processing for requests that have
been re-written by the RewriteValve. (markt)
</fix>
+ <fix>
+ Don't hard-code the domain of the StoreConfig MBean to
+ <code>Catalina</code> but use the domain name configured for the
+ associated server. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
