Merge branch 'wicket-6.x' into 5674-jquery-atmo-webjar
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eb863671 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eb863671 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eb863671 Branch: refs/heads/5674-jquery-atmo-webjar Commit: eb86367138f831c4b348239ca0b39c6022ae6902 Parents: eb74273 3afcc3b Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Aug 15 11:47:01 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Aug 15 11:47:01 2014 +0200 ---------------------------------------------------------------------- .../wicket/util/tester/BaseWicketTester.java | 10 +- .../wicket/examples/atmosphere/HomePage.java | 7 + .../wicket/atmosphere/AtmosphereBehavior.java | 24 ++- .../atmosphere/AtmosphereInternalEvent.java | 88 +++++++++ .../atmosphere/AtmosphereRequestHandler.java | 28 ++- .../wicket/atmosphere/AtmosphereWebRequest.java | 8 +- .../org/apache/wicket/atmosphere/EventBus.java | 100 ++++++++-- .../atmosphere/tester/AtmosphereTester.java | 184 +++++++++++++++---- .../tester/TesterAtmosphereBehavior.java | 65 +++++++ .../atmosphere/tester/TesterBroadcaster.java | 5 +- .../wicket/atmosphere/AtmosphereTesterTest.java | 110 +++++++++++ 11 files changed, 565 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/eb863671/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java ---------------------------------------------------------------------- diff --cc wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java index 4fae2da,7452d6a..5ecb36a --- 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,8 -17,10 +17,7 @@@ 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.util.SimpleBroadcaster;
