Merge branch 'trunk', remote-tracking branch 'upstream/master' into trunk
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/56084e96 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/56084e96 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/56084e96 Branch: refs/heads/master Commit: 56084e963f7558774ff9d3f043f8afec195d412b Parents: 5e2c00f bbdab9a Author: Michael Mosmann <[email protected]> Authored: Wed Jan 9 22:22:21 2013 +0100 Committer: Michael Mosmann <[email protected]> Committed: Wed Jan 9 22:22:21 2013 +0100 ---------------------------------------------------------------------- CHANGELOG-6.x | 52 +++++ archetypes/quickstart/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- pom.xml | 70 +++++--- testing/wicket-common-tests/pom.xml | 2 +- testing/wicket-threadtest/pom.xml | 2 +- wicket-auth-roles/pom.xml | 2 +- wicket-cdi/pom.xml | 2 +- wicket-core/pom.xml | 2 +- .../src/main/java/org/apache/wicket/Behaviors.java | 15 +-- .../src/main/java/org/apache/wicket/Component.java | 2 +- .../src/main/java/org/apache/wicket/Page.java | 8 +- .../RestartResponseAtInterceptPageException.java | 6 +- .../wicket/ajax/AbstractAjaxTimerBehavior.java | 13 +- .../org/apache/wicket/ajax/XmlAjaxResponse.java | 10 +- .../wicket/behavior/AbstractAjaxBehavior.java | 16 ++ .../request/mapper/AbstractBookmarkableMapper.java | 33 +++- .../wicket/core/request/mapper/MountedMapper.java | 2 +- .../resource/locator/ResourceStreamLocator.java | 9 +- .../org/apache/wicket/markup/html/form/Form.java | 2 +- .../wicket/markup/html/form/FormComponent.java | 8 +- .../wicket/protocol/http/BufferedWebResponse.java | 28 ++- .../wicket/protocol/http/IRequestLogger.java | 10 +- .../servlet/MultipartServletWebRequestImpl.java | 11 +- .../response/filter/XmlCleaningResponseFilter.java | 148 +++++++++++++++ .../validation/validator/RangeValidator.java | 4 +- .../mapper/AbstractBookmarkableMapperTest.java | 91 +++++++++ .../wicket/request/cycle/UrlRendererTest.java | 25 +++ .../filter/XmlCleaningResponseFilterTest.java | 130 +++++++++++++ wicket-datetime/pom.xml | 2 +- wicket-devutils/pom.xml | 2 +- wicket-examples/pom.xml | 3 +- wicket-experimental/pom.xml | 27 +--- wicket-experimental/wicket-atmosphere/pom.xml | 4 +- wicket-experimental/wicket-bean-validation/pom.xml | 8 +- .../.settings/org.eclipse.core.resources.prefs | 3 +- wicket-experimental/wicket-bootstrap/pom.xml | 4 +- wicket-experimental/wicket-examples-parent/pom.xml | 4 +- .../wicket-examples-jar/pom.xml | 5 +- .../wicket-examples-war/pom.xml | 4 +- .../wicket-native-websocket/pom.xml | 14 +-- .../wicket-native-websocket-core/pom.xml | 4 +- .../ws/api/AbstractWebSocketProcessor.java | 9 +- .../wicket/protocol/ws/api/WebSocketBehavior.java | 6 + .../ws/api/res/js/wicket-websocket-jquery.js | 1 + .../ws/api/res/js/wicket-websocket-setup.js.tmpl | 2 +- .../ws/util/tester/TestWebSocketProcessor.java | 2 + .../wicket-native-websocket-jetty/pom.xml | 4 +- .../wicket-native-websocket-jetty9/pom.xml | 4 +- .../wicket-native-websocket-tomcat/pom.xml | 4 +- wicket-extensions/pom.xml | 2 +- .../ajax/markup/html/AjaxLazyLoadPanel.java | 14 ++- .../extensions/ajax/markup/html/modal/res/modal.js | 6 +- .../extensions/markup/html/form/palette/palette.js | 2 +- wicket-guice/pom.xml | 2 +- wicket-ioc/pom.xml | 2 +- wicket-jmx/pom.xml | 2 +- wicket-objectssizeof-agent/pom.xml | 2 +- wicket-request/pom.xml | 4 +- .../org/apache/wicket/request/UrlRenderer.java | 22 ++- wicket-spring/pom.xml | 2 +- wicket-util/pom.xml | 2 +- .../org/apache/wicket/util/string/Strings.java | 4 +- .../org/apache/wicket/util/string/StringsTest.java | 28 ++-- wicket-velocity/pom.xml | 2 +- wicket/pom.xml | 2 +- 66 files changed, 720 insertions(+), 201 deletions(-) ----------------------------------------------------------------------
