camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] camel git commit: CAMEL-9908: Removing jetty 8
Date Wed, 27 Apr 2016 06:36:48 GMT
Repository: camel
Updated Branches:
  refs/heads/master eb7439438 -> bc77989c9


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/bc77989c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc77989c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc77989c

Branch: refs/heads/master
Commit: bc77989c90e396a06ea81d71f7d06a3156a0d42a
Parents: bb52dd5
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Apr 27 08:36:14 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Apr 27 08:36:42 2016 +0200

----------------------------------------------------------------------
 components/camel-atmosphere-websocket/pom.xml         | 14 +++++++-------
 .../websocket/WebsocketCamelRouterTestSupport.java    | 10 ++--------
 .../WebsocketCamelRouterWithInitParamTestSupport.java | 10 ++--------
 3 files changed, 11 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bc77989c/components/camel-atmosphere-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index f74778f..6bb3f8d 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -40,9 +40,9 @@
             org.atmosphere.*;version="${atmosphere-version-range}",
             org.apache.catalina;resolution:=optional,
             org.apache.catalina.comet;resolution:=optional,
-            org.eclipse.jetty.continuation;version="[8,10)";resolution:=optional,
-            org.eclipse.jetty.server;version="[8,10)";resolution:=optional,
-            org.eclipse.jetty.util.ssl;version="[8,10)";resolution:=optional,
+            org.eclipse.jetty.continuation;version="[9,10)";resolution:=optional,
+            org.eclipse.jetty.server;version="[9,10)";resolution:=optional,
+            org.eclipse.jetty.util.ssl;version="[9,10)";resolution:=optional,
             ${camel.osgi.import.defaults},
             *
         </camel.osgi.import.pkg>
@@ -99,15 +99,15 @@
 
         <!-- Jetty 8 for testing-->
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-websocket</artifactId>
-            <version>${jetty8-version}</version>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-server</artifactId>
+            <version>${jetty9-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>${jetty8-version}</version>
+            <version>${jetty9-version}</version>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bc77989c/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
index 95a23bc..bf98802 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
@@ -18,9 +18,7 @@ package org.apache.camel.component.atmosphere.websocket;
 
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.junit.After;
@@ -38,12 +36,8 @@ public class WebsocketCamelRouterTestSupport extends CamelTestSupport {
 
     @Before
     public void setUp() throws Exception {
-        server = new Server();
-        Connector connector = new SelectChannelConnector();
-        connector.setHost("localhost");
-        connector.setPort(PORT);
-        server.addConnector(connector);
-        
+        server = new Server(PORT);
+
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.setContextPath("/");
         server.setHandler(context);

http://git-wip-us.apache.org/repos/asf/camel/blob/bc77989c/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
index 8acf18c..b8c5768 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
@@ -18,9 +18,7 @@ package org.apache.camel.component.atmosphere.websocket;
 
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.junit.After;
@@ -38,12 +36,8 @@ public class WebsocketCamelRouterWithInitParamTestSupport extends CamelTestSuppo
 
     @Before
     public void setUp() throws Exception {
-        server = new Server();
-        Connector connector = new SelectChannelConnector();
-        connector.setHost("localhost");
-        connector.setPort(PORT);
-        server.addConnector(connector);
-        
+        server = new Server(PORT);
+
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.setContextPath("/");
         server.setHandler(context);


Mime
View raw message