From 5f68f40579ba80b0a37506f7ebb9911b16813d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= <interface@p3k.org>
Date: Sat, 17 Dec 2016 10:54:39 +0100
Subject: [PATCH] wip: removing ajp support

---
 src/helma/main/JettyServer.java | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/helma/main/JettyServer.java b/src/helma/main/JettyServer.java
index 7798c415..aa1257be 100644
--- a/src/helma/main/JettyServer.java
+++ b/src/helma/main/JettyServer.java
@@ -18,8 +18,8 @@ package helma.main;
 
 
 import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.ajp.Ajp13SocketConnector;
-import org.eclipse.jetty.server.bio.SocketConnector;
+//import org.eclipse.jetty.ajp.Ajp13SocketConnector;
+//import org.eclipse.jetty.server.bio.SocketConnector;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.xml.XmlConfiguration;
 
@@ -34,14 +34,14 @@ public class JettyServer {
     protected org.eclipse.jetty.server.Server http;
 
     // the AJP13 Listener, used for connecting from external webserver to servlet via JK
-    protected Ajp13SocketConnector ajp13;
+    //protected Ajp13SocketConnector ajp13;
 
     public static JettyServer init(Server server, ServerConfig config) throws IOException {
         File configFile = config.getConfigFile();
         if (configFile != null && configFile.exists()) {
             return new JettyServer(configFile.toURI().toURL());
-        } else if (config.hasWebsrvPort() || config.hasAjp13Port()) {
-            return new JettyServer(config.getWebsrvPort(), config.getAjp13Port(), server);
+        } else if (config.hasWebsrvPort()/* || config.hasAjp13Port()*/) {
+            return new JettyServer(config.getWebsrvPort()/*, config.getAjp13Port()*/, server);
         }
         return null;
     }
@@ -61,28 +61,28 @@ public class JettyServer {
         }
     }
 
-    private JettyServer(InetSocketAddress webPort, InetSocketAddress ajpPort, Server server)
+    private JettyServer(InetSocketAddress webPort/*, InetSocketAddress ajpPort*/, Server server)
             throws IOException {
-    	
+
         http = new org.eclipse.jetty.server.Server();
         http.setServer(http);
-        
+
         // start embedded web server if port is specified
         if (webPort != null) {
         	Connector conn = new SelectChannelConnector();
         	conn.setHost(webPort.getAddress().getHostAddress());
         	conn.setPort(webPort.getPort());
-        	
+
         	http.addConnector(conn);
         }
 
-        // activate the ajp13-listener
+        /*// activate the ajp13-listener
         if (ajpPort != null) {
             // create AJP13Listener
         	ajp13 = new Ajp13SocketConnector();
         	ajp13.setHost(ajpPort.getAddress().getHostAddress());
         	ajp13.setPort(ajpPort.getPort());
-        	
+
         	http.addConnector(ajp13);
 
             // jetty6 does not support protection of AJP13 connections anymore
@@ -94,8 +94,8 @@ public class JettyServer {
                 throw new RuntimeException(message);
             }
 
-            server.getLogger().info("Starting AJP13-Listener on port " + (ajpPort));            
-        }
+            server.getLogger().info("Starting AJP13-Listener on port " + (ajpPort));
+        }*/
         openListeners();
     }
 
@@ -105,16 +105,16 @@ public class JettyServer {
 
     public void start() throws Exception {
         http.start();
-        if (ajp13 != null) {
+        /*if (ajp13 != null) {
             ajp13.start();
-        }
+        }*/
     }
 
     public void stop() throws Exception {
         http.stop();
-        if (ajp13 != null) {
+        /*if (ajp13 != null) {
             ajp13.stop();
-        }
+        }*/
     }
 
     public void destroy() {