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/12 11:23:51 UTC
[19/21] WICKET-4439 Move classes around so that there are no two
packages with the same name in different modules
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/request/mapper/ResourceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/ResourceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/ResourceMapperTest.java
deleted file mode 100644
index f0be047..0000000
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/ResourceMapperTest.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.mapper;
-
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.IRequestMapper;
-import org.apache.wicket.request.Request;
-import org.apache.wicket.request.Url;
-import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.IResource;
-import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.request.resource.SharedResourceReference;
-import org.apache.wicket.util.string.StringValue;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class ResourceMapperTest extends WicketTestCase
-{
- private static final Charset CHARSET = Charset.forName("UTF-8");
- private static final String SHARED_NAME = "test-resource";
-
- private IRequestMapper mapper;
- private IRequestMapper mapperWithPlaceholder;
- private TestResource resource;
-
- /**
- * @throws Exception
- */
- @Before
- public void before() throws Exception
- {
- resource = new TestResource();
- tester.getApplication().getSharedResources().add(SHARED_NAME, resource);
- ResourceReference resourceReference = new SharedResourceReference(SHARED_NAME);
- mapper = new ResourceMapper("/test/resource", resourceReference);
- mapperWithPlaceholder = new ResourceMapper("/test2/${name}/resource", resourceReference);
- tester.getApplication().getRootRequestMapperAsCompound().add(mapper);
- }
-
- private Request createRequest(final String url)
- {
- return new Request()
- {
- @Override
- public Url getUrl()
- {
- return Url.parse(url, CHARSET);
- }
-
- @Override
- public Locale getLocale()
- {
- return null;
- }
-
- @Override
- public Charset getCharset()
- {
- return CHARSET;
- }
-
- @Override
- public Url getClientUrl()
- {
- return getUrl();
- }
-
- @Override
- public Object getContainerRequest()
- {
- return null;
- }
- };
- }
-
- /**
- * testInvalidPathIsEmpty()
- */
- @Test
- public void invalidPathIsEmpty()
- {
- IRequestHandler requestHandler = mapper.mapRequest(createRequest(""));
- assertNull(requestHandler);
- }
-
- /**
- * testInvalidPathIsMismatch()
- */
- @Test
- public void invalidPathIsMismatch()
- {
- IRequestHandler requestHandler = mapper.mapRequest(createRequest("test/resourcex"));
- assertNull(requestHandler);
- }
-
- /**
- * testInvalidPathIsTooShort()
- */
- @Test
- public void invalidPathIsTooShort()
- {
- IRequestHandler requestHandler = mapper.mapRequest(createRequest("test"));
- assertNull(requestHandler);
- }
-
- /**
- * testValidPathWithParams()
- */
- @Test
- public void validPathWithParams()
- {
- Request request = createRequest("test/resource/1/fred");
- IRequestHandler requestHandler = mapper.mapRequest(request);
- assertNotNull(requestHandler);
- assertEquals(ResourceReferenceRequestHandler.class, requestHandler.getClass());
- assertEquals(request.getUrl(), mapper.mapHandler(requestHandler));
-
- tester.processRequest(requestHandler);
- PageParameters params = resource.pageParameters;
- assertNotNull(params);
- assertEquals(0, params.getAllNamed().size());
- assertEquals(2, params.getIndexedCount());
-
- StringValue paramId = params.get(0);
- assertNotNull(paramId);
- assertEquals(1, paramId.toInt());
-
- StringValue paramName = params.get(1);
- assertNotNull(paramName);
- assertEquals("fred", paramName.toString());
- }
-
- /**
- * testValidPathWithParamsAndQueryPath()
- */
- @Test
- public void validPathWithParamsAndQueryPath()
- {
- Request request = createRequest("test/resource/1/fred?foo=bar&foo=baz&value=12");
- IRequestHandler requestHandler = mapper.mapRequest(request);
- assertNotNull(requestHandler);
- assertEquals(ResourceReferenceRequestHandler.class, requestHandler.getClass());
- assertEquals(request.getUrl(), mapper.mapHandler(requestHandler));
-
- tester.processRequest(requestHandler);
- PageParameters params = resource.pageParameters;
- assertNotNull(params);
- assertEquals(3, params.getAllNamed().size());
- assertEquals(2, params.getIndexedCount());
-
- StringValue paramId = params.get(0);
- assertNotNull(paramId);
- assertEquals(1, paramId.toInt());
-
- StringValue paramName = params.get(1);
- assertNotNull(paramName);
- assertEquals("fred", paramName.toString());
-
- List<StringValue> foo = params.getValues("foo");
- assertNotNull(foo.size() == 2);
- assertEquals("bar", foo.get(0).toString(""));
- assertEquals("baz", foo.get(1).toString(""));
-
- StringValue paramValue = params.get("value");
- assertEquals(12, paramValue.toInt());
- }
-
- /**
- * testPlaceholders()
- */
- @Test
- public void placeholders()
- {
- Request request = createRequest("test2/image/resource/foo/bar?a=abc&b=123");
- IRequestHandler requestHandler = mapperWithPlaceholder.mapRequest(request);
- assertNotNull(requestHandler);
- assertEquals(ResourceReferenceRequestHandler.class, requestHandler.getClass());
- assertEquals(request.getUrl(), mapperWithPlaceholder.mapHandler(requestHandler));
-
- tester.processRequest(requestHandler);
- PageParameters params = resource.pageParameters;
- assertNotNull(params);
- assertEquals(3, params.getAllNamed().size());
- assertEquals(2, params.getIndexedCount());
-
- assertEquals("foo", params.get(0).toString());
- assertEquals("bar", params.get(1).toString());
-
- assertEquals("image", params.get("name").toString());
- assertEquals("abc", params.get("a").toString());
- assertEquals("123", params.get("b").toString());
- }
-
- /**
- * testPlaceholdersWithQueryParamDuplicate()
- */
- @Test
- public void placeholdersWithQueryParamDuplicate()
- {
- // we have one named parameter that exists twice
- Request request = createRequest("test2/image/resource/foo/bar?name=name-2&val=123");
- IRequestHandler handler = mapperWithPlaceholder.mapRequest(request);
- assertNotNull(handler);
- assertEquals(ResourceReferenceRequestHandler.class, handler.getClass());
-
- // the query part of the duplicate should be gone now
- Url newUrl = mapperWithPlaceholder.mapHandler(handler);
- assertEquals(Url.parse("test2/name-2/resource/foo/bar?val=123"), newUrl);
-
- // create new request
- request = createRequest(newUrl.toString());
-
- // get handler again
- handler = mapperWithPlaceholder.mapRequest(request);
- assertNotNull(handler);
-
- tester.processRequest(handler);
- PageParameters params = resource.pageParameters;
- assertNotNull(params);
- assertEquals(2, params.getAllNamed().size());
- assertEquals(2, params.getIndexedCount());
-
- assertEquals("foo", params.get(0).toString());
- assertEquals("bar", params.get(1).toString());
-
- assertEquals("name-2", params.get("name").toString());
- assertEquals("123", params.get("val").toString());
- }
-
- /**
- *
- */
- @Test
- public void requestWithEmptyFilename()
- {
- // request invalid path with empty filename
- // this must not return a handler
- Request request = createRequest("test2/image/");
- IRequestHandler handler = mapperWithPlaceholder.mapRequest(request);
- assertNull(handler);
- }
-
- private static class TestResource implements IResource
- {
- private static final long serialVersionUID = -3130204487473856574L;
-
- public PageParameters pageParameters;
-
- @Override
- public void respond(Attributes attributes)
- {
- pageParameters = attributes.getParameters();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
deleted file mode 100644
index 212489f..0000000
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.mapper;
-
-import org.apache.wicket.MockPage;
-import org.apache.wicket.RequestListenerInterface;
-import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.markup.MarkupParser;
-import org.apache.wicket.page.IPageManagerContext;
-import org.apache.wicket.page.PageStoreManager;
-import org.apache.wicket.pageStore.DefaultPageStore;
-import org.apache.wicket.pageStore.IDataStore;
-import org.apache.wicket.pageStore.IPageStore;
-import org.apache.wicket.pageStore.memory.DummyPageManagerContext;
-import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.handler.PageProvider;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.request.resource.ResourceReference.Key;
-import org.apache.wicket.request.resource.ResourceReferenceRegistry;
-import org.apache.wicket.serialize.java.JavaSerializer;
-import org.apache.wicket.versioning.InMemoryPageStore;
-
-/**
- * Simple {@link EncoderContext} implementation for testing purposes
- *
- * @author Matej Knopp
- */
-public class TestMapperContext implements IMapperContext
-{
- private static final String APP_NAME = "test_app";
- private static int count;
- IDataStore dataStore;
- IPageStore pageStore;
- IPageManagerContext pageManagerContext;
- PageStoreManager pageManager;
- private String appName;
- private boolean createMockPageIfInstanceNotFound = true;
-
- /**
- * Construct.
- */
- public TestMapperContext()
- {
- appName = APP_NAME + count++;
- dataStore = new InMemoryPageStore();
- pageStore = new DefaultPageStore(new JavaSerializer(appName), dataStore, 4);
- pageManagerContext = new DummyPageManagerContext();
- pageManager = new PageStoreManager(appName, pageStore, pageManagerContext);
- }
-
- /**
- * just making sure the session cache will be empty by simulating an intermezzo request
- */
- public void cleanSessionCache()
- {
- getPageManager().getContext().setRequestData(null);
- MockPage other = new MockPage();
- other.setPageId(Integer.MAX_VALUE);
- getPageManager().touchPage(other);
- getPageManager().commitRequest();
- }
-
- /**
- * @return pageManager
- */
- public PageStoreManager getPageManager()
- {
- return pageManager;
- }
-
- @Override
- public String getBookmarkableIdentifier()
- {
- return "bookmarkable";
- }
-
- @Override
- public String getNamespace()
- {
- return MarkupParser.WICKET;
- }
-
- @Override
- public String getPageIdentifier()
- {
- return "page";
- }
-
- @Override
- public String getResourceIdentifier()
- {
- return "resource";
- }
-
- @Override
- public ResourceReferenceRegistry getResourceReferenceRegistry()
- {
- return registry;
- }
-
- private final ResourceReferenceRegistry registry = new ResourceReferenceRegistry()
- {
- @Override
- protected ResourceReference createDefaultResourceReference(Key key)
- {
- // Do not create package resource here because it requires "real" application
- return null;
- }
- };
-
- private boolean bookmarkable = true;
-
- /**
- * Determines whether the newly created page will have bookmarkable flag set
- *
- * @param bookmarkable
- */
- public void setBookmarkable(boolean bookmarkable)
- {
- this.bookmarkable = bookmarkable;
- }
-
- private boolean createdBookmarkable = true;
-
- /**
- * Determines whether the newly created page will have createdBookmarkable flag set
- *
- * @param createdBookmarkable
- */
- public void setCreatedBookmarkable(boolean createdBookmarkable)
- {
- this.createdBookmarkable = createdBookmarkable;
- }
-
- private int nextPageRenderCount = 0;
-
- /**
- *
- * @param nextPageRenderCount
- */
- public void setNextPageRenderCount(int nextPageRenderCount)
- {
- this.nextPageRenderCount = nextPageRenderCount;
- }
-
- @Override
- public IRequestablePage getPageInstance(int pageId)
- {
-
- IRequestablePage requestablePage = (IRequestablePage)pageManager.getPage(pageId);
- if (requestablePage == null && createMockPageIfInstanceNotFound)
- {
- MockPage page = new MockPage();
- page.setPageId(pageId);
- page.setBookmarkable(bookmarkable);
- page.setCreatedBookmarkable(createdBookmarkable);
- page.setRenderCount(nextPageRenderCount);
- requestablePage = page;
- }
- return requestablePage;
-
- }
-
- int idCounter = 0;
-
- @Override
- public IRequestablePage newPageInstance(Class<? extends IRequestablePage> pageClass,
- PageParameters pageParameters)
- {
- try
- {
- MockPage page;
- page = (MockPage)pageClass.newInstance();
- page.setPageId(++idCounter);
- page.setBookmarkable(true);
- page.setCreatedBookmarkable(true);
- if (pageParameters != null)
- {
- page.getPageParameters().overwriteWith(pageParameters);
- }
- return page;
- }
- catch (Exception e)
- {
- throw new WicketRuntimeException(e);
- }
- }
-
- @Override
- public RequestListenerInterface requestListenerInterfaceFromString(String interfaceName)
- {
- return RequestListenerInterface.forName(interfaceName);
- }
-
- @Override
- public String requestListenerInterfaceToString(RequestListenerInterface listenerInterface)
- {
- return listenerInterface.getName();
- }
-
- @Override
- public Class<? extends IRequestablePage> getHomePageClass()
- {
- return MockPage.class;
- }
-
- /**
- *
- * Adapts {@link PageProvider} to this {@link IMapperContext}
- *
- * @author Pedro Santos
- */
- public class TestPageProvider extends PageProvider
- {
-
- /**
- * Construct.
- *
- * @param pageId
- * @param renderCount
- */
- public TestPageProvider(int pageId, Integer renderCount)
- {
- super(pageId, renderCount);
- }
-
- @Override
- protected IPageSource getPageSource()
- {
- return TestMapperContext.this;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
deleted file mode 100644
index d5a507d..0000000
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.request.mapper;
-
-import org.apache.wicket.MockPage;
-import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.request.mapper.AbstractBookmarkableMapper.UrlInfo;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Tests for {@link UrlInfo}
- */
-public class UrlInfoTest extends Assert
-{
-
- /**
- * WICKET-4038 & WICKET-4054
- */
- @Test
- public void wicket4038()
- {
- PageParameters parameters = new PageParameters();
- parameters.add(WebRequest.PARAM_AJAX, "true");
- parameters.add(WebRequest.PARAM_AJAX_BASE_URL, "base/url");
- parameters.add(WebRequest.PARAM_AJAX_REQUEST_ANTI_CACHE, "12345.6879");
-
- AbstractBookmarkableMapper.UrlInfo info = new UrlInfo(null, MockPage.class, parameters);
- assertNull(info.getPageParameters());
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/crypt.txt
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/crypt.txt b/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/crypt.txt
deleted file mode 100644
index 266c44d..0000000
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/crypt.txt
+++ /dev/null
@@ -1 +0,0 @@
-CryptoMapperTest#testResourceReference()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/modified-crypt.txt
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/modified-crypt.txt b/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/modified-crypt.txt
deleted file mode 100644
index 380a05e..0000000
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/modified-crypt.txt
+++ /dev/null
@@ -1 +0,0 @@
-CryptoMapperTest#testResourceReferenceWithModifiedSegments()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/more/crypt.txt
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/more/crypt.txt b/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/more/crypt.txt
deleted file mode 100644
index 9be729d..0000000
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/crypt/more/crypt.txt
+++ /dev/null
@@ -1 +0,0 @@
-CryptoMapperTest#testResourceReferenceWithMoreSegments()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/request/mapper/less-crypt.txt
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/less-crypt.txt b/wicket-core/src/test/java/org/apache/wicket/request/mapper/less-crypt.txt
deleted file mode 100644
index 1e726e9..0000000
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/less-crypt.txt
+++ /dev/null
@@ -1 +0,0 @@
-CryptoMapperTest#testResourceReferenceWithLessSegments()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java b/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
index 69dab6d..f88d62e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
@@ -20,6 +20,7 @@ import java.net.URL;
import javax.servlet.ServletContext;
+import org.apache.wicket.core.util.file.WebApplicationPath;
import org.apache.wicket.util.resource.IResourceStream;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/io/SerializableCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/io/SerializableCheckerTest.java b/wicket-core/src/test/java/org/apache/wicket/util/io/SerializableCheckerTest.java
index 84a50a2..2190b38 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/io/SerializableCheckerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/io/SerializableCheckerTest.java
@@ -23,8 +23,9 @@ import java.io.Serializable;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
+import org.apache.wicket.core.util.io.SerializableChecker;
+import org.apache.wicket.core.util.io.SerializableChecker.WicketNotSerializableException;
import org.apache.wicket.util.Log4jEventHistory;
-import org.apache.wicket.util.io.SerializableChecker.WicketNotSerializableException;
import org.apache.wicket.util.value.ValueMap;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
index 5c79a52..a77c7ca 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
@@ -31,6 +31,8 @@ import org.apache.wicket.ConverterLocator;
import org.apache.wicket.IConverterLocator;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.core.util.lang.PropertyResolver;
+import org.apache.wicket.core.util.lang.PropertyResolverConverter;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converter.AbstractConverter;
@@ -73,7 +75,7 @@ public class PropertyResolverTest extends WicketTestCase
@Test
public void simpleExpression() throws Exception
{
- String name = (String)PropertyResolver.getValue("name", person);
+ String name = (String) PropertyResolver.getValue("name", person);
assertNull(name);
PropertyResolver.setValue("name", person, "wicket", CONVERTER);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/lang/WicketObjectsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/lang/WicketObjectsTest.java b/wicket-core/src/test/java/org/apache/wicket/util/lang/WicketObjectsTest.java
index 531173d..0cd2082 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/lang/WicketObjectsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/lang/WicketObjectsTest.java
@@ -19,6 +19,7 @@ package org.apache.wicket.util.lang;
import java.io.Serializable;
import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceTest.java
index ab94fca..3737bdc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceTest.java
@@ -23,10 +23,11 @@ import java.net.URL;
import java.util.Locale;
import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.core.util.resource.UrlResourceStream;
+import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
+import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
import org.apache.wicket.util.file.Folder;
import org.apache.wicket.util.file.Path;
-import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
-import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
import org.apache.wicket.util.string.Strings;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/resource/UrlResourceStreamTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/resource/UrlResourceStreamTest.java b/wicket-core/src/test/java/org/apache/wicket/util/resource/UrlResourceStreamTest.java
index e610314..5a066d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/resource/UrlResourceStreamTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/resource/UrlResourceStreamTest.java
@@ -23,6 +23,7 @@ import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.wicket.core.util.resource.UrlResourceStream;
import org.apache.wicket.util.lang.Bytes;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/CachingResourceStreamLocatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/CachingResourceStreamLocatorTest.java b/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/CachingResourceStreamLocatorTest.java
index c111393..9f50fe7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/CachingResourceStreamLocatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/CachingResourceStreamLocatorTest.java
@@ -24,10 +24,11 @@ import static org.mockito.Mockito.when;
import java.io.File;
import java.net.URL;
+import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
import org.apache.wicket.util.resource.FileResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.apache.wicket.util.resource.UrlResourceStream;
-import org.apache.wicket.util.resource.locator.caching.CachingResourceStreamLocator;
+import org.apache.wicket.core.util.resource.UrlResourceStream;
+import org.apache.wicket.core.util.resource.locator.caching.CachingResourceStreamLocator;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/ResourceNameIteratorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/ResourceNameIteratorTest.java b/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/ResourceNameIteratorTest.java
index ceed507..cd9283f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/ResourceNameIteratorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/resource/locator/ResourceNameIteratorTest.java
@@ -22,6 +22,10 @@ import java.util.Iterator;
import java.util.Locale;
import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.core.util.resource.locator.ExtensionResourceNameIterator;
+import org.apache.wicket.core.util.resource.locator.LocaleResourceNameIterator;
+import org.apache.wicket.core.util.resource.locator.ResourceNameIterator;
+import org.apache.wicket.core.util.resource.locator.StyleAndVariationResourceNameIterator;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java b/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
index 537210a..345278b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/string/JavaScriptStripperTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.util.string;
+import org.apache.wicket.core.util.string.JavaScriptStripper;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/string/UrlUtilsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/string/UrlUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/util/string/UrlUtilsTest.java
index c5af6fb..eb49922 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/string/UrlUtilsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/string/UrlUtilsTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.apache.wicket.core.util.string.UrlUtils;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolatorTest.java b/wicket-core/src/test/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolatorTest.java
index 8807e58..eeffe71 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/string/interpolator/PropertyVariableInterpolatorTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.util.string.interpolator;
+import org.apache.wicket.core.util.string.interpolator.PropertyVariableInterpolator;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
index 525717a..4de0108 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
@@ -30,7 +30,7 @@ import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.handler.ListenerInvocationNotAllowedException;
+import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.resource.IResourceStream;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
index 0d660ff..8b922b8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
@@ -52,9 +52,9 @@ import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestableComponent;
-import org.apache.wicket.request.handler.BookmarkablePageRequestHandler;
-import org.apache.wicket.request.handler.IPageProvider;
-import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
+import org.apache.wicket.core.request.handler.IPageProvider;
+import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ByteArrayResource;
import org.apache.wicket.request.resource.PackageResource.PackageResourceBlockedException;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java b/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
index 10d49d9..0333d99 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
@@ -23,7 +23,7 @@ import java.util.TimeZone;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.protocol.http.request.WebClientInfo;
-import org.apache.wicket.request.ClientInfo;
+import org.apache.wicket.core.request.ClientInfo;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.Strings;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java b/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
index 92ade4c..317026e 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
@@ -16,14 +16,14 @@
*/
package org.apache.wicket.datetime;
+import java.util.Locale;
+
import org.apache.wicket.datetime.markup.html.form.DateTextField;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
-import java.util.Locale;
-
/**
* Date converter that uses Joda Time and can be configured to take the time zone difference between
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
index 28808ff..f8cfec5 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
@@ -18,9 +18,9 @@ package org.apache.wicket.extensions.yui;
import org.apache.wicket.Application;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
/**
* Use the {@link #load(org.apache.wicket.markup.head.IHeaderResponse)} method to initialize the YUI library using the YUI loader.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
index a07f00e..b448196 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
@@ -22,11 +22,11 @@ import java.util.Map.Entry;
import java.util.Properties;
import org.apache.wicket.extensions.yui.YuiLib;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.markup.head.CssHeaderItem;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
index 893f0cb..0e9cb46 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
@@ -34,7 +34,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.protocol.http.request.WebClientInfo;
-import org.apache.wicket.request.ClientInfo;
+import org.apache.wicket.core.request.ClientInfo;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converter.ZeroPaddingIntegerConverter;
import org.apache.wicket.validation.validator.RangeValidator;
@@ -243,7 +243,7 @@ public class DateTimeField extends FormComponentPanel<Date>
* href="http://developer.yahoo.com/yui/calendar/">the widget's documentation</a> for the
* available options. If you want to override/ remove properties, you should call
* super.configure(properties) first. If you don't call that, be aware that you will have to
- * call {@link #localize(Map)} manually if you like localized strings to be added.
+ * call {@link #configure(java.util.Map)} manually if you like localized strings to be added.
*
* @param widgetProperties
* the current widget properties
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-datetime/src/test/java/org/apache/wicket/WicketTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/test/java/org/apache/wicket/WicketTestCase.java b/wicket-datetime/src/test/java/org/apache/wicket/WicketTestCase.java
index ed92786..f776c58 100644
--- a/wicket-datetime/src/test/java/org/apache/wicket/WicketTestCase.java
+++ b/wicket-datetime/src/test/java/org/apache/wicket/WicketTestCase.java
@@ -17,7 +17,6 @@
package org.apache.wicket;
import junit.framework.TestCase;
-
import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTester;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
index a941ddb..beb14b2 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
@@ -24,15 +24,15 @@ import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.devutils.DevUtilsPanel;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
/**
* The debug bar is for use during development. It allows contributors to add useful functions or
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java
index ec7ff45..67f0839 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java
@@ -25,7 +25,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
/**
* A panel for the debug bar that shows the size of the currently shown page.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowDescription.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowDescription.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowDescription.java
index 2d7d171..b07c005 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowDescription.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowDescription.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.devutils.diskstore.browser;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.pageStore.PageWindowManager.PageWindow;
+import org.apache.wicket.util.io.IClusterable;
/**
* A serializable representation of the page information
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
index d434b69..539721c 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
@@ -19,7 +19,7 @@ package org.apache.wicket.devutils.inspector;
import org.apache.wicket.Session;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
/**
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java b/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
index 3bbb361..a5e7141 100644
--- a/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
+++ b/wicket-devutils/src/test/java/org/apache/wicket/devutils/inspector/SessionSizeModelTest.java
@@ -17,7 +17,6 @@
package org.apache.wicket.devutils.inspector;
import junit.framework.TestCase;
-
import org.apache.wicket.Session;
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebSession;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java b/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
index 2d27740..25cc12b 100644
--- a/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
+++ b/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
@@ -17,7 +17,6 @@
package org.apache.wicket.devutils.stateless;
import junit.framework.TestCase;
-
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.DummyHomePage;
import org.apache.wicket.util.tester.WicketTester;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
index 1e3ae58..d79724a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
@@ -22,7 +22,7 @@ import java.net.UnknownHostException;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.response.filter.IResponseFilter;
import org.apache.wicket.util.string.AppendingStringBuffer;
-import org.apache.wicket.util.string.JavaScriptUtils;
+import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
@@ -77,7 +77,7 @@ public class ServerHostNameAndTimeFilter implements IResponseFilter
}
/**
- * @see org.apache.wicket.IResponseFilter#filter(AppendingStringBuffer)
+ * @see IResponseFilter#filter(AppendingStringBuffer)
*/
public AppendingStringBuffer filter(AppendingStringBuffer responseBuffer)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
index 85c738a..a9b1c11 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
@@ -29,8 +29,8 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.BookmarkablePageRequestHandler;
-import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
+import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.util.string.Strings;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java
index 536920b..1d959b7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.ajax.builtin;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
index 6592925..1d0fecd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.ajax.builtin;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.rating.RatingPanel;
import org.apache.wicket.markup.html.link.Link;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
index 8ba98c5..6f47194 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
@@ -19,7 +19,6 @@ package org.apache.wicket.examples.ajax.builtin;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -32,6 +31,7 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.io.IClusterable;
/**
* Ajax todo list without having to write any JavaScript yourself.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
index 186103d..7d9af81 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
@@ -24,9 +24,9 @@ import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.ComponentRenderingRequestHandler;
-import org.apache.wicket.request.handler.ListenerInterfaceRequestHandler;
-import org.apache.wicket.request.handler.PageAndComponentProvider;
+import org.apache.wicket.core.request.handler.ComponentRenderingRequestHandler;
+import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
+import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.util.string.AppendingStringBuffer;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
index af0df49..3447e60 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
@@ -38,9 +38,9 @@ import org.apache.wicket.protocol.http.BufferedWebResponse;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.PageProvider;
-import org.apache.wicket.request.handler.RenderPageRequestHandler;
-import org.apache.wicket.request.handler.RenderPageRequestHandler.RedirectPolicy;
+import org.apache.wicket.core.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.request.handler.render.PageRenderer;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResourceReference;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
index bff1662..48da6a4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/User.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.examples.authorization;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Address.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Address.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Address.java
index 3d6f134..168acc5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Address.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Address.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* An address.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Book.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Book.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Book.java
index 165104c..cef94dc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Book.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Book.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* A book.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
index 41bd194..7a50670 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
@@ -21,7 +21,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.CheckBoxMultipleChoice;
import org.apache.wicket.markup.html.form.Form;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
index af21e7d..83f6fc8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Count.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Count.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Count.java
index 3d4640b..7374c6f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Count.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Count.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* A class for counting things.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
index 9a6d58d..d68d1ba 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
@@ -19,7 +19,7 @@ package org.apache.wicket.examples.compref;
import java.util.Arrays;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
index e2a6200..506c57e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
@@ -19,7 +19,7 @@ package org.apache.wicket.examples.compref;
import java.util.Arrays;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.ListChoice;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
index a70c6ba..6a5421c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
@@ -21,7 +21,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.ListMultipleChoice;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Person.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Person.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Person.java
index 0b479ef..ef5a2dc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Person.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Person.java
@@ -18,7 +18,7 @@ package org.apache.wicket.examples.compref;
import java.util.Date;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
index edc1efc..7ac408c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
@@ -19,7 +19,7 @@ package org.apache.wicket.examples.compref;
import java.util.Arrays;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.examples.WicketExamplePage;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
index 47f21a0..c30f445 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.extensions.markup.html.form.select.IOptionRenderer;
import org.apache.wicket.extensions.markup.html.form.select.Select;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
index 22be5a0..7f62045 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextArea;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
index 50cbaec..da1c2c3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.java b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.java
index 15eb0d9..05ec45b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.java
@@ -17,7 +17,7 @@
package org.apache.wicket.examples.customresourceloading;
import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
+import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java
index bade970..b253e53 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java
@@ -24,9 +24,9 @@ import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.resource.UrlResourceStream;
-import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
-import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
+import org.apache.wicket.core.util.resource.UrlResourceStream;
+import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
+import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@ public class CustomResourceLoadingApplication extends WicketExampleApplication
private final class CustomResourceStreamLocator extends ResourceStreamLocator
{
/**
- * @see org.apache.wicket.util.resource.locator.ResourceStreamLocator#locate(java.lang.Class,
+ * @see org.apache.wicket.core.util.resource.locator.ResourceStreamLocator#locate(java.lang.Class,
* java.lang.String)
*/
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java
index 8f69383..ef24b0a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java
@@ -17,7 +17,7 @@
package org.apache.wicket.examples.customresourceloading;
import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
+import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java
index f173a54..73c640b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java
@@ -23,7 +23,7 @@ import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.IMarkupCacheKeyProvider;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.resource.UrlResourceStream;
+import org.apache.wicket.core.util.resource.UrlResourceStream;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
index 04fee7f..7c06da3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java
index 8191de6..6857acb 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.forminput;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Represents a US phone number. We use this instead of the direct string to trigger conversion to
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
index 97033f6..8c78898 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
@@ -18,8 +18,8 @@ package org.apache.wicket.examples.frames;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.handler.PageProvider;
-import org.apache.wicket.request.handler.RenderPageRequestHandler;
+import org.apache.wicket.core.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java
index c536d55..9086cab 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java
@@ -16,11 +16,11 @@
*/
package org.apache.wicket.examples.frames;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.Page;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.BookmarkablePageRequestHandler;
-import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
+import org.apache.wicket.core.request.handler.PageProvider;
+import org.apache.wicket.util.io.IClusterable;
/**
* Simple struct for holding the class of the right frame.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.java
index 4fea5f2..136b79c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/Home.java
@@ -18,8 +18,8 @@ package org.apache.wicket.examples.frames;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.handler.BookmarkablePageRequestHandler;
-import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
+import org.apache.wicket.core.request.handler.PageProvider;
/**
* Home page for the frames example.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/Comment.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/Comment.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/Comment.java
index e3a2e4a..766fc92 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/Comment.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/Comment.java
@@ -18,7 +18,7 @@ package org.apache.wicket.examples.guestbook;
import java.util.Date;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java
index eebde21..00dc7ac 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java
@@ -16,14 +16,13 @@
*/
package org.apache.wicket.examples.guice;
+import com.google.inject.Inject;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.examples.guice.service.IMyService;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.AbstractReadOnlyModel;
-import com.google.inject.Inject;
-
/**
* Everybody's favorite example (Hello World), modified to use Guice.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java
index c983f58..799ec25 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java
@@ -19,7 +19,7 @@ package org.apache.wicket.examples.hangman;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
index c1c3731..22869f6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
@@ -18,10 +18,10 @@ package org.apache.wicket.examples.hangman;
import java.awt.Color;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Primitives;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java
index 0375092..d78ae92 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java
@@ -19,7 +19,7 @@ package org.apache.wicket.examples.hangman;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java
index 24b4b38..1f31be0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java
@@ -22,11 +22,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
-import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
+import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
index 5909311..c5a30df 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.EnumeratedType;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/library/User.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/User.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/User.java
index d49a814..f0ad14d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/User.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/User.java
@@ -19,7 +19,7 @@ package org.apache.wicket.examples.library;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Book.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Book.java b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Book.java
index c3e265f..5a31670 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Book.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Book.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.linkomatic;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Simple book model.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1257c03d/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
index 1f078a3..bcef987 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.repeater;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* domain object for demonstrations.