You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/08/13 15:57:57 UTC
[1/2] git commit: Pretend it is WebSocket connection
Repository: wicket
Updated Branches:
refs/heads/wicket-atmosphere-tester d27683c0f -> 5e04d4304
Pretend it is WebSocket connection
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5ee53965
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5ee53965
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5ee53965
Branch: refs/heads/wicket-atmosphere-tester
Commit: 5ee5396560850ed602cfc7ae10f0e5de6c8f214e
Parents: d27683c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Aug 13 15:07:05 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Aug 13 15:07:05 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5ee53965/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java
index c5b1cb3..91ea64e 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java
@@ -66,7 +66,7 @@ public class AtmosphereTester
page.add(atmosphereBehavior);
wicketTester.startPage(page);
- wicketTester.getRequest().setHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT, AtmosphereResource.TRANSPORT.LONG_POLLING.name());
+ wicketTester.getRequest().setHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT, AtmosphereResource.TRANSPORT.WEBSOCKET.name());
wicketTester.executeBehavior(atmosphereBehavior);
}
[2/2] git commit: Remove custom executors - they are no needed
because of TesterBroadcaster#executeBlockingWrite(AtmosphereResource, Entry)
Posted by mg...@apache.org.
Remove custom executors - they are no needed because of TesterBroadcaster#executeBlockingWrite(AtmosphereResource, Entry)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5e04d430
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5e04d430
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5e04d430
Branch: refs/heads/wicket-atmosphere-tester
Commit: 5e04d4304484957153fee01b2ed2199b2c020ba0
Parents: 5ee5396
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Aug 13 15:57:02 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Aug 13 15:57:02 2014 +0200
----------------------------------------------------------------------
.../wicket/atmosphere/tester/TesterEventBus.java | 14 --------------
1 file changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5e04d430/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterEventBus.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterEventBus.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterEventBus.java
index be88777..48e97cb 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterEventBus.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterEventBus.java
@@ -16,14 +16,10 @@
*/
package org.apache.wicket.atmosphere.tester;
-import java.util.concurrent.Executors;
-
import org.apache.wicket.atmosphere.EventBus;
import org.apache.wicket.protocol.http.WebApplication;
import org.atmosphere.cpr.AtmosphereConfig;
import org.atmosphere.cpr.AtmosphereFramework;
-import org.atmosphere.cpr.BroadcasterConfig;
-import org.atmosphere.util.VoidExecutorService;
/**
*
@@ -47,16 +43,6 @@ class TesterEventBus extends EventBus
broadcaster.initialize("wicket-atmosphere-tester", config);
- VoidExecutorService sameThreadExecutorService = new VoidExecutorService();
- BroadcasterConfig broadcasterConfig = new BroadcasterConfig(
- sameThreadExecutorService,
- sameThreadExecutorService,
- Executors.newSingleThreadScheduledExecutor(),
- config, "tester-broadcaster-config");
- broadcaster.setBroadcasterConfig(broadcasterConfig);
- broadcasterConfig.setAsyncWriteService(sameThreadExecutorService);
- broadcasterConfig.setExecutorService(sameThreadExecutorService);
-
return broadcaster;
}