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 [4/6] - in /wicket/trunk:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/
wicket-datetime/src/main/java/org/apache/wicket/extens...
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyAjaxRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyAjaxRequestHandler.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyAjaxRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyAjaxRequestHandler.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.request.target.basic;
+package org.apache.wicket.request.handler.basic;
import org.apache.wicket.Application;
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;
/**
* The empty AJAX request target does output an empty AJAX response.
@@ -52,7 +52,7 @@ public final class EmptyAjaxRequestHandl
}
/**
- * @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)
{
@@ -75,7 +75,7 @@ public final class EmptyAjaxRequestHandl
}
/**
- * @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/request/handler/basic/EmptyRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyRequestHandler.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/EmptyRequestHandler.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;
/**
* The empty request target does nothing in itself but instead relies on some other source to
@@ -53,14 +53,14 @@ public final class EmptyRequestHandler i
/**
* Does nothing at all.
*
- * @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)
{
}
/**
- * @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/request/handler/basic/RedirectRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/RedirectRequestHandler.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/RedirectRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/RedirectRequestHandler.java Mon Mar 15 22:33:36 2010
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.request.target.basic;
+package org.apache.wicket.request.handler.basic;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.RequestContext;
import org.apache.wicket.markup.html.pages.RedirectPage;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.UrlUtils;
/**
@@ -58,7 +58,7 @@ public class RedirectRequestHandler impl
}
/**
- * @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)
{
@@ -67,7 +67,7 @@ public class RedirectRequestHandler impl
/**
* FIXME javadoc - what's special about this implementation?
*
- * @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)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/StringRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/StringRequestHandler.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/StringRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/basic/StringRequestHandler.java Mon Mar 15 22:33:36 2010
@@ -14,15 +14,15 @@
* 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 java.io.IOException;
import org.apache.wicket.Application;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.string.Strings;
@@ -99,7 +99,7 @@ public class StringRequestHandler implem
/**
* Responds by sending the string property.
*
- * @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)
{
@@ -119,7 +119,7 @@ public class StringRequestHandler implem
}
/**
- * @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)
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java Mon Mar 15 22:33:36 2010
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler.impl;
+package org.apache.wicket.request.handler.impl;
import org.apache.wicket.RequestListenerInterface;
-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.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.IComponentRequestHandler;
-import org.apache.wicket.ng.request.handler.IPageAndComponentProvider;
-import org.apache.wicket.ng.request.handler.IPageRequestHandler;
-import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
+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.cycle.RequestCycle;
+import org.apache.wicket.request.handler.IComponentRequestHandler;
+import org.apache.wicket.request.handler.IPageAndComponentProvider;
+import org.apache.wicket.request.handler.IPageRequestHandler;
+import org.apache.wicket.request.handler.PageAndComponentProvider;
import org.apache.wicket.util.lang.Checks;
/**
@@ -77,7 +77,7 @@ public class BookmarkableListenerInterfa
}
/**
- * @see org.apache.wicket.ng.request.handler.IComponentRequestHandler#getComponent()
+ * @see org.apache.wicket.request.handler.IComponentRequestHandler#getComponent()
*/
public IRequestableComponent getComponent()
{
@@ -85,7 +85,7 @@ public class BookmarkableListenerInterfa
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageRequestHandler#getPage()
+ * @see org.apache.wicket.request.handler.IPageRequestHandler#getPage()
*/
public IRequestablePage getPage()
{
@@ -93,7 +93,7 @@ public class BookmarkableListenerInterfa
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageClassRequestHandler#getPageClass()
+ * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageClass()
*/
public Class<? extends IRequestablePage> getPageClass()
{
@@ -101,7 +101,7 @@ public class BookmarkableListenerInterfa
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageClassRequestHandler#getPageParameters()
+ * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageParameters()
*/
public PageParameters getPageParameters()
{
@@ -109,7 +109,7 @@ public class BookmarkableListenerInterfa
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
@@ -138,7 +138,7 @@ public class BookmarkableListenerInterfa
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkablePageRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkablePageRequestHandler.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkablePageRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.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.handler.impl;
+package org.apache.wicket.request.handler.impl;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.IPageClassRequestHandler;
-import org.apache.wicket.ng.request.handler.IPageProvider;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.request.handler.IPageProvider;
import org.apache.wicket.util.lang.Checks;
/**
@@ -47,7 +47,7 @@ public class BookmarkablePageRequestHand
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageClassRequestHandler#getPageClass()
+ * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageClass()
*/
public Class<? extends IRequestablePage> getPageClass()
{
@@ -55,7 +55,7 @@ public class BookmarkablePageRequestHand
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageClassRequestHandler#getPageParameters()
+ * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageParameters()
*/
public PageParameters getPageParameters()
{
@@ -63,7 +63,7 @@ public class BookmarkablePageRequestHand
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
@@ -72,7 +72,7 @@ public class BookmarkablePageRequestHand
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BufferedResponseRequestHandler.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BufferedResponseRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BufferedResponseRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BufferedResponseRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BufferedResponseRequestHandler.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BufferedResponseRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/BufferedResponseRequestHandler.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.impl;
+package org.apache.wicket.request.handler.impl;
import org.apache.wicket.IRequestHandler;
-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;
/**
* Handler that renders a {@link BufferedWebResponse}.
@@ -41,14 +41,14 @@ public class BufferedResponseRequestHand
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java Mon Mar 15 22:33:36 2010
@@ -14,22 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler.impl;
+package org.apache.wicket.request.handler.impl;
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.IBehavior;
-import org.apache.wicket.ng.request.component.IRequestableComponent;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.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.IComponentRequestHandler;
-import org.apache.wicket.ng.request.handler.IPageAndComponentProvider;
-import org.apache.wicket.ng.request.handler.IPageRequestHandler;
-import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.protocol.http.WebRequest;
+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.cycle.RequestCycle;
+import org.apache.wicket.request.handler.IComponentRequestHandler;
+import org.apache.wicket.request.handler.IPageAndComponentProvider;
+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.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.util.lang.Checks;
/**
@@ -79,7 +79,7 @@ public class ListenerInterfaceRequestHan
}
/**
- * @see org.apache.wicket.ng.request.handler.IComponentRequestHandler#getComponent()
+ * @see org.apache.wicket.request.handler.IComponentRequestHandler#getComponent()
*/
public IRequestableComponent getComponent()
{
@@ -87,7 +87,7 @@ public class ListenerInterfaceRequestHan
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageRequestHandler#getPage()
+ * @see org.apache.wicket.request.handler.IPageRequestHandler#getPage()
*/
public IRequestablePage getPage()
{
@@ -95,7 +95,7 @@ public class ListenerInterfaceRequestHan
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageClassRequestHandler#getPageClass()
+ * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageClass()
*/
public Class<? extends IRequestablePage> getPageClass()
{
@@ -103,7 +103,7 @@ public class ListenerInterfaceRequestHan
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageClassRequestHandler#getPageParameters()
+ * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageParameters()
*/
public PageParameters getPageParameters()
{
@@ -111,7 +111,7 @@ public class ListenerInterfaceRequestHan
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
@@ -139,7 +139,7 @@ public class ListenerInterfaceRequestHan
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
public void respond(final RequestCycle requestCycle)
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/RenderPageRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/RenderPageRequestHandler.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/RenderPageRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java Mon Mar 15 22:33:36 2010
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler.impl;
+package org.apache.wicket.request.handler.impl;
import org.apache.wicket.Application;
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.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.IPageClassRequestHandler;
-import org.apache.wicket.ng.request.handler.IPageProvider;
-import org.apache.wicket.ng.request.handler.IPageRequestHandler;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.request.handler.IPageProvider;
+import org.apache.wicket.request.handler.IPageRequestHandler;
import org.apache.wicket.util.lang.Checks;
/**
@@ -110,7 +110,7 @@ public class RenderPageRequestHandler im
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageClassRequestHandler#getPageClass()
+ * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageClass()
*/
public Class<? extends IRequestablePage> getPageClass()
{
@@ -118,7 +118,7 @@ public class RenderPageRequestHandler im
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageClassRequestHandler#getPageParameters()
+ * @see org.apache.wicket.request.handler.IPageClassRequestHandler#getPageParameters()
*/
public PageParameters getPageParameters()
{
@@ -126,7 +126,7 @@ public class RenderPageRequestHandler im
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
@@ -134,7 +134,7 @@ public class RenderPageRequestHandler im
}
/**
- * @see org.apache.wicket.ng.request.handler.IPageRequestHandler#getPage()
+ * @see org.apache.wicket.request.handler.IPageRequestHandler#getPage()
*/
public IRequestablePage getPage()
{
@@ -142,7 +142,7 @@ public class RenderPageRequestHandler im
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/PageRenderer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/PageRenderer.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/PageRenderer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/PageRenderer.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.impl.render;
+package org.apache.wicket.request.handler.impl.render;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.IPageProvider;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.IPageProvider;
+import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
/**
* Delegate responsible for rendering the page. Depending on the implementation (web, test, portlet,
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/WebPageRenderer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/WebPageRenderer.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/WebPageRenderer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/impl/render/WebPageRenderer.java Mon Mar 15 22:33:36 2010
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler.impl.render;
+package org.apache.wicket.request.handler.impl.render;
import org.apache.wicket.Application;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.protocol.http.BufferedWebResponse;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -149,7 +149,7 @@ public class WebPageRenderer extends Pag
}
/**
- * @see org.apache.wicket.ng.request.handler.impl.render.PageRenderer#respond(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.request.handler.impl.render.PageRenderer#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
@Override
public void respond(RequestCycle requestCycle)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java Mon Mar 15 22:33:36 2010
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.handler.resource;
+package org.apache.wicket.request.handler.resource;
import java.util.Locale;
import org.apache.wicket.IRequestHandler;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.resource.IResource;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.Checks;
/**
@@ -78,14 +78,14 @@ public class ResourceReferenceRequestHan
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
public void respond(RequestCycle requestCycle)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.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.resource;
+package org.apache.wicket.request.handler.resource;
import org.apache.wicket.IRequestHandler;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.resource.IResource;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.util.lang.Checks;
/**
@@ -68,7 +68,7 @@ public class ResourceRequestHandler impl
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#respond(org.apache.wicket.request.cycle.RequestCycle)
*/
public void respond(final RequestCycle requestCycle)
{
@@ -78,7 +78,7 @@ public class ResourceRequestHandler impl
}
/**
- * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.ng.request.cycle.RequestCycle)
+ * @see org.apache.wicket.ng.request.IRequestHandler#detach(org.apache.wicket.request.cycle.RequestCycle)
*/
public void detach(RequestCycle requestCycle)
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.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.request.target.resource;
+package org.apache.wicket.request.handler.resource;
import org.apache.wicket.IRequestHandler;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.resource.ContentDisposition;
-import org.apache.wicket.ng.resource.ResourceStreamResource;
-import org.apache.wicket.ng.resource.IResource.Attributes;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.resource.ContentDisposition;
+import org.apache.wicket.request.resource.ResourceStreamResource;
+import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.util.resource.IResourceStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +70,7 @@ public class ResourceStreamRequestHandle
}
/**
- * @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)
{
@@ -126,7 +126,7 @@ public class ResourceStreamRequestHandle
/**
* Responds by sending the contents of the resource stream.
*
- * @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)
{
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java Mon Mar 15 22:33:36 2010
@@ -14,24 +14,24 @@
* 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.Request;
import org.apache.wicket.RequestListenerInterface;
-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.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.ng.request.mapper.info.ComponentInfo;
-import org.apache.wicket.ng.request.mapper.info.PageComponentInfo;
-import org.apache.wicket.ng.request.mapper.info.PageInfo;
+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.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.info.ComponentInfo;
+import org.apache.wicket.request.mapper.info.PageComponentInfo;
+import org.apache.wicket.request.mapper.info.PageInfo;
import org.apache.wicket.util.lang.Checks;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -191,7 +191,7 @@ public abstract class AbstractBookmarkab
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
*/
public IRequestHandler mapRequest(Request request)
{
@@ -232,7 +232,7 @@ public abstract class AbstractBookmarkab
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
+ * @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
*/
public Url mapHandler(final IRequestHandler requestHandler)
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.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.mapper;
+package org.apache.wicket.request.mapper;
import org.apache.wicket.Application;
import org.apache.wicket.Request;
import org.apache.wicket.RequestListenerInterface;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.Url.QueryParameter;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.mapper.info.PageComponentInfo;
-import org.apache.wicket.ng.request.mapper.parameters.IPageParametersEncoder;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.Url.QueryParameter;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.mapper.info.PageComponentInfo;
+import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.string.Strings;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.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.mapper;
+package org.apache.wicket.request.mapper;
import java.util.Locale;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.Url.QueryParameter;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.Url.QueryParameter;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.Strings;
/**
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BasicResourceReferenceMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BasicResourceReferenceMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BasicResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java Mon Mar 15 22:33:36 2010
@@ -14,16 +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 org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
-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.ng.request.mapper.parameters.IPageParametersEncoder;
-import org.apache.wicket.ng.request.mapper.parameters.SimplePageParametersEncoder;
-import org.apache.wicket.ng.resource.ResourceReference;
+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.parameters.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameters.SimplePageParametersEncoder;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.Classes;
/**
@@ -66,7 +66,7 @@ class BasicResourceReferenceMapper exten
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
*/
public IRequestHandler mapRequest(Request request)
{
@@ -119,7 +119,7 @@ class BasicResourceReferenceMapper exten
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
+ * @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
*/
public Url mapHandler(IRequestHandler requestHandler)
{
@@ -152,7 +152,7 @@ class BasicResourceReferenceMapper exten
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
*/
public int getCompatibilityScore(Request request)
{
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
------------------------------------------------------------------------------
svn:executable = *
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BookmarkableMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BookmarkableMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BookmarkableMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java Mon Mar 15 22:33:36 2010
@@ -14,15 +14,15 @@
* 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.Request;
-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.mapper.info.PageComponentInfo;
-import org.apache.wicket.ng.request.mapper.parameters.IPageParametersEncoder;
-import org.apache.wicket.ng.request.mapper.parameters.SimplePageParametersEncoder;
+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.mapper.info.PageComponentInfo;
+import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameters.SimplePageParametersEncoder;
import org.apache.wicket.util.lang.Checks;
/**
@@ -74,7 +74,7 @@ public class BookmarkableMapper extends
}
/**
- * @see org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper#buildUrl(org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper.UrlInfo)
+ * @see org.apache.wicket.request.mapper.AbstractBookmarkableMapper#buildUrl(org.apache.wicket.request.mapper.AbstractBookmarkableMapper.UrlInfo)
*/
@Override
protected Url buildUrl(UrlInfo info)
@@ -90,7 +90,7 @@ public class BookmarkableMapper extends
}
/**
- * @see org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper#parseRequest(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.mapper.AbstractBookmarkableMapper#parseRequest(org.apache.wicket.Request)
*/
@Override
protected UrlInfo parseRequest(Request request)
@@ -117,7 +117,7 @@ public class BookmarkableMapper extends
}
/**
- * @see org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper#pageMustHaveBeenCreatedBookmarkable()
+ * @see org.apache.wicket.request.mapper.AbstractBookmarkableMapper#pageMustHaveBeenCreatedBookmarkable()
*/
@Override
protected boolean pageMustHaveBeenCreatedBookmarkable()
@@ -126,7 +126,7 @@ public class BookmarkableMapper extends
}
/**
- * @see org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper#getCompatibilityScore(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.mapper.AbstractBookmarkableMapper#getCompatibilityScore(org.apache.wicket.Request)
*/
@Override
public int getCompatibilityScore(Request request)
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BufferedResponseMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BufferedResponseMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BufferedResponseMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java Mon Mar 15 22:33:36 2010
@@ -14,17 +14,17 @@
* 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.Request;
import org.apache.wicket.Session;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.impl.BufferedResponseRequestHandler;
import org.apache.wicket.protocol.http.BufferedWebResponse;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.impl.BufferedResponseRequestHandler;
/**
* Encoder that intercepts requests for which there is already stored buffer with rendered data.
@@ -86,7 +86,7 @@ public class BufferedResponseMapper impl
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
*/
public IRequestHandler mapRequest(Request request)
{
@@ -104,7 +104,7 @@ public class BufferedResponseMapper impl
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
+ * @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
*/
public Url mapHandler(IRequestHandler requestHandler)
{
@@ -112,7 +112,7 @@ public class BufferedResponseMapper impl
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
*/
public int getCompatibilityScore(Request request)
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/CompoundRequestMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/CompoundRequestMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/CompoundRequestMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CompoundRequestMapper.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper;
+package org.apache.wicket.request.mapper;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,9 +24,9 @@ import java.util.concurrent.CopyOnWriteA
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.ICompoundRequestMapper;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.request.ICompoundRequestMapper;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
/**
@@ -74,7 +74,7 @@ public class CompoundRequestMapper imple
}
/**
- * @see org.apache.wicket.ng.request.ICompoundRequestMapper#add(org.apache.wicket.ng.request.IRequestMapper)
+ * @see org.apache.wicket.request.ICompoundRequestMapper#add(org.apache.wicket.request.IRequestMapper)
*/
public CompoundRequestMapper add(IRequestMapper encoder)
{
@@ -83,7 +83,7 @@ public class CompoundRequestMapper imple
}
/**
- * @see org.apache.wicket.ng.request.ICompoundRequestMapper#remove(org.apache.wicket.ng.request.IRequestMapper)
+ * @see org.apache.wicket.request.ICompoundRequestMapper#remove(org.apache.wicket.request.IRequestMapper)
*/
public CompoundRequestMapper remove(IRequestMapper encoder)
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/CryptoMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/CryptoMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/CryptoMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.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.mapper;
+package org.apache.wicket.request.mapper;
import org.apache.wicket.Application;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.crypt.ICrypt;
import org.apache.wicket.util.crypt.ICryptFactory;
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
------------------------------------------------------------------------------
svn:executable = *
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/HomePageMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/HomePageMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/HomePageMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/HomePageMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/HomePageMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/HomePageMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/HomePageMapper.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.mapper;
+package org.apache.wicket.request.mapper;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
/**
* Mapper for rendering home page.
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/HomePageMapper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IMapperContext.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/IMapperContext.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IMapperContext.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IMapperContext.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/IMapperContext.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/IMapperContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IMapperContext.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.mapper;
+package org.apache.wicket.request.mapper;
import org.apache.wicket.RequestListenerInterface;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.resource.ResourceReferenceRegistry;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.resource.ResourceReferenceRegistry;
/**
* Utility interface for providing and creating new page instances.
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IPageSource.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/IPageSource.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IPageSource.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IPageSource.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/IPageSource.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/IPageSource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/IPageSource.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.mapper;
+package org.apache.wicket.request.mapper;
-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;
/**
* Interface for objects that are capable of getting and creating page instance.
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java Mon Mar 15 22:33:36 2010
@@ -14,17 +14,17 @@
* 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.lang.ref.WeakReference;
import org.apache.wicket.Request;
-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.mapper.info.PageComponentInfo;
-import org.apache.wicket.ng.request.mapper.parameters.IPageParametersEncoder;
-import org.apache.wicket.ng.request.mapper.parameters.SimplePageParametersEncoder;
+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.mapper.info.PageComponentInfo;
+import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameters.SimplePageParametersEncoder;
import org.apache.wicket.util.lang.Checks;
/**
@@ -91,7 +91,7 @@ public class MountedMapper extends Abstr
}
/**
- * @see org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper#parseRequest(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.mapper.AbstractBookmarkableMapper#parseRequest(org.apache.wicket.Request)
*/
@Override
protected UrlInfo parseRequest(Request request)
@@ -148,7 +148,7 @@ public class MountedMapper extends Abstr
}
/**
- * @see org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper#buildUrl(org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper.UrlInfo)
+ * @see org.apache.wicket.request.mapper.AbstractBookmarkableMapper#buildUrl(org.apache.wicket.request.mapper.AbstractBookmarkableMapper.UrlInfo)
*/
@Override
protected Url buildUrl(UrlInfo info)
@@ -209,7 +209,7 @@ public class MountedMapper extends Abstr
}
/**
- * @see org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper#pageMustHaveBeenCreatedBookmarkable()
+ * @see org.apache.wicket.request.mapper.AbstractBookmarkableMapper#pageMustHaveBeenCreatedBookmarkable()
*/
@Override
protected boolean pageMustHaveBeenCreatedBookmarkable()
@@ -218,7 +218,7 @@ public class MountedMapper extends Abstr
}
/**
- * @see org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper#getCompatibilityScore(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.mapper.AbstractBookmarkableMapper#getCompatibilityScore(org.apache.wicket.Request)
*/
@Override
public int getCompatibilityScore(Request request)
@@ -234,7 +234,7 @@ public class MountedMapper extends Abstr
}
/**
- * @see org.apache.wicket.ng.request.mapper.AbstractBookmarkableMapper#checkPageClass(java.lang.Class)
+ * @see org.apache.wicket.request.mapper.AbstractBookmarkableMapper#checkPageClass(java.lang.Class)
*/
@Override
protected boolean checkPageClass(Class<? extends IRequestablePage> pageClass)
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/PageInstanceMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/PageInstanceMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/PageInstanceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java Mon Mar 15 22:33:36 2010
@@ -14,20 +14,20 @@
* 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.Request;
import org.apache.wicket.RequestListenerInterface;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
-import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
-import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
-import org.apache.wicket.ng.request.mapper.info.ComponentInfo;
-import org.apache.wicket.ng.request.mapper.info.PageComponentInfo;
-import org.apache.wicket.ng.request.mapper.info.PageInfo;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestablePage;
+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.info.ComponentInfo;
+import org.apache.wicket.request.mapper.info.PageComponentInfo;
+import org.apache.wicket.request.mapper.info.PageInfo;
/**
* Decodes and encodes the following URLs:
@@ -54,7 +54,7 @@ public class PageInstanceMapper extends
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
*/
public IRequestHandler mapRequest(Request request)
{
@@ -97,7 +97,7 @@ public class PageInstanceMapper extends
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
+ * @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
*/
public Url mapHandler(IRequestHandler requestHandler)
{
@@ -145,7 +145,7 @@ public class PageInstanceMapper extends
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
*/
public int getCompatibilityScore(Request request)
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ParentPathReferenceRewriter.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ParentPathReferenceRewriter.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ParentPathReferenceRewriter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java Mon Mar 15 22:33:36 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper;
+package org.apache.wicket.request.mapper;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.NullProvider;
import org.apache.wicket.util.lang.Checks;
@@ -62,7 +62,7 @@ public class ParentPathReferenceRewriter
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
*/
public IRequestHandler mapRequest(Request request)
{
@@ -83,7 +83,7 @@ public class ParentPathReferenceRewriter
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
+ * @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
*/
public Url mapHandler(IRequestHandler requestHandler)
{
@@ -102,7 +102,7 @@ public class ParentPathReferenceRewriter
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
*/
public int getCompatibilityScore(Request request)
{
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
------------------------------------------------------------------------------
svn:executable = *
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.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.mapper;
+package org.apache.wicket.request.mapper;
-import org.apache.wicket.ng.request.mapper.parameters.IPageParametersEncoder;
-import org.apache.wicket.ng.request.mapper.parameters.SimplePageParametersEncoder;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.request.mapper.parameters.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameters.SimplePageParametersEncoder;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.NullProvider;
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/StalePageException.java (from r923312, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/StalePageException.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/StalePageException.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/StalePageException.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/StalePageException.java&r1=923312&r2=923479&rev=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/StalePageException.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/StalePageException.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.mapper;
+package org.apache.wicket.request.mapper;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ng.request.component.IRequestablePage;
+import org.apache.wicket.request.component.IRequestablePage;
/**
* Exception invoked when when stale link has been clicked. The page should then be rerendered with
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper.info;
+package org.apache.wicket.request.mapper.info;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper.info;
+package org.apache.wicket.request.mapper.info;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.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.mapper.info;
+package org.apache.wicket.request.mapper.info;
-import org.apache.wicket.ng.request.component.IRequestablePage;
+import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/IMountedRequestMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/IMountedRequestMapper.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/IMountedRequestMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/IMountedRequestMapper.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper.mount;
+package org.apache.wicket.request.mapper.mount;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/Mount.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/Mount.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.mapper.mount;
+package org.apache.wicket.request.mapper.mount;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.request.Url;
/**
*
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.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.mapper.mount;
+package org.apache.wicket.request.mapper.mount;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.mapper.AbstractMapper;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.mapper.AbstractMapper;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.StringValue;
@@ -80,7 +80,7 @@ public class MountMapper extends Abstrac
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
*/
public int getCompatibilityScore(Request request)
{
@@ -107,7 +107,7 @@ public class MountMapper extends Abstrac
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.Request)
*/
public final IRequestHandler mapRequest(Request request)
{
@@ -132,7 +132,7 @@ public class MountMapper extends Abstrac
}
/**
- * @see org.apache.wicket.ng.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
+ * @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
*/
public Url mapHandler(IRequestHandler handler)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/MountParameters.java Mon Mar 15 22:33:36 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper.mount;
+package org.apache.wicket.request.mapper.mount;
import java.util.Collection;
import java.util.HashMap;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedMapperAdapter.java Mon Mar 15 22:33:36 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper.mount;
+package org.apache.wicket.request.mapper.mount;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.IRequestMapper;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Url;
/**
* Adapts a {@link IRequestMapper} to be used as a {@link IMountedRequestMapper}
@@ -44,7 +44,7 @@ class UnmountedMapperAdapter implements
}
/**
- * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
*/
public int getCompatibilityScore(Request request)
{
@@ -52,7 +52,7 @@ class UnmountedMapperAdapter implements
}
/**
- * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
+ * @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
*/
public Mount mapHandler(IRequestHandler requestHandler)
{
@@ -65,8 +65,8 @@ class UnmountedMapperAdapter implements
}
/**
- * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#mapRequest(org.apache.wicket.Request,
- * org.apache.wicket.ng.request.mapper.mount.MountParameters)
+ * @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapRequest(org.apache.wicket.Request,
+ * org.apache.wicket.request.mapper.mount.MountParameters)
*/
public IRequestHandler mapRequest(Request request, MountParameters mountParams)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/mount/UnmountedRequestHandlerAdapter.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.mapper.mount;
+package org.apache.wicket.request.mapper.mount;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.request.Url;
/**
* Adapts a singleton {@link IRequestHandler} instance to {@link IMountedRequestMapper}
@@ -42,7 +42,7 @@ class UnmountedRequestHandlerAdapter imp
}
/**
- * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
+ * @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#getCompatibilityScore(org.apache.wicket.Request)
*/
public int getCompatibilityScore(Request request)
{
@@ -50,7 +50,7 @@ class UnmountedRequestHandlerAdapter imp
}
/**
- * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
+ * @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapHandler(org.apache.wicket.ng.request.IRequestHandler)
*/
public Mount mapHandler(IRequestHandler requestHandler)
{
@@ -62,8 +62,8 @@ class UnmountedRequestHandlerAdapter imp
}
/**
- * @see org.apache.wicket.ng.request.mapper.mount.IMountedRequestMapper#mapRequest(org.apache.wicket.Request,
- * org.apache.wicket.ng.request.mapper.mount.MountParameters)
+ * @see org.apache.wicket.request.mapper.mount.IMountedRequestMapper#mapRequest(org.apache.wicket.Request,
+ * org.apache.wicket.request.mapper.mount.MountParameters)
*/
public IRequestHandler mapRequest(Request request, MountParameters mountParams)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/IPageParametersEncoder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/IPageParametersEncoder.java?rev=923479&r1=923312&r2=923479&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/IPageParametersEncoder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/parameters/IPageParametersEncoder.java Mon Mar 15 22:33:36 2010
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper.parameters;
+package org.apache.wicket.request.mapper.parameters;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
-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;
/**
* Encoder that can encode and decode {@link PageParameters} to/from URL.