diff options
| author | Artur Signell <artur@vaadin.com> | 2013-10-11 16:28:32 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-10-14 17:18:51 +0000 |
| commit | c29ca5ea626b7d2a219bf32bcd0c1b4bf5258018 (patch) | |
| tree | ef394fe86e61b3c903d0f78baa771a262ba4c77f /server | |
| parent | 25fc2f2f1af0b6bf52053f0ca6d11d31c5e7453a (diff) | |
| download | vaadin-framework-c29ca5ea626b7d2a219bf32bcd0c1b4bf5258018.tar.gz vaadin-framework-c29ca5ea626b7d2a219bf32bcd0c1b4bf5258018.zip | |
Update to atmosphere javascript 2.0.3-vaadin1 (#12241, #12127)
Build vaadinPush.js from the released version instead of having a separate
javascript version in the project
Change-Id: I37aac284216c8ec6efd03c242e639e88854f11fd
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/Constants.java | 4 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/VaadinServletService.java | 4 | ||||
| -rw-r--r-- | server/tests/src/com/vaadin/tests/server/TestAtmosphereVersion.java | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index 8c379abe06..e910ba903b 100644 --- a/server/src/com/vaadin/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -67,7 +67,7 @@ public interface Constants { // Keep the version number in sync with push/build.xml and other locations // listed in that file - static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.14.vaadin4"; + static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "1.0.14.vaadin4"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" @@ -82,7 +82,7 @@ public interface Constants { + "If using a dependency management system, please add a dependency\n" + "to vaadin-push.\n" + "If managing dependencies manually, please make sure Atmosphere\n" - + REQUIRED_ATMOSPHERE_VERSION + + REQUIRED_ATMOSPHERE_RUNTIME_VERSION + " is included on the classpath.\n" + "Will fall back to using " + PushMode.class.getSimpleName() diff --git a/server/src/com/vaadin/server/VaadinServletService.java b/server/src/com/vaadin/server/VaadinServletService.java index 3b39f17849..818f2e87c6 100644 --- a/server/src/com/vaadin/server/VaadinServletService.java +++ b/server/src/com/vaadin/server/VaadinServletService.java @@ -66,11 +66,11 @@ public class VaadinServletService extends VaadinService { private static boolean checkAtmosphereSupport() { try { String rawVersion = Version.getRawVersion(); - if (!Constants.REQUIRED_ATMOSPHERE_VERSION.equals(rawVersion)) { + if (!Constants.REQUIRED_ATMOSPHERE_RUNTIME_VERSION.equals(rawVersion)) { getLogger().log( Level.WARNING, Constants.INVALID_ATMOSPHERE_VERSION_WARNING, - new Object[] { Constants.REQUIRED_ATMOSPHERE_VERSION, + new Object[] { Constants.REQUIRED_ATMOSPHERE_RUNTIME_VERSION, rawVersion }); } return true; diff --git a/server/tests/src/com/vaadin/tests/server/TestAtmosphereVersion.java b/server/tests/src/com/vaadin/tests/server/TestAtmosphereVersion.java index 5c27ef0752..3d37022b81 100644 --- a/server/tests/src/com/vaadin/tests/server/TestAtmosphereVersion.java +++ b/server/tests/src/com/vaadin/tests/server/TestAtmosphereVersion.java @@ -12,7 +12,7 @@ public class TestAtmosphereVersion extends TestCase { * classpath */ public void testAtmosphereVersion() { - assertEquals(Constants.REQUIRED_ATMOSPHERE_VERSION, + assertEquals(Constants.REQUIRED_ATMOSPHERE_RUNTIME_VERSION, Version.getRawVersion()); } } |