Merge remote-tracking branch 'origin/wicket-6.x' into wicket-6.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c4656d00 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c4656d00 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c4656d00 Branch: refs/heads/wicket-6.x Commit: c4656d00f23ce89fc49c596bf3c96f729697f17b Parents: b1d635e 945f5a0 Author: Martijn Dashorst <[email protected]> Authored: Sat Nov 8 16:39:19 2014 +0100 Committer: Martijn Dashorst <[email protected]> Committed: Sat Nov 8 16:39:19 2014 +0100 ---------------------------------------------------------------------- .../ajax/attributes/AjaxCallListener.java | 63 +++++++- .../wicket/ajax/res/js/wicket-event-jquery.js | 3 +- .../wicket/markup/head/ResourceAggregator.java | 1 + .../ReplacementResourceBundleReference.java | 12 ++ .../wicket/TestDetachPageExpectedResult.html | 1 + .../ajax/AjaxBehaviorEnabled_expected.html | 1 + .../AjaxHeaderContributionPage2_expected.html | 1 + .../AjaxHeaderContributionPage_expected.html | 1 + .../wicket/ajax/DomReadyOrderPage_expected.html | 1 + .../form/AjaxFormSubmitTestPage_expected.html | 1 + .../OnChangeAjaxBehaviorTestPage_expected.html | 1 + .../ajaxLink/AjaxLinkPageExpectedResult.html | 1 + .../AjaxLinkWithBorderPageExpectedResult.html | 1 + .../html/ajaxLink/AjaxPage2_ExpectedResult.html | 1 + .../html/basic/SimplePageExpectedResult_13.html | 1 + .../HideableBorderPage_ExpectedResult.html | 1 + .../panel/InlinePanelPageExpectedResult_7.html | 1 + .../panel/InlinePanelPageExpectedResult_8.html | 1 + .../ResourceAggregatorTest1Page_results.html | 1 + .../ResourceAggregatorTest2Page_results.html | 1 + .../yui/calendar/DatesPage1_ExpectedResult.html | 1 + .../apache/wicket/util/io/BOMInputStream.java | 4 +- .../util/license/ApacheLicenceHeaderTest.java | 158 +++++++++---------- .../license/ApacheLicenseHeaderTestCase.java | 5 - .../WicketUtilApacheLicenceHeaderTest.java | 76 +++++++++ 25 files changed, 245 insertions(+), 94 deletions(-) ----------------------------------------------------------------------
