Author: markt
Date: Wed Dec 11 12:36:17 2013
New Revision: 1550123
URL: http://svn.apache.org/r1550123
Log:
More logical grouping of components (group by Host then by Context)
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1550123&r1=1550122&r2=1550123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Wed
Dec 11 12:36:17 2013
@@ -373,10 +373,10 @@ public final class ApplicationFilterConf
}
if (context instanceof StandardContext) {
StandardContext standardContext = (StandardContext) context;
- onameStr = domain + ":j2eeType=Filter,name=" + filterName +
- ",WebModule=" + webMod + ",J2EEApplication=" +
- standardContext.getJ2EEApplication() + ",J2EEServer=" +
- standardContext.getJ2EEServer();
+ onameStr = domain + ":j2eeType=Filter,WebModule=" + webMod +
+ ",name=" + filterName + ",J2EEApplication=" +
+ standardContext.getJ2EEApplication() + ",J2EEServer=" +
+ standardContext.getJ2EEServer();
} else {
onameStr = domain + ":j2eeType=Filter,name=" + filterName +
",WebModule=" + webMod;
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1550123&r1=1550122&r2=1550123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed Dec 11
12:36:17 2013
@@ -1230,15 +1230,15 @@ public abstract class ContainerBase exte
// each container
while (!(c instanceof Engine)) {
if (c instanceof Wrapper) {
- keyProperties.append(",servlet=");
- keyProperties.append(c.getName());
+ keyProperties.insert(0, ",servlet=");
+ keyProperties.insert(9, c.getName());
} else if (c instanceof Context) {
- keyProperties.append(",context=");
+ keyProperties.insert(0, ",context=");
ContextName cn = new ContextName(c.getName());
- keyProperties.append(cn.getDisplayName());
+ keyProperties.insert(9,cn.getDisplayName());
} else if (c instanceof Host) {
- keyProperties.append(",host=");
- keyProperties.append(c.getName());
+ keyProperties.insert(0, ",host=");
+ keyProperties.insert(6, c.getName());
} else if (c == null) {
// May happen in unit testing and/or some embedding scenarios
keyProperties.append(",container");
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1550123&r1=1550122&r2=1550123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Wed
Dec 11 12:36:17 2013
@@ -745,10 +745,10 @@ public class NamingContextListener
contextName = "/" + contextName;
Host host = (Host) ((Context)container).getParent();
name = new ObjectName(domain + ":type=DataSource" +
- ",context=" + contextName +
- ",host=" + host.getName() +
- ",class=" + resource.getType() +
- ",name=" + quotedResourceName);
+ ",host=" + host.getName() +
+ ",context=" + contextName +
+ ",class=" + resource.getType() +
+ ",name=" + quotedResourceName);
}
return (name);
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1550123&r1=1550122&r2=1550123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed Dec 11
12:36:17 2013
@@ -1050,11 +1050,15 @@ public class StandardWrapper extends Con
if (isJspServlet) {
StringBuilder oname = new StringBuilder(getDomain());
- oname.append(":type=JspMonitor,name=");
- oname.append(getName());
+ oname.append(":type=JspMonitor");
oname.append(getWebModuleKeyProperties());
+ oname.append(",name=");
+ oname.append(getName());
+
+ oname.append(getJ2EEKeyProperties());
+
try {
jspMonitorON = new ObjectName(oname.toString());
Registry.getRegistry(null, null)
@@ -1795,7 +1799,11 @@ public class StandardWrapper extends Con
protected String getObjectNameKeyProperties() {
StringBuilder keyProperties =
- new StringBuilder("j2eeType=Servlet,name=");
+ new StringBuilder("j2eeType=Servlet");
+
+ keyProperties.append(getWebModuleKeyProperties());
+
+ keyProperties.append(",name=");
String name = getName();
if (Util.objectNameValueNeedsQuote(name)) {
@@ -1803,7 +1811,7 @@ public class StandardWrapper extends Con
}
keyProperties.append(name);
- keyProperties.append(getWebModuleKeyProperties());
+ keyProperties.append(getJ2EEKeyProperties());
return keyProperties.toString();
}
@@ -1825,12 +1833,18 @@ public class StandardWrapper extends Con
}
keyProperties.append(contextName);
+ return keyProperties.toString();
+ }
+
+ private String getJ2EEKeyProperties() {
+
+ StringBuilder keyProperties = new StringBuilder(",J2EEApplication=");
+
StandardContext ctx = null;
if (parent instanceof StandardContext) {
ctx = (StandardContext) getParent();
}
- keyProperties.append(",J2EEApplication=");
if (ctx == null) {
keyProperties.append("none");
} else {
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1550123&r1=1550122&r2=1550123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Wed Dec 11
12:36:17 2013
@@ -408,8 +408,8 @@ public class WebappLoader extends Lifecy
contextName = "/" + contextName;
}
ObjectName cloname = new ObjectName(context.getDomain() +
- ":type=WebappClassLoader,context=" + contextName +
- ",host=" + context.getParent().getName());
+ ":type=WebappClassLoader,host=" +
context.getParent().getName() +
+ ",context=" + contextName);
Registry.getRegistry(null, null)
.registerComponent(classLoader, cloname, null);
@@ -454,8 +454,8 @@ public class WebappLoader extends Lifecy
contextName = "/" + contextName;
}
ObjectName cloname = new ObjectName(context.getDomain() +
- ":type=WebappClassLoader,context=" + contextName +
- ",host=" + context.getParent().getName());
+ ":type=WebappClassLoader,host=" +
context.getParent().getName() +
+ ",context=" + contextName);
Registry.getRegistry(null, null).unregisterComponent(cloname);
} catch (Exception e) {
log.error("LifecycleException ", e);
@@ -680,6 +680,9 @@ public class WebappLoader extends Lifecy
StringBuilder name = new StringBuilder("type=Loader");
+ name.append(",host=");
+ name.append(context.getParent().getName());
+
name.append(",context=");
String contextName = context.getName();
@@ -688,9 +691,6 @@ public class WebappLoader extends Lifecy
}
name.append(contextName);
- name.append(",host=");
- name.append(context.getParent().getName());
-
return name.toString();
}
}
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1550123&r1=1550122&r2=1550123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Wed Dec 11
12:36:17 2013
@@ -347,8 +347,8 @@ public class MBeanUtils {
ContextName cn = new ContextName(context.getName());
Container host = context.getParent();
name = new ObjectName(domain + ":type=Environment" +
- ",resourcetype=Context,context=" + cn.getDisplayName()
+
- ",host=" + host.getName() +
+ ",resourcetype=Context,host=" + host.getName() +
+ ",context=" + cn.getDisplayName() +
",name=" + environment.getName());
}
return (name);
@@ -375,17 +375,17 @@ public class MBeanUtils {
resource.getNamingResources().getContainer();
if (container instanceof Server) {
name = new ObjectName(domain + ":type=Resource" +
- ",resourcetype=Global,class=" + resource.getType() +
- ",name=" + quotedResourceName);
+ ",resourcetype=Global,class=" + resource.getType() +
+ ",name=" + quotedResourceName);
} else if (container instanceof Context) {
Context context = ((Context)container);
ContextName cn = new ContextName(context.getName());
Container host = context.getParent();
name = new ObjectName(domain + ":type=Resource" +
- ",resourcetype=Context,context=" + cn.getDisplayName()
+
- ",host=" + host.getName() +
- ",class=" + resource.getType() +
- ",name=" + quotedResourceName);
+ ",resourcetype=Context,host=" + host.getName() +
+ ",context=" + cn.getDisplayName() +
+ ",class=" + resource.getType() +
+ ",name=" + quotedResourceName);
}
return (name);
@@ -413,16 +413,16 @@ public class MBeanUtils {
resourceLink.getNamingResources().getContainer();
if (container instanceof Server) {
name = new ObjectName(domain + ":type=ResourceLink" +
- ",resourcetype=Global" +
- ",name=" + quotedResourceLinkName);
+ ",resourcetype=Global" +
+ ",name=" + quotedResourceLinkName);
} else if (container instanceof Context) {
Context context = ((Context)container);
ContextName cn = new ContextName(context.getName());
Container host = context.getParent();
name = new ObjectName(domain + ":type=ResourceLink" +
- ",resourcetype=Context,context=" + cn.getDisplayName()
+
- ",host=" + host.getName() +
- ",name=" + quotedResourceLinkName);
+ ",resourcetype=Context,host=" + host.getName() +
+ ",context=" + cn.getDisplayName() +
+ ",name=" + quotedResourceLinkName);
}
return (name);
@@ -469,8 +469,8 @@ public class MBeanUtils {
ContextName cn = new ContextName(context.getName());
Container host = context.getParent();
- name = new ObjectName(domain + ":type=Loader,context=" +
- cn.getDisplayName() + ",host=" + host.getName());
+ name = new ObjectName(domain + ":type=Loader,host=" + host.getName() +
+ ",context=" + cn.getDisplayName());
return name;
}
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1550123&r1=1550122&r2=1550123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Wed Dec 11
12:36:17 2013
@@ -1261,6 +1261,9 @@ public abstract class ManagerBase extend
StringBuilder name = new StringBuilder("type=Manager");
+ name.append(",host=");
+ name.append(context.getParent().getName());
+
name.append(",context=");
String contextName = context.getName();
if (!contextName.startsWith("/")) {
@@ -1268,9 +1271,6 @@ public abstract class ManagerBase extend
}
name.append(contextName);
- name.append(",host=");
- name.append(context.getParent().getName());
-
return name.toString();
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1550123&r1=1550122&r2=1550123&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Dec 11 12:36:17 2013
@@ -191,6 +191,11 @@
Jasper-specific lifecycle listener. <code>JasperListener</code> has
been
removed. (jboynes)
</scode>
+ <fix>
+ Chnage ordering of elements of JMX objects names so components are
+ grouped more logically in JConsole. Generally, components are now
+ grouped by Host and then by Context. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
