Merge remote-tracking branch 'github/WICKET-5677' into WICKET-5677 Conflicts: wicket-core/src/main/java/org/apache/wicket/Component.java wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/348e9dbc Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/348e9dbc Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/348e9dbc Branch: refs/heads/WICKET-5677 Commit: 348e9dbc899c3a62eccf7c50739162b0c0be63c2 Parents: 40c4210 c3eb7e2 Author: Carl-Eric Menzel <cmen...@wicketbuch.de> Authored: Fri Aug 22 00:29:16 2014 +0200 Committer: Carl-Eric Menzel <cmen...@wicketbuch.de> Committed: Fri Aug 22 00:29:16 2014 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Component.java | 51 +- .../java/org/apache/wicket/MarkupContainer.java | 48 +- .../AjaxPagingNavigationIncrementLink.java | 4 + .../paging/AjaxPagingNavigationLink.java | 4 + .../wicket/util/tester/BaseWicketTester.java | 10 +- .../test/java/org/apache/wicket/OnAddTest.java | 160 - .../java/org/apache/wicket/OnReAddTest.java | 179 ++ wicket-core/src/test/js/qunit/qunit.css | 80 +- wicket-core/src/test/js/qunit/qunit.js | 2057 ++++++------ wicket-examples/src/main/java/log4j.properties | 2 +- .../atmosphere/AtmosphereApplication.java | 2 + .../wicket/examples/atmosphere/HomePage.java | 7 + .../wicket/examples/hangman/WordGenerator.java | 2 +- wicket-experimental/wicket-atmosphere/pom.xml | 25 +- .../wicket/atmosphere/AtmosphereBehavior.java | 64 +- .../atmosphere/AtmosphereInternalEvent.java | 88 + .../atmosphere/AtmosphereRequestHandler.java | 28 +- .../wicket/atmosphere/AtmosphereWebRequest.java | 8 +- .../org/apache/wicket/atmosphere/EventBus.java | 100 +- .../apache/wicket/atmosphere/Initializer.java | 48 + ...JQueryWicketAtmosphereResourceReference.java | 5 +- .../wicket/atmosphere/jquery.atmosphere.js | 3012 ------------------ .../atmosphere/tester/AtmosphereTester.java | 197 ++ .../atmosphere/tester/TesterAsyncSupport.java | 68 + .../tester/TesterAtmosphereBehavior.java | 65 + .../atmosphere/tester/TesterBroadcaster.java | 41 + .../tester/TesterBroadcasterFactory.java | 48 + .../atmosphere/tester/TesterEventBus.java | 54 + .../src/main/resources/wicket.properties | 15 + .../wicket/atmosphere/AtmosphereTesterTest.java | 110 + .../apache/wicket/atmosphere/ChatMessage.java | 42 + .../org/apache/wicket/atmosphere/HomePage.html | 24 + .../org/apache/wicket/atmosphere/HomePage.java | 84 + .../wicket/atmosphere/ReceiverFilter.java | 40 + 34 files changed, 2555 insertions(+), 4217 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/348e9dbc/wicket-core/src/main/java/org/apache/wicket/Component.java ----------------------------------------------------------------------