You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/03/11 13:32:55 UTC

[10/22] git commit: Merge remote-tracking branch 'upstream/master' into trunk

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/5ffb19d8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5ffb19d8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5ffb19d8

Branch: refs/heads/master
Commit: 5ffb19d8bf8522d19506240da8b38ff69a4707eb
Parents: 2a60388 776cb63
Author: Michael Mosmann <mi...@mosmann.de>
Authored: Thu Dec 6 22:06:17 2012 +0100
Committer: Michael Mosmann <mi...@mosmann.de>
Committed: Thu Dec 6 22:06:17 2012 +0100

----------------------------------------------------------------------
 CHANGELOG-6.x                                      |   80 +
 archetypes/quickstart/pom.xml                      |    2 +-
 .../src/main/resources/archetype-resources/pom.xml |    2 +-
 .../src/main/java/HomePage.java                    |    8 +-
 .../src/main/java/WicketApplication.java           |    3 +-
 .../archetype-resources/src/test/java/Start.java   |   16 +-
 pom.xml                                            |   82 +-
 release-dashorst.sh                                |   17 +-
 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/Application.properties  |   40 +-
 .../apache/wicket/Application_bg.properties.xml    |   55 +-
 .../org/apache/wicket/Application_de.properties    |   26 +-
 .../org/apache/wicket/Application_de_CH.properties |   27 +-
 .../org/apache/wicket/Application_fr.properties    |   39 +-
 .../org/apache/wicket/Application_no.properties    |   36 +-
 .../apache/wicket/Application_ru.properties.xml    |   46 +-
 .../apache/wicket/Application_th_TH.properties.xml |   26 +-
 .../src/main/java/org/apache/wicket/Component.java |    6 +-
 .../java/org/apache/wicket/ConverterLocator.java   |    8 +-
 .../java/org/apache/wicket/IGenericComponent.java  |   59 +
 .../java/org/apache/wicket/ResourceBundles.java    |   22 +-
 .../main/java/org/apache/wicket/SystemMapper.java  |   15 +-
 .../apache/wicket/ajax/AbstractAjaxResponse.java   |    2 +-
 .../wicket/ajax/AbstractAjaxTimerBehavior.java     |   17 +-
 .../apache/wicket/ajax/markup/html/AjaxLink.java   |   27 +-
 .../wicket/ajax/markup/html/form/AjaxButton.java   |   15 +-
 .../ajax/markup/html/form/AjaxSubmitLink.java      |   20 +-
 .../paging/AjaxPagingNavigationIncrementLink.java  |   17 +-
 .../paging/AjaxPagingNavigationLink.java           |   15 +-
 .../wicket/ajax/res/js/wicket-event-jquery.js      |    5 +-
 .../handler/BookmarkablePageRequestHandler.java    |    8 +
 .../wicket/core/request/handler/PageProvider.java  |   13 +
 .../handler/RequestSettingRequestHandler.java      |   91 +
 .../mapper/AbstractResourceReferenceMapper.java    |   54 +-
 .../mapper/BasicResourceReferenceMapper.java       |   68 +-
 .../wicket/core/request/mapper/CryptoMapper.java   |   40 +-
 .../wicket/core/request/mapper/HomePageMapper.java |   17 +-
 .../wicket/core/request/mapper/MountedMapper.java  |   37 +-
 .../wicket/core/util/io/SerializableChecker.java   |  718 +--
 .../wicket/core/util/lang/WicketObjects.java       |   10 +
 .../objects/checker/AbstractObjectChecker.java     |   86 +
 .../checker/CheckingObjectOutputStream.java        |  741 ++
 .../core/util/objects/checker/IObjectChecker.java  |  126 +
 .../objects/checker/NotDetachedModelChecker.java   |   69 +
 .../objects/checker/OrphanComponentChecker.java    |   74 +
 .../resource/locator/ResourceStreamLocator.java    |    2 +-
 .../apache/wicket/feedback/FeedbackCollector.java  |   31 +-
 .../apache/wicket/feedback/FeedbackMessage.java    |    5 +-
 .../wicket/feedback/FeedbackMessagesModel.java     |   21 +-
 .../wicket/feedback/FencedFeedbackPanel.java       |  202 +
 .../apache/wicket/markup/AbstractMarkupParser.java |   10 +-
 .../org/apache/wicket/markup/MarkupParser.java     |   12 +-
 .../apache/wicket/markup/head/CssHeaderItem.java   |   70 +-
 .../wicket/markup/head/JavaScriptHeaderItem.java   |    8 +-
 .../apache/wicket/markup/html/GenericWebPage.java  |   29 +-
 .../markup/html/SecurePackageResourceGuard.java    |    3 +-
 .../apache/wicket/markup/html/basic/EnumLabel.java |   27 +-
 .../org/apache/wicket/markup/html/basic/Label.java |   20 +-
 .../wicket/markup/html/form/AutoLabelResolver.java |   11 +-
 .../markup/html/form/AutoLabelTagHandler.java      |   20 +-
 .../markup/html/form/AutoLabelTextResolver.java    |    2 +-
 .../org/apache/wicket/markup/html/form/Check.java  |   27 +-
 .../markup/html/form/CheckBoxMultipleChoice.java   |   51 +-
 .../org/apache/wicket/markup/html/form/Form.java   |   33 +-
 .../wicket/markup/html/form/FormComponent.java     |  112 +-
 .../wicket/markup/html/form/NumberTextField.java   |   69 +-
 .../org/apache/wicket/markup/html/form/Radio.java  |   27 +-
 .../wicket/markup/html/form/RadioChoice.java       |  263 +-
 .../markup/html/image/ContextPathGenerator.java    |    2 +-
 .../apache/wicket/markup/html/include/Include.java |    4 +-
 .../wicket/markup/html/link/ExternalLink.java      |    2 +-
 .../org/apache/wicket/markup/html/link/Link.java   |   27 +-
 .../apache/wicket/markup/html/list/ListItem.java   |   27 +-
 .../paging/PagingNavigationIncrementLink.java      |    2 +-
 .../wicket/markup/html/panel/FeedbackPanel.html    |    4 +-
 .../wicket/markup/html/panel/FeedbackPanel.java    |   25 +-
 .../wicket/markup/html/panel/GenericPanel.java     |    7 +-
 .../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      |    9 +-
 .../markup/parser/filter/WicketTagIdentifier.java  |   31 +-
 .../org/apache/wicket/mock/MockWebRequest.java     |    2 +-
 .../org/apache/wicket/pageStore/DiskDataStore.java |    2 +-
 .../protocol/http/AbstractRequestLogger.java       |   20 +-
 .../protocol/http/ReloadingWicketFilter.java       |   10 +-
 .../wicket/protocol/http/WebApplication.java       |    8 +-
 .../apache/wicket/protocol/http/WicketFilter.java  |   80 +-
 .../documentvalidation/HtmlDocumentParser.java     |    2 +-
 .../protocol/http/request/WebClientInfo.java       |   34 +-
 .../protocol/http/servlet/ServletWebRequest.java   |   64 +-
 .../protocol/http/servlet/ServletWebResponse.java  |   26 +-
 .../apache/wicket/protocol/https/HttpsMapper.java  |    5 +-
 .../apache/wicket/request/cycle/RequestCycle.java  |   46 +-
 .../resource/ResourceReferenceRequestHandler.java  |    9 +
 .../wicket/request/resource/AbstractResource.java  |   19 +-
 .../request/resource/UrlResourceReference.java     |   11 +-
 .../resource/bundles/ConcatBundleResource.java     |   31 +-
 .../bundles/ConcatResourceBundleReference.java     |   23 +-
 .../org/apache/wicket/resource/jquery/jquery.js    | 8082 ++++++++-------
 .../apache/wicket/resource/jquery/jquery.min.js    |    6 +-
 .../wicket/serialize/java/JavaSerializer.java      |   26 +-
 .../wicket/settings/def/ResourceSettings.java      |   12 +-
 .../wicket/util/reference/ClassReference.java      |   84 +
 .../wicket/util/tester/BaseWicketTester.java       |    5 +-
 .../wicket/util/tester/WicketTesterHelper.java     |    2 +-
 .../validation/validator/StringValidator.java      |   10 +-
 .../org/apache/wicket/ConverterLocatorTest.java    |    6 +-
 .../AbstractResourceReferenceMapperOwnTest.java    |   66 +
 .../core/request/mapper/CryptoMapperTest.java      |   22 +-
 .../core/util/license/ApacheLicenceHeaderTest.java |    4 +-
 .../objects/checker/AbstractObjectCheckerTest.java |   47 +
 .../checker/OrphanComponentCheckerTest.java        |   44 +
 .../html/form/LocalizedErrorMessageTest.java       |    6 +-
 .../markup/html/form/NumberTextFieldTest.java      |  144 +
 .../html/form/upload/FileUploadErrorTest.java      |   18 +-
 .../innerfeedback/InnerFeedbackTest.java           |    2 +-
 .../markup/html/list/PagedTableNavigatorTest.java  |    2 +
 .../PagedTableNavigatorWithLabelProviderTest.java  |    3 +
 .../list/PagedTableNavigatorWithMarginTest.java    |    3 +
 .../wicket/markup/html/list/PagedTableTest.java    |    3 +
 .../markup/html/panel/FencedFeedbackPanelTest.java |  220 +
 .../protocol/http/request/WebClientInfoTest.java   |   76 +-
 .../http/servlet/ServletWebRequestTest.java        |   35 +-
 .../http/servlet/ServletWebResponseTest.java       |   15 +-
 .../wicket/protocol/https/HttpsMapperTest.java     |    6 +-
 .../wicket/request/cycle/UrlRendererTest.java      |   58 +-
 .../MinifiedAwareResourceReferenceTest.java        |    4 +-
 .../wicket/request/resource/ResouceBundleTest.java |    2 +-
 .../java/org/apache/wicket/request/resource/a.js   |    2 +-
 .../java/org/apache/wicket/request/resource/b.js   |    2 +-
 .../org/apache/wicket/request/resource/b.min.js    |    2 +-
 .../resource/bundles/CompressBundlesTest.java      |   98 +
 .../java/org/apache/wicket/resource/bundles/one.js |   20 +
 .../org/apache/wicket/resource/bundles/three.js    |   20 +
 .../java/org/apache/wicket/resource/bundles/two.js |   20 +
 .../wicket/serialize/java/JavaSerializerTest.java  |  116 +
 .../wicket/util/io/SerializableCheckerTest.java    |   18 +-
 .../util/resource/ResourceStreamLocatorTest.java   |    2 +-
 .../apache/wicket/util/tester/FormTesterTest.java  |    4 +-
 .../wicket/util/tester/WicketTesterTest.java       |    8 +-
 .../java/org/apache/wicket/util/tester/test.html   |    2 +-
 wicket-core/src/test/js/all.html                   |    4 +-
 wicket-core/src/test/js/qunit/qunit-1.10.0.css     |  235 +
 wicket-core/src/test/js/qunit/qunit-1.10.0.js      | 1977 ++++
 wicket-core/src/test/js/qunit/qunit-1.9.0.css      |  231 -
 wicket-core/src/test/js/qunit/qunit-1.9.0.js       | 1932 ----
 wicket-datetime/pom.xml                            |    2 +-
 .../org/apache/wicket/datetime/DateConverter.java  |   19 +-
 wicket-devutils/pom.xml                            |    9 +-
 .../devutils/debugbar/SessionSizeDebugPanel.java   |    4 +-
 .../devutils/inspector/SessionSizeModel.java       |   42 +-
 wicket-examples/pom.xml                            |   15 +-
 .../examples/ajax/builtin/AjaxApplication.java     |    2 +
 .../examples/ajax/builtin/FileUploadPage.html      |    3 +-
 .../examples/ajax/builtin/FileUploadPage.java      |   28 +-
 .../wicket/examples/atmosphere/ChatMessage.java    |   42 +
 .../wicket/examples/atmosphere/HomePage.html       |    1 +
 .../wicket/examples/atmosphere/HomePage.java       |   11 +-
 .../wicket/examples/atmosphere/ReceiverFilter.java |   40 +
 .../bean/validation/BeanValidationApplication.java |   36 +
 .../bean/validation/BeanValidationPage.html        |   48 +
 .../bean/validation/BeanValidationPage.java        |   49 +
 .../bean/validation/BeanValidationPage.properties  |   14 +
 .../wicket/examples/bean/validation/Person.java    |   86 +
 .../compref/CheckBoxMultipleChoicePage.html        |    4 +-
 .../compref/CheckBoxMultipleChoicePage.java        |   22 +-
 .../wicket/examples/compref/PalettePage.java       |   11 +-
 .../forminput/FormInput_da_DK.properties.xml       |    4 +-
 .../examples/forminput/FormInput_de.properties.xml |    4 +-
 .../forminput/FormInput_fa_IR.properties.xml       |    4 +-
 .../examples/forminput/FormInput_ja.properties.xml |    4 +-
 .../forminput/FormInput_pt_BR.properties.xml       |    4 +-
 .../examples/forminput/FormInput_ru.properties.xml |    4 +-
 .../forminput/FormInput_th_TH.properties.xml       |    4 +-
 .../forminput/FormInput_zh_CN.properties.xml       |    4 +-
 .../org/apache/wicket/examples/niceurl/Home.html   |    9 +-
 .../org/apache/wicket/examples/niceurl/Home.java   |    3 +-
 .../examples/niceurl/NiceUrlApplication.java       |    6 +-
 .../apache/wicket/examples/niceurl/Page2PP.html    |   20 +
 .../apache/wicket/examples/niceurl/Page2PP.java    |   40 +
 .../apache/wicket/examples/niceurl/Page2QP.html    |   20 -
 .../apache/wicket/examples/niceurl/Page2QP.java    |   39 -
 .../apache/wicket/examples/niceurl/Page2UP.html    |   20 +
 .../apache/wicket/examples/niceurl/Page2UP.java    |   41 +
 .../wicket/examples/repeater/DataTablePage.html    |    1 +
 .../wicket/examples/repeater/DataTablePage.java    |   19 +-
 .../apache/wicket/examples/upload/UploadPage.html  |   12 +-
 .../apache/wicket/examples/homepage/HomePage.html  |    1 +
 wicket-examples/src/main/webapp/WEB-INF/web.xml    |  386 +-
 .../org/apache/wicket/examples/StartExamples.java  |    2 +-
 .../wicket/examples/niceurl/NiceUrlTest.java       |   22 +-
 wicket-experimental/pom.xml                        |   11 +-
 wicket-experimental/wicket-atmosphere/pom.xml      |    6 +-
 .../wicket/atmosphere/AtmosphereBehavior.java      |   31 +-
 .../atmosphere/AtmosphereRequestHandler.java       |   24 +-
 .../org/apache/wicket/atmosphere/EventBus.java     |   74 +-
 .../wicket/atmosphere/EventSubscription.java       |   20 +-
 .../org/apache/wicket/atmosphere/Subscribe.java    |   14 +-
 .../wicket/atmosphere/TrackMessageSizeFilter.java  |   54 +
 .../apache/wicket/atmosphere/jquery.atmosphere.js  |  718 ++-
 .../wicket/atmosphere/jquery.wicketatmosphere.js   |    2 +
 .../.settings/org.eclipse.jdt.core.prefs           |  284 +
 .../.settings/org.eclipse.jdt.ui.prefs             |    3 +
 wicket-experimental/wicket-bean-validation/pom.xml |   31 +
 .../validation/BeanValidationConfiguration.java    |  147 +
 .../bean/validation/BeanValidationContext.java     |   41 +
 .../wicket/bean/validation/ConstraintIterator.java |   89 +
 .../bean/validation/DefaultPropertyResolver.java   |   50 +
 .../bean/validation/DefaultValidatorProvider.java  |   41 +
 .../validation/DefaultViolationTranslator.java     |   60 +
 .../apache/wicket/bean/validation/GroupsModel.java |   60 +
 .../wicket/bean/validation/IPropertyResolver.java  |   20 +
 .../wicket/bean/validation/ITagModifier.java       |   31 +
 .../bean/validation/IViolationTranslator.java      |   24 +
 .../apache/wicket/bean/validation/Property.java    |   41 +
 .../wicket/bean/validation/PropertyValidator.java  |  222 +
 .../bean/validation/PropertyValidator.properties   |   24 +
 .../bean/validation/SessionLocaleInterpolator.java |   53 +
 .../wicket/bean/validation/SizeTagModifier.java    |   26 +
 .../org/apache/wicket/bean/validation/package.html |   52 +
 wicket-experimental/wicket-bootstrap/pom.xml       |    4 +-
 .../org/apache/wicket/bootstrap/Bootstrap.java     |  123 +-
 .../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 |    4 +-
 .../wicket-examples-jar/pom.xml                    |    6 +-
 .../wicket/examples/base/AbstractBasePage.html     |   11 +
 .../wicket/examples/base/AbstractBasePage.java     |   41 +-
 .../org/apache/wicket/examples/base/Examples.java  |    5 +-
 .../org/apache/wicket/examples/base/HomePage.html  |   15 +-
 .../org/apache/wicket/examples/base/HomePage.java  |    6 +-
 .../wicket/examples/base/annot/ExamplePage.java    |   31 +
 .../java/org/apache/wicket/examples/base/docs.css  |   11 +-
 .../org/apache/wicket/examples/base/examples.js    |    4 +-
 .../examples/base/navbar/TopNavbarMenuItem.java    |   30 +
 .../navbar/TopbarBookmarkableLinkBehavior.java     |   33 -
 .../wicket/examples/basic/BasicExamplesPage.html   |   15 +-
 .../wicket/examples/basic/BasicExamplesPage.java   |    5 +-
 .../examples/components/ComponentExamplesPage.html |   11 +-
 .../examples/components/ComponentExamplesPage.java |    6 +
 .../apache/wicket/examples/components/Labels.md    |    4 +-
 .../org/apache/wicket/examples/components/Links.md |    4 +
 .../org/apache/wicket/examples/components/Lists.md |   93 +
 .../wicket-examples-war/pom.xml                    |    4 +-
 .../wicket-native-websocket/pom.xml                |    6 +-
 .../wicket-native-websocket-core/pom.xml           |    4 +-
 .../wicket/protocol/ws/IWebSocketSettings.java     |   90 +
 .../wicket/protocol/ws/WebSocketSettings.java      |   86 +
 .../ws/api/AbstractWebSocketConnection.java        |   45 +
 .../ws/api/AbstractWebSocketProcessor.java         |   23 +-
 .../protocol/ws/api/IWebSocketConnection.java      |   12 +
 .../ws/api/IWebSocketConnectionRegistry.java       |    8 +
 .../ws/api/SimpleWebSocketConnectionRegistry.java  |   25 +
 .../protocol/ws/api/WebSocketPushBroadcaster.java  |  125 +
 .../wicket/protocol/ws/api/WebSocketResponse.java  |    2 +-
 .../ws/api/event/WebSocketPushPayload.java         |   44 +
 .../ws/api/message/IWebSocketPushMessage.java      |   26 +
 .../wicket/protocol/ws/concurrent/Executor.java    |   42 +
 .../ws/util/tester/TestWebSocketProcessor.java     |   15 +
 .../protocol/ws/util/tester/WebSocketTester.java   |   17 +
 .../wicket-native-websocket-jetty/pom.xml          |    4 +-
 .../ws/jetty/JettyWebSocketConnection.java         |    7 +-
 .../protocol/ws/jetty/JettyWebSocketProcessor.java |    2 +-
 .../wicket-native-websocket-jetty9/pom.xml         |    4 +-
 .../ws/jetty/Jetty9WebSocketConnection.java        |    9 +-
 .../ws/jetty/Jetty9WebSocketProcessor.java         |    2 +-
 .../wicket-native-websocket-tomcat/pom.xml         |    4 +-
 .../ws/tomcat7/TomcatWebSocketConnection.java      |    7 +-
 .../ws/tomcat7/TomcatWebSocketProcessor.java       |    2 +-
 wicket-extensions/pom.xml                          |    2 +-
 .../wicket/extensions/Initializer.properties       |    2 +
 .../autocomplete/AbstractAutoCompleteRenderer.java |    1 -
 .../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          |   13 +-
 .../extensions/markup/html/form/palette/palette.js |    4 +-
 .../html/repeater/data/table/AbstractToolbar.java  |    5 +-
 .../html/repeater/data/table/PropertyColumn.java   |   23 +-
 .../data/table/export/AbstractDataExporter.java    |  116 +
 .../table/export/AbstractExportableColumn.java     |   86 +
 .../data/table/export/CSVDataExporter.java         |  250 +
 .../repeater/data/table/export/ExportToolbar.html  |   25 +
 .../repeater/data/table/export/ExportToolbar.java  |  346 +
 .../repeater/data/table/export/IDataExporter.java  |   76 +
 .../data/table/export/IExportableColumn.java       |   54 +
 .../repeater/data/table/export/package-info.java   |   21 +
 .../markup/html/repeater/tree/AbstractTree.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 +-
 .../org/apache/wicket/request/IRequestCycle.java   |   11 +-
 .../java/org/apache/wicket/request/Request.java    |    2 +-
 .../main/java/org/apache/wicket/request/Url.java   |    7 +-
 .../org/apache/wicket/request/UrlRenderer.java     |   44 +-
 .../wicket/request/mapper/AbstractMapper.java      |    2 +-
 .../request/mapper/CompoundRequestMapper.java      |   45 +
 .../java/org/apache/wicket/request/UrlTest.java    |   12 +
 wicket-spring/pom.xml                              |    2 +-
 wicket-util/pom.xml                                |    2 +-
 .../java/org/apache/wicket/util/ClassProvider.java |    2 +
 .../apache/wicket/util/encoding/UrlDecoder.java    |    6 +-
 .../org/apache/wicket/util/string/Strings.java     |   23 +-
 .../org/apache/wicket/util/string/StringsTest.java |   12 +
 wicket-velocity/pom.xml                            |    2 +-
 wicket/pom.xml                                     |    2 +-
 322 files changed, 16077 insertions(+), 8849 deletions(-)
----------------------------------------------------------------------