Author: remy.maucherat(a)jboss.com Date: 2012-08-23 07:42:33 -0400 (Thu, 23 Aug 2012) New Revision: 2066 Modified: branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java 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/ajp/Constants.java branches/7.0.x/webapps/docs/sysprops.xml Log: Improve a bit the Tomcat authentication property patch. Modified: branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java =================================================================== --- branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java 2012-08-16 04:30:24 UTC (rev 2065) +++ branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java 2012-08-23 11:42:33 UTC (rev 2066) @@ -329,8 +329,7 @@ /** * Use Tomcat authentication ? */ - protected boolean tomcatAuthentication = - Boolean.valueOf(System.getProperty("org.apache.coyote.ajp.AprProcessor.TOMCATAUTHENTICATION", "true")).booleanValue(); + protected boolean tomcatAuthentication = true; public boolean getTomcatAuthentication() { return tomcatAuthentication; } public void setTomcatAuthentication(boolean tomcatAuthentication) { this.tomcatAuthentication = tomcatAuthentication; } 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-16 04:30:24 UTC (rev 2065) +++ branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProtocol.java 2012-08-23 11:42:33 UTC (rev 2066) @@ -345,7 +345,7 @@ * Should authentication be done in the native webserver layer, * or in the Servlet container ? */ - protected boolean tomcatAuthentication = true; + protected boolean tomcatAuthentication = Constants.DEFAULT_TOMCAT_AUTHENTICATION; public boolean getTomcatAuthentication() { return tomcatAuthentication; } public void setTomcatAuthentication(boolean tomcatAuthentication) { this.tomcatAuthentication = tomcatAuthentication; } 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-16 04:30:24 UTC (rev 2065) +++ branches/7.0.x/java/org/apache/coyote/ajp/AjpProtocol.java 2012-08-23 11:42:33 UTC (rev 2066) @@ -319,8 +319,7 @@ * Should authentication be done in the native webserver layer, * or in the Servlet container ? */ - protected boolean tomcatAuthentication = - Boolean.valueOf(System.getProperty("org.apache.coyote.ajp.AprProcessor.TOMCATAUTHENTICATION", "true")).booleanValue(); + protected boolean tomcatAuthentication = Constants.DEFAULT_TOMCAT_AUTHENTICATION; public boolean getTomcatAuthentication() { return tomcatAuthentication; } public void setTomcatAuthentication(boolean tomcatAuthentication) { this.tomcatAuthentication = tomcatAuthentication; } Modified: branches/7.0.x/java/org/apache/coyote/ajp/Constants.java =================================================================== --- branches/7.0.x/java/org/apache/coyote/ajp/Constants.java 2012-08-16 04:30:24 UTC (rev 2065) +++ branches/7.0.x/java/org/apache/coyote/ajp/Constants.java 2012-08-23 11:42:33 UTC (rev 2066) @@ -44,6 +44,8 @@ public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 300000; public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0; 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(); // Prefix codes for message types from server to container public static final byte JK_AJP13_FORWARD_REQUEST = 2; Modified: branches/7.0.x/webapps/docs/sysprops.xml =================================================================== --- branches/7.0.x/webapps/docs/sysprops.xml 2012-08-16 04:30:24 UTC (rev 2065) +++ branches/7.0.x/webapps/docs/sysprops.xml 2012-08-23 11:42:33 UTC (rev 2066) @@ -168,6 +168,12 @@ <p>Server Identity stringr: the <code>Server:</code> header. The default value is <code>Apache-Coyote/1.1</code>.</p> </property> + + <property name="org.apache.coyote.ajp.DEFAULT_TOMCAT_AUTHENTICATION"> + <p>Perform authentication in the application server rather than in the frontend + web server. The default value is <code>true</code>.</p> + </property> + </properties> </section>