Update camel-web to build/run with Jetty 9 and 8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f815dee8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f815dee8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f815dee8 Branch: refs/heads/master Commit: f815dee8d5db2bf4bca5a46f8a8c7ded8b16935f Parents: bd1eb27 Author: Daniel Kulp <dk...@apache.org> Authored: Fri Nov 14 14:50:53 2014 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Fri Nov 14 15:30:40 2014 -0500 ---------------------------------------------------------------------- .../test/java/org/apache/camel/web/Main.java | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f815dee8/components/camel-web/src/test/java/org/apache/camel/web/Main.java ---------------------------------------------------------------------- diff --git a/components/camel-web/src/test/java/org/apache/camel/web/Main.java b/components/camel-web/src/test/java/org/apache/camel/web/Main.java index ca41fa4..22e5886 100644 --- a/components/camel-web/src/test/java/org/apache/camel/web/Main.java +++ b/components/camel-web/src/test/java/org/apache/camel/web/Main.java @@ -16,9 +16,7 @@ */ package org.apache.camel.web; -import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.webapp.WebAppContext; import org.slf4j.Logger; @@ -35,9 +33,12 @@ public final class Main { public static int mainPort = 9998; public static final String WEBAPP_DIR = "src/main/webapp"; public static final String WEBAPP_CTX = "/"; - protected static final Server SERVER = new Server(); + + protected static Server server; + private static final Logger LOG = LoggerFactory.getLogger(Main.class); + private Main() { } @@ -56,18 +57,15 @@ public final class Main { public static void start() throws Exception { LOG.info("Starting Web Server on port: " + mainPort); - SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(mainPort); - connector.setServer(SERVER); WebAppContext context = new WebAppContext(); context.setResourceBase(WEBAPP_DIR); context.setContextPath(WEBAPP_CTX); - context.setServer(SERVER); + context.setServer(server); - SERVER.setHandler(context); - SERVER.setConnectors(new Connector[]{connector}); - SERVER.start(); + server = new Server(mainPort); + server.setHandler(context); + server.start(); LOG.info(""); LOG.info("=============================================================================="); @@ -77,7 +75,8 @@ public final class Main { } public static void stop() throws Exception { - SERVER.stop(); + server.stop(); + server = null; } /**
