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 [3/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/markup/html/internal/Enclosure.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java Mon Mar 15 22:33:36 2010
@@ -30,7 +30,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.IFormSubmittingComponent;
import org.apache.wicket.markup.parser.filter.EnclosureHandler;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.response.NullResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HeaderResponse.java Mon Mar 15 22:33:36 2010
@@ -26,9 +26,9 @@ import org.apache.wicket.IRequestHandler
import org.apache.wicket.Response;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WicketEventReference;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.response.NullResponse;
import org.apache.wicket.util.string.JavascriptUtils;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/ResponseBufferZone.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/ResponseBufferZone.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/ResponseBufferZone.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/ResponseBufferZone.java Mon Mar 15 22:33:36 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.html.in
import org.apache.wicket.Response;
import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.response.StringResponse;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java Mon Mar 15 22:33:36 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.Page;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.lang.Classes;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java Mon Mar 15 22:33:36 2010
@@ -20,10 +20,10 @@ import java.io.File;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.resource.ContentDisposition;
import org.apache.wicket.protocol.http.WicketURLEncoder;
-import org.apache.wicket.request.target.resource.ResourceStreamRequestHandler;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
+import org.apache.wicket.request.resource.ContentDisposition;
import org.apache.wicket.util.resource.FileResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java Mon Mar 15 22:33:36 2010
@@ -20,7 +20,7 @@ import org.apache.wicket.markup.Componen
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.string.UrlUtils;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java Mon Mar 15 22:33:36 2010
@@ -20,7 +20,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.Session;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.string.Strings;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java Mon Mar 15 22:33:36 2010
@@ -17,12 +17,12 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.IResourceListener;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.ng.resource.IResource;
-import org.apache.wicket.ng.resource.ResourceReference;
-import org.apache.wicket.ng.resource.IResource.Attributes;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.request.resource.IResource.Attributes;
/**
* A link to any ResourceReference.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java Mon Mar 15 22:33:36 2010
@@ -19,8 +19,8 @@ package org.apache.wicket.markup.html.pa
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java Mon Mar 15 22:33:36 2010
@@ -21,11 +21,11 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.ClientInfo;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java Mon Mar 15 22:33:36 2010
@@ -23,15 +23,15 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.request.handler.impl.BookmarkablePageRequestHandler;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.ClientInfo;
-import org.apache.wicket.request.target.basic.RedirectRequestHandler;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.request.handler.basic.RedirectRequestHandler;
+import org.apache.wicket.request.handler.impl.BookmarkablePageRequestHandler;
import org.apache.wicket.settings.IRequestCycleSettings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java Mon Mar 15 22:33:36 2010
@@ -19,8 +19,8 @@ package org.apache.wicket.markup.html.pa
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java Mon Mar 15 22:33:36 2010
@@ -19,8 +19,8 @@ package org.apache.wicket.markup.html.pa
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java Mon Mar 15 22:33:36 2010
@@ -41,8 +41,8 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.model.IDetachable;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.ng.resource.JavascriptResourceReference;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.resource.JavascriptResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.AppendingStringBuffer;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java Mon Mar 15 22:33:36 2010
@@ -31,8 +31,8 @@ import org.apache.wicket.markup.Componen
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.ng.resource.CompressedResourceReference;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.resource.CompressedResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.EnumeratedType;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java Mon Mar 15 22:33:36 2010
@@ -23,8 +23,8 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.ng.resource.PackageResourceReference;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
/**
* Simple panel that contains an icon next to a label.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java Mon Mar 15 22:33:36 2010
@@ -28,7 +28,7 @@ import org.apache.wicket.markup.MarkupSt
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.markup.resolver.IComponentResolver;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.UrlUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java Mon Mar 15 22:33:36 2010
@@ -31,12 +31,12 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.parser.filter.WicketLinkTagHandler;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
-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.RequestUtils;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.request.resource.PackageResource;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.Packages;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java Mon Mar 15 22:33:36 2010
@@ -20,9 +20,9 @@ import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.BufferedWebResponse;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
* A IBehavior which can be added to any component. It allows to post-process (transform) the markup
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockApplication.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockApplication.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockApplication.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.mock;
+package org.apache.wicket.mock;
import org.apache.wicket.IPageManagerProvider;
import org.apache.wicket.Page;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockHomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockHomePage.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockHomePage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockHomePage.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.mock;
+package org.apache.wicket.mock;
import org.apache.wicket.markup.html.WebPage;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockPageManager.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockPageManager.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockPageManager.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockPageManager.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.mock;
+package org.apache.wicket.mock;
import java.util.HashMap;
import java.util.Map;
-import org.apache.wicket.ng.page.IManageablePage;
+import org.apache.wicket.page.IManageablePage;
import org.apache.wicket.pageStore.IPageManager;
import org.apache.wicket.pageStore.IPageManagerContext;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockRequestParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockRequestParameters.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockRequestParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockRequestParameters.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.mock;
+package org.apache.wicket.mock;
import java.util.ArrayList;
import java.util.Collections;
@@ -23,8 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.wicket.ng.request.IRequestParameters;
-import org.apache.wicket.ng.request.IWritableRequestParameters;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.IWritableRequestParameters;
import org.apache.wicket.util.string.StringValue;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockSessionStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockSessionStore.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockSessionStore.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockSessionStore.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.mock;
+package org.apache.wicket.mock;
import java.io.Serializable;
import java.util.ArrayList;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebRequest.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebRequest.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.mock;
+package org.apache.wicket.mock;
import java.util.ArrayList;
import java.util.Collections;
@@ -26,8 +26,8 @@ import java.util.Map;
import javax.servlet.http.Cookie;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ng.request.Url;
import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.request.Url;
/**
* Mutable mock {@link WebRequest}.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebResponse.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockWebResponse.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.mock;
+package org.apache.wicket.mock;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java Mon Mar 15 22:33:36 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.model;
import org.apache.wicket.Component;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/page/IManageablePage.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/IManageablePage.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/page/IManageablePage.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/page/IManageablePage.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/IManageablePage.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/IManageablePage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/page/IManageablePage.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;
+package org.apache.wicket.page;
// TODO WICKET-NG: this iface used to extend IDetachable, however this causes problems because Page becomes IDetachable and some property models will cause an infinite loop trigging detach on the component again because it is their target object. In the future Component should indeed implement IDetachable, for now copied #detach into this iface directly.
public interface IManageablePage
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/AbstractPageManager.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/AbstractPageManager.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/AbstractPageManager.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/AbstractPageManager.java Mon Mar 15 22:33:36 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.pageStore;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ng.page.IManageablePage;
+import org.apache.wicket.page.IManageablePage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -121,7 +121,7 @@ public abstract class AbstractPageManage
}
/**
- * @see org.apache.wicket.pageStore.IPageManager#touchPage(org.apache.wicket.ng.page.IManageablePage)
+ * @see org.apache.wicket.pageStore.IPageManager#touchPage(org.apache.wicket.page.IManageablePage)
*/
public void touchPage(IManageablePage page)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageManagerContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageManagerContext.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageManagerContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageManagerContext.java Mon Mar 15 22:33:36 2010
@@ -20,7 +20,7 @@ import java.io.Serializable;
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;
/**
* Wicket's default page manager context
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java Mon Mar 15 22:33:36 2010
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.wicket.Page;
-import org.apache.wicket.ng.page.IManageablePage;
+import org.apache.wicket.page.IManageablePage;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.lang.Objects;
@@ -145,7 +145,7 @@ public class DefaultPageStore implements
/**
* @see org.apache.wicket.pageStore.IPageStore#storePage(java.lang.String,
- * org.apache.wicket.ng.page.IManageablePage)
+ * org.apache.wicket.page.IManageablePage)
*/
public void storePage(final String sessionId, final IManageablePage page)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/IPageManager.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/IPageManager.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/IPageManager.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/IPageManager.java Mon Mar 15 22:33:36 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.pageStore;
-import org.apache.wicket.ng.page.IManageablePage;
+import org.apache.wicket.page.IManageablePage;
/**
* Page manager.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/IPageStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/IPageStore.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/IPageStore.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/IPageStore.java Mon Mar 15 22:33:36 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.pageStore;
import java.io.Serializable;
-import org.apache.wicket.ng.page.IManageablePage;
+import org.apache.wicket.page.IManageablePage;
/**
* Persist (read & write) Page data
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/PersistentPageManager.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/PersistentPageManager.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/PersistentPageManager.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/PersistentPageManager.java Mon Mar 15 22:33:36 2010
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.wicket.ng.page.IManageablePage;
+import org.apache.wicket.page.IManageablePage;
/**
*
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/RequestAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/RequestAdapter.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/RequestAdapter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/RequestAdapter.java Mon Mar 15 22:33:36 2010
@@ -20,7 +20,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.ng.page.IManageablePage;
+import org.apache.wicket.page.IManageablePage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java Mon Mar 15 22:33:36 2010
@@ -24,7 +24,7 @@ import javax.servlet.http.Cookie;
import org.apache.wicket.IClusterable;
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.util.string.AppendingStringBuffer;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java Mon Mar 15 22:33:36 2010
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.value.ValueMap;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Mon Mar 15 22:33:36 2010
@@ -30,20 +30,20 @@ import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
+import org.apache.wicket.ThreadContext;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.pages.AccessDeniedPage;
import org.apache.wicket.markup.html.pages.InternalErrorPage;
import org.apache.wicket.markup.html.pages.PageExpiredErrorPage;
import org.apache.wicket.markup.resolver.AutoLinkResolver;
-import org.apache.wicket.ng.ThreadContext;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.ng.request.handler.impl.render.PageRenderer;
-import org.apache.wicket.ng.request.handler.impl.render.WebPageRenderer;
-import org.apache.wicket.ng.request.mapper.MountedMapper;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.handler.impl.render.PageRenderer;
+import org.apache.wicket.request.handler.impl.render.WebPageRenderer;
+import org.apache.wicket.request.mapper.MountedMapper;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.session.HttpSessionStore;
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.util.IProvider;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequest.java Mon Mar 15 22:33:36 2010
@@ -23,8 +23,8 @@ import java.util.Locale;
import javax.servlet.http.Cookie;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.IRequestParameters;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.Url;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java Mon Mar 15 22:33:36 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.feedback.IFeedbackMessageFilter;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.settings.IRequestCycleSettings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Mon Mar 15 22:33:36 2010
@@ -30,11 +30,11 @@ import javax.servlet.http.HttpServletRes
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.wicket.ThreadContext;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ng.ThreadContext;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.protocol.http.servlet.ServletWebResponse;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java Mon Mar 15 22:33:36 2010
@@ -102,7 +102,7 @@ import org.slf4j.LoggerFactory;
* webApplication is protected instead of private. Thus subclasses may provide their own means of
* providing the application object.
*
- * @see org.apache.wicket.RequestCycle
+ * @see org.apache.wicket.request.cycle.RequestCycle
* @author Jonathan Locke
* @author Timur Mehrvarz
* @author Juergen Donnerstag
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java Mon Mar 15 22:33:36 2010
@@ -47,11 +47,11 @@ import javax.servlet.http.HttpSession;
import org.apache.wicket.Application;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ng.mock.MockRequestParameters;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.Url.QueryParameter;
+import org.apache.wicket.mock.MockRequestParameters;
import org.apache.wicket.protocol.http.WicketURLDecoder;
import org.apache.wicket.protocol.http.WicketURLEncoder;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.Url.QueryParameter;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.upload.FileUploadBase;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletRequestContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletRequestContext.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletRequestContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletRequestContext.java Mon Mar 15 22:33:36 2010
@@ -27,9 +27,9 @@ import javax.servlet.http.HttpServletReq
import org.apache.wicket.RequestContext;
import org.apache.wicket.Response;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
* FIXME javadoc
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java Mon Mar 15 22:33:36 2010
@@ -21,10 +21,10 @@ import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.ClientInfo;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseHandler.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseHandler.java Mon Mar 15 22:33:36 2010
@@ -17,8 +17,8 @@
package org.apache.wicket.protocol.http.request;
import org.apache.wicket.IRequestHandler;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
@@ -68,7 +68,7 @@ public final class WebErrorCodeResponseH
/**
* Respond by sending the set errorCode and optionally the message to the browser.
*
- * @see org.apache.wicket.IRequestHandler#respond(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
@@ -97,7 +97,7 @@ public final class WebErrorCodeResponseH
}
/**
- * @see org.apache.wicket.IRequestHandler#detach(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java Mon Mar 15 22:33:36 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.protocol.http.request;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.resource.ContentDisposition;
-import org.apache.wicket.request.target.resource.ResourceStreamRequestHandler;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
+import org.apache.wicket.request.resource.ContentDisposition;
import org.apache.wicket.util.resource.WebExternalResourceStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@ public class WebExternalResourceRequestT
}
/**
- * @see org.apache.wicket.IRequestHandler#detach(org.apache.wicket.RequestCycle)
+ * @see org.apache.wicket.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
@Override
public void detach(RequestCycle requestCycle)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java Mon Mar 15 22:33:36 2010
@@ -20,9 +20,9 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.ng.request.IRequestParameters;
-import org.apache.wicket.ng.request.Url;
import org.apache.wicket.protocol.http.IMultipartWebRequest;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.Url;
import org.apache.wicket.util.upload.FileItem;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java Mon Mar 15 22:33:36 2010
@@ -32,11 +32,11 @@ import javax.servlet.ServletRequest;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.ng.request.IRequestParameters;
-import org.apache.wicket.ng.request.IWritableRequestParameters;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.Url.QueryParameter;
import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.IWritableRequestParameters;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.Url.QueryParameter;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.lang.Checks;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java Mon Mar 15 22:33:36 2010
@@ -23,8 +23,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ng.request.Url;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.Url;
import org.apache.wicket.util.lang.Checks;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java?rev=923479&r1=923478&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java Mon Mar 15 22:33:36 2010
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpSession;
import org.apache.wicket.Application;
import org.apache.wicket.Session;
-import org.apache.wicket.ng.ThreadContext;
+import org.apache.wicket.ThreadContext;
import org.apache.wicket.protocol.http.WebApplication;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/ICompoundRequestMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/ICompoundRequestMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/ICompoundRequestMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/ICompoundRequestMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/ICompoundRequestMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/ICompoundRequestMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/ICompoundRequestMapper.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;
/**
* Mapper that delegates the mapping to a contained {@link IRequestMapper}s with the highest
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestMapper.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 org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestParameters.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestParameters.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestParameters.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestParameters.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestParameters.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestParameters.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.List;
import java.util.Set;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IWritableRequestParameters.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IWritableRequestParameters.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IWritableRequestParameters.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IWritableRequestParameters.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IWritableRequestParameters.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IWritableRequestParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IWritableRequestParameters.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.List;
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IWritableRequestParameters.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/Url.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/Url.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/Url.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/Url.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.io.Serializable;
import java.util.ArrayList;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestableComponent.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.component;
+package org.apache.wicket.request.component;
import java.util.List;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestablePage.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestablePage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestablePage.java Mon Mar 15 22:33:36 2010
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.component;
+package org.apache.wicket.request.component;
-import org.apache.wicket.ng.page.IManageablePage;
+import org.apache.wicket.page.IManageablePage;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/PageParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/PageParameters.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/PageParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/PageParameters.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.component;
+package org.apache.wicket.request.component;
import java.io.Serializable;
import java.util.ArrayList;
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.protocol.http.RequestUtils;
+import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.IStringIterator;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/IExceptionMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/IExceptionMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/IExceptionMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/IExceptionMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/IExceptionMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/IExceptionMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/IExceptionMapper.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.cycle;
+package org.apache.wicket.request.cycle;
import org.apache.wicket.IRequestHandler;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.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.cycle;
+package org.apache.wicket.request.cycle;
import java.util.ArrayList;
import java.util.List;
@@ -25,18 +25,18 @@ import org.apache.wicket.MetaDataKey;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
-import org.apache.wicket.ng.ThreadContext;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
-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.PageProvider;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.ThreadContext;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.ClientInfo;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
+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.PageProvider;
+import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.Checks;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -315,7 +315,7 @@ public class RequestCycle extends Reques
}
/**
- * @see org.apache.wicket.ng.request.cycle.RequestHandlerStack#getRequestCycle()
+ * @see org.apache.wicket.request.cycle.RequestHandlerStack#getRequestCycle()
*/
@Override
protected RequestCycle getRequestCycle()
@@ -418,7 +418,7 @@ public class RequestCycle extends Reques
}
/**
- * @see org.apache.wicket.ng.request.cycle.RequestHandlerStack#detach()
+ * @see org.apache.wicket.request.cycle.RequestHandlerStack#detach()
*/
@Override
public void detach()
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleContext.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycleContext.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleContext.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleContext.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycleContext.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycleContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycleContext.java Mon Mar 15 22:33:36 2010
@@ -14,11 +14,11 @@
* 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 org.apache.wicket.Request;
import org.apache.wicket.Response;
-import org.apache.wicket.ng.request.IRequestMapper;
+import org.apache.wicket.request.IRequestMapper;
/**
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestHandlerStack.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestHandlerStack.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestHandlerStack.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestHandlerStack.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.cycle;
+package org.apache.wicket.request.cycle;
import java.util.ArrayList;
import java.util.LinkedList;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/UrlRenderer.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/UrlRenderer.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/UrlRenderer.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/UrlRenderer.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.cycle;
+package org.apache.wicket.request.cycle;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.request.Url;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.PrependingStringBuffer;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentNotFoundException.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/ComponentNotFoundException.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentNotFoundException.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentNotFoundException.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/ComponentNotFoundException.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/ComponentNotFoundException.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentNotFoundException.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.handler;
+package org.apache.wicket.request.handler;
import org.apache.wicket.WicketRuntimeException;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/ComponentRenderingRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/ComponentRenderingRequestHandler.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/ComponentRenderingRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java Mon Mar 15 22:33:36 2010
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler;
+package org.apache.wicket.request.handler;
import org.apache.wicket.Component;
-import org.apache.wicket.ng.request.component.IRequestableComponent;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.cycle.RequestCycle;
/**
* Request handler that renders a component
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ComponentRenderingRequestHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IComponentRequestHandler.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IComponentRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IComponentRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IComponentRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IComponentRequestHandler.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IComponentRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IComponentRequestHandler.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.request.handler;
+package org.apache.wicket.request.handler;
import org.apache.wicket.IRequestHandler;
-import org.apache.wicket.ng.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestableComponent;
/**
* Request handler that works with a component.
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageAndComponentProvider.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageAndComponentProvider.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageAndComponentProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java Mon Mar 15 22:33:36 2010
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler;
+package org.apache.wicket.request.handler;
-import org.apache.wicket.ng.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestableComponent;
/**
* Extension of {@link IPageProvider} that is also capable of providing a Component belonging to the
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageAndComponentProvider.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageClassRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageClassRequestHandler.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageClassRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageClassRequestHandler.java Mon Mar 15 22:33:36 2010
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler;
+package org.apache.wicket.request.handler;
import org.apache.wicket.IRequestHandler;
-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;
/**
* Request handler that works with page class.
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageProvider.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageProvider.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageProvider.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageProvider.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageProvider.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageProvider.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.handler;
+package org.apache.wicket.request.handler;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.mapper.StalePageException;
import org.apache.wicket.protocol.http.PageExpiredException;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.StalePageException;
/**
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageProvider.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageRequestHandler.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageRequestHandler.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/IPageRequestHandler.java Mon Mar 15 22:33:36 2010
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler;
+package org.apache.wicket.request.handler;
-import org.apache.wicket.ng.request.component.IRequestablePage;
+import org.apache.wicket.request.component.IRequestablePage;
/**
* Request handler that works with a page instance.
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java Mon Mar 15 22:33:36 2010
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler;
+package org.apache.wicket.request.handler;
-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.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.lang.Checks;
/**
@@ -134,7 +134,7 @@ public class PageAndComponentProvider ex
}
/**
- * @see org.apache.wicket.ng.request.handler.PageProvider#prepareForRenderNewPage()
+ * @see org.apache.wicket.request.handler.PageProvider#prepareForRenderNewPage()
*/
@Override
protected boolean prepareForRenderNewPage()
@@ -143,7 +143,7 @@ public class PageAndComponentProvider ex
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageAndComponentProvider#getComponent()
+ * @see org.apache.wicket.request.handler.IPageAndComponentProvider#getComponent()
*/
public IRequestableComponent getComponent()
{
@@ -161,7 +161,7 @@ public class PageAndComponentProvider ex
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageAndComponentProvider#getComponentPath()
+ * @see org.apache.wicket.request.handler.IPageAndComponentProvider#getComponentPath()
*/
public String getComponentPath()
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java Mon Mar 15 22:33:36 2010
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler;
+package org.apache.wicket.request.handler;
import org.apache.wicket.Application;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Page;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.mapper.IPageSource;
-import org.apache.wicket.ng.request.mapper.StalePageException;
import org.apache.wicket.pageStore.IPageManager;
import org.apache.wicket.protocol.http.PageExpiredException;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.IPageSource;
+import org.apache.wicket.request.mapper.StalePageException;
import org.apache.wicket.util.lang.Checks;
/**
@@ -151,7 +151,7 @@ public class PageProvider implements IPa
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageProvider#getPageInstance()
+ * @see org.apache.wicket.request.handler.IPageProvider#getPageInstance()
*/
public IRequestablePage getPageInstance()
{
@@ -168,7 +168,7 @@ public class PageProvider implements IPa
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageProvider#getPageParameters()
+ * @see org.apache.wicket.request.handler.IPageProvider#getPageParameters()
*/
public PageParameters getPageParameters()
{
@@ -192,7 +192,7 @@ public class PageProvider implements IPa
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageProvider#getPageClass()
+ * @see org.apache.wicket.request.handler.IPageProvider#getPageClass()
*/
public Class<? extends IRequestablePage> getPageClass()
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/AbortRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/AbortRequestHandler.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/AbortRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/AbortRequestHandler.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.request.target.basic;
+package org.apache.wicket.request.handler.basic;
import org.apache.wicket.IRequestHandler;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.request.cycle.RequestCycle;
public class AbortRequestHandler implements IRequestHandler
{