Merge branch 'wicket-7.x' of https://git-wip-us.apache.org/repos/asf/wicket into wicket-7.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/aa1391ae Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/aa1391ae Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/aa1391ae Branch: refs/heads/wicket-7.x Commit: aa1391aeebdd6c9cbbc61d6e35ae47dc1f8111f9 Parents: d12b133 aedeb6e Author: Martijn Dashorst <[email protected]> Authored: Sun Jan 10 14:47:22 2016 +0100 Committer: Martijn Dashorst <[email protected]> Committed: Sun Jan 10 14:47:22 2016 +0100 ---------------------------------------------------------------------- pom.xml | 2 +- .../testing/pages/InsertContactTest.java | 8 +++ .../java/org/apache/wicket/Application.java | 3 +- .../org/apache/wicket/Application_de.properties | 1 + ...RestartResponseAtInterceptPageException.java | 1 - .../main/java/org/apache/wicket/Session.java | 1 + .../html/TransparentWebMarkupContainer.java | 3 +- .../protocol/http/mock/MockHttpSession.java | 10 ++- .../request/resource/PackageResource.java | 18 +++-- .../request/resource/PartWriterCallback.java | 3 +- .../html/border/BorderWithAutoLabelPage.html | 28 ++++++++ .../html/border/BorderWithAutoLabelPage.java | 38 +++++++++++ .../markup/html/border/ComponentBorderTest.java | 8 +++ .../resource/PackageResourceReferenceTest.java | 16 ++--- .../wicket/util/tester/WicketTesterTest.java | 25 +++++++ .../extensions/wizard/WizardButtonBar.java | 70 ++++++++++++++++++-- .../wicket/protocol/ws/WebSocketSettings.java | 27 ++++++-- .../ws/api/AbstractWebSocketProcessor.java | 4 +- 18 files changed, 233 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
