You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/10/28 09:16:55 UTC
[39/47] git commit: Upgrade Atmosphere to 2.0.0
Upgrade Atmosphere to 2.0.0
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a13dec06
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a13dec06
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a13dec06
Branch: refs/heads/wicket-4997
Commit: a13dec062fffbe1b9fe933b0f546e6f50e1d7fed
Parents: dd336fe
Author: Leonid Bogdanov <le...@mail.ru>
Authored: Thu Sep 26 13:12:31 2013 +0400
Committer: Leonid Bogdanov <le...@mail.ru>
Committed: Thu Sep 26 13:12:31 2013 +0400
----------------------------------------------------------------------
wicket-experimental/wicket-atmosphere/pom.xml | 2 +-
.../wicket/atmosphere/AtmosphereBehavior.java | 21 +-
.../wicket/atmosphere/jquery.atmosphere.js | 1591 ++++++++++--------
3 files changed, 897 insertions(+), 717 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a13dec06/wicket-experimental/wicket-atmosphere/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml
index 06cc3e4..924f71d 100644
--- a/wicket-experimental/wicket-atmosphere/pom.xml
+++ b/wicket-experimental/wicket-atmosphere/pom.xml
@@ -27,7 +27,7 @@
<version>0.15-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
- <atmosphere.version>1.0.13</atmosphere.version>
+ <atmosphere.version>2.0.0</atmosphere.version>
</properties>
<name>Wicket-Atmosphere</name>
<description>Wicket-Atmosphere provides integration of the Atmosphere Framework in Wicket.</description>
http://git-wip-us.apache.org/repos/asf/wicket/blob/a13dec06/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java
index 894d58d..486e480 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java
@@ -98,6 +98,16 @@ public class AtmosphereBehavior extends Behavior
}
@Override
+ public void onPreSuspend(AtmosphereResourceEvent event)
+ {
+ }
+
+ @Override
+ public void onClose(AtmosphereResourceEvent event)
+ {
+ }
+
+ @Override
public void onResourceRequested()
{
RequestCycle requestCycle = RequestCycle.get();
@@ -107,16 +117,7 @@ public class AtmosphereBehavior extends Behavior
Meteor meteor = Meteor.build(request.getContainerRequest());
// Add us to the listener list.
meteor.addListener(this);
-
- String transport = request.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT);
- if (HeaderConfig.LONG_POLLING_TRANSPORT.equalsIgnoreCase(transport))
- {
- meteor.suspend(-1, false);
- }
- else
- {
- meteor.suspend(-1);
- }
+ meteor.suspend(-1);
String uuid = meteor.getAtmosphereResource().uuid();
component.getPage().setMetaData(ATMOSPHERE_UUID, uuid);