diff options
author | Leif Åstrand <leif@vaadin.com> | 2013-04-23 16:26:35 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2013-04-23 13:36:30 +0000 |
commit | f8c43317db44bb42c62f8280e8824daa2689ae1f (patch) | |
tree | 20d340b75bcae4d4344a8b8b53d029d6aab52ec0 /server | |
parent | 02d6e3ed61139e23a2ba431001d48c48a1aecc61 (diff) | |
download | vaadin-framework-f8c43317db44bb42c62f8280e8824daa2689ae1f.tar.gz vaadin-framework-f8c43317db44bb42c62f8280e8824daa2689ae1f.zip |
Add patched AtmosphereFramework without support message (#11654)
Change-Id: If0c236cf696d744b55a5288d4622b5d16e07a5cc
Diffstat (limited to 'server')
-rw-r--r-- | server/ivy.xml | 4 | ||||
-rw-r--r-- | server/src/com/vaadin/server/communication/PushRequestHandler.java | 4 |
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()); |