Author: tfonteyn Date: 2013-06-05 06:57:09 -0400 (Wed, 05 Jun 2013) New Revision: 2214 Modified: branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpAprProcessor.java branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpAprProtocol.java branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpProtocol.java branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/http11/Http11AprProtocol.java branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/http11/Http11Protocol.java Log: [BZ-970693] combo one-off for BZ 900775 + WFLY-254 Modified: branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpAprProcessor.java =================================================================== --- branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpAprProcessor.java 2013-06-04 16:13:51 UTC (rev 2213) +++ branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpAprProcessor.java 2013-06-05 10:57:09 UTC (rev 2214) @@ -329,7 +329,8 @@ /** * Use Tomcat authentication ? */ - protected boolean tomcatAuthentication = true; + protected boolean tomcatAuthentication = + Boolean.valueOf(System.getProperty("org.apache.coyote.ajp.AprProcessor.TOMCATAUTHENTICATION", "true")).booleanValue(); public boolean getTomcatAuthentication() { return tomcatAuthentication; } public void setTomcatAuthentication(boolean tomcatAuthentication) { this.tomcatAuthentication = tomcatAuthentication; } Modified: branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpAprProtocol.java =================================================================== --- branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-06-04 16:13:51 UTC (rev 2213) +++ branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-06-05 10:57:09 UTC (rev 2214) @@ -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/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpProtocol.java =================================================================== --- branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpProtocol.java 2013-06-04 16:13:51 UTC (rev 2213) +++ branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/ajp/AjpProtocol.java 2013-06-05 10:57:09 UTC (rev 2214) @@ -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); } @@ -319,7 +319,8 @@ * Should authentication be done in the native webserver layer, * or in the Servlet container ? */ - protected boolean tomcatAuthentication = true; + protected boolean tomcatAuthentication = + Boolean.valueOf(System.getProperty("org.apache.coyote.ajp.AprProcessor.TOMCATAUTHENTICATION", "true")).booleanValue(); public boolean getTomcatAuthentication() { return tomcatAuthentication; } public void setTomcatAuthentication(boolean tomcatAuthentication) { this.tomcatAuthentication = tomcatAuthentication; } Modified: branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/http11/Http11AprProtocol.java 2013-06-04 16:13:51 UTC (rev 2213) +++ branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/http11/Http11AprProtocol.java 2013-06-05 10:57:09 UTC (rev 2214) @@ -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/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/http11/Http11Protocol.java =================================================================== --- branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/http11/Http11Protocol.java 2013-06-04 16:13:51 UTC (rev 2213) +++ branches/JBOSSWEB_7_0_16_FINAL_BZ-970693/java/org/apache/coyote/http11/Http11Protocol.java 2013-06-05 10:57:09 UTC (rev 2214) @@ -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 ); }