Merge 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/a09e0571 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a09e0571 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a09e0571 Branch: refs/heads/master Commit: a09e0571f8a62e83580a42893f3f6c3485ed5543 Parents: cecb43c 00401d7 Author: Michael Mosmann <[email protected]> Authored: Thu Nov 8 17:19:02 2012 +0100 Committer: Michael Mosmann <[email protected]> Committed: Thu Nov 8 17:19:02 2012 +0100 ---------------------------------------------------------------------- CHANGELOG-6.x | 48 + archetypes/quickstart/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../src/main/java/HomePage.java | 8 +- .../archetype-resources/src/test/java/Start.java | 16 +- pom.xml | 30 +- release-dashorst.sh | 2 +- testing/wicket-common-tests/pom.xml | 2 +- wicket-auth-roles/pom.xml | 2 +- wicket-cdi/pom.xml | 2 +- wicket-core/pom.xml | 2 +- .../java/org/apache/wicket/ConverterLocator.java | 8 +- .../mapper/AbstractResourceReferenceMapper.java | 54 +- .../mapper/BasicResourceReferenceMapper.java | 68 +- .../resource/locator/ResourceStreamLocator.java | 2 +- .../apache/wicket/feedback/FeedbackMessage.java | 5 +- .../apache/wicket/markup/AbstractMarkupParser.java | 4 +- .../org/apache/wicket/markup/MarkupParser.java | 12 +- .../markup/html/SecurePackageResourceGuard.java | 2 +- .../wicket/markup/html/form/AutoLabelResolver.java | 11 +- .../markup/html/form/AutoLabelTagHandler.java | 20 +- .../markup/html/form/AutoLabelTextResolver.java | 2 +- .../wicket/markup/html/form/FormComponent.java | 2 +- .../markup/html/image/ContextPathGenerator.java | 2 +- .../apache/wicket/markup/html/include/Include.java | 4 +- .../wicket/markup/html/link/ExternalLink.java | 2 +- .../wicket/markup/html/panel/FeedbackPanel.html | 4 +- .../wicket/markup/html/panel/FeedbackPanel.java | 2 +- .../wicket/markup/parser/AbstractMarkupFilter.java | 60 +- .../markup/parser/filter/EnclosureHandler.java | 7 + .../parser/filter/HtmlHeaderSectionHandler.java | 1 + .../parser/filter/InlineEnclosureHandler.java | 9 +- .../parser/filter/RelativePathPrefixHandler.java | 10 +- .../markup/parser/filter/RootMarkupFilter.java | 16 +- .../parser/filter/WicketContainerTagHandler.java | 8 +- .../markup/parser/filter/WicketLinkTagHandler.java | 7 + .../parser/filter/WicketMessageTagHandler.java | 10 +- .../parser/filter/WicketRemoveTagHandler.java | 7 + .../org/apache/wicket/mock/MockWebRequest.java | 2 +- .../org/apache/wicket/pageStore/DiskDataStore.java | 2 +- .../protocol/http/AbstractRequestLogger.java | 20 +- .../wicket/protocol/http/WebApplication.java | 8 +- .../protocol/http/servlet/ServletWebRequest.java | 11 +- .../protocol/http/servlet/ServletWebResponse.java | 26 +- .../request/resource/UrlResourceReference.java | 2 +- .../org/apache/wicket/resource/jquery/jquery.js | 8012 ++++++++------- .../apache/wicket/resource/jquery/jquery.min.js | 6 +- .../wicket/util/tester/BaseWicketTester.java | 5 +- .../org/apache/wicket/ConverterLocatorTest.java | 6 +- .../AbstractResourceReferenceMapperOwnTest.java | 66 + .../http/servlet/ServletWebRequestTest.java | 35 +- .../http/servlet/ServletWebResponseTest.java | 15 +- .../wicket/util/tester/WicketTesterTest.java | 6 +- wicket-datetime/pom.xml | 2 +- wicket-devutils/pom.xml | 2 +- wicket-examples/pom.xml | 2 +- .../examples/ajax/builtin/AjaxApplication.java | 2 + .../examples/ajax/builtin/FileUploadPage.html | 3 +- .../examples/ajax/builtin/FileUploadPage.java | 26 +- .../wicket/examples/compref/PalettePage.java | 11 +- wicket-experimental/pom.xml | 2 +- wicket-experimental/wicket-atmosphere/pom.xml | 2 +- wicket-experimental/wicket-bootstrap/pom.xml | 2 +- .../wicket/bootstrap/css/bootstrap-responsive.css | 36 +- .../bootstrap/css/bootstrap-responsive.min.css | 4 +- .../org/apache/wicket/bootstrap/css/bootstrap.css | 635 +- .../apache/wicket/bootstrap/css/bootstrap.min.css | 4 +- .../org/apache/wicket/bootstrap/js/bootstrap.js | 212 +- .../apache/wicket/bootstrap/js/bootstrap.min.js | 2 +- wicket-experimental/wicket-examples-parent/pom.xml | 2 +- .../wicket-native-websocket/pom.xml | 2 +- wicket-extensions/pom.xml | 2 +- .../html/autocomplete/wicket-autocomplete.js | 3 +- .../ajax/markup/html/form/upload/progressbar.js | 4 +- .../markup/html/basic/SmartLinkMultiLineLabel.java | 4 +- .../markup/html/form/palette/Palette.java | 7 +- 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 +- .../wicket/request/mapper/AbstractMapper.java | 2 +- .../request/mapper/CompoundRequestMapper.java | 45 + wicket-spring/pom.xml | 2 +- wicket-util/pom.xml | 2 +- .../util/convert/converter/DateConverter.java | 2 +- .../util/convert/converter/SqlDateConverter.java | 2 +- .../util/convert/converter/SqlTimeConverter.java | 4 +- .../convert/converter/SqlTimestampConverter.java | 4 +- .../org/apache/wicket/util/string/StringsTest.java | 12 +- wicket-velocity/pom.xml | 2 +- wicket/pom.xml | 2 +- 92 files changed, 5161 insertions(+), 4578 deletions(-) ----------------------------------------------------------------------
