Repository: camel Updated Branches: refs/heads/master 81a0f01df -> 3c3202eab
CAMEL-9908: Removing jetty 8 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c3202ea Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c3202ea Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c3202ea Branch: refs/heads/master Commit: 3c3202eabb38b88f34bc2db45b2df6f19389c03f Parents: 81a0f01 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Apr 26 20:14:03 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Apr 26 20:21:43 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/atom/JettyTestServer.java | 2 +- components/camel-rss/pom.xml | 4 ++-- .../java/org/apache/camel/component/rss/JettyTestServer.java | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3c3202ea/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java ---------------------------------------------------------------------- diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java index ad67bc8..417f41e 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java @@ -43,7 +43,7 @@ import static org.junit.Assert.fail; public final class JettyTestServer { private static final Logger LOG = LoggerFactory.getLogger(JettyTestServer.class); - protected static final int PORT = AvailablePortFinder.getNextAvailable(); + private static final int PORT = AvailablePortFinder.getNextAvailable(); private static JettyTestServer instance; public int port; http://git-wip-us.apache.org/repos/asf/camel/blob/3c3202ea/components/camel-rss/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml index 2b87adc..b8f8d21 100644 --- a/components/camel-rss/pom.xml +++ b/components/camel-rss/pom.xml @@ -82,13 +82,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty8-version}</version> + <version>${jetty9-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>${jetty8-version}</version> + <version>${jetty9-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/3c3202ea/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java ---------------------------------------------------------------------- diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java index 89806ab..9c0b9e2 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java @@ -23,6 +23,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.camel.test.AvailablePortFinder; import org.apache.commons.io.FileUtils; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; @@ -42,6 +43,7 @@ import static org.junit.Assert.fail; public final class JettyTestServer { private static final Logger LOG = LoggerFactory.getLogger(JettyTestServer.class); + private static final int PORT = AvailablePortFinder.getNextAvailable(); private static JettyTestServer instance; public int port; @@ -52,7 +54,8 @@ public final class JettyTestServer { } public void startServer() { - server = new Server(0); + server = new Server(PORT); + port = PORT; ServletContextHandler servletContext = new ServletContextHandler(ServletContextHandler.SESSIONS); servletContext.setSecurityHandler(basicAuth("camel", "camelPass", "Private!")); @@ -65,7 +68,6 @@ public final class JettyTestServer { LOG.error("Could not start Server!", ex); fail(ex.getLocalizedMessage()); } - port = server.getConnectors()[0].getLocalPort(); } public void stopServer() {
