summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/ivy.xml4
-rw-r--r--server/src/com/vaadin/server/communication/PushRequestHandler.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/server/ivy.xml b/server/ivy.xml
index 1ecdadd15d..5ff4592ca8 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -49,10 +49,6 @@
<!-- Jsoup for BootstrapHandler -->
<dependency org="org.jsoup" name="jsoup" rev="1.6.3"
conf="build,ide,test -> default" />
-
- <!-- Atmosphere -->
- <dependency org="org.atmosphere" name="atmosphere-runtime" rev="1.0.12"
- conf="build-provided,ide,test -> default" />
<!-- TESTING DEPENDENCIES -->
diff --git a/server/src/com/vaadin/server/communication/PushRequestHandler.java b/server/src/com/vaadin/server/communication/PushRequestHandler.java
index 4f56c0b6a3..f7cff43e84 100644
--- a/server/src/com/vaadin/server/communication/PushRequestHandler.java
+++ b/server/src/com/vaadin/server/communication/PushRequestHandler.java
@@ -56,6 +56,10 @@ public class PushRequestHandler implements RequestHandler {
atmosphere
.addInitParameter("org.atmosphere.cpr.sessionSupport", "true");
+ // Disable Atmosphere's message about commercial support
+ atmosphere.addInitParameter("org.atmosphere.cpr.showSupportMessage",
+ "false");
+
// Required to ensure the client-side knows at which points to split the
// message stream into individual messages when using certain transports
atmosphere.interceptor(new TrackMessageSizeInterceptor());