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 [6/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...
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java (from r923312, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BasicResourceReferenceMapperTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BasicResourceReferenceMapperTest.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BasicResourceReferenceMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java Mon Mar 15 22:33:36 2010
@@ -14,14 +14,16 @@
* 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.IRequestHandler;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.request.mapper.BasicResourceReferenceMapper;
+import org.apache.wicket.request.mapper.IMapperContext;
/**
* @author Matej Knopp
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java (from r923312, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java Mon Mar 15 22:33:36 2010
@@ -14,23 +14,26 @@
* 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 org.apache.wicket.IRequestHandler;
+import org.apache.wicket.MockPage;
import org.apache.wicket.markup.html.link.ILinkListener;
-import org.apache.wicket.ng.MockPage;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.IRequestableComponent;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.handler.IPageProvider;
-import org.apache.wicket.ng.request.handler.IPageRequestHandler;
-import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
-import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
-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.request.Url;
+import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.handler.IPageProvider;
+import org.apache.wicket.request.handler.IPageRequestHandler;
+import org.apache.wicket.request.handler.PageAndComponentProvider;
+import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
+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.mapper.BookmarkableMapper;
+import org.apache.wicket.request.mapper.IMapperContext;
+import org.apache.wicket.request.mapper.StalePageException;
/**
* @author Matej Knopp
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java (from r923312, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java Mon Mar 15 22:33:36 2010
@@ -14,24 +14,27 @@
* 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 org.apache.wicket.IRequestHandler;
+import org.apache.wicket.MockPage;
import org.apache.wicket.markup.html.link.ILinkListener;
-import org.apache.wicket.ng.MockPage;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.IRequestableComponent;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.handler.IPageProvider;
-import org.apache.wicket.ng.request.handler.IPageRequestHandler;
-import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
-import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
-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.request.IRequestMapper;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.handler.IPageProvider;
+import org.apache.wicket.request.handler.IPageRequestHandler;
+import org.apache.wicket.request.handler.PageAndComponentProvider;
+import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
+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.mapper.IMapperContext;
+import org.apache.wicket.request.mapper.MountedMapper;
+import org.apache.wicket.request.mapper.StalePageException;
/**
* @author Matej Knopp
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java (from r923312, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java Mon Mar 15 22:33:36 2010
@@ -14,19 +14,22 @@
* 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 org.apache.wicket.IRequestHandler;
+import org.apache.wicket.MockPage;
import org.apache.wicket.markup.html.link.ILinkListener;
-import org.apache.wicket.ng.MockPage;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.IRequestableComponent;
-import org.apache.wicket.ng.request.handler.IPageProvider;
-import org.apache.wicket.ng.request.handler.IPageRequestHandler;
-import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
-import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.handler.IPageProvider;
+import org.apache.wicket.request.handler.IPageRequestHandler;
+import org.apache.wicket.request.handler.PageAndComponentProvider;
+import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.request.handler.impl.ListenerInterfaceRequestHandler;
+import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.mapper.IMapperContext;
+import org.apache.wicket.request.mapper.PageInstanceMapper;
+import org.apache.wicket.request.mapper.StalePageException;
/**
*
Copied: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java (from r923312, wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java?p2=wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java&p1=wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java Mon Mar 15 22:33:36 2010
@@ -14,17 +14,18 @@
* 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.MockPage;
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ng.MockPage;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.resource.ResourceReference;
-import org.apache.wicket.ng.resource.ResourceReferenceRegistry;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.IMapperContext;
+import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.request.resource.ResourceReferenceRegistry;
/**
* Simple {@link EncoderContext} implementation for testing purposes
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper.info;
+package org.apache.wicket.request.mapper.info;
+
+import org.apache.wicket.request.mapper.info.ComponentInfo;
import junit.framework.TestCase;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper.info;
+package org.apache.wicket.request.mapper.info;
+
+import org.apache.wicket.request.mapper.info.PageComponentInfo;
import junit.framework.TestCase;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java Mon Mar 15 22:33:36 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.resource;
-import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.mock.MockApplication;
public class DummyApplication extends MockApplication
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/session/DefaultPageFactoryTest.java Mon Mar 15 22:33:36 2010
@@ -21,8 +21,8 @@ import org.apache.wicket.IPageFactory;
import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.request.target.basic.EmptyRequestHandler;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.handler.basic.EmptyRequestHandler;
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/ImageStatelessTest.java Mon Mar 15 22:33:36 2010
@@ -18,8 +18,8 @@ package org.apache.wicket.stateless;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.image.Image;
-import org.apache.wicket.ng.resource.ByteArrayResource;
-import org.apache.wicket.ng.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ByteArrayResource;
+import org.apache.wicket.request.resource.PackageResourceReference;
/**
* @author jcompagner
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.stateless;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.StatelessLink;
-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/stateless/StatelessComponentTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java Mon Mar 15 22:33:36 2010
@@ -17,8 +17,8 @@
package org.apache.wicket.stateless;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.PageParameters;
/**
* @author jcompagner
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.stateless;
import junit.framework.TestCase;
import org.apache.wicket.Page;
-import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.stateless.pages.HomePage;
import org.apache.wicket.stateless.pages.LoginPage;
import org.apache.wicket.util.tester.FormTester;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java Mon Mar 15 22:33:36 2010
@@ -20,7 +20,7 @@ import junit.framework.TestCase;
import org.apache.wicket.Page;
import org.apache.wicket.Session;
-import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.stateless.pages.HomePage;
import org.apache.wicket.stateless.pages.LoginPage;
import org.apache.wicket.util.tester.FormTester;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java Mon Mar 15 22:33:36 2010
@@ -18,8 +18,8 @@ package org.apache.wicket.stateless.page
import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.ng.mock.MockApplication;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.mock.MockApplication;
+import org.apache.wicket.request.Url;
import org.apache.wicket.util.tester.WicketTester;
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java Mon Mar 15 22:33:36 2010
@@ -25,8 +25,8 @@ import junit.framework.Assert;
import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
* @author jcompagner
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java Mon Mar 15 22:33:36 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.util.tester;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.ResourceLink;
-import org.apache.wicket.ng.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
/**
* Mock page for testing WicketTesters ability to test ResourceLinks
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java Mon Mar 15 22:33:36 2010
@@ -21,7 +21,7 @@ import java.util.Locale;
import org.apache.wicket.Session;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.form.upload.FileUpload;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.tester.MockFormFileUploadPage.MockDomainObjectFileUpload;
import org.apache.wicket.util.tester.MockFormPage.MockDomainObject;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.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.upload.FileUploadField;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.string.StringValue;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java Mon Mar 15 22:33:36 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.util.tester;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
/**
* Mock page for testing PageParameters handling in WicketTester.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockResourceLinkPage.java Mon Mar 15 22:33:36 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.util.tester;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.ResourceLink;
-import org.apache.wicket.ng.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
/**
* Mock page for testing WicketTesters ability to test ResourceLinks
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java Mon Mar 15 22:33:36 2010
@@ -36,7 +36,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.ng.resource.PackageResource.PackageResourceBlockedException;
+import org.apache.wicket.request.resource.PackageResource.PackageResourceBlockedException;
import org.apache.wicket.util.tester.MockPageParameterPage.MockInnerClassPage;
import org.apache.wicket.util.tester.MockPageWithFormAndAjaxFormSubmitBehavior.Pojo;
import org.apache.wicket.util.tester.apps_1.Book;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication.java Mon Mar 15 22:33:36 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.tester.apps_1;
-import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.mock.MockApplication;
/**
* @author Juergen Donnerstag