Updated Branches: refs/heads/master 24aeba451 -> 407902720
Merge branch 'for-apache-master-pr-2' of https://github.com/jesselong/wicket Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/40790272 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/40790272 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/40790272 Branch: refs/heads/master Commit: 4079027206c7adeac2369c7fc8c17499974e09bb Parents: 24aeba4 83740b9 Author: Jeremy Thomerson <[email protected]> Authored: Sun Jul 8 23:11:48 2012 -0500 Committer: Jeremy Thomerson <[email protected]> Committed: Sun Jul 8 23:11:48 2012 -0500 ---------------------------------------------------------------------- .../AuthenticatedWebApplication.java | 2 + .../AnnotationsRoleAuthorizationStrategy.java | 2 + .../MetaDataRoleAuthorizationStrategy.java | 2 + .../authentication/panel/SignInPanelTest.java | 1 + .../AnnotationsRoleAuthorizationStrategyTest.java | 1 + .../role/annotations/AnnotationsRoleTest.java | 2 + .../role/metadata/ActionPermissionsTest.java | 4 +- .../metadata/InstantiationPermissionsTest.java | 4 +- .../apache/wicket/ajax/AbstractAjaxResponse.java | 1 + .../org/apache/wicket/ajax/AjaxRequestTarget.java | 1 + .../org/apache/wicket/ajax/json/JSONArray.java | 1 + .../org/apache/wicket/ajax/json/JSONException.java | 1 + .../org/apache/wicket/ajax/json/JSONStringer.java | 1 + .../org/apache/wicket/ajax/json/JSONTokener.java | 1 + .../wicket/markup/head/PriorityHeaderItem.java | 1 + .../markup/head/filter/FilteredHeaderItem.java | 1 + .../org/apache/wicket/markup/html/form/Button.java | 2 + .../wicket/markup/html/form/StatelessForm.java | 1 + .../apache/wicket/markup/html/form/SubmitLink.java | 2 + .../org/apache/wicket/mock/MockSessionStore.java | 3 + .../apache/wicket/session/HttpSessionStore.java | 3 + .../apache/wicket/settings/def/PageSettings.java | 2 + .../wicket/settings/def/ResourceSettings.java | 2 + .../validation/validator/AbstractValidator.java | 1 + ...ponentBehaviorOverComponentTagBehaviorTest.java | 3 + ...ResponseAtInterceptPageExceptionInAjaxTest.java | 1 + .../test/java/org/apache/wicket/VisitorTest.java | 1 + .../apache/wicket/behavior/SharedBehaviorTest.java | 1 + .../head/filter/FilteringHeaderResponseTest.java | 2 +- .../markup/parser/filter/CustomMarkupLabel.java | 2 + .../markup/parser/filter/HtmlHandlerTest.java | 1 + .../filter/HtmlHeaderSectionHandlerTest.java | 1 + .../persistent/disk/PageWindowManagerTest.java | 1 + .../wicket/protocol/http/WicketFilterTest.java | 1 + .../request/cycle/RequestCycleUrlForTest.java | 2 + .../wicket/resource/loader/FooInitializer.java | 2 + .../loader/ValidatorStringResourceLoaderTest.java | 3 +- .../PreserveCookieForTheNextHandlerTest.java | 2 + .../datetime/markup/html/form/DateTextField.java | 1 + .../wicket/extensions/yui/calendar/DatesPage1.java | 1 + .../devutils/debugbar/DebugBarInitializer.java | 2 + .../devutils/debugbar/InspectorDebugPanel.java | 1 + .../devutils/debugbar/PageSizeDebugPanel.java | 1 + .../devutils/debugbar/SessionSizeDebugPanel.java | 1 + .../devutils/debugbar/VersionDebugContributor.java | 1 + .../diskstore/browser/PageWindowProvider.java | 5 ++ .../inspector/RenderPerformanceListener.java | 1 + .../devutils/stateless/StatelessChecker.java | 2 + .../examples/ServerHostNameAndTimeFilter.java | 1 + .../ajax/builtin/modal/ModalContent1Page.java | 2 + .../ajax/builtin/modal/ModalWindowPage.java | 5 ++ .../wicket/examples/asemail/MailTemplate.java | 1 + .../authentication1/SignInApplication.java | 2 + .../authorization/UserRolesAuthorizer.java | 1 + .../wicket/examples/breadcrumb/FirstPanel.java | 1 + .../wicket/examples/breadcrumb/FourthPanel.java | 1 + .../wicket/examples/breadcrumb/ResultPanel.java | 1 + .../wicket/examples/breadcrumb/SecondPanel.java | 2 + .../wicket/examples/breadcrumb/ThirdPanel.java | 1 + .../apache/wicket/examples/compref/Address.java | 1 + .../examples/compref/DropDownChoicePage.java | 2 + .../org/apache/wicket/examples/compref/Person.java | 1 + .../apache/wicket/examples/compref/SelectPage.java | 2 + .../PageWithCustomLoading.java | 2 + .../apache/wicket/examples/dates/DatesPage.java | 1 + .../wicket/examples/forminput/FormInput.java | 2 + .../wicket/examples/forminput/UsPhoneNumber.java | 1 + .../apache/wicket/examples/guestbook/Comment.java | 1 + .../wicket/examples/guice/service/MyService.java | 1 + .../examples/repeater/AjaxDataTablePage.java | 1 + .../apache/wicket/examples/repeater/Contact.java | 2 + .../examples/repeater/ContactDataProvider.java | 4 + .../wicket/examples/repeater/DataTablePage.java | 1 + .../repeater/SortableContactDataProvider.java | 2 + .../examples/requestmapper/CustomHomeMapper.java | 3 + .../examples/requestmapper/LocaleFirstMapper.java | 3 + .../ResourceDecorationApplication.java | 2 +- .../spring/annot/web/ProxyDataProvider.java | 1 + .../examples/spring/common/ContactDaoImpl.java | 7 ++ .../spring/common/web/ContactDataProvider.java | 2 + .../apache/wicket/examples/tree/FooProvider.java | 5 ++ .../apache/wicket/examples/tree/TableTreePage.java | 1 + .../tree/content/CheckedFolderContent.java | 3 + .../wicket/examples/tree/content/Content.java | 1 + .../wicket/examples/wizard/NewUserWizard.java | 3 + .../ws/api/event/WebSocketBinaryPayload.java | 1 + .../protocol/http/Tomcat7WebSocketFilter.java | 1 + .../org/apache/wicket/extensions/Initializer.java | 2 + .../ajax/markup/html/AjaxEditableLabel.java | 5 +- .../ajax/markup/html/AjaxLazyLoadPanelTester.java | 1 + .../ajax/markup/html/IndicatingAjaxButton.java | 1 + .../markup/html/IndicatingAjaxFallbackLink.java | 1 + .../ajax/markup/html/IndicatingAjaxLink.java | 1 + .../autocomplete/AbstractAutoCompleteRenderer.java | 3 + .../html/autocomplete/AutoCompleteBehavior.java | 2 + .../markup/html/form/upload/UploadProgressBar.java | 3 + .../ajax/markup/html/modal/ModalWindow.java | 1 + .../data/sort/AjaxFallbackOrderByLink.java | 1 + .../extensions/breadcrumb/BreadCrumbBar.java | 8 +++ .../breadcrumb/DefaultBreadCrumbsModel.java | 5 ++ .../breadcrumb/panel/BreadCrumbPanel.java | 3 + .../breadcrumb/panel/BreadCrumbPanelFactory.java | 1 + .../panel/BreadCrumbParticipantDelegate.java | 4 + .../markup/html/basic/DefaultLinkParser.java | 3 + .../extensions/markup/html/basic/LinkParser.java | 1 + .../extensions/markup/html/form/DateTextField.java | 1 + .../extensions/markup/html/form/select/Select.java | 1 + .../html/repeater/data/grid/PropertyPopulator.java | 2 + .../markup/html/repeater/data/table/DataTable.java | 6 ++ .../html/repeater/data/table/PropertyColumn.java | 1 + .../table/filter/ChoiceFilteredPropertyColumn.java | 1 + .../data/table/filter/FilterStateModel.java | 3 + .../table/filter/TextFilteredPropertyColumn.java | 1 + .../markup/html/repeater/tree/AbstractTree.java | 1 + .../markup/html/repeater/tree/NestedTree.java | 1 + .../markup/html/repeater/tree/TableTree.java | 1 + .../markup/html/repeater/tree/nested/Subtree.java | 4 + .../repeater/tree/table/AbstractTreeColumn.java | 1 + .../repeater/tree/table/ITreeDataProvider.java | 1 + .../markup/html/repeater/tree/table/NodeModel.java | 3 + .../html/repeater/tree/table/TreeColumn.java | 1 + .../html/repeater/tree/table/TreeDataProvider.java | 11 +++- .../markup/html/repeater/util/ProviderSubset.java | 17 ++++++ .../html/repeater/util/SortableDataProvider.java | 2 + .../html/repeater/util/SortableTreeProvider.java | 1 + .../html/repeater/util/TreeModelProvider.java | 15 +++++ .../extensions/markup/html/tabs/AbstractTab.java | 3 + .../markup/html/tabs/PanelCachingTab.java | 3 + .../markup/html/tree/DefaultAbstractTree.java | 2 + .../markup/html/tree/table/AbstractColumn.java | 5 ++ .../html/tree/table/PropertyRenderableColumn.java | 3 + .../markup/html/tree/table/PropertyTreeColumn.java | 3 + .../extensions/wizard/AbstractWizardModel.java | 6 ++ .../apache/wicket/extensions/wizard/Wizard.java | 4 + .../wicket/extensions/wizard/WizardButtonBar.java | 1 + .../wicket/extensions/wizard/WizardModel.java | 11 ++++ .../wicket/extensions/wizard/WizardStep.java | 7 ++ .../wizard/dynamic/DynamicWizardModel.java | 10 +++ .../wizard/dynamic/DynamicWizardStep.java | 5 ++ .../ajax/markup/html/AjaxEditableTest.java | 2 +- .../markup/html/form/palette/PaletteTestPage.java | 2 + .../html/repeater/data/table/ContactsDatabase.java | 4 + .../html/repeater/data/table/DataTablePage.java | 1 + .../html/repeater/data/table/DataTableTest.java | 5 ++ .../data/table/SortableContactDataProvider.java | 3 + .../html/repeater/tree/table/NodeModelTest.java | 3 + .../repeater/tree/table/TreeDataProviderTest.java | 6 ++- .../html/repeater/util/ProviderSubsetTest.java | 8 +++ .../html/upload/UploadFormWithProgressBarTest.java | 1 + .../wicket/guice/GuiceFieldValueFactory.java | 2 + .../wicket/guice/GuiceProxyTargetLocator.java | 1 + .../wicket/guice/GuiceWebApplicationFactory.java | 2 + .../org/apache/wicket/guice/GuiceInjectorTest.java | 3 +- .../guice/GuiceWebApplicationFactoryTest.java | 4 + .../wicket/guice/JavaxInjectTestComponent.java | 6 ++ .../wicket/guice/JavaxInjectTestNoComponent.java | 1 + .../org/apache/wicket/guice/TestComponent.java | 6 ++ .../org/apache/wicket/guice/TestNoComponent.java | 1 + .../java/org/apache/wicket/guice/TestService.java | 1 + .../org/apache/wicket/guice/TestServiceBlue.java | 1 + .../org/apache/wicket/guice/TestServiceRed.java | 1 + .../injection/CompoundFieldValueFactory.java | 2 + .../wicket/injection/NoopFieldValueFactory.java | 2 + .../apache/wicket/proxy/LazyInitProxyFactory.java | 6 ++ .../org/apache/wicket/injection/InjectorTest.java | 3 +- .../wicket/proxy/LazyInitProxyFactoryTest.java | 5 ++ .../wicket/proxy/util/IObjectMethodTester.java | 3 + .../apache/wicket/proxy/util/InterfaceObject.java | 1 + .../wicket/proxy/util/MockObjectLocator.java | 1 + .../java/org/apache/wicket/jmx/Application.java | 7 ++ .../org/apache/wicket/jmx/ApplicationSettings.java | 7 ++ .../java/org/apache/wicket/jmx/DebugSettings.java | 14 +++++ .../java/org/apache/wicket/jmx/Initializer.java | 2 + .../java/org/apache/wicket/jmx/MarkupSettings.java | 14 +++++ .../java/org/apache/wicket/jmx/PageSettings.java | 2 + .../apache/wicket/jmx/RequestCycleSettings.java | 8 +++ .../java/org/apache/wicket/jmx/RequestLogger.java | 7 ++ .../org/apache/wicket/jmx/ResourceSettings.java | 11 ++++ .../org/apache/wicket/jmx/SecuritySettings.java | 3 + .../org/apache/wicket/jmx/SessionSettings.java | 2 + .../java/org/apache/wicket/jmx/StoreSettings.java | 5 ++ .../InstrumentationObjectSizeOfStrategy.java | 1 + .../request/flow/ResetResponseException.java | 4 + .../request/handler/EmptyRequestHandler.java | 2 + .../wicket/request/handler/TextRequestHandler.java | 2 + .../http/handler/ErrorCodeRequestHandler.java | 2 + .../mapper/ParentPathReferenceRewriter.java | 3 + .../wicket/request/mapper/mount/MountMapper.java | 3 + .../mapper/mount/UnmountedMapperAdapter.java | 3 + .../mount/UnmountedRequestHandlerAdapter.java | 3 + .../request/mapper/parameter/PageParameters.java | 15 +++++ .../mapper/parameter/PageParametersEncoder.java | 2 + .../parameter/UrlPathPageParametersEncoder.java | 3 +- .../CombinedRequestParametersAdapter.java | 3 + .../request/parameter/EmptyRequestParameters.java | 3 + .../parameter/UrlRequestParametersAdapter.java | 3 + .../apache/wicket/spring/SpringBeanLocator.java | 1 + .../wicket/spring/SpringWebApplicationFactory.java | 2 + .../annot/AnnotProxyFieldValueFactory.java | 2 + .../injection/annot/SpringComponentInjector.java | 1 + .../wicket/spring/test/ApplicationContextMock.java | 33 +++++++++++ .../spring/test/SpringContextLocatorMock.java | 1 + .../annot/AnnotProxyFieldValueFactoryTest.java | 1 + .../wicket/spring/injection/util/Injectable.java | 3 + .../spring/injection/util/JavaxInjectable.java | 3 + .../java/org/apache/wicket/util/ClassProvider.java | 1 + .../org/apache/wicket/util/LazyInitializer.java | 1 + .../java/org/apache/wicket/util/NullProvider.java | 1 + .../java/org/apache/wicket/util/ValueProvider.java | 1 + .../apache/wicket/util/collections/IntHashMap.java | 5 ++ .../apache/wicket/util/collections/MicroMap.java | 21 +++++++ .../apache/wicket/util/collections/MiniMap.java | 21 +++++++ .../wicket/util/collections/ReadOnlyIterator.java | 1 + .../util/collections/ReverseListIterator.java | 4 + .../collections/UrlExternalFormComparator.java | 1 + .../apache/wicket/util/convert/MaskConverter.java | 2 + .../util/convert/converter/AbstractConverter.java | 1 + .../convert/converter/BigDecimalConverter.java | 1 + .../util/convert/converter/BooleanConverter.java | 1 + .../util/convert/converter/ByteConverter.java | 1 + .../util/convert/converter/CalendarConverter.java | 2 + .../util/convert/converter/CharacterConverter.java | 1 + .../util/convert/converter/DateConverter.java | 1 + .../util/convert/converter/DoubleConverter.java | 1 + .../util/convert/converter/FloatConverter.java | 1 + .../util/convert/converter/IntegerConverter.java | 1 + .../util/convert/converter/LongConverter.java | 1 + .../util/convert/converter/ShortConverter.java | 1 + .../util/convert/converter/SqlDateConverter.java | 1 + .../util/convert/converter/SqlTimeConverter.java | 1 + .../convert/converter/SqlTimestampConverter.java | 1 + .../converter/ZeroPaddingIntegerConverter.java | 1 + .../apache/wicket/util/crypt/AbstractCrypt.java | 3 + .../wicket/util/crypt/ClassCryptFactory.java | 1 + .../util/crypt/CryptFactoryCachingDecorator.java | 1 + .../java/org/apache/wicket/util/crypt/NoCrypt.java | 3 + .../apache/wicket/util/crypt/NoCryptFactory.java | 1 + .../apache/wicket/util/diff/myers/MyersDiff.java | 1 + .../java/org/apache/wicket/util/file/File.java | 1 + .../org/apache/wicket/util/file/FileCleaner.java | 3 + .../java/org/apache/wicket/util/file/Folder.java | 4 + .../org/apache/wicket/util/lang/Exceptions.java | 1 + .../util/license/AbstractLicenseHeaderHandler.java | 3 + .../util/license/ApacheLicenseHeaderTestCase.java | 3 + .../util/license/CssLicenseHeaderHandler.java | 2 + .../util/license/JavaLicenseHeaderHandler.java | 2 + .../license/JavaScriptLicenseHeaderHandler.java | 2 + .../license/PropertiesLicenseHeaderHandler.java | 2 + .../util/license/VelocityLicenseHeaderHandler.java | 2 + .../util/license/XmlLicenseHeaderHandler.java | 2 + .../wicket/util/listener/ChangeListenerSet.java | 2 +- .../wicket/util/listener/ListenerCollection.java | 2 + .../util/markup/xhtml/WellFormedXmlTestCase.java | 6 ++- .../util/resource/AbstractResourceStream.java | 9 +++ .../resource/AbstractStringResourceStream.java | 4 + .../wicket/util/resource/FileResourceStream.java | 3 + .../wicket/util/resource/IResourceStream.java | 1 + .../wicket/util/resource/XSLTResourceStream.java | 2 + .../wicket/util/resource/ZipResourceStream.java | 2 + .../wicket/util/string/AbstractStringList.java | 3 + .../wicket/util/string/AppendingStringBuffer.java | 3 + .../org/apache/wicket/util/string/Entities.java | 9 +++ .../org/apache/wicket/util/string/StringList.java | 2 + .../org/apache/wicket/util/string/Strings.java | 1 + .../java/org/apache/wicket/util/thread/Task.java | 1 + .../org/apache/wicket/util/time/TimeFrame.java | 2 + .../apache/wicket/util/upload/DiskFileItem.java | 18 ++++++ .../wicket/util/upload/DiskFileItemFactory.java | 1 + .../wicket/util/upload/FileItemHeadersImpl.java | 3 + .../apache/wicket/util/upload/FileUploadBase.java | 9 +++ .../wicket/util/upload/LimitedInputStream.java | 1 + .../util/upload/MultipartFormInputStream.java | 1 + .../wicket/util/upload/ServletRequestContext.java | 4 + .../wicket/util/value/CopyOnWriteValueMap.java | 44 +++++++++++++++ .../org/apache/wicket/util/value/IntValue.java | 1 + .../org/apache/wicket/util/value/LongValue.java | 1 + .../org/apache/wicket/util/value/ValueMap.java | 32 +++++++++++ .../apache/wicket/util/visit/AllVisitFilter.java | 2 + .../apache/wicket/util/visit/ClassVisitFilter.java | 2 + .../org/apache/wicket/util/visit/IVisitFilter.java | 2 + .../java/org/apache/wicket/util/visit/Visit.java | 3 + .../java/org/apache/wicket/util/visit/Visits.java | 1 + .../wicket/util/xml/CustomEntityResolver.java | 2 + .../org/apache/wicket/util/time/DurationTest.java | 2 + .../org/apache/wicket/velocity/Initializer.java | 2 + .../wicket/velocity/markup/html/VelocityPanel.java | 2 + 286 files changed, 890 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
