You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/03/07 09:39:05 UTC
[19/19] 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/53f07873/wicket-request/src/test/java/org/apache/wicket/request/HttpHeaderCollectionTest.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/test/java/org/apache/wicket/request/HttpHeaderCollectionTest.java b/wicket-request/src/test/java/org/apache/wicket/request/HttpHeaderCollectionTest.java
index d92b76b..34b6fcb 100644
--- a/wicket-request/src/test/java/org/apache/wicket/request/HttpHeaderCollectionTest.java
+++ b/wicket-request/src/test/java/org/apache/wicket/request/HttpHeaderCollectionTest.java
@@ -16,6 +16,12 @@
*/
package org.apache.wicket.request;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.Locale;
import java.util.Set;
import java.util.TimeZone;
@@ -23,8 +29,6 @@ import java.util.TimeZone;
import org.apache.wicket.util.time.Time;
import org.junit.Test;
-import static org.junit.Assert.*;
-
public class HttpHeaderCollectionTest
{
@Test
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java b/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java
index 1cd610d..77f441f 100644
--- a/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java
+++ b/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java
@@ -19,7 +19,7 @@ package org.apache.wicket.request.parameter;
import java.util.List;
import org.apache.wicket.request.Url;
-import org.apache.wicket.util.string.*;
+import org.apache.wicket.util.string.StringValue;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java b/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java
index 94992f8..41de72a 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.spring;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.springframework.context.ApplicationContext;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
index 53ba05d..2a479e5 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
@@ -20,7 +20,7 @@ import java.lang.ref.WeakReference;
import org.apache.wicket.proxy.IProxyTargetLocator;
import org.apache.wicket.util.lang.Objects;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.ApplicationContext;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-spring/src/test/java/org/apache/wicket/spring/Bean.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/Bean.java b/wicket-spring/src/test/java/org/apache/wicket/spring/Bean.java
index 85e4216..61d86f1 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/Bean.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/Bean.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.spring;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* Mock spring bean
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
index 1f429e2..1f9109e 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.spring;
import org.apache.wicket.spring.test.ApplicationContextMock;
import org.apache.wicket.spring.test.SpringContextLocatorMock;
-import org.apache.wicket.util.lang.WicketObjects;
+import org.apache.wicket.core.util.lang.WicketObjects;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/IClusterable.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/IClusterable.java b/wicket-util/src/main/java/org/apache/wicket/IClusterable.java
deleted file mode 100755
index fdbd541..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/IClusterable.java
+++ /dev/null
@@ -1,31 +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;
-
-import java.io.Serializable;
-
-/**
- * Wicket version of {@link Serializable}. All Wicket interfaces and base classes that should
- * typically be clustered should implement this interface. This communicates their intent and also
- * makes configuration for <a href="http://terracotta.org/">Terracotta</a> a lot easier.
- *
- * @author eelcohillenius
- */
-public interface IClusterable extends Serializable
-{
- // nothing here, as it is a .... brrrr .... tagging interface!
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/LazyInitializer.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/LazyInitializer.java b/wicket-util/src/main/java/org/apache/wicket/util/LazyInitializer.java
index 2cc80e6..bbff91b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/LazyInitializer.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/LazyInitializer.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* An abstraction for lazy-initializing values. Guarantees only a single instance of the value is
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java
index 8f720d3..200726f 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/IConverter.java
@@ -19,7 +19,7 @@ package org.apache.wicket.util.convert;
import java.util.Date;
import java.util.Locale;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/io/IClusterable.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/io/IClusterable.java b/wicket-util/src/main/java/org/apache/wicket/util/io/IClusterable.java
new file mode 100755
index 0000000..d079631
--- /dev/null
+++ b/wicket-util/src/main/java/org/apache/wicket/util/io/IClusterable.java
@@ -0,0 +1,31 @@
+/*
+ * 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.util.io;
+
+import java.io.Serializable;
+
+/**
+ * Wicket version of {@link Serializable}. All Wicket interfaces and base classes that should
+ * typically be clustered should implement this interface. This communicates their intent and also
+ * makes configuration for <a href="http://terracotta.org/">Terracotta</a> a lot easier.
+ *
+ * @author eelcohillenius
+ */
+public interface IClusterable extends Serializable
+{
+ // nothing here, as it is a .... brrrr .... tagging interface!
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/lang/PackageName.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/PackageName.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/PackageName.java
index 5014fc1..73bd74f 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/PackageName.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/PackageName.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.lang;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* A type-safe package name class since Package is unreliable (it's not a Package object, but rather
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java
index fab5391..e089bab 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.util.lang;
-import org.apache.wicket.util.string.IStringIterator;
import org.apache.wicket.util.string.StringList;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
index 8568513..b511272 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
@@ -25,7 +25,6 @@ import java.io.LineNumberReader;
import java.util.List;
import junit.framework.Assert;
-
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.string.Strings;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
index b8d9136..0f630dd 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.List;
import junit.framework.Assert;
-
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
index 103cc4f..9f79d46 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
@@ -23,7 +23,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import junit.framework.Assert;
-
import org.apache.wicket.util.string.Strings;
class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
index d646c1a..80be4eb 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.List;
import junit.framework.Assert;
-
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
index cea88a7..05b8ddb 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.List;
import junit.framework.Assert;
-
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
index e41fa2a..004ccf4 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
@@ -23,7 +23,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import junit.framework.Assert;
-
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
import org.apache.wicket.util.string.Strings;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java b/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java
index 1637753..de61148 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStream.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
index 74bfc29..2d5b18a 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Locale;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.watch.IModifiable;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java b/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
index c483e8e..366c52f 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/StringValue.java
@@ -22,7 +22,7 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.util.Locale;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItem.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItem.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItem.java
index 0eb8cac..bfdf357 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItem.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItem.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.io.IClusterable;
/**
* <p>
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java b/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
index a2f6bfb..9ccfe74 100644
--- a/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
+++ b/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
@@ -27,7 +27,7 @@ import org.apache.wicket.Application;
import org.apache.wicket.IInitializer;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.util.file.WebApplicationPath;
+import org.apache.wicket.core.util.file.WebApplicationPath;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java b/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
index 9660b77..62687ed 100644
--- a/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
+++ b/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
@@ -21,8 +21,8 @@ import java.util.Map;
import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
import org.apache.wicket.Component;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.model.IModel;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.util.lang.Packages;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
index 18380e3..8da0c80 100644
--- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
+++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPage.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
-import org.apache.wicket.util.resource.UrlResourceStream;
+import org.apache.wicket.core.util.resource.UrlResourceStream;
import org.apache.wicket.velocity.markup.html.VelocityPanel;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
index f795a12..b8f0b0e 100644
--- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
+++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
@@ -23,7 +23,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.resource.UrlResourceStream;
+import org.apache.wicket.core.util.resource.UrlResourceStream;
import org.apache.wicket.velocity.markup.html.VelocityPanel;
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/53f07873/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
----------------------------------------------------------------------
diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
index abd8137..5bdf3a2 100644
--- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
+++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
@@ -21,7 +21,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.collections.MiniMap;
import org.apache.wicket.util.lang.Packages;
-import org.apache.wicket.util.string.JavaScriptUtils;
+import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.velocity.VelocityJavaScriptContributor;
/**