Updated Branches: refs/heads/master ced2cf0b2 -> 675dc4288
CAMEL-6751 Upgaded to Jetty 8.1.x and Sevelt API 3.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/675dc428 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/675dc428 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/675dc428 Branch: refs/heads/master Commit: 675dc4288b493181d24e565e32f928b1be3e0612 Parents: ced2cf0 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Sep 17 09:38:50 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Sep 17 09:38:50 2013 +0200 ---------------------------------------------------------------------- components/camel-spring-ws/pom.xml | 2 +- .../org/apache/camel/component/websocket/WebsocketComponent.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/675dc428/components/camel-spring-ws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml index 2531ee7..f7f69a9 100644 --- a/components/camel-spring-ws/pom.xml +++ b/components/camel-spring-ws/pom.xml @@ -71,7 +71,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> <version>${geronimo-servlet-spec-version}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/675dc428/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java index 31bc5c0..4aa74b8 100644 --- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java +++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.management.MBeanServer; +import javax.servlet.DispatcherType; import org.apache.camel.Endpoint; import org.apache.camel.RuntimeCamelException; @@ -35,7 +36,6 @@ import org.apache.camel.util.jsse.SSLContextParameters; import org.eclipse.jetty.http.ssl.SslContextFactory; import org.eclipse.jetty.jmx.MBeanContainer; import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.DispatcherType; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.SessionManager;
