Switch to org.apache.coyote.ajp.AjpProtocol rather than org.apache.jk.server.JkCoyote...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@763580 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java
index 9df11b1..33bfec6 100644 (file)
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -596,7 +596,7 @@ public class Connector
             || "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 @@ public class Connector
                     ("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);
             }

diff --git a/java/org/apache/catalina/startup/Embedded.java b/java/org/apache/catalina/startup/Embedded.java
index 65379bf..64d4353 100644 (file)
--- a/java/org/apache/catalina/startup/Embedded.java
+++ b/java/org/apache/catalina/startup/Embedded.java
@@ -418,7 +418,7 @@ public class Embedded  extends StandardService {
         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")) {