Author: markt Date: Thu Apr 9 09:49:34 2009 New Revision: 763580 URL: http://svn.apache.org/viewvc?rev=763580&view=rev Log: Switch to org.apache.coyote.ajp.AjpProtocol rather than org.apache.jk.server.JkCoyoteHandler
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=763580&r1=763579&r2=763580&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Apr 9 09:49:34 2009 @@ -596,7 +596,7 @@ || "org.apache.coyote.http11.Http11AprProtocol".equals (getProtocolHandlerClassName())) { return "HTTP/1.1"; - } else if ("org.apache.jk.server.JkCoyoteHandler".equals + } else if ("org.apache.coyote.ajp.AjpProtocol".equals (getProtocolHandlerClassName()) || "org.apache.coyote.ajp.AjpAprProtocol".equals (getProtocolHandlerClassName())) { @@ -684,7 +684,7 @@ ("org.apache.coyote.http11.Http11Protocol"); } else if ("AJP/1.3".equals(protocol)) { setProtocolHandlerClassName - ("org.apache.jk.server.JkCoyoteHandler"); + ("org.apache.coyote.ajp.AjpProtocol"); } else if (protocol != null) { setProtocolHandlerClassName(protocol); } Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=763580&r1=763579&r2=763580&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Thu Apr 9 09:49:34 2009 @@ -418,7 +418,7 @@ try { if (protocol.equals("ajp")) { - connector = new Connector("org.apache.jk.server.JkCoyoteHandler"); + connector = new Connector("org.apache.coyote.ajp.AjpProtocol"); } else if (protocol.equals("memory")) { connector = new Connector("org.apache.coyote.memory.MemoryProtocolHandler"); } else if (protocol.equals("http")) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org