You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/03/15 23:33:46 UTC
svn commit: r923479 [5/6] - in /wicket/trunk:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/
wicket-datetime/src/main/java/org/apache/wicket/extens...
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/SimplePageParametersEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/SimplePageParametersEncoder.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/SimplePageParametersEncoder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/SimplePageParametersEncoder.java Mon Mar 15 22:33:36 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper.parameters;
+package org.apache.wicket.request.mapper.parameters;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.Url.QueryParameter;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.Url.QueryParameter;
+import org.apache.wicket.request.component.PageParameters;
/**
* Simple encoder with direct indexed/named parameters mapping.
@@ -36,7 +36,7 @@ public class SimplePageParametersEncoder
}
/**
- * @see org.apache.wicket.ng.request.mapper.parameters.IPageParametersEncoder#decodePageParameters(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.mapper.parameters.IPageParametersEncoder#decodePageParameters(org.apache.wicket.Request)
*/
public PageParameters decodePageParameters(Request request)
{
@@ -58,7 +58,7 @@ public class SimplePageParametersEncoder
}
/**
- * @see org.apache.wicket.ng.request.mapper.parameters.IPageParametersEncoder#encodePageParameters(org.apache.wicket.ng.request.component.PageParameters)
+ * @see org.apache.wicket.request.mapper.parameters.IPageParametersEncoder#encodePageParameters(org.apache.wicket.request.component.PageParameters)
*/
public Url encodePageParameters(PageParameters pageParameters)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.parameter;
+package org.apache.wicket.request.parameter;
import java.util.ArrayList;
import java.util.Collections;
@@ -22,7 +22,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.wicket.ng.request.IRequestParameters;
+import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.util.string.StringValue;
/**
@@ -49,7 +49,7 @@ public class CombinedRequestParametersAd
}
/**
- * @see org.apache.wicket.ng.request.IRequestParameters#getParameterNames()
+ * @see org.apache.wicket.request.IRequestParameters#getParameterNames()
*/
public Set<String> getParameterNames()
{
@@ -62,7 +62,7 @@ public class CombinedRequestParametersAd
}
/**
- * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValue(java.lang.String)
+ * @see org.apache.wicket.request.IRequestParameters#getParameterValue(java.lang.String)
*/
public StringValue getParameterValue(String name)
{
@@ -78,7 +78,7 @@ public class CombinedRequestParametersAd
}
/**
- * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValues(java.lang.String)
+ * @see org.apache.wicket.request.IRequestParameters#getParameterValues(java.lang.String)
*/
public List<StringValue> getParameterValues(String name)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/EmptyRequestParameters.java Mon Mar 15 22:33:36 2010
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.parameter;
+package org.apache.wicket.request.parameter;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import org.apache.wicket.ng.request.IRequestParameters;
+import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.util.string.StringValue;
/**
@@ -41,7 +41,7 @@ public class EmptyRequestParameters impl
}
/**
- * @see org.apache.wicket.ng.request.IRequestParameters#getParameterNames()
+ * @see org.apache.wicket.request.IRequestParameters#getParameterNames()
*/
public Set<String> getParameterNames()
{
@@ -49,7 +49,7 @@ public class EmptyRequestParameters impl
}
/**
- * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValue(java.lang.String)
+ * @see org.apache.wicket.request.IRequestParameters#getParameterValue(java.lang.String)
*/
public StringValue getParameterValue(String name)
{
@@ -57,7 +57,7 @@ public class EmptyRequestParameters impl
}
/**
- * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValues(java.lang.String)
+ * @see org.apache.wicket.request.IRequestParameters#getParameterValues(java.lang.String)
*/
public List<StringValue> getParameterValues(String name)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.parameter;
+package org.apache.wicket.request.parameter;
import java.util.ArrayList;
import java.util.Collections;
@@ -22,9 +22,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.wicket.ng.request.IRequestParameters;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.Url.QueryParameter;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.Url.QueryParameter;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
@@ -51,7 +51,7 @@ public class UrlRequestParametersAdapter
}
/**
- * @see org.apache.wicket.ng.request.IRequestParameters#getParameterNames()
+ * @see org.apache.wicket.request.IRequestParameters#getParameterNames()
*/
public Set<String> getParameterNames()
{
@@ -64,7 +64,7 @@ public class UrlRequestParametersAdapter
}
/**
- * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValue(java.lang.String)
+ * @see org.apache.wicket.request.IRequestParameters#getParameterValue(java.lang.String)
*/
public StringValue getParameterValue(String name)
{
@@ -72,7 +72,7 @@ public class UrlRequestParametersAdapter
}
/**
- * @see org.apache.wicket.ng.request.IRequestParameters#getParameterValues(java.lang.String)
+ * @see org.apache.wicket.request.IRequestParameters#getParameterValues(java.lang.String)
*/
public List<StringValue> getParameterValues(String name)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.io.IOException;
import java.io.InputStream;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ByteArrayResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ByteArrayResource.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ByteArrayResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ByteArrayResource.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.util.Locale;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ClassScanner.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ClassScanner.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ClassScanner.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ClassScanner.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/CompressedResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/CompressedResourceReference.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/CompressedResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/CompressedResourceReference.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.util.Locale;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ContentDisposition.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ContentDisposition.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ContentDisposition.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ContentDisposition.java Mon Mar 15 22:33:36 2010
@@ -1,4 +1,4 @@
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
/**
* Represents content disposition of a resource
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/DynamicImageResource.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java Mon Mar 15 22:33:36 2010
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.io.Serializable;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.handler.resource.ResourceRequestHandler;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavascriptResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavascriptResourceReference.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavascriptResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/JavascriptResourceReference.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.util.Locale;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResource.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.util.Locale;
@@ -23,10 +23,10 @@ import javax.servlet.http.HttpServletRes
import org.apache.wicket.Application;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.html.IPackageResourceGuard;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.protocol.http.request.WebErrorCodeResponseHandler;
-import org.apache.wicket.request.target.basic.AbortRequestHandler;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.basic.AbortRequestHandler;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Packages;
import org.apache.wicket.util.resource.IResourceStream;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.util.Locale;
import java.util.concurrent.ConcurrentHashMap;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.io.Serializable;
import java.util.Locale;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.util.Locale;
import java.util.Map;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.io.IOException;
import java.io.InputStream;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/SharedResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/SharedResourceReference.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/SharedResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/SharedResourceReference.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.resource;
+package org.apache.wicket.request.resource;
import java.util.Locale;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java Mon Mar 15 22:33:36 2010
@@ -26,8 +26,8 @@ import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.authorization.AuthorizationException;
import org.apache.wicket.markup.MarkupException;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.lang.Generics;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java Mon Mar 15 22:33:36 2010
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.wicket.IResponseFilter;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.pages.BrowserInfoPage;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.settings.IExceptionSettings.UnexpectedExceptionDisplay;
import org.apache.wicket.util.time.Duration;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java Mon Mar 15 22:33:36 2010
@@ -20,10 +20,10 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Time;
import org.slf4j.Logger;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/KeyInSessionSunJceCryptFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/KeyInSessionSunJceCryptFactory.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/KeyInSessionSunJceCryptFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/crypt/KeyInSessionSunJceCryptFactory.java Mon Mar 15 22:33:36 2010
@@ -20,7 +20,7 @@ import java.util.UUID;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.Session;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
* Crypt factory that produces {@link SunJceCrypt} instances based on http session-specific
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java Mon Mar 15 22:33:36 2010
@@ -31,9 +31,9 @@ import java.util.HashMap;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
+import org.apache.wicket.ThreadContext;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.application.IClassResolver;
-import org.apache.wicket.ng.ThreadContext;
import org.apache.wicket.settings.IApplicationSettings;
import org.apache.wicket.util.io.ByteCountingOutputStream;
import org.apache.wicket.util.io.IObjectStreamFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java Mon Mar 15 22:33:36 2010
@@ -23,7 +23,7 @@ import java.util.Locale;
import org.apache.wicket.IClusterable;
import org.apache.wicket.protocol.http.WebResponse;
-import org.apache.wicket.request.target.resource.ResourceStreamRequestHandler;
+import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
import org.apache.wicket.util.watch.IModifiable;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/UrlUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/UrlUtils.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/UrlUtils.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/UrlUtils.java Mon Mar 15 22:33:36 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.string;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
* Various url utilities
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java Mon Mar 15 22:33:36 2010
@@ -21,7 +21,7 @@ import java.util.Iterator;
import java.util.Map;
import org.apache.wicket.Application;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Mon Mar 15 22:33:36 2010
@@ -44,6 +44,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.Session;
+import org.apache.wicket.ThreadContext;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.Component.IVisitor;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
@@ -69,23 +70,9 @@ import org.apache.wicket.markup.html.lin
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.ng.ThreadContext;
-import org.apache.wicket.ng.mock.MockApplication;
-import org.apache.wicket.ng.mock.MockPageManager;
-import org.apache.wicket.ng.mock.MockSessionStore;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.cycle.IExceptionMapper;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.cycle.RequestCycleContext;
-import org.apache.wicket.ng.request.handler.IPageProvider;
-import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
-import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.request.handler.impl.BookmarkablePageRequestHandler;
-import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.ng.request.handler.impl.render.PageRenderer;
+import org.apache.wicket.mock.MockApplication;
+import org.apache.wicket.mock.MockPageManager;
+import org.apache.wicket.mock.MockSessionStore;
import org.apache.wicket.pageStore.IPageManager;
import org.apache.wicket.pageStore.IPageManagerContext;
import org.apache.wicket.protocol.http.WebApplication;
@@ -95,6 +82,19 @@ import org.apache.wicket.protocol.http.m
import org.apache.wicket.protocol.http.mock.MockHttpSession;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.protocol.http.servlet.ServletWebResponse;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.cycle.IExceptionMapper;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycleContext;
+import org.apache.wicket.request.handler.IPageProvider;
+import org.apache.wicket.request.handler.PageAndComponentProvider;
+import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.request.handler.impl.BookmarkablePageRequestHandler;
+import org.apache.wicket.request.handler.impl.ListenerInterfaceRequestHandler;
+import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.handler.impl.render.PageRenderer;
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
import org.apache.wicket.util.IProvider;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java Mon Mar 15 22:33:36 2010
@@ -21,8 +21,7 @@ import java.util.List;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.wicket.ng.ThreadContext;
-import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.mock.MockServletContext;
import org.apache.wicket.resource.loader.BundleStringResourceLoader;
import org.apache.wicket.resource.loader.ClassStringResourceLoader;
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/MockComponent.java (from r923312, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MockComponent.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/MockComponent.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockComponent.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MockComponent.java Mon Mar 15 22:33:36 2010
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng;
+package org.apache.wicket;
import java.util.Collections;
import java.util.List;
import org.apache.wicket.behavior.IBehavior;
-import org.apache.wicket.ng.request.component.IRequestableComponent;
-import org.apache.wicket.ng.request.component.IRequestablePage;
+import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.util.string.Strings;
/**
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPage.java (from r923312, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPage.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPage.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/MockPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MockPage.java Mon Mar 15 22:33:36 2010
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng;
+package org.apache.wicket;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
/**
* Simple {@link IRequestablePage} implementation for testing purposes
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java Mon Mar 15 22:33:36 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.session.DefaultPageFactory;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java Mon Mar 15 22:33:36 2010
@@ -18,9 +18,9 @@ package org.apache.wicket;
import java.io.InputStream;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.resource.PackageResourceReference;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
public class ParentResourceEscapePathTest extends WicketTestCase
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ResourceTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ResourceTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ResourceTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ResourceTest.java Mon Mar 15 22:33:36 2010
@@ -21,9 +21,9 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.wicket.ng.resource.IResource;
-import org.apache.wicket.ng.resource.ResourceStreamResource;
import org.apache.wicket.protocol.http.mock.MockHttpServletResponse;
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceStreamResource;
import org.apache.wicket.util.resource.FileResourceStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java Mon Mar 15 22:33:36 2010
@@ -16,10 +16,10 @@
*/
package org.apache.wicket;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.resource.PackageResourceReference;
-import org.apache.wicket.ng.resource.ResourceReference;
-import org.apache.wicket.ng.resource.SharedResourceReference;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.request.resource.SharedResourceReference;
/**
* @author jcompagner
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket;
import junit.framework.TestCase;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.tester.WicketTester;
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java Mon Mar 15 22:33:36 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.Session;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
-import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.util.tester.WicketTester;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java Mon Mar 15 22:33:36 2010
@@ -20,7 +20,7 @@ import org.apache.wicket.ajax.markup.htm
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Homepage WICKET-2328
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.ajax;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.ng.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
/**
*
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageToNormalPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageToNormalPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageToNormalPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageToNormalPage.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.ajax.markup.ht
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
* Tests going from an ajax request to a normal request.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java Mon Mar 15 22:33:36 2010
@@ -21,10 +21,10 @@ import java.util.Locale;
import org.apache.wicket.Application;
import org.apache.wicket.SharedResources;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.ng.resource.PackageResource;
-import org.apache.wicket.ng.resource.PackageResourceReference;
-import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.resource.PackageResource;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
/**
* Tests for package resources.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/autolink/Index.java Mon Mar 15 22:33:36 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.autolink;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Basic bookmarkable index page.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClass.java Mon Mar 15 22:33:36 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.ba
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* @author jcompagner
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.bo
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.image.Image;
-import org.apache.wicket.ng.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java Mon Mar 15 22:33:36 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* FormHasErrorPage
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/HomePage.java Mon Mar 15 22:33:36 2010
@@ -20,7 +20,7 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Homepage
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java Mon Mar 15 22:33:36 2010
@@ -22,8 +22,8 @@ import java.util.Locale;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.ImageButton;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.resource.PackageResourceReference;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.resource.PackageResourceReference;
/**
* Demonstrates localization.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java Mon Mar 15 22:33:36 2010
@@ -26,7 +26,7 @@ import org.apache.wicket.RestartResponse
import org.apache.wicket.Session;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
-import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.tester.FormTester;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage.java Mon Mar 15 22:33:36 2010
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Homepage
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1.java Mon Mar 15 22:33:36 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.fo
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Homepage
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java Mon Mar 15 22:33:36 2010
@@ -20,8 +20,8 @@ import java.util.Locale;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.resource.PackageResourceReference;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.resource.PackageResourceReference;
/**
* Demonstrates localization.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_4.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.in
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Mock page for testing.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_5.java Mon Mar 15 22:33:36 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.in
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Mock page for testing.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java Mon Mar 15 22:33:36 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.diff.DiffUtil;
import org.apache.wicket.util.tester.FormTester;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.li
import org.apache.wicket.Application;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* @author jcompagner
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java Mon Mar 15 22:33:36 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* @author jcompagner
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/HomePage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/HomePage.java Mon Mar 15 22:33:36 2010
@@ -21,7 +21,7 @@ import org.apache.wicket.markup.html.Web
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.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Homepage
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/HomePage.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.parser;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
*
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java Mon Mar 15 22:33:36 2010
@@ -20,8 +20,8 @@ import org.apache.wicket.markup.html.IHe
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.ng.resource.JavascriptResourceReference;
-import org.apache.wicket.ng.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
/**
* @author jcompagner
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_1.java Mon Mar 15 22:33:36 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.resolve
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Homepage
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.resolve
import org.apache.wicket.behavior.CssHeaderContributor;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Homepage
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/HomePage.java Mon Mar 15 22:33:36 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.validation.FormComponentFeedbackBorder;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.validation.validator.StringValidator;
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/DiskDataStoreTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/DiskDataStoreTest.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/DiskDataStoreTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/DiskDataStoreTest.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.page.persistent.disk;
+package org.apache.wicket.page.persistent.disk;
import java.util.ArrayList;
import java.util.List;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/PageWindowManagerTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/PageWindowManagerTest.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/PageWindowManagerTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/PageWindowManagerTest.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.page.persistent.disk;
+package org.apache.wicket.page.persistent.disk;
import junit.framework.TestCase;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java Mon Mar 15 22:33:36 2010
@@ -1,24 +1,24 @@
-/*
- * 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.properties;
-
-import org.apache.wicket.ng.mock.MockApplication;
-
-public class MyTesterApplication extends MockApplication
-{
-
-}
+/*
+ * 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.properties;
+
+import org.apache.wicket.mock.MockApplication;
+
+public class MyTesterApplication extends MockApplication
+{
+
+}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java Mon Mar 15 22:33:36 2010
@@ -22,9 +22,9 @@ import java.io.InputStream;
import junit.framework.TestCase;
-import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.request.WebExternalResourceRequestTarget;
-import org.apache.wicket.request.target.resource.ResourceStreamRequestHandler;
+import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.resource.WebExternalResourceStream;
import org.apache.wicket.util.tester.WicketTester;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java Mon Mar 15 22:33:36 2010
@@ -20,8 +20,8 @@ import java.util.Locale;
import junit.framework.TestCase;
-import org.apache.wicket.ng.mock.MockWebRequest;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.mock.MockWebRequest;
+import org.apache.wicket.request.Url;
/**
* @author Timo Rantalaiho
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java Mon Mar 15 22:33:36 2010
@@ -42,12 +42,12 @@ import javax.servlet.http.HttpServletRes
import junit.framework.TestCase;
import org.apache.wicket.Application;
-import org.apache.wicket.ng.ThreadContext;
-import org.apache.wicket.ng.mock.MockApplication;
-import org.apache.wicket.ng.resource.DynamicImageResource;
+import org.apache.wicket.ThreadContext;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
import org.apache.wicket.protocol.http.mock.MockHttpServletResponse;
import org.apache.wicket.protocol.http.mock.MockServletContext;
+import org.apache.wicket.request.resource.DynamicImageResource;
public class WicketFilterTest extends TestCase
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategyTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategyTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategyTest.java Mon Mar 15 22:33:36 2010
@@ -20,9 +20,9 @@ import junit.framework.TestCase;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.SimplePage;
-import org.apache.wicket.ng.mock.MockApplication;
-import org.apache.wicket.ng.request.mapper.CompoundRequestMapper;
-import org.apache.wicket.ng.request.mapper.CryptoMapper;
+import org.apache.wicket.mock.MockApplication;
+import org.apache.wicket.request.mapper.CompoundRequestMapper;
+import org.apache.wicket.request.mapper.CryptoMapper;
import org.apache.wicket.util.crypt.Base64;
import org.apache.wicket.util.crypt.ICrypt;
import org.apache.wicket.util.crypt.ICryptFactory;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/HomePage.java Mon Mar 15 22:33:36 2010
@@ -21,7 +21,7 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Homepage
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java Mon Mar 15 22:33:36 2010
@@ -24,8 +24,8 @@ import org.apache.wicket.markup.html.lis
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException;
+import org.apache.wicket.request.component.PageParameters;
/**
* Page that optionally throws an abortexception during render phase.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java Mon Mar 15 22:33:36 2010
@@ -20,8 +20,8 @@ import junit.framework.Assert;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException;
+import org.apache.wicket.request.component.PageParameters;
/**
* Testcase for WICKET-1418, throwing an abortexception during rendering.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/A.java Mon Mar 15 22:33:36 2010
@@ -18,8 +18,8 @@ package org.apache.wicket.redirect.encod
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.component.PageParameters;
/**
* Homepage
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/HomePage.java Mon Mar 15 22:33:36 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.redirect.encodingtest;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Homepage
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java Mon Mar 15 22:33:36 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.redirect.encod
import junit.framework.TestCase;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.tester.WicketTester;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/WicketApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/WicketApplication.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/WicketApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/WicketApplication.java Mon Mar 15 22:33:36 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.redirect.encod
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.mock.MockApplication;
/**
* Application object for your web application. If you want to run this application without
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java Mon Mar 15 22:33:36 2010
@@ -22,7 +22,7 @@ import org.apache.wicket.RestartResponse
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
-import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.util.tester.WicketTester;
/**
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/UrlTest.java (from r923312, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/UrlTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/UrlTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/request/UrlTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/UrlTest.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/UrlTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/UrlTest.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request;
+package org.apache.wicket.request;
import java.util.ArrayList;
import java.util.Arrays;
@@ -22,7 +22,8 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.wicket.ng.request.Url.QueryParameter;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.Url.QueryParameter;
/**
* @author Matej Knopp
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java Mon Mar 15 22:33:36 2010
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.cycle;
+package org.apache.wicket.request.cycle;
import junit.framework.TestCase;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Response;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestHandlerStack;
/**
*
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java Mon Mar 15 22:33:36 2010
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.cycle;
+package org.apache.wicket.request.cycle;
import junit.framework.TestCase;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.UrlRenderer;
/**
* @author MAtej Knopp
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/AbstractMapperTest.java (from r923312, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractMapperTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/AbstractMapperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/AbstractMapperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractMapperTest.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/AbstractMapperTest.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper;
+package org.apache.wicket.request.mapper;
import java.util.Locale;
@@ -23,8 +23,8 @@ import junit.framework.TestCase;
import org.apache.wicket.Request;
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.markup.html.link.ILinkListener;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.IRequestablePage;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestablePage;
/**
* @author Matej Knopp
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapperTest.java (from r923312, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapperTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapperTest.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapperTest.java Mon Mar 15 22:33:36 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper;
+package org.apache.wicket.request.mapper;
import java.util.Locale;
-import org.apache.wicket.ng.resource.IResource;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceReference;
/**
* @author Matej Knopp