Author: tfonteyn Date: 2013-09-06 06:40:39 -0400 (Fri, 06 Sep 2013) New Revision: 2256 Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/AjpProtocol.java branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/Constants.java Log: [bz-1005130] Allow configuration of the requiredSecret attribute for the AJP connector Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java =================================================================== --- branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-09-06 09:47:21 UTC (rev 2255) +++ branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/AjpAprProtocol.java 2013-09-06 10:40:39 UTC (rev 2256) @@ -324,7 +324,7 @@ /** * Required secret. */ - protected String requiredSecret = null; + protected String requiredSecret = Constants.DEFAULT_REQUIRED_SECRET; public void setRequiredSecret(String requiredSecret) { this.requiredSecret = requiredSecret; } /** Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/AjpProtocol.java =================================================================== --- branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/AjpProtocol.java 2013-09-06 09:47:21 UTC (rev 2255) +++ branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/AjpProtocol.java 2013-09-06 10:40:39 UTC (rev 2256) @@ -299,7 +299,7 @@ /** * Required secret. */ - protected String requiredSecret = null; + protected String requiredSecret = Constants.DEFAULT_REQUIRED_SECRET; public void setRequiredSecret(String requiredSecret) { this.requiredSecret = requiredSecret; } /** Modified: branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/Constants.java =================================================================== --- branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/Constants.java 2013-09-06 09:47:21 UTC (rev 2255) +++ branches/JBOSSWEB_7_2_2_FINAL_BZ-1005130/src/main/java/org/apache/coyote/ajp/Constants.java 2013-09-06 10:40:39 UTC (rev 2256) @@ -46,6 +46,8 @@ public static final boolean DEFAULT_TCP_NO_DELAY = true; public static final boolean DEFAULT_TOMCAT_AUTHENTICATION = Boolean.valueOf(System.getProperty("org.apache.coyote.ajp.DEFAULT_TOMCAT_AUTHENTICATION", "true")).booleanValue(); + public static final String DEFAULT_REQUIRED_SECRET = + System.getProperty("org.apache.coyote.ajp.DEFAULT_REQUIRED_SECRET"); // Prefix codes for message types from server to container public static final byte JK_AJP13_FORWARD_REQUEST = 2;