You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2010/01/08 22:48:56 UTC
svn commit: r897330 [1/3] - in /wicket/trunk:
wicket-auth-roles/src/main/java/org/apache/wicket/authentication/
wicket-examples/src/main/java/org/apache/wicket/examples/
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/
wicket-exam...
Author: knopp
Date: Fri Jan 8 21:48:50 2010
New Revision: 897330
URL: http://svn.apache.org/viewvc?rev=897330&view=rev
Log:
some progress, still crazy
Added:
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/ResourceReference.java (contents, props changed)
- copied, changed from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/ResourceReference.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/SharedResources.java (contents, props changed)
- copied, changed from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/SharedResources.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/CompressedPackageResource.java (contents, props changed)
- copied, changed from r895520, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/JavascriptPackageResource.java (contents, props changed)
- copied, changed from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/PackageResource.java (contents, props changed)
- copied, changed from r895520, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/CompressedResourceReference.java (contents, props changed)
- copied, changed from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/CompressedResourceReference.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavaScriptReference.java (contents, props changed)
- copied, changed from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavaScriptReference.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java (contents, props changed)
- copied, changed from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/PackagedResourceReference.java (contents, props changed)
- copied, changed from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/StyleSheetReference.java (contents, props changed)
- copied, changed from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/StyleSheetReference.java
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/package.html (contents, props changed)
- copied, changed from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/package.html
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/request/IRequestTargetMountsInfo.java (contents, props changed)
- copied, changed from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMountsInfo.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Resource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/HomePageMapper.java (with props)
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ClassScanner.java (with props)
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/CompressedResourceReference.java (with props)
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/JavascriptResourceReference.java (with props)
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/PackageResource.java (with props)
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/DummyRequestLogger.java (with props)
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/SharedResources.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/CompressedResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavaScriptReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/StyleSheetReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/package.html
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMountsInfo.java
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleRequestCycle.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Application.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DatabaseLocator.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/SessionModel.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/IInitializer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Initializer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestContext.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/CssHeaderContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/CssReferenceHeaderContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/JavascriptHeaderContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/JavascriptReferenceHeaderContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/SystemMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/IResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceStreamResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/AuthenticatedWebApplication.java Fri Jan 8 21:48:50 2010
@@ -22,7 +22,6 @@
import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener;
@@ -91,7 +90,8 @@
if (!AuthenticatedWebSession.get().isSignedIn())
{
// Redirect to intercept page to let the user sign in
- throw new RestartResponseAtInterceptPageException(getSignInPageClass());
+ // TODO NG
+ // throw new RestartResponseAtInterceptPageException(getSignInPageClass());
}
else
{
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java Fri Jan 8 21:48:50 2010
@@ -20,7 +20,6 @@
import java.net.UnknownHostException;
import org.apache.wicket.IResponseFilter;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.JavascriptUtils;
import org.apache.wicket.util.string.Strings;
@@ -29,8 +28,7 @@
/**
* Displays server host name (combination of name, ipaddress and unique id, which is either based)
- * and time it took to handle the request in the browser's status bar like this:
- * <code>window.defaultStatus = 'Host: myhost/192.168.1.66/someid, handled in: 0.01s'</code>
+ * and time it took to handle the request in the browser's status bar like this: <code>window.defaultStatus = 'Host: myhost/192.168.1.66/someid, handled in: 0.01s'</code>
*
* @author eelco hillenius
*/
@@ -82,7 +80,10 @@
public AppendingStringBuffer filter(AppendingStringBuffer responseBuffer)
{
int index = responseBuffer.indexOf("<head>");
- long timeTaken = System.currentTimeMillis() - RequestCycle.get().getStartTime();
+// long timeTaken = System.currentTimeMillis() - RequestCycle.get().getStartTime();
+
+ // TODO NG
+ long timeTaken = 0;
if (index != -1)
{
AppendingStringBuffer script = new AppendingStringBuffer(75);
@@ -114,7 +115,7 @@
String hostName = localMachine.getHostName();
String address = localMachine.getHostAddress();
host = ((!Strings.isEmpty(hostName)) ? hostName + "/" + address : address) + "/" +
- hostId;
+ hostId;
}
catch (UnknownHostException e)
{
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java Fri Jan 8 21:48:50 2010
@@ -18,11 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.wicket.Request;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.Response;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.settings.ISecuritySettings;
import org.apache.wicket.util.crypt.ClassCryptFactory;
import org.apache.wicket.util.crypt.NoCrypt;
@@ -72,9 +68,10 @@
* @see org.apache.wicket.protocol.http.WebApplication#newRequestCycle(org.apache.wicket.Request,
* org.apache.wicket.Response)
*/
- @Override
- public final RequestCycle newRequestCycle(Request request, Response response)
- {
- return new WicketExampleRequestCycle(this, (WebRequest)request, response);
- }
+ // TODD NG
+// @Override
+// public final RequestCycle newRequestCycle(Request request, Response response)
+// {
+// return new WicketExampleRequestCycle(this, (WebRequest)request, response);
+// }
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleRequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleRequestCycle.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleRequestCycle.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleRequestCycle.java Fri Jan 8 21:48:50 2010
@@ -16,81 +16,85 @@
*/
package org.apache.wicket.examples;
-import org.apache.wicket.Page;
-import org.apache.wicket.Request;
-import org.apache.wicket.Response;
-import org.apache.wicket.examples.source.SourcesPage;
-import org.apache.wicket.protocol.http.BufferedWebResponse;
-import org.apache.wicket.protocol.http.PageExpiredException;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebRequestCycle;
-import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.request.cycle.RequestCycleContext;
/**
* Handles the PageExpiredException so that the SourcesPage can recover from a session expired.
*
+ * TODO NG
+ *
* @author rgravener
*/
-public class WicketExampleRequestCycle extends WebRequestCycle
+public class WicketExampleRequestCycle extends RequestCycle
{
- /**
- * Construct.
- *
- * @param application
- * @param request
- * @param response
- */
- public WicketExampleRequestCycle(WebApplication application, WebRequest request,
- Response response)
- {
- super(application, request, response);
- }
/**
- * @see org.apache.wicket.RequestCycle#onRuntimeException(org.apache.wicket.Page,
- * java.lang.RuntimeException)
- */
- @Override
- public Page onRuntimeException(final Page page, final RuntimeException e)
- {
- final Throwable cause;
- if (e.getCause() != null)
- {
- cause = e.getCause();
- }
- else
- {
- cause = e;
- }
-
- if (cause instanceof PageExpiredException)
- {
- handlePageExpiredException((PageExpiredException)cause);
- }
- return super.onRuntimeException(page, e);
- }
-
- /**
- * Checks to see if the request was ajax based. If so we send a 404 so that the
- * org.apache.wicket.ajax.IAjaxCallDecorator failure script is executed.
+ * Construct.
*
- * @param e
+ * @param context
*/
- private void handlePageExpiredException(final PageExpiredException e)
+ public WicketExampleRequestCycle(RequestCycleContext context)
{
- Response response = getOriginalResponse();
- if (response instanceof BufferedWebResponse)
- {
- BufferedWebResponse bufferedWebResponse = (BufferedWebResponse)response;
- Request request = getRequest();
- if (bufferedWebResponse.isAjax() &&
- request.getParameter(SourcesPage.PAGE_CLASS) != null)
- {
- // If there is a better way to figure out if SourcesPage was the request, we should
- // do that.
- throw new AbortWithWebErrorCodeException(404);
- }
- }
+ super(context);
}
+// /**
+// * Construct.
+// *
+// * @param application
+// * @param request
+// * @param response
+// */
+// public WicketExampleRequestCycle(WebApplication application, WebRequest request,
+// Response response)
+// {
+// super(application, request, response);
+// }
+//
+// /**
+// * @see org.apache.wicket.RequestCycle#onRuntimeException(org.apache.wicket.Page,
+// * java.lang.RuntimeException)
+// */
+// @Override
+// public Page onRuntimeException(final Page page, final RuntimeException e)
+// {
+// final Throwable cause;
+// if (e.getCause() != null)
+// {
+// cause = e.getCause();
+// }
+// else
+// {
+// cause = e;
+// }
+//
+// if (cause instanceof PageExpiredException)
+// {
+// handlePageExpiredException((PageExpiredException)cause);
+// }
+// return super.onRuntimeException(page, e);
+// }
+//
+// /**
+// * Checks to see if the request was ajax based. If so we send a 404 so that the
+// * org.apache.wicket.ajax.IAjaxCallDecorator failure script is executed.
+// *
+// * @param e
+// */
+// private void handlePageExpiredException(final PageExpiredException e)
+// {
+// Response response = getOriginalResponse();
+// if (response instanceof BufferedWebResponse)
+// {
+// BufferedWebResponse bufferedWebResponse = (BufferedWebResponse)response;
+// Request request = getRequest();
+// if (bufferedWebResponse.isAjax() &&
+// request.getParameter(SourcesPage.PAGE_CLASS) != null)
+// {
+// // If there is a better way to figure out if SourcesPage was the request, we should
+// // do that.
+// throw new AbortWithWebErrorCodeException(404);
+// }
+// }
+// }
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java Fri Jan 8 21:48:50 2010
@@ -22,8 +22,6 @@
import org.apache.wicket.examples.ajax.builtin.tree.EditableTreeTablePage;
import org.apache.wicket.examples.ajax.builtin.tree.SimpleTreePage;
import org.apache.wicket.examples.ajax.builtin.tree.TreeTablePage;
-import org.apache.wicket.markup.html.AjaxServerAndClientTimeFilter;
-import org.apache.wicket.request.target.coding.HybridUrlCodingStrategy;
/**
@@ -47,29 +45,32 @@
super.init();
getResourceSettings().setThrowExceptionOnMissingResource(false);
- getRequestCycleSettings().addResponseFilter(new AjaxServerAndClientTimeFilter());
+
+ // TODO (NG)
+ // getRequestCycleSettings().addResponseFilter(new AjaxServerAndClientTimeFilter());
+
getDebugSettings().setAjaxDebugModeEnabled(true);
- mount(new HybridUrlCodingStrategy("autocomplete", AutoCompletePage.class));
- mount(new HybridUrlCodingStrategy("choice", ChoicePage.class));
- mount(new HybridUrlCodingStrategy("clock", ClockPage.class));
- mount(new HybridUrlCodingStrategy("editable-label", EditableLabelPage.class));
- mount(new HybridUrlCodingStrategy("effects", EffectsPage.class));
- mount(new HybridUrlCodingStrategy("form", FormPage.class));
- mount(new HybridUrlCodingStrategy("guest-book", GuestBook.class));
- mount(new HybridUrlCodingStrategy("lazy-loading", LazyLoadingPage.class));
- mount(new HybridUrlCodingStrategy("links", LinksPage.class));
- mount(new HybridUrlCodingStrategy("modal-window", ModalWindowPage.class));
- mount(new HybridUrlCodingStrategy("on-change-ajax-behavior", OnChangeAjaxBehaviorPage.class));
- mount(new HybridUrlCodingStrategy("pageables", PageablesPage.class));
- mount(new HybridUrlCodingStrategy("ratings", RatingsPage.class));
- mount(new HybridUrlCodingStrategy("tabbed-panel", TabbedPanelPage.class));
- mount(new HybridUrlCodingStrategy("todo-list", TodoList.class));
- mount(new HybridUrlCodingStrategy("world-clock", WorldClockPage.class));
- mount(new HybridUrlCodingStrategy("tree/simple", SimpleTreePage.class));
- mount(new HybridUrlCodingStrategy("tree/table", TreeTablePage.class));
- mount(new HybridUrlCodingStrategy("tree/table/editable", EditableTreeTablePage.class));
- mount(new HybridUrlCodingStrategy("upload", FileUploadPage.class));
+ mountBookmarkablePage("autocomplete", AutoCompletePage.class);
+ mountBookmarkablePage("choice", ChoicePage.class);
+ mountBookmarkablePage("clock", ClockPage.class);
+ mountBookmarkablePage("editable-label", EditableLabelPage.class);
+ mountBookmarkablePage("effects", EffectsPage.class);
+ mountBookmarkablePage("form", FormPage.class);
+ mountBookmarkablePage("guest-book", GuestBook.class);
+ mountBookmarkablePage("lazy-loading", LazyLoadingPage.class);
+ mountBookmarkablePage("links", LinksPage.class);
+ mountBookmarkablePage("modal-window", ModalWindowPage.class);
+ mountBookmarkablePage("on-change-ajax-behavior", OnChangeAjaxBehaviorPage.class);
+ mountBookmarkablePage("pageables", PageablesPage.class);
+ mountBookmarkablePage("ratings", RatingsPage.class);
+ mountBookmarkablePage("tabbed-panel", TabbedPanelPage.class);
+ mountBookmarkablePage("todo-list", TodoList.class);
+ mountBookmarkablePage("world-clock", WorldClockPage.class);
+ mountBookmarkablePage("tree/simple", SimpleTreePage.class);
+ mountBookmarkablePage("tree/table", TreeTablePage.class);
+ mountBookmarkablePage("tree/table/editable", EditableTreeTablePage.class);
+ mountBookmarkablePage("upload", FileUploadPage.class);
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.java Fri Jan 8 21:48:50 2010
@@ -17,13 +17,15 @@
package org.apache.wicket.examples.ajax.builtin;
import org.apache.wicket.IClusterable;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.rating.RatingPanel;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
@@ -191,13 +193,15 @@
@Override
protected String getActiveStarUrl(int iteration)
{
- return getRequestCycle().urlFor(WICKETSTAR1).toString();
+ IRequestHandler handler = new ResourceReferenceRequestHandler(WICKETSTAR1);
+ return getRequestCycle().renderUrlFor(handler).toString();
}
@Override
protected String getInactiveStarUrl(int iteration)
{
- return getRequestCycle().urlFor(WICKETSTAR0).toString();
+ IRequestHandler handler = new ResourceReferenceRequestHandler(WICKETSTAR0);
+ return getRequestCycle().renderUrlFor(handler).toString();
}
@Override
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java Fri Jan 8 21:48:50 2010
@@ -18,7 +18,6 @@
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
-import org.apache.wicket.markup.html.AjaxServerAndClientTimeFilter;
/**
@@ -44,7 +43,9 @@
super.init();
getResourceSettings().setThrowExceptionOnMissingResource(false);
- getRequestCycleSettings().addResponseFilter(new AjaxServerAndClientTimeFilter());
+
+ // TODO (NG)
+ // getRequestCycleSettings().addResponseFilter(new AjaxServerAndClientTimeFilter());
}
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignInApplication.java Fri Jan 8 21:48:50 2010
@@ -20,7 +20,6 @@
import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
@@ -90,7 +89,9 @@
// Intercept the request, but remember the target for later.
// Invoke Component.continueToOriginalDestination() after successful logon to
// continue with the target remembered.
- throw new RestartResponseAtInterceptPageException(SignIn.class);
+
+ // TODO (NG)
+// throw new RestartResponseAtInterceptPageException(SignIn.class);
}
// okay to proceed
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java Fri Jan 8 21:48:50 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.examples.authentication1;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* Simple logout page.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java Fri Jan 8 21:48:50 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.authentication2;
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* Simple home page which requires authentication
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.java Fri Jan 8 21:48:50 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.examples.authentication2;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.authentication.panel.SignInPanel;
import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Application.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Application.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2Application.java Fri Jan 8 21:48:50 2010
@@ -20,7 +20,6 @@
import org.apache.wicket.Page;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.Session;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.IAuthorizationStrategy;
@@ -92,7 +91,8 @@
// Intercept the request, but remember the target for later.
// Invoke Component.continueToOriginalDestination() after successful logon to
// continue with the target remembered.
- throw new RestartResponseAtInterceptPageException(SignIn2.class);
+ // TODO (NG)
+// throw new RestartResponseAtInterceptPageException(SignIn2.class);
}
// okay to proceed
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java Fri Jan 8 21:48:50 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.authentication2;
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* Simple logout page.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.java Fri Jan 8 21:48:50 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.examples.authentication3;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.authentication.panel.SignInPanel;
import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java Fri Jan 8 21:48:50 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.examples.authentication3;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* Simple logout page.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java Fri Jan 8 21:48:50 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples.captcha;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource;
import org.apache.wicket.markup.ComponentTag;
@@ -25,6 +24,7 @@
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.util.value.ValueMap;
@@ -52,7 +52,8 @@
captchaImageResource = new CaptchaImageResource(imagePass);
add(new Image("captchaImage", captchaImageResource));
- add(new RequiredTextField<String>("password", new PropertyModel<String>(properties, "password"))
+ add(new RequiredTextField<String>("password", new PropertyModel<String>(properties,
+ "password"))
{
@Override
protected final void onComponentTag(final ComponentTag tag)
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java Fri Jan 8 21:48:50 2010
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* Example page that cannot be bookmarked. A page is bookmarkable when it has a public default
@@ -61,13 +61,14 @@
// never null, the check is not nescesarry. On the other hand... would
// you ever trust
// any API enough to just not check it at all?
- if (pageParameters == null || pageParameters.getString("message") == null)
+ if (pageParameters == null ||
+ pageParameters.getNamedParameter("message").toOptionalString() == null)
{
message = "This is the default message";
}
else
{
- message = pageParameters.getString("message");
+ message = pageParameters.getNamedParameter("message").toOptionalString();
}
// Add a label to display the message
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java Fri Jan 8 21:48:50 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
@@ -47,7 +47,8 @@
// Note that any arguments are passed as request parameters, and should
// thus be strings
PageParameters parameters = new PageParameters();
- parameters.put("message", "This message was passed as a page parameter argument");
+ parameters.setNamedParameter("message",
+ "This message was passed as a page parameter argument");
add(new BookmarkablePageLink<Void>("pageLinkWithArgs", BookmarkablePage.class, parameters));
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java Fri Jan 8 21:48:50 2010
@@ -20,9 +20,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java Fri Jan 8 21:48:50 2010
@@ -25,7 +25,6 @@
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
-import org.apache.wicket.SharedResources;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
import org.apache.wicket.protocol.http.WebSession;
@@ -92,30 +91,34 @@
imgSave.setFont(font);
DefaultButtonImageResource imgReset = new DefaultButtonImageResource("\u91CD\u7F6E");
imgReset.setFont(font);
- SharedResources sharedResources = getSharedResources();
- sharedResources.add("save", Locale.SIMPLIFIED_CHINESE, imgSave);
- sharedResources.add("reset", Locale.SIMPLIFIED_CHINESE, imgReset);
-
- // Japanese buttons
- Font fontJa = new Font("Serif", Font.BOLD, 16);
- DefaultButtonImageResource imgSaveJa = new DefaultButtonImageResource("\u4fdd\u5b58");
- imgSaveJa.setFont(fontJa);
- DefaultButtonImageResource imgResetJa = new DefaultButtonImageResource(
- "\u30ea\u30bb\u30c3\u30c8");
- imgResetJa.setFont(fontJa);
- sharedResources.add("save", Locale.JAPANESE, imgSaveJa);
- sharedResources.add("reset", Locale.JAPANESE, imgResetJa);
-
- // Persian buttons
- Font fontFa = new Font("Serif", Font.BOLD, 16);
- Locale farsi = new Locale("fa", "IR");
- DefaultButtonImageResource imgSaveFa = new DefaultButtonImageResource(
- "\u0630\u062e\u064a\u0631\u0647");
- imgSaveFa.setFont(fontFa);
- DefaultButtonImageResource imgResetFa = new DefaultButtonImageResource(
- "\u0628\u0627\u0632\u0646\u0634\u0627\u0646\u064a");
- imgResetFa.setFont(fontFa);
- getSharedResources().add("save", farsi, imgSaveFa);
- getSharedResources().add("reset", farsi, imgResetFa);
+
+ // TODO NG
+
+// SharedResources sharedResources = getSharedResources();
+// sharedResources.add("save", Locale.SIMPLIFIED_CHINESE, imgSave);
+// sharedResources.add("reset", Locale.SIMPLIFIED_CHINESE, imgReset);
+//
+// // Japanese buttons
+// Font fontJa = new Font("Serif", Font.BOLD, 16);
+// DefaultButtonImageResource imgSaveJa = new DefaultButtonImageResource("\u4fdd\u5b58");
+// imgSaveJa.setFont(fontJa);
+// DefaultButtonImageResource imgResetJa = new DefaultButtonImageResource(
+// "\u30ea\u30bb\u30c3\u30c8");
+// imgResetJa.setFont(fontJa);
+// sharedResources.add("save", Locale.JAPANESE, imgSaveJa);
+// sharedResources.add("reset", Locale.JAPANESE, imgResetJa);
+//
+// // Persian buttons
+// Font fontFa = new Font("Serif", Font.BOLD, 16);
+// Locale farsi = new Locale("fa", "IR");
+// DefaultButtonImageResource imgSaveFa = new DefaultButtonImageResource(
+// "\u0630\u062e\u064a\u0631\u0647");
+// imgSaveFa.setFont(fontFa);
+// DefaultButtonImageResource imgResetFa = new DefaultButtonImageResource(
+// "\u0628\u0627\u0632\u0646\u0634\u0627\u0646\u064a");
+// imgResetFa.setFont(fontFa);
+// getSharedResources().add("save", farsi, imgSaveFa);
+// getSharedResources().add("reset", farsi, imgResetFa);
+//
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java Fri Jan 8 21:48:50 2010
@@ -17,11 +17,14 @@
package org.apache.wicket.examples.frames;
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebPage;
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.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
/**
@@ -38,7 +41,9 @@
{
public CharSequence getObject()
{
- return RequestCycle.get().urlFor(frameTarget.getFrameClass(), null);
+ IRequestHandler handler = new RenderPageRequestHandler(new DefaultPageProvider(
+ frameTarget.getFrameClass()));
+ return RequestCycle.get().renderUrlFor(handler);
}
public void setObject(final CharSequence object)
@@ -66,7 +71,8 @@
// create a new page instance, passing this 'master page' as an argument
LeftFrame leftFrame = new LeftFrame(this);
// get the url to that page
- String leftFrameSrc = RequestCycle.get().urlFor(leftFrame).toString();
+ IRequestHandler handler = new RenderPageRequestHandler(new DefaultPageProvider(leftFrame));
+ String leftFrameSrc = RequestCycle.get().renderUrlFor(handler).toString();
// and create a simple component that modifies it's src attribute to
// hold the url to that frame
WebComponent leftFrameTag = new WebComponent("leftFrame");
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java Fri Jan 8 21:48:50 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.examples.hangman;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* The home page for the hangman application. Contains just a single hyperlink to the actual guess
@@ -36,7 +36,7 @@
*/
public Home(final PageParameters parameters)
{
- final String word = parameters.getString("word");
+ final String word = parameters.getNamedParameter("word").toOptionalString();
if (word == null)
{
getGame().newGame(5, new WordGenerator());
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java Fri Jan 8 21:48:50 2010
@@ -20,8 +20,8 @@
import org.apache.wicket.IClusterable;
import org.apache.wicket.Resource;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.lang.Primitives;
@@ -36,7 +36,7 @@
private boolean guessed;
/** The letter */
- private char letter;
+ private final char letter;
/**
* Constructor
@@ -60,12 +60,13 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(final Object object)
{
if (object instanceof Letter)
{
final Letter that = (Letter)object;
- return that.letter == this.letter && that.guessed == this.guessed;
+ return that.letter == letter && that.guessed == guessed;
}
return false;
}
@@ -76,13 +77,13 @@
public ResourceReference getSharedImageResource()
{
return new ResourceReference(Letter.class, asString() +
- (isGuessed() ? "_enabled" : "_disabled"))
+ (isGuessed() ? "_enabled" : "_disabled"))
{
protected Resource newResource()
{
// Lazy loading of shared resource
final DefaultButtonImageResource buttonResource = new DefaultButtonImageResource(
- 30, 30, asString());
+ 30, 30, asString());
if (!isGuessed())
{
buttonResource.setColor(Color.GRAY);
@@ -97,12 +98,13 @@
*/
public void guess()
{
- this.guessed = true;
+ guessed = true;
}
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
return Primitives.hashCode(letter << (guessed ? 1 : 0));
@@ -121,12 +123,13 @@
*/
public void reset()
{
- this.guessed = false;
+ guessed = false;
}
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "[Letter letter = " + letter + ", guessed = " + guessed + "]";
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java Fri Jan 8 21:48:50 2010
@@ -18,7 +18,6 @@
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
-import org.apache.wicket.util.lang.PackageName;
/**
* Application class for hello browser example.
@@ -52,6 +51,6 @@
super.init();
getRequestCycleSettings().setGatherExtendedBrowserInfo(true);
- mount("howdy", PackageName.forClass(HelloBrowserApplication.class));
+ mountBookmarkablePage("howdy", HelloBrowser.class);
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java Fri Jan 8 21:48:50 2010
@@ -21,14 +21,14 @@
import java.awt.image.BufferedImage;
import java.util.Random;
-import org.apache.wicket.Resource;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.image.resource.BufferedDynamicImageResource;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
import org.apache.wicket.markup.html.image.resource.RenderedDynamicImageResource;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.resource.IResource;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
@@ -102,13 +102,15 @@
return new ResourceReference(Home.class, "image5")
{
@Override
- public Resource newResource()
+ public IResource getResource()
{
final BufferedDynamicImageResource resource = new BufferedDynamicImageResource();
final BufferedImage image = new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
drawCircle((Graphics2D)image.getGraphics());
resource.setImage(image);
- return resource;
+
+ // TODO: NG
+ return (IResource)resource;
}
};
}
@@ -138,9 +140,10 @@
return new ResourceReference("okButton")
{
@Override
- protected Resource newResource()
+ public IResource getResource()
{
- return new DefaultButtonImageResource("Ok");
+ // TODO NG
+ return (IResource)new DefaultButtonImageResource("Ok");
}
};
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java Fri Jan 8 21:48:50 2010
@@ -18,10 +18,6 @@
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
-import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
-import org.apache.wicket.protocol.http.request.urlcompressing.UrlCompressingWebRequestProcessor;
-import org.apache.wicket.protocol.http.request.urlcompressing.UrlCompressor;
-import org.apache.wicket.request.IRequestCycleProcessor;
/**
@@ -56,18 +52,8 @@
{
super.init();
- getSharedResources().add("cancelButton", new DefaultButtonImageResource("Cancel"));
+ // TODO (NG)
+// getSharedResources().add("cancelButton", new DefaultButtonImageResource("Cancel"));
}
- /**
- * Special overwrite to have url compressing for this example.
- *
- * @see UrlCompressor
- * @see org.apache.wicket.protocol.http.WebApplication#newRequestCycleProcessor()
- */
- @Override
- protected IRequestCycleProcessor newRequestCycleProcessor()
- {
- return new UrlCompressingWebRequestProcessor();
- }
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java Fri Jan 8 21:48:50 2010
@@ -18,11 +18,11 @@
import java.awt.Dimension;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.extensions.captcha.kittens.KittenCaptchaPanel;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* Kitten captcha example
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java Fri Jan 8 21:48:50 2010
@@ -18,11 +18,11 @@
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.library.Book.WritingStyle;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.util.string.StringList;
import org.apache.wicket.util.string.StringValueConversionException;
@@ -43,7 +43,7 @@
*/
public BookDetails(final PageParameters parameters) throws StringValueConversionException
{
- this(Book.get(parameters.getLong("id")));
+ this(Book.get(parameters.getNamedParameter("id").toLong()));
}
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java Fri Jan 8 21:48:50 2010
@@ -19,13 +19,13 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.PageableListView;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.java Fri Jan 8 21:48:50 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.examples.library;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.authentication.panel.SignInPanel;
import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java Fri Jan 8 21:48:50 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.examples.library;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* Simple logout page.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java Fri Jan 8 21:48:50 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.linkomatic;
import org.apache.wicket.Component;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -33,6 +32,7 @@
import org.apache.wicket.markup.parser.filter.RelativePathPrefixHandler;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java Fri Jan 8 21:48:50 2010
@@ -19,7 +19,6 @@
import org.apache.wicket.Page;
import org.apache.wicket.examples.ServerHostNameAndTimeFilter;
import org.apache.wicket.examples.WicketExampleApplication;
-import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
/**
* Application class for the linkomatic example.
@@ -46,7 +45,8 @@
{
super.init();
- getSharedResources().add("cancelButton", new DefaultButtonImageResource("Cancel"));
+ // TODO WNG
+ // getSharedResources().add("cancelButton", new DefaultButtonImageResource("Cancel"));
// log host name and server time in the browser's status bar
getRequestCycleSettings().addResponseFilter(new ServerHostNameAndTimeFilter());
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java Fri Jan 8 21:48:50 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.examples.linkomatic;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java Fri Jan 8 21:48:50 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.examples.linkomatic;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java Fri Jan 8 21:48:50 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.examples.linkomatic;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
@@ -35,6 +35,7 @@
*/
public Page3(PageParameters parameters)
{
- add(new Label("bookmarkparameter", parameters.getString("bookmarkparameter")));
+ add(new Label("bookmarkparameter", parameters.getNamedParameter("bookmarkparameter")
+ .toOptionalString()));
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java Fri Jan 8 21:48:50 2010
@@ -25,13 +25,13 @@
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreeNode;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.examples.ajax.builtin.tree.SimpleTreePage;
import org.apache.wicket.extensions.markup.html.tree.Tree;
import org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree.LinkType;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java Fri Jan 8 21:48:50 2010
@@ -18,18 +18,13 @@
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
-import org.apache.wicket.examples.niceurl.mounted.Page3;
-import org.apache.wicket.protocol.http.WebRequestCycleProcessor;
-import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy;
-import org.apache.wicket.request.IRequestCodingStrategy;
-import org.apache.wicket.request.IRequestCycleProcessor;
-import org.apache.wicket.request.target.coding.QueryStringUrlCodingStrategy;
-import org.apache.wicket.util.lang.PackageName;
/**
* Application class for this example.
*
+ * TODO NG
+ *
* @author Eelco Hillenius
*/
public class NiceUrlApplication extends WicketExampleApplication
@@ -51,10 +46,10 @@
return Home.class;
}
- private <C extends Page> void mountBookmarkablePageWithUrlCoding(String path, Class<C> pageClass)
- {
- mount(new QueryStringUrlCodingStrategy(path, pageClass));
- }
+// private <C extends Page> void mountBookmarkablePageWithUrlCoding(String path, Class<C> pageClass)
+// {
+// mount(new QueryStringUrlCodingStrategy(path, pageClass));
+// }
/**
* @see org.apache.wicket.examples.WicketExampleApplication#init()
@@ -73,7 +68,7 @@
mountBookmarkablePage("/a/nice/path/to/the/first/page", Page1.class);
mountBookmarkablePage("/path/to/page2", Page2.class);
- mountBookmarkablePageWithUrlCoding("/path/to/page2qpencoded", Page2QP.class);
+// mountBookmarkablePageWithUrlCoding("/path/to/page2qpencoded", Page2QP.class);
// mount a whole package at once (all bookmarkable pages,
// the relative class name will be part of the url
@@ -82,26 +77,26 @@
// sense to use one of the (important) classes in your package, so
// that any refactoring (like a package rename) will automatically
// be applied here.
- mount("/my/mounted/package", PackageName.forClass(Page3.class));
+// mount("/my/mounted/package", PackageName.forClass(Page3.class));
}
/**
* Sets up a request coding strategy that uses case-insensitive mounts
*
- * @see org.apache.wicket.protocol.http.WebApplication#newRequestCycleProcessor()
+ * @see org.apache.wicket.protocol.http.WebApplication#newRequestCycleProcessor() //
*/
- @Override
- protected IRequestCycleProcessor newRequestCycleProcessor()
- {
- return new WebRequestCycleProcessor()
- {
- @Override
- protected IRequestCodingStrategy newRequestCodingStrategy()
- {
- WebRequestCodingStrategy.Settings stratSettings = new WebRequestCodingStrategy.Settings();
- stratSettings.setMountsCaseSensitive(false);
- return new WebRequestCodingStrategy(stratSettings);
- }
- };
- }
+// @Override
+// protected IRequestCycleProcessor newRequestCycleProcessor()
+// {
+// return new WebRequestCycleProcessor()
+// {
+// @Override
+// protected IRequestCodingStrategy newRequestCodingStrategy()
+// {
+// WebRequestCodingStrategy.Settings stratSettings = new WebRequestCodingStrategy.Settings();
+// stratSettings.setMountsCaseSensitive(false);
+// return new WebRequestCodingStrategy(stratSettings);
+// }
+// };
+// }
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java Fri Jan 8 21:48:50 2010
@@ -18,13 +18,13 @@
import java.util.Locale;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.util.value.ValueMap;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java Fri Jan 8 21:48:50 2010
@@ -18,12 +18,12 @@
import java.util.Locale;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.util.value.ValueMap;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DatabaseLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DatabaseLocator.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DatabaseLocator.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DatabaseLocator.java Fri Jan 8 21:48:50 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.examples.repeater;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.Application;
/**
* service locator class for contacts database
@@ -31,7 +31,7 @@
*/
public static ContactsDatabase getDatabase()
{
- RepeaterApplication app = (RepeaterApplication)RequestCycle.get().getApplication();
+ RepeaterApplication app = (RepeaterApplication)Application.get();
return app.getContactsDB();
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java Fri Jan 8 21:48:50 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.repeater;
import org.apache.wicket.Page;
-import org.apache.wicket.markup.html.ServerAndClientTimeFilter;
import org.apache.wicket.protocol.http.WebApplication;
/**
@@ -45,7 +44,8 @@
protected void init()
{
getDebugSettings().setDevelopmentUtilitiesEnabled(true);
- getRequestCycleSettings().addResponseFilter(new ServerAndClientTimeFilter());
+ // TODO NG
+ // getRequestCycleSettings().addResponseFilter(new ServerAndClientTimeFilter());
}
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Fri Jan 8 21:48:50 2010
@@ -37,7 +37,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxCallDecorator;
@@ -49,7 +48,8 @@
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.protocol.http.servlet.AbortWithWebErrorCodeException;
+import org.apache.wicket.ng.request.component.PageParameters;
+import org.apache.wicket.protocol.http.request.WebErrorCodeResponseHandler;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.lang.PackageName;
import org.apache.wicket.util.string.AppendingStringBuffer;
@@ -90,7 +90,8 @@
{
// name contains the name of the selected file
if (Strings.isEmpty(name) &&
- Strings.isEmpty(getPage().getRequest().getParameter(SOURCE)))
+ Strings.isEmpty(getPage().getRequest().getRequestParameters().getParameterValue(
+ SOURCE).toOptionalString()))
{
return "";
}
@@ -99,7 +100,10 @@
try
{
StringBuffer sb = new StringBuffer();
- source = (name != null) ? name : getPage().getRequest().getParameter(SOURCE);
+ source = (name != null) ? name : getPage().getRequest()
+ .getRequestParameters()
+ .getParameterValue(SOURCE)
+ .toOptionalString();
InputStream resourceAsStream = getPageTargetClass().getResourceAsStream(source);
if (resourceAsStream == null)
{
@@ -517,13 +521,6 @@
return name;
}
- /**
- * Default constructor, only used for test purposes.
- */
- public SourcesPage()
- {
- this(new PageParameters(PAGE_CLASS + "=" + SourcesPage.class.getName()));
- }
/**
*
@@ -540,7 +537,10 @@
@Override
public String getObject()
{
- return name != null ? name : getPage().getRequest().getParameter(SOURCE);
+ return name != null ? name : getPage().getRequest()
+ .getRequestParameters()
+ .getParameterValue(SOURCE)
+ .toOptionalString();
}
});
@@ -570,15 +570,18 @@
public static PageParameters generatePageParameters(Class<? extends Page> clazz, String fileName)
{
PageParameters p = new PageParameters();
- p.put(PAGE_CLASS, clazz.getName());
+ p.setNamedParameter(PAGE_CLASS, clazz.getName());
if (fileName != null)
- p.put(SOURCE, fileName);
+ p.setNamedParameter(SOURCE, fileName);
return p;
}
private String getPageParam()
{
- return getPage().getRequest().getParameter(PAGE_CLASS);
+ return getPage().getRequest()
+ .getRequestParameters()
+ .getParameterValue(PAGE_CLASS)
+ .toOptionalString();
}
private Class<? extends Page> getPageTargetClass()
@@ -594,8 +597,9 @@
{
log.error("key: " + PAGE_CLASS + " is null.");
}
- throw new AbortWithWebErrorCodeException(404,
- "Could not find sources for the page you requested");
+ getRequestCycle().replaceAllRequestHandlers(
+ new WebErrorCodeResponseHandler(404,
+ "Could not find sources for the page you requested"));
}
if (!pageParam.startsWith("org.apache.wicket.examples"))
{
@@ -610,8 +614,9 @@
}
catch (ClassNotFoundException e)
{
- throw new AbortWithWebErrorCodeException(404,
- "Could not find sources for the page you requested");
+ getRequestCycle().replaceAllRequestHandlers(
+ new WebErrorCodeResponseHandler(404,
+ "Could not find sources for the page you requested"));
}
}
return page;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java Fri Jan 8 21:48:50 2010
@@ -62,7 +62,8 @@
{
Session.get().invalidate();
setResponsePage(Index.class);
- setRedirect(true);
+ // TODO NG
+ // setRedirect(true);
}
});
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/SessionModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/SessionModel.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/SessionModel.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/SessionModel.java Fri Jan 8 21:48:50 2010
@@ -17,8 +17,8 @@
package org.apache.wicket.examples.stateless;
import org.apache.wicket.Application;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
/**
* Model that displays whether a session was created yet, and if it was, prints the session id.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java Fri Jan 8 21:48:50 2010
@@ -18,9 +18,6 @@
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
-import org.apache.wicket.request.target.coding.IndexedParamUrlCodingStrategy;
-import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
-import org.apache.wicket.request.target.coding.QueryStringUrlCodingStrategy;
/**
* Application class for the stateless application.
@@ -53,11 +50,10 @@
{
super.init();
- mount(new QueryStringUrlCodingStrategy("/statefull", StatefulPage.class));
- mount(new QueryStringUrlCodingStrategy("/query", StatelessPage1.class));
- mount(new MixedParamUrlCodingStrategy("/mixed", StatelessPage2.class, new String[] {
- "param1", "param2" }));
- mount(new IndexedParamUrlCodingStrategy("/indexed", StatelessPage3.class));
+ mountBookmarkablePage("/statefull", StatefulPage.class);
+ mountBookmarkablePage("/query", StatelessPage1.class);
+ mountBookmarkablePage("/mixed", StatelessPage2.class);
+ mountBookmarkablePage("/indexed", StatelessPage3.class);
// mount("/public", PackageName.forClass(StatelessApplication.class));
// mountBookmarkablePage("foo", StatelessPage.class);
}