You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2015/06/22 10:24:01 UTC

[9/9] wicket git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/08f6c9ef
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/08f6c9ef
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/08f6c9ef

Branch: refs/heads/master
Commit: 08f6c9ef553527121680bd4c142f04acda0ed53c
Parents: 73119c6 0b6a46f
Author: Martijn Dashorst <da...@apache.org>
Authored: Mon Jun 22 10:23:37 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Mon Jun 22 10:23:37 2015 +0200

----------------------------------------------------------------------
 pom.xml                                         |   2 +-
 .../java/org/apache/wicket/Application.java     |   2 +-
 .../mapper/AbstractResourceReferenceMapper.java | 156 --------------
 .../mapper/BasicResourceReferenceMapper.java    |   6 +-
 .../core/request/mapper/ResourceMapper.java     |   4 +-
 .../apache/wicket/markup/html/MarkupUtil.java   |   6 -
 .../apache/wicket/markup/html/media/Source.java |   2 +-
 .../apache/wicket/pageStore/DiskDataStore.java  |  11 +-
 .../wicket/pageStore/PerSessionPageStore.java   |   2 +-
 .../protocol/http/AbstractRequestLogger.java    |  34 ++--
 .../CsrfPreventionRequestCycleListener.java     |   4 +-
 .../wicket/protocol/http/IRequestLogger.java    |  46 ++++-
 .../http/mock/MockHttpServletRequest.java       |   5 +-
 .../protocol/http/mock/MockServletContext.java  |  30 +--
 .../request/handler/render/WebPageRenderer.java |   2 +-
 .../request/resource/PackageResource.java       |  18 +-
 .../resource/PackageResourceReference.java      |  74 ++++++-
 .../apache/wicket/resource/ResourceUtil.java    | 194 +++++++++++++++++-
 .../org/apache/wicket/util/image/ImageUtil.java |   2 +-
 .../wicket/util/tester/WicketTestCase.java      | 202 +++++++++++++++++++
 .../wicket/AttributeModifierComponentTest.java  |   2 +-
 .../org/apache/wicket/AuthorizationTest.java    |   1 +
 .../org/apache/wicket/BehaviorRequestTest.java  |   1 +
 .../java/org/apache/wicket/BehaviorUrlTest.java |   1 +
 ...entBehaviorOverComponentTagBehaviorTest.java |   1 +
 .../wicket/ComponentConfigurationTest.java      |   1 +
 .../ComponentInitializationIntegrationTest.java |   1 +
 .../wicket/ComponentInitializationTest.java     |   1 +
 .../apache/wicket/ComponentOnConfigureTest.java |   1 +
 .../java/org/apache/wicket/ComponentTest.java   |   1 +
 .../ComponentWithLazyModelCreationTest.java     |   1 +
 ...ceptionMapperResourceBlockedDevModeTest.java |   1 +
 ...eptionMapperResourceBlockedProdModeTest.java |   1 +
 .../wicket/DefaultExceptionMapperTest.java      |   1 +
 .../apache/wicket/DisabledComponentTest.java    |   1 +
 .../org/apache/wicket/EventDispatcherTest.java  |   1 +
 .../org/apache/wicket/ExceptionMapperTest.java  |   1 +
 .../org/apache/wicket/FeedbackMessagesTest.java |   2 +-
 .../apache/wicket/FormDispatchEventTest.java    |   1 +
 .../org/apache/wicket/MarkupContainerTest.java  |   1 +
 .../apache/wicket/MarkupIdGeneratorTest.java    |   1 +
 .../java/org/apache/wicket/PageFactoryTest.java |   1 +
 .../apache/wicket/PageMarkupLoadingTest.java    |   1 +
 .../wicket/ParentResourceEscapePathTest.java    |   1 +
 .../org/apache/wicket/PlaceholderTagIdTest.java |   1 +
 .../test/java/org/apache/wicket/RemoveTest.java |   1 +
 .../org/apache/wicket/RequestEncodingTest.java  |   1 +
 .../java/org/apache/wicket/ResourceTest.java    |   1 +
 ...ponseAtInterceptPageExceptionInAjaxTest.java |   1 +
 ...artResponseAtInterceptPageExceptionTest.java |   1 +
 .../wicket/RestartResponseExceptionTest.java    |   1 +
 .../wicket/RestartWithMountedPageTest.java      |   1 +
 .../org/apache/wicket/SetResponsePageTest.java  |   1 +
 .../apache/wicket/SharedResourceUrlTest.java    |   1 +
 .../test/java/org/apache/wicket/TesterTest.java |   1 +
 .../java/org/apache/wicket/VisitorTest.java     |   2 +-
 .../java/org/apache/wicket/WicketTestCase.java  | 201 ------------------
 .../ajax/AjaxBehaviorAndMetaDataTest.java       |   2 +-
 .../wicket/ajax/AjaxBehaviorEnabledTest.java    |   2 +-
 .../wicket/ajax/AjaxCallbackFunctionTest.java   |   2 +-
 .../org/apache/wicket/ajax/AjaxChannelTest.java |   2 +-
 .../ajax/AjaxComponentVisibilityTest.java       |   2 +-
 .../wicket/ajax/AjaxEventBehaviorTest.java      |   2 +-
 .../wicket/ajax/AjaxHeaderContributionTest.java |   2 +-
 .../wicket/ajax/AjaxRequestHandlerTest.java     |   2 +-
 .../wicket/ajax/AjaxTimerBehaviorTest.java      |   2 +-
 .../apache/wicket/ajax/DomReadyOrderTest.java   |   2 +-
 .../ajax/GlobalUpdateAjaxAttributesTest.java    |   2 +-
 .../InternalErrorCallsAjaxOnFailureTest.java    |   2 +-
 ...FormChoiceComponentUpdatingBehaviorTest.java |   2 +-
 .../ajax/form/AjaxFormSubmitBehaviorTest.java   |   2 +-
 .../wicket/ajax/form/AjaxFormSubmitTest.java    |   2 +-
 .../ajax/form/OnChangeAjaxBehaviorTest.java     |   2 +-
 .../ajax/markup/html/AjaxFallbackLinkTest.java  |   2 +-
 .../ajax/markup/html/ajaxLink/AjaxLinkTest.java |   2 +-
 .../html/componentMap/SimpleTestPanelTest.java  |   2 +-
 .../ajax/markup/html/form/AjaxButtonTest.java   |   2 +-
 .../ComponentIsRenderedAllowedTest.java         |   2 +-
 .../behavior/ImmutableBehaviorIdsTest.java      |   2 +-
 .../wicket/behavior/SharedBehaviorTest.java     |   2 +-
 .../component/replacewith/ReplaceWithTest.java  |   2 +-
 .../ListenerInterfaceRequestHandlerTest.java    |   2 +-
 .../mapper/AbstractBookmarkableMapperTest.java  |   2 +-
 .../AbstractResourceReferenceMapperOwnTest.java |   5 +-
 .../core/request/mapper/ResourceMapperTest.java |   2 +-
 .../checker/DifferentPageCheckerTest.java       |   2 +-
 .../checker/OrphanComponentCheckerTest.java     |   2 +-
 .../objects/checker/SessionCheckerTest.java     |   2 +-
 .../resource/ClassPathResourceFinderTest.java   |   2 +-
 .../ComponentRendererTest.java                  |   2 +-
 .../DontStoreNotRenderedPageTestCase.java       |   2 +-
 .../wicket/feedback/FeedbackRenderTest.java     |   2 +-
 .../InterceptDataCleanedAfterReadTest.java      |   2 +-
 .../ComponentTagAttributeEscapingTest.java      |   2 +-
 .../DefaultMarkupCacheKeyProviderTest.java      |   2 +-
 .../wicket/markup/HtmlProblemFinderTest.java    |   2 +-
 .../apache/wicket/markup/MarkupCacheTest.java   |   2 +-
 .../wicket/markup/MarkupFragmentTest.java       |   2 +-
 .../wicket/markup/MarkupInheritanceTest.java    |   2 +-
 .../apache/wicket/markup/MarkupParserTest.java  |   2 +-
 .../org/apache/wicket/markup/MarkupTest.java    |   2 +-
 .../wicket/markup/MarkupVariationTest.java      |   2 +-
 .../markup/RefreshingViewOnRemoveTest.java      |   2 +-
 .../wicket/markup/WicketNamespaceTest.java      |   2 +-
 .../wicket/markup/head/HeaderResponseTest.java  |   2 +-
 .../filter/FilteringHeaderResponseTest.java     |   2 +-
 .../markup/html/ComponentMarkupIdTest.java      |   3 +-
 .../html/DecoratingHeaderResponseTest.java      |   2 +-
 .../markup/html/HeaderContributorTest.java      |   2 +-
 .../wicket/markup/html/MarkupHeadFirstTest.java |   2 +-
 .../markup/html/PackageResourceGuardTest.java   |   2 +-
 .../wicket/markup/html/PackageResourceTest.java |   2 +-
 .../html/SecurePackageResourceGuardTest.java    |   2 +-
 .../html/TransparentWebMarkupContainerTest.java |   2 +-
 .../apache/wicket/markup/html/WebPageTest.java  |   2 +-
 .../wicket/markup/html/XmlDeclResponseTest.java |   2 +-
 .../AutocomponetsGenerationTest.java            |   2 +-
 .../html/autolink/AutoLinkInPanelsTest.java     |   2 +-
 .../markup/html/autolink/AutolinkTest.java      |   2 +-
 .../markup/html/basic/HomePageRedirectTest.java |   2 +-
 .../wicket/markup/html/basic/LabelTest.java     |   2 +-
 .../markup/html/basic/SimplePageTest.java       |   2 +-
 .../html/basic/SimpleResponsePageClassTest.java |   2 +-
 .../wicket/markup/html/basic/XmlPageTest.java   |   2 +-
 .../markup/html/border/ComponentBorderTest.java |   2 +-
 .../html/debug/WicketComponentTreeTest.java     |   2 +-
 ...tComponentConvertEmptyStringsToNullTest.java |   2 +-
 .../html/form/AutoFormLabelPickupTest.java      |   2 +-
 .../wicket/markup/html/form/AutoLabelTest.java  |   2 +-
 .../html/form/AutoLabelWithContentTest.java     |   2 +-
 .../html/form/AutoLabelWithinEnclosureTest.java |   2 +-
 .../wicket/markup/html/form/ButtonTest.java     |   2 +-
 .../html/form/CheckBoxMultipleChoiceTest.java   |   2 +-
 .../wicket/markup/html/form/CheckGroupTest.java |   2 +-
 .../html/form/CollectionFormComponentTest.java  |   2 +-
 .../form/DisabledItemRetainingCheckBoxTest.java |   2 +-
 .../markup/html/form/DropDownChoiceTest.java    |   2 +-
 .../form/FormComponentPanelProcessingTest.java  |   2 +-
 .../markup/html/form/FormComponentTest.java     |   3 +-
 .../form/FormParentDisabledRawInputTest.java    |   2 +-
 .../markup/html/form/FormSubmitOrderTest.java   |   2 +-
 .../wicket/markup/html/form/FormSubmitTest.java |   2 +-
 .../wicket/markup/html/form/FormTest.java       |   2 +-
 ...FormValidationDisabledFormComponentTest.java |   2 +-
 .../html/form/FormWithMultipleButtonsTest.java  |   2 +-
 .../html/form/ListMultipleChoiceTest.java       |   2 +-
 .../html/form/LocalizedErrorMessageTest.java    |   2 +-
 .../markup/html/form/NestedFormSubmitTest.java  |   2 +-
 .../markup/html/form/NestedFormsTest.java       |   2 +-
 .../markup/html/form/NumberTextFieldTest.java   |   2 +-
 .../html/form/OnValidateModelObjectsTest.java   |   2 +-
 .../html/form/PrimitiveTypeRequiredTest.java    |   2 +-
 .../markup/html/form/RadioChoiceTest.java       |   2 +-
 .../wicket/markup/html/form/RadioGroupTest.java |   2 +-
 .../markup/html/form/TestFormHasError.java      |   2 +-
 .../wicket/markup/html/form/TextAreaTest.java   |   2 +-
 .../wicket/markup/html/form/TextFieldTest.java  |   2 +-
 .../html/form/ValidatorPropertiesTest.java      |   2 +-
 .../markup/html/form/border/TestHomePage.java   |   2 +-
 .../html/form/border/TestHomePage_2134.java     |   2 +-
 .../markup/html/form/encryption/CryptTest.java  |   2 +-
 .../html/form/feedback/FormFeedbackTest.java    |   2 +-
 .../form/formComponentPanel/SimplePageTest.java |   2 +-
 .../html/form/imagebutton/ImageButtonTest.java  |   2 +-
 .../imagebutton/InvalidImageButtonTest.java     |   2 +-
 .../markup/html/form/login/InterceptTest.java   |   2 +-
 .../html/form/panelBorder/TestHomePage.java     |   2 +-
 .../form/panelBorder/TestHomePage_2134.java     |   2 +-
 .../html/form/submitlink/TestHomePage.java      |   2 +-
 .../html/form/upload/FileUploadErrorTest.java   |   2 +-
 .../html/form/upload/FileUploadFieldTest.java   |   2 +-
 .../markup/html/form/upload/FileUploadTest.java |   2 +-
 .../form/upload/MultiFileUploadFieldTest.java   |   2 +-
 .../validation/FormValidatorBehaviorTest.java   |   2 +-
 .../html/form/validation/HomePageTest.java      |   2 +-
 .../innerfeedback/InnerFeedbackTest.java        |   2 +-
 .../markup/html/header/HeaderScopingTest.java   |   2 +-
 .../header/inheritance/InheritanceHeadTest.java |   2 +-
 .../markup/html/header/testing/HeaderTest.java  |   2 +-
 .../markup/html/header/testing2/HeaderTest.java |   2 +-
 .../markup/html/header/testing3/HeaderTest.java |   2 +-
 .../header/threelayers/InheritanceHeadTest.java |   2 +-
 .../threelayers2/InheritanceHeadTest.java       |   2 +-
 .../markup/html/image/AjaxUpdatedImageTest.java |   2 +-
 .../wicket/markup/html/image/ImageTest.java     |   2 +-
 .../markup/html/image/InlineImageTest.java      |   2 +-
 .../markup/html/image/InvalidImageTest.java     |   2 +-
 .../markup/html/image/NonCachingImageTest.java  |   2 +-
 .../markup/html/image/ResponsiveImageTest.java  |   2 +-
 .../markup/html/internal/AjaxEnclosureTest.java |   2 +-
 .../markup/html/internal/EnclosureTest.java     |   2 +-
 .../html/internal/HtmlHeaderContainerTest.java  |   2 +-
 .../html/internal/InlineEnclosureTest.java      |   2 +-
 .../markup/html/internal/TogglePageTest.java    |   2 +-
 .../HtmlHeaderItemsContainerTest.java           |   2 +-
 .../markup/html/link/AbstractLinkTest.java      |   2 +-
 .../wicket/markup/html/link/AutolinkTest.java   |   2 +-
 .../link/BookmarkableHomePageLinksTest.java     |   2 +-
 .../html/link/BookmarkablePageLinkTest.java     |   2 +-
 .../html/link/ClientSideImageMapTest.java       |   2 +-
 .../markup/html/link/DownloadLinkTest.java      |   2 +-
 .../markup/html/link/ExternalLinkTest.java      |   2 +-
 .../wicket/markup/html/link/HrefTest.java       |   2 +-
 .../markup/html/link/MountedPageLinkTest.java   |   2 +-
 .../html/link/submitLink/FormPage2Test.java     |   3 +-
 .../html/link/submitLink/FormPageTest.java      |   3 +-
 .../list/IncrementalTableNavigationTest.java    |   2 +-
 .../wicket/markup/html/list/ListViewTest.java   |   2 +-
 .../html/list/PagedTableNavigatorTest.java      |   2 +-
 ...agedTableNavigatorWithLabelProviderTest.java |   2 +-
 .../list/PagedTableNavigatorWithMarginTest.java |   2 +-
 .../wicket/markup/html/list/PagedTableTest.java |   2 +-
 .../markup/html/list/SimpleTableTest.java       |   2 +-
 .../wicket/markup/html/list/TableTest.java      |   2 +-
 .../markup/html/markupId/TestHomePage.java      |   2 +-
 .../wicket/markup/html/media/MediaTagsTest.java |   2 +-
 .../paging/AbstractPagingNavigationTest.java    |   2 +-
 .../wicket/markup/html/page/TestHomePage.java   |   2 +-
 .../markup/html/panel/FeedbackPanelTest.java    |   2 +-
 .../wicket/markup/html/panel/FragmentTest.java  |   2 +-
 .../wicket/markup/html/panel/PanelTest.java     |   2 +-
 .../markup/html/tags/InputTagNotClosedTest.java |   2 +-
 .../OutputTransformerContainerTest.java         |   2 +-
 .../wicket/markup/parser/MergedMarkupTest.java  |   2 +-
 .../parser/RelativePathPrefixHandlerTest.java   |   2 +-
 .../wicket/markup/parser/TestHomePage.java      |   2 +-
 .../parser/filter/DoubleHeaderPartPageTest.java |   2 +-
 .../markup/parser/filter/HeaderSectionTest.java |   2 +-
 .../markup/parser/filter/HtmlHandlerTest.java   |   2 +-
 .../filter/HtmlHeaderSectionHandlerTest.java    |   2 +-
 .../parser/filter/OpenCloseTagExpanderTest.java |   2 +-
 .../filter/StyleAndScriptIdentifierTest.java    |   2 +-
 .../ChildFirstHeaderRenderStrategyTest.java     |   2 +-
 .../wicket/markup/resolver/TestHomePage.java    |   2 +-
 .../resolver/WicketContainerResolverTest.java   |   2 +-
 .../resolver/WicketMessageResolverTest.java     |   2 +-
 .../border/WicketMessageResolverTest.java       |   2 +-
 .../AutoLinkResolveInParentsMarkupTest.java     |   2 +-
 .../markup/resolver/issue3559/MyTest.java       |   2 +-
 .../resolver/issue5569/Issue5569Test.java       |   2 +-
 .../AbstractTransformerBehaviorTest.java        |   2 +-
 .../markupFragments/MarkupFragmentTest.java     |  16 +-
 .../wicket/model/CompoundPropertyModelTest.java |   2 +-
 .../org/apache/wicket/model/DetachableTest.java |   2 +-
 .../apache/wicket/model/InheritedModelTest.java |   2 +-
 .../model/LoadableDetachableModelTest.java      |   2 +-
 .../apache/wicket/model/ModelToStringTest.java  |   2 +-
 .../apache/wicket/model/PropertyModelTest.java  |   2 +-
 .../apache/wicket/model/ResourceModelTest.java  |   2 +-
 .../wicket/model/StringResourceModelTest.java   |   2 +-
 .../org/apache/wicket/model/TestHomePage.java   |   2 +-
 .../wicket/noheadnobody/NoHeadNoBodyTest.java   |   2 +-
 .../PageExpirationRecoveryTest.java             |   2 +-
 .../memory/HttpSessionDataStoreTest.java        |   2 +-
 .../wicket/properties/PropertiesTest.java       |   2 +-
 .../http/AbstractRequestLoggerTest.java         |   6 +-
 .../protocol/http/BufferedWebResponseTest.java  |   2 +-
 .../CsrfPreventionRequestCycleListenerTest.java |   2 +-
 .../protocol/http/ModifyCookiePageTest.java     |   2 +-
 .../protocol/http/WebApplicationTest.java       |   3 +-
 .../http/WebResponseExceptionsTest.java         |   2 +-
 .../protocol/http/WicketTagPanelTest.java       |   2 +-
 .../http/mock/MockHttpServletRequestTest.java   |   2 +-
 .../CryptedUrlWebRequestCodingStrategyTest.java |   2 +-
 ...dRemoteAddressRequestWrapperFactoryTest.java |   2 +-
 .../http/servlet/WicketSessionFilterTest.java   |   2 +-
 .../servlet/XForwardedRequestWrapperTest.java   |   2 +-
 .../ComponentQueueingPerformanceTest.java       |   2 +-
 .../wicket/queueing/ComponentQueueingTest.java  |   2 +-
 ...eueingTransparentWebMarkupContainerTest.java |   2 +-
 .../redirect/RestartWithMountedPageTest.java    |   2 +-
 .../redirect/abort/AbortExceptionTest.java      |   2 +-
 .../redirect/intercept/InterceptTest.java       |   2 +-
 .../MultiRequestCycleListenerCallOrderTest.java |   2 +-
 .../cycle/PageRequestHandlerTrackerTest.java    |   2 +-
 .../request/handler/PageProviderTest.java       |   2 +-
 .../SkipRenderWithSetResponsePageTest.java      |   2 +-
 ...elessPageManipulatingPageParametersTest.java |   2 +-
 .../resource/ResourceAuthorizationTest.java     |   2 +-
 .../request/resource/ByteArrayResourceTest.java |   2 +-
 .../ContextRelativeResourceReferenceTest.java   |   2 +-
 .../resource/CssPackageResourceTest.java        |   7 +-
 .../resource/DynamicImageResourceTest.java      |   2 +-
 .../resource/JavaScriptPackageResourceTest.java |   7 +-
 .../resource/LessResourceReferenceTest.java     |   2 +-
 .../MinifiedAwareResourceReferenceTest.java     |   2 +-
 .../resource/PackageResourceReferenceTest.java  |   2 +-
 .../request/resource/ResouceBundleTest.java     |   2 +-
 .../resource/ResourceReferenceRegistryTest.java |   2 +-
 .../resource/UrlResourceReferenceTest.java      |   2 +-
 .../ContextRelativeResourceCachingTest.java     |   2 +-
 .../wicket/resource/CssUrlReplacerTest.java     |   2 +-
 .../wicket/resource/ResourceUtilTest.java       | 137 +++++++++++++
 .../TextTemplateResourceReferenceTest.java      |   2 +-
 .../UtfPropertiesFilePropertiesLoaderTest.java  |   2 +-
 .../resource/XmlFilePropertiesLoaderTest.java   |   2 +-
 .../ResourceAggregatorRenderTest.java           |   2 +-
 .../aggregator/ResourceAggregatorTest.java      |   2 +-
 .../resource/bundles/CompressBundlesTest.java   |   2 +-
 .../loader/ClassStringResourceLoaderTest.java   |   2 +-
 .../ComponentStringResourceLoaderTest.java      |   2 +-
 .../loader/PackageStringResourceLoaderTest.java |   2 +-
 .../ValidatorStringResourceLoaderTest.java      |   2 +-
 .../PreserveCookieForTheNextHandlerTest.java    |   2 +-
 .../response/filter/ResponseFilterTest.java     |   2 +-
 .../serialize/java/JavaSerializerTest.java      |   2 +-
 .../session/BindSessionOnRedirectTest.java      |   2 +-
 .../wicket/session/DefaultPageFactoryTest.java  |   2 +-
 .../wicket/settings/DebugSettingsTest.java      |   2 +-
 .../wicket/settings/ISecuritySettingsTest.java  |   2 +-
 .../def/SetCustomResourceSettingsTest.java      |   2 +-
 .../wicket/stateless/ImageStatelessTest.java    |   2 +-
 .../stateless/StatelessComponentTest.java       |   2 +-
 .../stateless/StatelessDynmicLinksTest.java     |   2 +-
 .../wicket/stateless/StatelessFormTest.java     |   2 +-
 .../wicket/stateless/StatelessFormUrlTest.java  |   2 +-
 .../wicket/stateless/TemporarySessionTest.java  |   2 +-
 .../pages/RefreshStatelessPageTest.java         |   2 +-
 .../stateless/pages/StatelessFormTest.java      |   2 +-
 .../wicket/util/cookies/CookieUtilsTest.java    |   2 +-
 ...PreserveRequestCookieAfterLinkClickTest.java |   2 +-
 .../util/cookies/SetCookieAndRedirectTest.java  |   2 +-
 .../iterator/AbstractHierarchyIteratorTest.java |   2 +-
 .../util/iterator/ComponentIteratorTest.java    |   2 +-
 .../wicket/util/lang/PropertyResolverTest.java  |   2 +-
 .../wicket/util/lang/WicketObjectsTest.java     |   2 +-
 .../apache/wicket/util/resource/PathTest.java   |   2 +-
 .../resource/ResourceStreamLocatorTest.java     |   2 +-
 .../locator/ResourceNameIteratorTest.java       |   2 +-
 .../util/tester/FormTesterSubmitLinkTest.java   |   1 -
 .../wicket/util/tester/FormTesterTest.java      |   1 -
 ...tartComponentInPageRedirectToRenderTest.java |   1 -
 .../WicketTesterClickExternalLinkTest.java      |   1 -
 .../util/tester/WicketTesterCookieTest.java     |   1 -
 .../WicketTesterLazyIsPageStatelessBase.java    |   1 -
 .../tester/WicketTesterSessionCreationTest.java |   1 -
 .../WicketTesterSessionInvalidateTest.java      |   1 -
 .../wicket/util/tester/WicketTesterTest.java    |   1 -
 .../apache/wicket/util/tester/apps_2/Test.java  |   2 +-
 .../util/tester/apps_3/FormTesterTest.java      |   2 +-
 .../util/tester/apps_4/FormTesterTest.java      |   2 +-
 .../util/tester/apps_5/AjaxLinkClickTest.java   |   2 +-
 .../tester/apps_5/AjaxSubmitLinkClickTest.java  |   2 +-
 .../wicket/util/tester/apps_7/TestHomePage.java |   2 +-
 .../validation/ValidatorBehaviorTest.java       |   2 +-
 .../java/org/apache/wicket/WicketTestCase.java  | 146 --------------
 .../extensions/yui/calendar/DatePickerTest.java |  10 +-
 .../yui/calendar/DateTimeFieldTest.java         |   2 +-
 .../main/webapp/META-INF/velocity.properties    | 167 +++++++++++++++
 wicket-examples/src/main/webapp/WEB-INF/web.xml |   5 +
 .../apache/wicket/examples/WicketTestCase.java  |  51 -----
 .../examples/ajax/prototype/AjaxTest.java       |   2 +-
 .../wicket/examples/compref/ComprefTest.java    |   2 +-
 .../wicket/examples/encodings/EncodingTest.java |   2 +-
 .../examples/forminput/FormInputTest.java       |   2 +-
 .../examples/guestbook/GuestbookTest.java       |   2 +-
 .../examples/hangman/WordGeneratorTest.java     |   2 +-
 .../examples/helloworld/HelloWorldTest.java     |   2 +-
 .../examples/linkomatic/LinkomaticTest.java     |   2 +-
 .../java/org/apache/wicket/WicketTestCase.java  | 166 ---------------
 .../ajax/markup/html/AjaxEditableTest.java      |   2 +-
 .../html/autocomplete/AutoCompleteTest.java     |   2 +-
 .../html/AjaxLazyLoadPanelTesterTest.java       |   2 +-
 .../markup/html/form/DateTextFieldTest.java     |   2 +-
 .../markup/html/form/palette/PaletteTest.java   |   2 +-
 .../markup/html/form/select/SelectTest.java     |   2 +-
 .../resource/ThumbnailImageResourceTest.java    |   2 +-
 .../html/repeater/data/table/DataTableTest.java |   2 +-
 .../markup/html/tabs/TabbedPanelTest.java       |   2 +-
 .../html/tabs/TabbedPanelVisibilityTest.java    |   2 +-
 .../upload/UploadFormWithProgressBarTest.java   |   2 +-
 .../extensions/wizard/WizardModelTest.java      |   2 +-
 .../protocol/ws/AbstractUpgradeFilter.java      |  23 ++-
 .../protocol/ws/javax/JavaxWebSocketFilter.java |  19 +-
 .../ws/jetty/Jetty7WebSocketFilter.java         |  19 +-
 .../ws/jetty9/Jetty9WebSocketFilter.java        |  25 ++-
 .../ws/tomcat7/Tomcat7WebSocketFilter.java      |  22 +-
 .../src/docs/guide/resources/resources_6.gdoc   |   6 +
 .../src/docs/guide/resources/resources_9.gdoc   |   2 +-
 .../java/org/apache/wicket/util/io/IOUtils.java |   1 -
 .../org/apache/wicket/util/lang/Objects.java    |  16 ++
 .../org/apache/wicket/util/string/Strings.java  |  15 ++
 382 files changed, 1363 insertions(+), 1152 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/08f6c9ef/pom.xml
----------------------------------------------------------------------