Author: markt
Date: Sun Dec 14 17:17:09 2014
New Revision: 1645473
URL: http://svn.apache.org/r1645473
Log:
Partial revert of r1645465 since StoreConfig is at the Server/JVM level so
there is only ever one of them.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.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=1645473&r1=1645472&r2=1645473&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Sun Dec 14
17:17:09 2014
@@ -690,7 +690,8 @@ public final class StandardServer extend
*/
public synchronized void storeConfig() throws Exception {
try {
- ObjectName sname = new ObjectName(getDomain() +
":type=StoreConfig");
+ // Note: Hard-coded domain used since this object is per Server/JVM
+ ObjectName sname = new ObjectName("Catalina:type=StoreConfig");
if (mserver.isRegistered(sname)) {
mserver.invoke(sname, "storeConfig", null, null);
} else {
@@ -716,7 +717,8 @@ public final class StandardServer extend
*/
public synchronized void storeContext(Context context) throws Exception {
try {
- ObjectName sname = new ObjectName(getDomain() +
":type=StoreConfig");
+ // Note: Hard-coded domain used since this object is per Server/JVM
+ ObjectName sname = new ObjectName("Catalina:type=StoreConfig");
if (mserver.isRegistered(sname)) {
mserver.invoke(sname, "store",
new Object[] {context},
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1645473&r1=1645472&r2=1645473&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sun Dec
14 17:17:09 2014
@@ -583,8 +583,7 @@ public class ManagerServlet extends Http
ObjectName storeConfigOname;
try {
- // Note that there is only ever one StoreConfig per JVM and the
- // name of the MBean is hard-coded.
+ // Note: Hard-coded domain used since this object is per Server/JVM
storeConfigOname = new ObjectName("Catalina:type=StoreConfig");
} catch (MalformedObjectNameException e) {
// Should never happen. The name above is valid.
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=1645473&r1=1645472&r2=1645473&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Sun Dec 14 17:17:09 2014
@@ -92,7 +92,8 @@ public class StoreConfigLifecycleListene
return;
}
try {
- oname = new ObjectName(server.getDomain() + ":type=StoreConfig" );
+ // Note: Hard-coded domain used since this object is per Server/JVM
+ oname = new ObjectName("Catalina: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=1645473&r1=1645472&r2=1645473&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Sun Dec
14 17:17:09 2014
@@ -42,7 +42,6 @@ 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;
/**
@@ -77,7 +76,6 @@ public class TestRegistration extends To
"Tomcat:type=Server",
"Tomcat:type=Service",
"Tomcat:type=StringCache",
- "Tomcat:type=StoreConfig",
"Tomcat:type=Valve,name=StandardEngineValve",
};
}
@@ -160,9 +158,6 @@ 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]
