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 2012/03/07 11:42:22 UTC
[3/24] git commit: WICKET-4439 Move classes around so that there are
no two packages with the same name in different modules
WICKET-4439 Move classes around so that there are no two packages with the same name in different modules
Move the problematic classes in o.a.w.core.** package.
Add a test case that should prevent re-introducing this problem again.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ddc37320
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ddc37320
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ddc37320
Branch: refs/heads/sandbox/wicket4439
Commit: ddc37320f2ddb85f22bcb028718bcfb1f470e9e9
Parents: c58fbc1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 7 10:36:42 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 7 12:28:49 2012 +0200
----------------------------------------------------------------------
pom.xml | 1577 ++++++++-------
testing/common-tests/pom.xml | 84 +
.../wicket/osgi/OsgiClashingPackagesTest.java | 132 ++
.../apps/app1/DetachableContactModel.java | 1 -
.../threadtest/apps/app1/ResourceTestPage.java | 4 +-
.../authorization/strategies/role/Roles.java | 2 +-
.../role/metadata/ActionPermissions.java | 2 +-
.../role/metadata/InstantiationPermissions.java | 2 +-
.../strategies/role/annotations/AdminPage.java | 1 -
.../role/annotations/AnnotationsRoleTest.java | 1 -
.../role/metadata/ActionPermissionsTest.java | 1 -
.../metadata/InstantiationPermissionsTest.java | 1 -
.../main/java/org/apache/wicket/Application.java | 8 +-
.../java/org/apache/wicket/AttributeModifier.java | 1 +
.../src/main/java/org/apache/wicket/Component.java | 12 +-
.../org/apache/wicket/DefaultExceptionMapper.java | 10 +-
.../org/apache/wicket/DefaultMapperContext.java | 22 +-
.../java/org/apache/wicket/IConverterLocator.java | 1 +
.../org/apache/wicket/IPageRendererProvider.java | 2 +-
.../java/org/apache/wicket/IRequestListener.java | 2 +
.../src/main/java/org/apache/wicket/Localizer.java | 2 +-
.../java/org/apache/wicket/MarkupContainer.java | 3 +-
.../main/java/org/apache/wicket/MetaDataEntry.java | 2 +
.../main/java/org/apache/wicket/MetaDataKey.java | 2 +
.../src/main/java/org/apache/wicket/Page.java | 2 +-
.../main/java/org/apache/wicket/PageReference.java | 4 +-
.../apache/wicket/RequestListenerInterface.java | 2 +-
.../RestartResponseAtInterceptPageException.java | 6 +-
.../apache/wicket/RestartResponseException.java | 8 +-
.../src/main/java/org/apache/wicket/Session.java | 5 +-
.../main/java/org/apache/wicket/SystemMapper.java | 10 +-
.../wicket/ajax/AbstractAjaxTimerBehavior.java | 5 +-
.../java/org/apache/wicket/ajax/AjaxChannel.java | 2 +-
.../org/apache/wicket/ajax/AjaxRequestHandler.java | 18 +-
.../org/apache/wicket/ajax/AjaxRequestTarget.java | 2 +-
.../ajax/attributes/AjaxRequestAttributes.java | 6 +-
.../wicket/ajax/attributes/IAjaxCallListener.java | 2 +-
.../ajax/attributes/JavaScriptFunctionBody.java | 2 +-
.../wicket/ajax/attributes/ThrottlingSettings.java | 2 +-
.../ajax/form/AjaxFormValidatingBehavior.java | 2 +-
.../HeaderContributorListenerCollection.java | 2 +-
.../UnauthorizedInstantiationException.java | 2 +-
.../strategies/action/IActionAuthorizer.java | 2 +-
.../java/org/apache/wicket/behavior/Behavior.java | 4 +-
.../org/apache/wicket/core/request/ClientInfo.java | 36 +
...ookmarkableListenerInterfaceRequestHandler.java | 184 ++
.../handler/BookmarkablePageRequestHandler.java | 98 +
.../handler/BufferedResponseRequestHandler.java | 55 +
.../handler/ComponentNotFoundException.java | 67 +
.../handler/ComponentRenderingRequestHandler.java | 73 +
.../request/handler/EmptyAjaxRequestHandler.java | 108 +
.../request/handler/IComponentRequestHandler.java | 42 +
.../request/handler/IPageAndComponentProvider.java | 43 +
.../request/handler/IPageClassRequestHandler.java | 41 +
.../wicket/core/request/handler/IPageProvider.java | 109 +
.../core/request/handler/IPageRequestHandler.java | 57 +
.../handler/ListenerInterfaceRequestHandler.java | 281 +++
.../ListenerInvocationNotAllowedException.java | 84 +
.../request/handler/PageAndComponentProvider.java | 214 ++
.../wicket/core/request/handler/PageProvider.java | 412 ++++
.../request/handler/RenderPageRequestHandler.java | 179 ++
.../handler/logger/ListenerInterfaceLogData.java | 243 +++
.../core/request/handler/logger/PageLogData.java | 132 ++
.../handler/logger/ResourceReferenceLogData.java | 89 +
.../handler/logger/ResourceStreamLogData.java | 109 +
.../request/mapper/AbstractBookmarkableMapper.java | 414 ++++
.../request/mapper/AbstractComponentMapper.java | 157 ++
.../mapper/AbstractResourceReferenceMapper.java | 171 ++
.../mapper/BasicResourceReferenceMapper.java | 256 +++
.../core/request/mapper/BookmarkableMapper.java | 154 ++
.../request/mapper/BufferedResponseMapper.java | 153 ++
.../wicket/core/request/mapper/CryptoMapper.java | 286 +++
.../wicket/core/request/mapper/HomePageMapper.java | 112 +
.../wicket/core/request/mapper/IMapperContext.java | 77 +
.../wicket/core/request/mapper/IPageSource.java | 49 +
.../wicket/core/request/mapper/MountedMapper.java | 524 +++++
.../wicket/core/request/mapper/PackageMapper.java | 231 +++
.../core/request/mapper/PageInstanceMapper.java | 168 ++
.../wicket/core/request/mapper/ResourceMapper.java | 270 +++
.../request/mapper/ResourceReferenceMapper.java | 56 +
.../core/request/mapper/StalePageException.java | 53 +
.../util/crypt/KeyInSessionSunJceCryptFactory.java | 65 +
.../wicket/core/util/file/WebApplicationPath.java | 144 ++
.../wicket/core/util/io/SerializableChecker.java | 734 +++++++
.../wicket/core/util/lang/PropertyResolver.java | 1542 ++++++++++++++
.../core/util/lang/PropertyResolverConverter.java | 109 +
.../wicket/core/util/lang/WicketObjects.java | 420 ++++
.../org/apache/wicket/core/util/lang/package.html | 27 +
.../resource/AbstractResourceStreamWriter.java | 124 ++
.../core/util/resource/IResourceStreamWriter.java | 42 +
.../core/util/resource/PackageResourceStream.java | 101 +
.../core/util/resource/UrlResourceStream.java | 277 +++
.../util/resource/WebExternalResourceStream.java | 122 ++
.../locator/EmptyResourceNameIterator.java | 45 +
.../locator/ExtensionResourceNameIterator.java | 93 +
.../resource/locator/IResourceStreamLocator.java | 92 +
.../locator/LocaleResourceNameIterator.java | 154 ++
.../locator/OsgiResourceStreamLocator.java | 56 +
.../resource/locator/ResourceNameIterator.java | 290 +++
.../resource/locator/ResourceStreamLocator.java | 282 +++
.../StyleAndVariationResourceNameIterator.java | 122 ++
.../caching/AbstractResourceStreamReference.java | 46 +
.../caching/CachingResourceStreamLocator.java | 140 ++
.../caching/FileResourceStreamReference.java | 42 +
.../locator/caching/IResourceStreamReference.java | 27 +
.../caching/NullResourceStreamReference.java | 35 +
.../caching/UrlResourceStreamReference.java | 54 +
.../wicket/core/util/resource/locator/package.html | 27 +
.../wicket/core/util/string/ComponentStrings.java | 117 ++
.../apache/wicket/core/util/string/CssUtils.java | 81 +
.../core/util/string/JavaScriptStripper.java | 228 +++
.../wicket/core/util/string/JavaScriptUtils.java | 253 +++
.../apache/wicket/core/util/string/UrlUtils.java | 101 +
.../interpolator/PropertyVariableInterpolator.java | 129 ++
.../apache/wicket/core/util/string/package.html | 27 +
.../apache/wicket/feedback/FeedbackMessages.java | 4 +-
.../wicket/feedback/IFeedbackMessageFilter.java | 2 +-
.../javascript/DefaultJavaScriptCompressor.java | 2 +-
.../DefaultMarkupResourceStreamProvider.java | 4 +-
.../apache/wicket/markup/MarkupResourceStream.java | 2 +-
.../wicket/markup/head/CssContentHeaderItem.java | 8 +-
.../markup/head/CssUrlReferenceHeaderItem.java | 2 +-
.../markup/head/JavaScriptContentHeaderItem.java | 2 +-
.../wicket/markup/head/JavaScriptHeaderItem.java | 2 +-
.../head/JavaScriptUrlReferenceHeaderItem.java | 2 +-
.../wicket/markup/head/OnDomReadyHeaderItem.java | 2 +-
.../wicket/markup/head/OnEventHeaderItem.java | 2 +-
.../wicket/markup/head/OnLoadHeaderItem.java | 2 +-
.../html/IComponentAwareHeaderContributor.java | 2 +-
.../wicket/markup/html/IHeaderContributor.java | 2 +-
.../org/apache/wicket/markup/html/WebPage.java | 2 +-
.../wicket/markup/html/border/BorderBehavior.java | 2 +-
.../apache/wicket/markup/html/debug/PageView.java | 2 +-
.../markup/html/form/AbstractCheckSelector.java | 6 +-
.../wicket/markup/html/form/ChoiceRenderer.java | 2 +-
.../wicket/markup/html/form/DropDownChoice.java | 4 +-
.../wicket/markup/html/form/FormComponent.java | 2 +-
.../wicket/markup/html/form/IChoiceRenderer.java | 2 +-
.../markup/html/form/ValidationErrorFeedback.java | 2 +-
.../wicket/markup/html/form/upload/FileUpload.java | 2 +-
.../html/form/upload/MultiFileUploadField.java | 4 +-
.../html/form/validation/IFormValidator.java | 2 +-
.../markup/html/image/ContextPathGenerator.java | 2 +-
.../image/resource/LocalizedImageResource.java | 2 +-
.../apache/wicket/markup/html/include/Include.java | 4 +-
.../markup/html/internal/HtmlHeaderContainer.java | 2 +-
.../markup/html/link/BookmarkablePageLink.java | 2 +-
.../wicket/markup/html/link/ExternalLink.java | 2 +-
.../apache/wicket/markup/html/link/IPageLink.java | 2 +-
.../wicket/markup/html/link/PopupSettings.java | 9 +-
.../markup/html/navigation/paging/IPageable.java | 2 +-
.../navigation/paging/IPagingLabelProvider.java | 2 +-
.../wicket/markup/html/pages/BrowserInfoForm.java | 4 +-
.../markup/loader/InheritedMarkupMarkupLoader.java | 2 +-
.../parser/filter/RelativePathPrefixHandler.java | 2 +-
.../parser/filter/StyleAndScriptIdentifier.java | 2 +-
.../wicket/markup/repeater/IItemReuseStrategy.java | 2 +-
.../wicket/markup/resolver/IComponentResolver.java | 2 +-
.../markup/resolver/WicketMessageResolver.java | 2 +-
.../wicket/markup/transformer/XsltTransformer.java | 4 +-
.../java/org/apache/wicket/mock/MockHomePage.html | 2 +-
.../org/apache/wicket/mock/MockWebRequest.java | 2 +-
.../apache/wicket/model/AbstractPropertyModel.java | 4 +-
.../wicket/model/ComponentPropertyModel.java | 2 +-
.../java/org/apache/wicket/model/IDetachable.java | 2 +-
.../org/apache/wicket/model/IModelComparator.java | 2 +-
.../org/apache/wicket/model/PropertyModel.java | 2 +-
.../apache/wicket/model/StringResourceModel.java | 2 +-
.../org/apache/wicket/page/IManageablePage.java | 2 +-
.../memory/MemorySizeEvictionStrategy.java | 2 +-
.../apache/wicket/pageStore/memory/PageTable.java | 2 +-
.../wicket/protocol/http/ClientProperties.java | 2 +-
.../wicket/protocol/http/IRequestLogger.java | 2 +-
.../wicket/protocol/http/PageExpiredException.java | 2 +-
.../wicket/protocol/http/WebApplication.java | 12 +-
.../protocol/http/request/WebClientInfo.java | 2 +-
.../protocol/http/servlet/ServletWebRequest.java | 2 +-
.../wicket/protocol/http/servlet/UploadInfo.java | 10 +-
.../apache/wicket/protocol/https/HttpsMapper.java | 5 +-
.../java/org/apache/wicket/request/ClientInfo.java | 36 -
.../apache/wicket/request/cycle/RequestCycle.java | 8 +-
...ookmarkableListenerInterfaceRequestHandler.java | 184 --
.../handler/BookmarkablePageRequestHandler.java | 98 -
.../handler/BufferedResponseRequestHandler.java | 55 -
.../handler/ComponentNotFoundException.java | 67 -
.../handler/ComponentRenderingRequestHandler.java | 73 -
.../request/handler/EmptyAjaxRequestHandler.java | 108 -
.../request/handler/IComponentRequestHandler.java | 42 -
.../request/handler/IPageAndComponentProvider.java | 43 -
.../request/handler/IPageClassRequestHandler.java | 41 -
.../wicket/request/handler/IPageProvider.java | 109 -
.../request/handler/IPageRequestHandler.java | 57 -
.../handler/ListenerInterfaceRequestHandler.java | 296 ---
.../ListenerInterfaceRequestHandler.java.orig | 254 ---
.../ListenerInvocationNotAllowedException.java | 84 -
.../request/handler/PageAndComponentProvider.java | 214 --
.../wicket/request/handler/PageProvider.java | 412 ----
.../request/handler/RenderPageRequestHandler.java | 188 --
.../handler/logger/ListenerInterfaceLogData.java | 243 ---
.../wicket/request/handler/logger/PageLogData.java | 132 --
.../handler/logger/ResourceReferenceLogData.java | 89 -
.../handler/logger/ResourceStreamLogData.java | 109 -
.../request/handler/render/PageRenderer.java | 6 +-
.../request/handler/render/WebPageRenderer.java | 4 +-
.../resource/ResourceReferenceRequestHandler.java | 2 +-
.../resource/ResourceStreamRequestHandler.java | 2 +-
.../WebExternalResourceRequestHandler.java | 4 +-
.../request/mapper/AbstractBookmarkableMapper.java | 414 ----
.../request/mapper/AbstractComponentMapper.java | 156 --
.../mapper/AbstractResourceReferenceMapper.java | 171 --
.../mapper/BasicResourceReferenceMapper.java | 256 ---
.../wicket/request/mapper/BookmarkableMapper.java | 154 --
.../request/mapper/BufferedResponseMapper.java | 153 --
.../apache/wicket/request/mapper/CryptoMapper.java | 286 ---
.../wicket/request/mapper/HomePageMapper.java | 112 -
.../wicket/request/mapper/IMapperContext.java | 77 -
.../apache/wicket/request/mapper/IPageSource.java | 50 -
.../wicket/request/mapper/MountedMapper.java | 524 -----
.../wicket/request/mapper/PackageMapper.java | 231 ---
.../wicket/request/mapper/PageInstanceMapper.java | 168 --
.../wicket/request/mapper/ResourceMapper.java | 269 ---
.../request/mapper/ResourceReferenceMapper.java | 55 -
.../wicket/request/mapper/StalePageException.java | 53 -
.../wicket/request/resource/ByteArrayResource.java | 5 +-
.../request/resource/ContextRelativeResource.java | 2 +-
.../apache/wicket/request/resource/IResource.java | 2 +-
.../wicket/request/resource/PackageResource.java | 4 +-
.../request/resource/PackageResourceReference.java | 2 +-
.../wicket/request/resource/ResourceReference.java | 5 +-
.../request/resource/ResourceStreamResource.java | 2 +-
.../version/LastModifiedResourceVersion.java | 1 -
.../wicket/resource/IPropertiesFactoryContext.java | 2 +-
.../apache/wicket/resource/PropertiesFactory.java | 2 +-
.../org/apache/wicket/resource/ResourceUtil.java | 4 +-
.../resource/TextTemplateResourceReference.java | 2 +-
.../wicket/resource/bundles/IResourceBundle.java | 2 +-
.../loader/ComponentStringResourceLoader.java | 4 +-
.../loader/PackageStringResourceLoader.java | 2 +-
.../filter/AjaxServerAndClientTimeFilter.java | 4 +-
.../response/filter/ServerAndClientTimeFilter.java | 4 +-
.../wicket/serialize/java/JavaSerializer.java | 2 +-
.../wicket/settings/IRequestCycleSettings.java | 2 +-
.../apache/wicket/settings/IResourceSettings.java | 8 +-
.../wicket/settings/def/ResourceSettings.java | 10 +-
.../apache/wicket/util/cookies/CookieDefaults.java | 2 +-
.../util/crypt/KeyInSessionSunJceCryptFactory.java | 62 -
.../wicket/util/file/WebApplicationPath.java | 142 --
.../apache/wicket/util/io/SerializableChecker.java | 734 -------
.../apache/wicket/util/lang/PropertyResolver.java | 1542 --------------
.../util/lang/PropertyResolverConverter.java | 108 -
.../org/apache/wicket/util/lang/WicketObjects.java | 419 ----
.../java/org/apache/wicket/util/lang/package.html | 27 -
.../resource/AbstractResourceStreamWriter.java | 123 --
.../util/resource/IResourceStreamWriter.java | 41 -
.../util/resource/PackageResourceStream.java | 98 -
.../wicket/util/resource/UrlResourceStream.java | 274 ---
.../util/resource/WebExternalResourceStream.java | 120 --
.../locator/EmptyResourceNameIterator.java | 47 -
.../locator/ExtensionResourceNameIterator.java | 93 -
.../resource/locator/IResourceStreamLocator.java | 92 -
.../locator/LocaleResourceNameIterator.java | 154 --
.../locator/OsgiResourceStreamLocator.java | 56 -
.../resource/locator/ResourceNameIterator.java | 290 ---
.../resource/locator/ResourceStreamLocator.java | 282 ---
.../StyleAndVariationResourceNameIterator.java | 122 --
.../caching/AbstractResourceStreamReference.java | 46 -
.../caching/CachingResourceStreamLocator.java | 140 --
.../caching/FileResourceStreamReference.java | 42 -
.../locator/caching/IResourceStreamReference.java | 27 -
.../caching/NullResourceStreamReference.java | 35 -
.../caching/UrlResourceStreamReference.java | 54 -
.../wicket/util/resource/locator/package.html | 27 -
.../wicket/util/string/ComponentStrings.java | 116 --
.../org/apache/wicket/util/string/CssUtils.java | 81 -
.../wicket/util/string/JavaScriptStripper.java | 226 --
.../apache/wicket/util/string/JavaScriptUtils.java | 252 ---
.../org/apache/wicket/util/string/UrlUtils.java | 100 -
.../interpolator/PropertyVariableInterpolator.java | 128 --
.../org/apache/wicket/util/string/package.html | 27 -
.../apache/wicket/util/template/CssTemplate.java | 2 +-
.../wicket/util/template/JavaScriptTemplate.java | 2 +-
.../wicket/util/template/PackageTextTemplate.java | 2 +-
.../wicket/util/tester/BaseWicketTester.java | 12 +-
.../org/apache/wicket/util/tester/DiffUtil.java | 1 -
.../org/apache/wicket/util/tester/FormTester.java | 1 -
.../apache/wicket/util/tester/WicketTester.java | 1 -
.../wicket/util/tester/WicketTesterHelper.java | 3 +-
.../apache/wicket/validation/IValidationError.java | 2 +-
.../org/apache/wicket/validation/IValidator.java | 2 +-
.../validation/validator/AbstractValidator.java | 2 +-
.../org/apache/wicket/BehaviorRequestTest.java | 8 +-
.../wicket/ComponentWithLazyModelCreationTest.java | 4 +-
.../org/apache/wicket/DisabledComponentTest.java | 2 +-
.../org/apache/wicket/ExceptionMapperTest.java | 4 +-
.../ListenerInterfaceRequestHandlerTest.java | 128 ++
.../core/request/mapper/AbstractMapperTest.java | 95 +
.../AbstractResourceReferenceMapperTest.java | 224 ++
.../mapper/BasicResourceReferenceMapperTest.java | 563 +++++
.../request/mapper/BookmarkableMapperTest.java | 409 ++++
.../core/request/mapper/CryptoMapperTest.java | 268 +++
.../core/request/mapper/MountedMapperTest.java | 787 +++++++
.../core/request/mapper/PackageMapperTest.java | 536 +++++
.../request/mapper/PageInstanceMapperTest.java | 204 ++
.../core/request/mapper/ResourceMapperTest.java | 277 +++
.../core/request/mapper/TestMapperContext.java | 249 +++
.../wicket/core/request/mapper/UrlInfoTest.java | 46 +
.../wicket/core/request/mapper/crypt/crypt.txt | 1 +
.../core/request/mapper/crypt/modified-crypt.txt | 1 +
.../core/request/mapper/crypt/more/crypt.txt | 1 +
.../wicket/core/request/mapper/less-crypt.txt | 1 +
.../org/apache/wicket/markup/MarkupParserTest.java | 4 +-
.../html/TransparentWebMarkupContainerTest.java | 2 +-
.../html/form/FormParentDisabledRawInputTest.java | 2 +-
.../wicket/markup/html/form/FormSubmitTest.java | 2 +-
.../markup/html/link/MountedPageLinkTest.java | 2 +-
.../wicket/page/PageAccessSynchronizerTest.java | 2 +-
.../memory/MemorySizeEvictionStrategyTest.java | 2 +-
.../protocol/http/WebExternalResourceTest.java | 2 +-
.../CryptedUrlWebRequestCodingStrategyTest.java | 2 +-
.../wicket/protocol/https/HttpsMapperTest.java | 4 +-
.../request/cycle/RequestCycleUrlForTest.java | 2 +-
.../ListenerInterfaceRequestHandlerTest.java | 128 --
.../wicket/request/handler/PageProviderTest.java | 5 +-
.../handler/render/WebPageRendererTest.java | 6 +-
.../wicket/request/mapper/AbstractMapperTest.java | 95 -
.../AbstractResourceReferenceMapperTest.java | 224 --
.../mapper/BasicResourceReferenceMapperTest.java | 563 -----
.../request/mapper/BookmarkableMapperTest.java | 409 ----
.../wicket/request/mapper/CryptoMapperTest.java | 264 ---
.../wicket/request/mapper/MountedMapperTest.java | 787 -------
.../wicket/request/mapper/PackageMapperTest.java | 536 -----
.../request/mapper/PageInstanceMapperTest.java | 204 --
.../wicket/request/mapper/ResourceMapperTest.java | 277 ---
.../wicket/request/mapper/TestMapperContext.java | 249 ---
.../apache/wicket/request/mapper/UrlInfoTest.java | 46 -
.../apache/wicket/request/mapper/crypt/crypt.txt | 1 -
.../wicket/request/mapper/crypt/modified-crypt.txt | 1 -
.../wicket/request/mapper/crypt/more/crypt.txt | 1 -
.../apache/wicket/request/mapper/less-crypt.txt | 1 -
.../wicket/util/file/WebApplicationPathTest.java | 1 +
.../wicket/util/io/SerializableCheckerTest.java | 3 +-
.../wicket/util/lang/PropertyResolverTest.java | 4 +-
.../apache/wicket/util/lang/WicketObjectsTest.java | 1 +
.../apache/wicket/util/resource/ResourceTest.java | 5 +-
.../util/resource/UrlResourceStreamTest.java | 1 +
.../locator/CachingResourceStreamLocatorTest.java | 5 +-
.../resource/locator/ResourceNameIteratorTest.java | 4 +
.../wicket/util/string/JavaScriptStripperTest.java | 1 +
.../apache/wicket/util/string/UrlUtilsTest.java | 1 +
.../PropertyVariableInterpolatorTest.java | 1 +
.../apache/wicket/util/tester/FormTesterTest.java | 2 +-
.../wicket/util/tester/WicketTesterTest.java | 6 +-
.../org/apache/wicket/datetime/DateConverter.java | 2 +-
.../apache/wicket/datetime/StyleDateConverter.java | 4 +-
.../org/apache/wicket/extensions/yui/YuiLib.java | 2 +-
.../extensions/yui/calendar/AbstractCalendar.java | 2 +-
.../extensions/yui/calendar/DateTimeField.java | 4 +-
.../java/org/apache/wicket/WicketTestCase.java | 1 -
.../apache/wicket/devutils/debugbar/DebugBar.java | 4 +-
.../devutils/debugbar/PageSizeDebugPanel.java | 2 +-
.../diskstore/browser/PageWindowDescription.java | 2 +-
.../devutils/inspector/SessionSizeModel.java | 2 +-
.../devutils/inspector/SessionSizeModelTest.java | 1 -
.../devutils/stateless/StatelessCheckerTest.java | 1 -
.../examples/ServerHostNameAndTimeFilter.java | 4 +-
.../examples/ajax/builtin/AutoCompletePage.java | 4 +-
.../wicket/examples/ajax/builtin/FormPage.java | 2 +-
.../wicket/examples/ajax/builtin/RatingsPage.java | 2 +-
.../wicket/examples/ajax/builtin/TodoList.java | 2 +-
.../wicket/examples/ajax/prototype/Index.java | 6 +-
.../wicket/examples/asemail/MailTemplate.java | 6 +-
.../apache/wicket/examples/authorization/User.java | 2 +-
.../apache/wicket/examples/compref/Address.java | 2 +-
.../org/apache/wicket/examples/compref/Book.java | 2 +-
.../compref/CheckBoxMultipleChoicePage.java | 2 +-
.../wicket/examples/compref/CheckBoxPage.java | 2 +-
.../org/apache/wicket/examples/compref/Count.java | 2 +-
.../examples/compref/DropDownChoicePage.java | 2 +-
.../wicket/examples/compref/ListChoicePage.java | 2 +-
.../examples/compref/ListMultipleChoicePage.java | 2 +-
.../org/apache/wicket/examples/compref/Person.java | 2 +-
.../wicket/examples/compref/RadioChoicePage.java | 2 +-
.../apache/wicket/examples/compref/SelectPage.java | 2 +-
.../wicket/examples/compref/TextAreaPage.java | 2 +-
.../wicket/examples/compref/TextFieldPage.java | 2 +-
.../AlternativePageFromWebContext.java | 2 +-
.../CustomResourceLoadingApplication.java | 8 +-
.../customresourceloading/PageFromWebContext.java | 2 +-
.../PageWithCustomLoading.java | 2 +-
.../wicket/examples/forminput/FormInputModel.java | 2 +-
.../wicket/examples/forminput/UsPhoneNumber.java | 2 +-
.../apache/wicket/examples/frames/BodyFrame.java | 4 +-
.../apache/wicket/examples/frames/FrameTarget.java | 6 +-
.../org/apache/wicket/examples/frames/Home.java | 4 +-
.../apache/wicket/examples/guestbook/Comment.java | 2 +-
.../org/apache/wicket/examples/guice/HomePage.java | 3 +-
.../org/apache/wicket/examples/hangman/Game.java | 2 +-
.../org/apache/wicket/examples/hangman/Letter.java | 2 +-
.../org/apache/wicket/examples/hangman/Word.java | 2 +-
.../wicket/examples/hangman/WordGenerator.java | 4 +-
.../org/apache/wicket/examples/library/Book.java | 2 +-
.../org/apache/wicket/examples/library/User.java | 2 +-
.../apache/wicket/examples/linkomatic/Book.java | 2 +-
.../apache/wicket/examples/repeater/Contact.java | 2 +-
.../examples/requestmapper/CustomHomeMapper.java | 16 +-
.../examples/requestmapper/LocaleFirstMapper.java | 2 +-
.../requestmapper/RequestMapperApplication.java | 3 +-
.../wicket/examples/spring/common/Contact.java | 2 +-
.../wicket/examples/spring/common/ContactDao.java | 2 -
.../spring/common/web/ExampleApplication.java | 1 -
.../wicket/examples/stockquote/StockQuotePage.java | 2 +-
.../wicket/examples/upload/UploadApplication.java | 5 +-
.../wicket/examples/velocity/DynamicPage.java | 3 +-
.../wicket/examples/velocity/TemplatePage.java | 2 +-
.../wicket/examples/wizard/NewUserWizard.java | 2 +-
.../org/apache/wicket/examples/wizard/User.java | 2 +-
.../wicket/examples/JettyTestCaseDecorator.java | 3 +-
.../apache/wicket/examples/WicketWebTestCase.java | 5 +-
.../org/apache/wicket/filtertest/Application.java | 2 +-
.../wicket/filtertest/WithoutCPWithFPTest.java | 3 +-
.../wicket/filtertest/WithoutCPWithoutFPTest.java | 3 +-
.../ajax/markup/html/AjaxEditableChoiceLabel.java | 4 +-
.../ajax/markup/html/AjaxEditableLabel.java | 2 +-
.../markup/html/AjaxEditableMultiLineLabel.java | 4 +-
.../html/autocomplete/AutoCompleteSettings.java | 2 +-
.../html/autocomplete/IAutoCompleteRenderer.java | 2 +-
.../ajax/markup/html/modal/ModalWindow.java | 6 +-
.../breadcrumb/BreadCrumbModelListenerSupport.java | 2 +-
.../extensions/breadcrumb/IBreadCrumbModel.java | 2 +-
.../breadcrumb/IBreadCrumbModelListener.java | 2 +-
.../breadcrumb/IBreadCrumbParticipant.java | 2 +-
.../breadcrumb/panel/IBreadCrumbPanelFactory.java | 2 +-
.../markup/html/captcha/CaptchaImageResource.java | 2 +-
.../form/palette/component/AbstractOptions.java | 2 +-
.../markup/html/form/select/IOptionRenderer.java | 2 +-
.../html/repeater/data/grid/ICellPopulator.java | 2 +-
.../markup/html/repeater/data/sort/ISortState.java | 2 +-
.../html/repeater/data/sort/ISortStateLocator.java | 2 +-
.../html/repeater/data/sort/OrderByLink.java | 2 +-
.../html/repeater/data/table/NavigatorLabel.java | 2 +-
.../repeater/data/table/filter/FilterForm.java | 2 +-
.../data/table/filter/GoAndClearFilter.java | 2 +-
.../data/table/filter/IFilterStateLocator.java | 2 +-
.../html/repeater/tree/table/TreeColumn.java | 1 -
.../markup/html/repeater/util/SingleSortState.java | 2 +-
.../markup/html/repeater/util/SortParam.java | 2 +-
.../wicket/extensions/markup/html/tabs/ITab.java | 2 +-
.../extensions/markup/html/tree/BaseTree.java | 2 +-
.../markup/html/tree/DefaultAbstractTree.java | 2 +-
.../markup/html/tree/DefaultTreeState.java | 2 +-
.../html/tree/table/AbstractPropertyColumn.java | 2 +-
.../markup/html/tree/table/ColumnLocation.java | 2 +-
.../extensions/markup/html/tree/table/IColumn.java | 2 +-
.../markup/html/tree/table/IRenderable.java | 2 +-
.../markup/html/tree/table/TreeTable.java | 2 +-
.../apache/wicket/extensions/wizard/IWizard.java | 2 +-
.../wicket/extensions/wizard/IWizardModel.java | 2 +-
.../extensions/wizard/IWizardModelListener.java | 2 +-
.../wicket/extensions/wizard/IWizardStep.java | 2 +-
.../wicket/extensions/wizard/WizardModel.java | 2 +-
.../markup/html/repeater/data/table/Contact.java | 2 +-
.../html/repeater/tree/table/NodeModelTest.java | 1 -
.../html/repeater/util/ProviderSubsetTest.java | 1 -
.../html/repeater/util/TreeModelProviderTest.java | 1 -
.../extensions/markup/html/tree/TreeTest.java | 2 -
.../wicket/guice/GuiceComponentInjector.java | 11 +-
.../wicket/guice/GuiceFieldValueFactory.java | 5 +-
.../apache/wicket/guice/GuiceInjectorHolder.java | 5 +-
.../wicket/guice/GuiceProxyTargetLocator.java | 9 +-
.../wicket/guice/GuiceWebApplicationFactory.java | 9 +-
.../org/apache/wicket/guice/GuiceInjectorTest.java | 11 +-
.../guice/GuiceWebApplicationFactoryTest.java | 3 +-
.../wicket/guice/JavaxInjectTestComponent.java | 3 +-
.../wicket/guice/JavaxInjectTestNoComponent.java | 2 +-
.../java/org/apache/wicket/guice/TestBehavior.java | 3 +-
.../org/apache/wicket/guice/TestComponent.java | 3 +-
.../org/apache/wicket/guice/TestNoComponent.java | 5 +-
.../org/apache/wicket/proxy/ILazyInitProxy.java | 2 +-
.../apache/wicket/proxy/IProxyTargetLocator.java | 2 +-
.../apache/wicket/proxy/LazyInitProxyFactory.java | 5 +-
.../wicket/proxy/LazyInitProxyFactoryTest.java | 2 +-
.../org/apache/wicket/jmx/ApplicationMBean.java | 1 -
.../InstrumentationObjectSizeOfStrategy.java | 4 +-
.../wicket/util/instrument/ObjectSizeOfAgent.java | 6 +-
.../request/mapper/parameter/PageParameters.java | 2 +-
.../CombinedRequestParametersAdapter.java | 1 -
.../wicket/request/HttpHeaderCollectionTest.java | 8 +-
.../CombinedRequestParametersAdapterTest.java | 2 +-
.../wicket/spring/ISpringContextLocator.java | 2 +-
.../apache/wicket/spring/SpringBeanLocator.java | 2 +-
.../test/java/org/apache/wicket/spring/Bean.java | 2 +-
.../wicket/spring/SpringBeanLocatorTest.java | 2 +-
.../main/java/org/apache/wicket/IClusterable.java | 31 -
.../org/apache/wicket/util/LazyInitializer.java | 2 +-
.../org/apache/wicket/util/convert/IConverter.java | 2 +-
.../org/apache/wicket/util/io/IClusterable.java | 31 +
.../org/apache/wicket/util/lang/PackageName.java | 2 +-
.../java/org/apache/wicket/util/lang/Packages.java | 1 -
.../util/license/AbstractLicenseHeaderHandler.java | 1 -
.../util/license/CssLicenseHeaderHandler.java | 1 -
.../util/license/JavaLicenseHeaderHandler.java | 1 -
.../license/PropertiesLicenseHeaderHandler.java | 1 -
.../util/license/VelocityLicenseHeaderHandler.java | 1 -
.../util/license/XmlLicenseHeaderHandler.java | 1 -
.../wicket/util/parse/metapattern/MetaPattern.java | 2 +-
.../wicket/util/resource/IResourceStream.java | 2 +-
.../org/apache/wicket/util/string/StringValue.java | 2 +-
.../org/apache/wicket/util/upload/FileItem.java | 2 +-
.../org/apache/wicket/velocity/Initializer.java | 2 +-
.../velocity/VelocityJavaScriptContributor.java | 2 +-
.../contrib/markup/html/velocity/VelocityPage.java | 2 +-
.../velocity/VelocityWithMarkupParsingPage.java | 2 +-
.../contrib/velocity/VelocityJavaScriptPage.java | 2 +-
513 files changed, 17240 insertions(+), 17316 deletions(-)
----------------------------------------------------------------------