From f8c43317db44bb42c62f8280e8824daa2689ae1f Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 23 Apr 2013 16:26:35 +0300
Subject: Add patched AtmosphereFramework without support message (#11654)

Change-Id: If0c236cf696d744b55a5288d4622b5d16e07a5cc
---
 server/ivy.xml                                                     | 4 ----
 server/src/com/vaadin/server/communication/PushRequestHandler.java | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'server')

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());
-- 
cgit v1.2.3