summaryrefslogtreecommitdiffstats
path: root/push
diff options
context:
space:
mode:
authorTapio Aali <tapio@vaadin.com>2015-02-09 15:37:41 +0200
committerVaadin Code Review <review@vaadin.com>2015-02-18 14:44:27 +0000
commit735f0748344d7ee594c4e52a715d867dfdb23cb1 (patch)
treea1a940c03cb1595e30486ddaa5cb1f64d61e412f /push
parentd23382ad25b0a9f1ab1bf864f8fd3746e5b1c320 (diff)
downloadvaadin-framework-735f0748344d7ee594c4e52a715d867dfdb23cb1.tar.gz
vaadin-framework-735f0748344d7ee594c4e52a715d867dfdb23cb1.zip
Make push path configurable (#14432).
In order to use websockets with Weblogic 12.1.2 or later, push path 'ws' needs to be used instead of 'PUSH'. Change-Id: Ia90d11c20a375cef9cf4a53986a70d616a83db06
Diffstat (limited to 'push')
-rw-r--r--push/build.xml2
-rw-r--r--push/ivy.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/push/build.xml b/push/build.xml
index 9afe76620c..4e180fa03d 100644
--- a/push/build.xml
+++ b/push/build.xml
@@ -18,7 +18,7 @@
location="${result.dir}/js/VAADIN/vaadinPush.debug.js" />
<!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java -->
- <property name="atmosphere.runtime.version" value="2.2.4.vaadin2" />
+ <property name="atmosphere.runtime.version" value="2.2.4.vaadin3" />
<property name="jquery.js" location="lib/jquery/jquery-1.11.0.js" />
<path id="classpath.compile.custom" />
diff --git a/push/ivy.xml b/push/ivy.xml
index b899b34af7..b8d943f176 100644
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ivy-module [
<!-- Keep the version number in sync with build.xml -->
- <!ENTITY atmosphere.runtime.version "2.2.4.vaadin2">
+ <!ENTITY atmosphere.runtime.version "2.2.4.vaadin3">
<!ENTITY atmosphere.js.version "2.2.6.vaadin3">
]>