Merge branch 'wicket-6.x' into wicket-atmosphere-tester
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3afcc3b7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3afcc3b7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3afcc3b7 Branch: refs/heads/wicket-6.x Commit: 3afcc3b7924e06761713ad58fce90a5a49c7018b Parents: 50df0c1 39c2b67 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Aug 15 09:50:17 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Aug 15 09:50:17 2014 +0200 ---------------------------------------------------------------------- .../wicket/examples/atmosphere/HomePage.java | 7 ++ .../wicket/atmosphere/AtmosphereBehavior.java | 24 +++++- .../atmosphere/AtmosphereInternalEvent.java | 88 ++++++++++++++++++++ .../org/apache/wicket/atmosphere/EventBus.java | 37 +++++++- 4 files changed, 154 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3afcc3b7/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3afcc3b7/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java ---------------------------------------------------------------------- diff --cc wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java index 253473b,d2b96b5..113816d --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java @@@ -121,9 -113,17 +120,19 @@@ public class EventBus implements Unboun private final AtmosphereParameters parameters = new AtmosphereParameters(); + private Broadcaster broadcaster; + /** + * A flag indicating whether to be notified about Atmosphere internal events + * + * <strong>Caution:</strong>: enabling this may cause a lot of <em>onBroadcast</em> notifications + * + * @see org.apache.wicket.atmosphere.AtmosphereInternalEvent + * @see org.atmosphere.cpr.AtmosphereResourceEventListener + */ + private boolean wantAtmosphereNotifications = false; + + /** * Creates and registers an {@code EventBus} for the given application. The first broadcaster * returned by the {@code BroadcasterFactory} is used. *
