You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/11/17 17:39:20 UTC
camel git commit: Upgrade Atmosphere-runtime to version 2.4.0
Repository: camel
Updated Branches:
refs/heads/master ae0dffccb -> 9cbf3601c
Upgrade Atmosphere-runtime to version 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9cbf3601
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9cbf3601
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9cbf3601
Branch: refs/heads/master
Commit: 9cbf3601c29ad55bd8859dde4f0e60c6ffb755d5
Parents: ae0dffc
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Nov 17 17:36:31 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Nov 17 17:36:31 2015 +0100
----------------------------------------------------------------------
.../camel/component/atmosphere/websocket/WebsocketConsumer.java | 4 +++-
parent/pom.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9cbf3601/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
index 2680baa..22beae5 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
@@ -29,7 +29,9 @@ import org.apache.camel.component.servlet.ServletConsumer;
import org.atmosphere.cpr.ApplicationConfig;
import org.atmosphere.cpr.AtmosphereFramework;
import org.atmosphere.cpr.AtmosphereRequest;
+import org.atmosphere.cpr.AtmosphereRequestImpl;
import org.atmosphere.cpr.AtmosphereResponse;
+import org.atmosphere.cpr.AtmosphereResponseImpl;
import org.atmosphere.websocket.WebSocketProtocol;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +69,7 @@ public class WebsocketConsumer extends ServletConsumer {
}
void service(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
- framework.doCometSupport(AtmosphereRequest.wrap(request), AtmosphereResponse.wrap(response));
+ framework.doCometSupport(AtmosphereRequestImpl.wrap(request), AtmosphereResponseImpl.wrap(response));
}
public void sendMessage(final String connectionKey, Object message) {
http://git-wip-us.apache.org/repos/asf/camel/blob/9cbf3601/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 94b9164..92d471e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
<asm-version>3.3.1</asm-version>
<aspectj-version>1.8.7</aspectj-version>
<atmos-client-version>2.2.2</atmos-client-version>
- <atmosphere-version>2.3.5</atmosphere-version>
+ <atmosphere-version>2.4.0</atmosphere-version>
<atmosphere-version-range>[2.0,3.0)</atmosphere-version-range>
<atomikos-transactions-version>3.9.3</atomikos-transactions-version>
<avalon-bundle-version>4.3.1_1</avalon-bundle-version>