Author: jfrederic.clere(a)jboss.com Date: 2012-08-09 10:39:59 -0400 (Thu, 09 Aug 2012) New Revision: 2059 Modified: branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProtocol.java branches/7.0.x/java/org/apache/coyote/ajp/AjpProtocol.java branches/7.0.x/java/org/apache/coyote/http11/Http11AprProtocol.java branches/7.0.x/java/org/apache/coyote/http11/Http11Protocol.java Log: Arrange r2033 = add the internal JMX names. Modified: branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProtocol.java =================================================================== --- branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProtocol.java 2012-08-08 16:26:10 UTC (rev 2058) +++ branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProtocol.java 2012-08-09 14:39:59 UTC (rev 2059) @@ -189,14 +189,14 @@ if (this.domain != null ) { try { tpOname = new ObjectName - (domain + ":" + "type=ThreadPool,name=" + getName()); + (domain + ":" + "type=ThreadPool,name=" + getJmxName()); Registry.getRegistry(null, null) .registerComponent(endpoint, tpOname, null ); } catch (Exception e) { log.error("Can't register threadpool" ); } rgOname = new ObjectName - (domain + ":type=GlobalRequestProcessor,name=" + getName()); + (domain + ":type=GlobalRequestProcessor,name=" + getJmxName()); Registry.getRegistry(null, null).registerComponent (cHandler.global, rgOname, null); } Modified: branches/7.0.x/java/org/apache/coyote/ajp/AjpProtocol.java =================================================================== --- branches/7.0.x/java/org/apache/coyote/ajp/AjpProtocol.java 2012-08-08 16:26:10 UTC (rev 2058) +++ branches/7.0.x/java/org/apache/coyote/ajp/AjpProtocol.java 2012-08-09 14:39:59 UTC (rev 2059) @@ -186,14 +186,14 @@ if (this.domain != null ) { try { tpOname = new ObjectName - (domain + ":" + "type=ThreadPool,name=" + getName()); + (domain + ":" + "type=ThreadPool,name=" + getJmxName()); Registry.getRegistry(null, null) .registerComponent(endpoint, tpOname, null ); } catch (Exception e) { log.error("Can't register threadpool" ); } rgOname = new ObjectName - (domain + ":type=GlobalRequestProcessor,name=" + getName()); + (domain + ":type=GlobalRequestProcessor,name=" + getJmxName()); Registry.getRegistry(null, null).registerComponent (cHandler.global, rgOname, null); } Modified: branches/7.0.x/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- branches/7.0.x/java/org/apache/coyote/http11/Http11AprProtocol.java 2012-08-08 16:26:10 UTC (rev 2058) +++ branches/7.0.x/java/org/apache/coyote/http11/Http11AprProtocol.java 2012-08-09 14:39:59 UTC (rev 2059) @@ -136,14 +136,14 @@ if( this.domain != null ) { try { tpOname=new ObjectName - (domain + ":" + "type=ThreadPool,name=" + getName()); + (domain + ":" + "type=ThreadPool,name=" + getJmxName()); Registry.getRegistry(null, null) .registerComponent(endpoint, tpOname, null ); } catch (Exception e) { log.error("Can't register threadpool" ); } rgOname=new ObjectName - (domain + ":type=GlobalRequestProcessor,name=" + getName()); + (domain + ":type=GlobalRequestProcessor,name=" + getJmxName()); Registry.getRegistry(null, null).registerComponent ( cHandler.global, rgOname, null ); } Modified: branches/7.0.x/java/org/apache/coyote/http11/Http11Protocol.java =================================================================== --- branches/7.0.x/java/org/apache/coyote/http11/Http11Protocol.java 2012-08-08 16:26:10 UTC (rev 2058) +++ branches/7.0.x/java/org/apache/coyote/http11/Http11Protocol.java 2012-08-09 14:39:59 UTC (rev 2059) @@ -202,14 +202,14 @@ if (this.domain != null) { try { tpOname = new ObjectName - (domain + ":" + "type=ThreadPool,name=" + getName()); + (domain + ":" + "type=ThreadPool,name=" + getJmxName()); Registry.getRegistry(null, null) .registerComponent(endpoint, tpOname, null ); } catch (Exception e) { log.error("Can't register endpoint"); } rgOname=new ObjectName - (domain + ":type=GlobalRequestProcessor,name=" + getName()); + (domain + ":type=GlobalRequestProcessor,name=" + getJmxName()); Registry.getRegistry(null, null).registerComponent ( cHandler.global, rgOname, null ); }