[jbossweb-commits] JBossWeb SVN: r2479 - in branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889: src/main/java/org/apache/coyote/ajp and 1 other directories.

Author: bmaxwell Date: 2014-07-18 16:34:47 -0400 (Fri, 18 Jul 2014) New Revision: 2479 Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/pom.xml branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java Log: [BZ-1120889] backport fix for APR connector does not allow adding system property org.apache.tomcat.util.ENABLE_MODELER=true Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/pom.xml =================================================================== --- branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/pom.xml 2014-07-18 20:19:32 UTC (rev 2478) +++ branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/pom.xml 2014-07-18 20:34:47 UTC (rev 2479) @@ -33,7 +33,7 @@ <groupId>org.jboss.web</groupId> <artifactId>jbossweb</artifactId> - <version>7.2.2.Final</version> + <version>7.2.2.Final-redhat-1-bz-1120889</version> <name>JBoss Web</name> <description>Servlet 3.0 container</description> Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java =================================================================== --- branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2014-07-18 20:19:32 UTC (rev 2478) +++ branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2014-07-18 20:34:47 UTC (rev 2479) @@ -166,14 +166,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) { CoyoteLogger.AJP_LOGGER.errorRegisteringPool(e); } rgOname = new ObjectName - (domain + ":type=GlobalRequestProcessor,name=" + getName()); + (domain + ":type=GlobalRequestProcessor,name=" + getJmxName()); Registry.getRegistry(null, null).registerComponent(cHandler.global, rgOname, null); } } Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2014-07-18 20:19:32 UTC (rev 2478) +++ branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java 2014-07-18 20:34:47 UTC (rev 2479) @@ -118,14 +118,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) { CoyoteLogger.HTTP_LOGGER.errorRegisteringPool(e); } rgOname=new ObjectName - (domain + ":type=GlobalRequestProcessor,name=" + getName()); + (domain + ":type=GlobalRequestProcessor,name=" + getJmxName()); Registry.getRegistry(null, null).registerComponent ( cHandler.global, rgOname, null ); } Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java =================================================================== --- branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2014-07-18 20:19:32 UTC (rev 2478) +++ branches/JBOSSWEB_7_2_2_FINAL_BZ-1120889/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java 2014-07-18 20:34:47 UTC (rev 2479) @@ -129,12 +129,12 @@ if (org.apache.tomcat.util.Constants.ENABLE_MODELER) { if (this.domain != null) { try { - tpOname = new ObjectName(domain + ":" + "type=ThreadPool,name=" + getName()); + tpOname = new ObjectName(domain + ":" + "type=ThreadPool,name=" + getJmxName()); Registry.getRegistry(null, null).registerComponent(endpoint, tpOname, null); } catch (Exception e) { CoyoteLogger.HTTP_LOGGER.errorRegisteringPool(e); } - rgOname = new ObjectName(domain + ":type=GlobalRequestProcessor,name=" + getName()); + rgOname = new ObjectName(domain + ":type=GlobalRequestProcessor,name=" + getJmxName()); Registry.getRegistry(null, null).registerComponent(cHandler.global, rgOname, null); } }