Browse Source

Upgrade to Atmosphere 1.0.13 (#11861)

Change-Id: Ie9281ff5e9805be89942bf3ca8259740f49e15ab
tags/7.1.0
Johannes Dahlström 11 years ago
parent
commit
f8fb8b7bfd

+ 0
- 1
.classpath View File

@@ -11,7 +11,6 @@
<classpathentry kind="src" path="uitest/src"/>
<classpathentry kind="src" path="buildhelpers/src"/>
<classpathentry kind="src" path="shared/src"/>
<classpathentry kind="src" path="push/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="owner.project.facets" value="java"/>

+ 281
- 272
WebContent/VAADIN/jquery.atmosphere.js
File diff suppressed because it is too large
View File


+ 1
- 2
push/build.xml View File

@@ -13,7 +13,7 @@
<property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" />

<!-- Keep the version number in sync with ivy.xml -->
<property name="atmosphere.version" value="1.0.12" />
<property name="atmosphere.version" value="1.0.13" />
<property name="jquery.version" value="1.7.2" />

<path id="classpath.compile.custom" />
@@ -62,7 +62,6 @@
<antcall target="common.sources.jar">
<reference torefid="extra.jar.includes" refid="jar.includes" />
</antcall>
<antcall target="common.javadoc.jar" />
<antcall target="common.publish-local" />
</target>


+ 1
- 1
push/ivy.xml View File

@@ -28,7 +28,7 @@
<!-- Atmosphere -->
<!-- Keep the version number in sync with build.xml -->
<dependency org="org.atmosphere" name="atmosphere-runtime" rev="1.0.12"
<dependency org="org.atmosphere" name="atmosphere-runtime" rev="1.0.13"
conf="build,ide,test -> default">
</dependency>
</dependencies>

+ 0
- 1779
push/src/org/atmosphere/cpr/AtmosphereFramework.java
File diff suppressed because it is too large
View File


+ 2
- 2
server/src/com/vaadin/server/Constants.java View File

@@ -65,11 +65,11 @@ public interface Constants {
+ " Widgetset version: %s\n"
+ "=================================================================";

static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.12";
static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.13";

static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n"
+ "=================================================================\n"
+ "Vaadin depends on Atomsphere {0} but version {1} was found.\n"
+ "Vaadin depends on Atmosphere {0} but version {1} was found.\n"
+ "This might cause compatibility problems if push is used.\n"
+ "=================================================================";


+ 1
- 1
shared/src/com/vaadin/shared/communication/PushConstants.java View File

@@ -42,5 +42,5 @@ public class PushConstants implements Serializable {
* The character used to mark message boundaries when messages may be split
* into multiple fragments.
*/
public static final char MESSAGE_DELIMITER = '\0';
public static final char MESSAGE_DELIMITER = '|';
}

Loading…
Cancel
Save