Repository: wicket
Updated Branches:
refs/heads/master c93d0186c -> f0a6399c0
WICKET-5718: upgrade Atmosphere to 2.2.2
Conflicts:
wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/58b7b75d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/58b7b75d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/58b7b75d
Branch: refs/heads/master
Commit: 58b7b75d881a9693a81d04a6db6cccfda67f8b95
Parents: c93d018
Author: Emond Papegaaij <[email protected]>
Authored: Fri Oct 3 15:19:50 2014 +0200
Committer: Emond Papegaaij <[email protected]>
Committed: Fri Oct 3 15:38:07 2014 +0200
----------------------------------------------------------------------
wicket-examples/src/main/webapp/WEB-INF/web.xml | 10 ++--
wicket-experimental/wicket-atmosphere/pom.xml | 4 +-
.../wicket/atmosphere/AtmosphereBehavior.java | 5 ++
.../atmosphere/TrackMessageSizeFilter.java | 53 --------------------
.../atmosphere/tester/TesterBroadcaster.java | 11 ++--
5 files changed, 18 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/58b7b75d/wicket-examples/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/webapp/WEB-INF/web.xml
b/wicket-examples/src/main/webapp/WEB-INF/web.xml
index f7d1c7b..92f956a 100644
--- a/wicket-examples/src/main/webapp/WEB-INF/web.xml
+++ b/wicket-examples/src/main/webapp/WEB-INF/web.xml
@@ -875,10 +875,14 @@
<param-value>org.atmosphere.websocket.protocol.EchoProtocol</param-value>
</init-param>
<init-param>
-
<param-name>org.atmosphere.cpr.broadcastFilterClasses</param-name>
-
<param-value>org.apache.wicket.atmosphere.TrackMessageSizeFilter</param-value>
+
<param-name>org.atmosphere.cpr.AtmosphereInterceptor</param-name>
+
<param-value>org.atmosphere.client.TrackMessageSizeInterceptor</param-value>
</init-param>
- <load-on-startup>1</load-on-startup>
+ <init-param>
+
<param-name>org.atmosphere.client.TrackMessageSizeInterceptor.delimiter</param-name>
+ <param-value><![CDATA[<|msg|>]]></param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
http://git-wip-us.apache.org/repos/asf/wicket/blob/58b7b75d/wicket-experimental/wicket-atmosphere/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/pom.xml
b/wicket-experimental/wicket-atmosphere/pom.xml
index a6ec90a..101cb88 100644
--- a/wicket-experimental/wicket-atmosphere/pom.xml
+++ b/wicket-experimental/wicket-atmosphere/pom.xml
@@ -41,8 +41,8 @@
</repository>
</repositories>
<properties>
- <atmosphere.version>2.1.8</atmosphere.version>
- <jquery.atmosphere.version>2.1.6</jquery.atmosphere.version>
+ <atmosphere.version>2.2.2</atmosphere.version>
+ <jquery.atmosphere.version>2.2.3</jquery.atmosphere.version>
</properties>
<dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/58b7b75d/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 0cfb9bc..147b122 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
@@ -206,6 +206,11 @@ public class AtmosphereBehavior extends
AbstractAjaxBehavior
eventBus.post(new
AtmosphereInternalEvent(AtmosphereInternalEvent.Type.Throwable, event));
}
}
+
+ @Override
+ public void onHeartbeat(AtmosphereResourceEvent event)
+ {
+ }
@Override
public void renderHead(Component component, IHeaderResponse response)
http://git-wip-us.apache.org/repos/asf/wicket/blob/58b7b75d/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/TrackMessageSizeFilter.java
----------------------------------------------------------------------
diff --git
a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/TrackMessageSizeFilter.java
b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/TrackMessageSizeFilter.java
deleted file mode 100644
index c540cd2..0000000
---
a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/TrackMessageSizeFilter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.atmosphere;
-
-import static org.atmosphere.cpr.HeaderConfig.X_ATMOSPHERE_TRACKMESSAGESIZE;
-
-import org.atmosphere.cpr.AtmosphereRequest;
-import org.atmosphere.cpr.AtmosphereResource;
-
-/**
- * A broadcast filter, based on {@link
org.atmosphere.client.TrackMessageSizeFilter}, but with a
- * different delimiter {@code <|msg|>} to prevent conflicts with pipes
in the messages.
- */
-public class TrackMessageSizeFilter extends
org.atmosphere.client.TrackMessageSizeFilter
-{
-
- @Override
- public BroadcastAction filter(AtmosphereResource r, Object message,
Object originalMessage)
- {
-
- AtmosphereRequest request = r.getRequest();
- if
("true".equalsIgnoreCase(request.getHeader(X_ATMOSPHERE_TRACKMESSAGESIZE)) &&
- message != null &&
String.class.isAssignableFrom(message.getClass()))
- {
-
- String msg = message.toString();
- msg = msg.length() + "<|msg|>" + msg;
- return new
BroadcastAction(BroadcastAction.ACTION.CONTINUE, msg);
-
- }
- return new BroadcastAction(BroadcastAction.ACTION.CONTINUE,
message);
- }
-
- @Override
- public BroadcastAction filter(Object originalMessage, Object message)
- {
- return new BroadcastAction(message);
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/58b7b75d/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java
----------------------------------------------------------------------
diff --git
a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java
b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java
index 7452d6a..7ec23ac 100644
---
a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java
+++
b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java
@@ -17,11 +17,8 @@
package org.apache.wicket.atmosphere.tester;
import org.atmosphere.cpr.AtmosphereConfig;
-import org.atmosphere.cpr.AtmosphereResource;
import org.atmosphere.cpr.AtmosphereResponse;
-import org.atmosphere.cpr.BroadcasterConfig;
-import org.atmosphere.cpr.DefaultBroadcaster;
-import org.atmosphere.cpr.Entry;
+import org.atmosphere.cpr.Deliver;
import org.atmosphere.util.SimpleBroadcaster;
/**
@@ -35,10 +32,10 @@ class TesterBroadcaster extends SimpleBroadcaster
}
@Override
- protected void push(Entry entry)
+ protected void push(Deliver entry)
{
- AtmosphereResponse response = entry.resource.getResponse();
- String message = entry.message.toString();
+ AtmosphereResponse response = entry.getResource().getResponse();
+ String message = entry.getMessage().toString();
response.write(message);
}
}
