Author: mgrigorov
Date: Sat Sep 25 08:21:34 2010
New Revision: 1001164
URL: http://svn.apache.org/viewvc?rev=1001164&view=rev
Log:
Rename WebApplication#mountBookmarkablePage() to #mountPage() and remove
@Deprecated from it. This helper method uses MountedMapper behind the scenes.
Remove @Deprecated from #mountSharedResource() (this uses ResourceMapper).
For now these are the only two mounting methods added for user convenience. To
use different IRequestMapper use: getRootRequestMapperAsCompound().add(new
XyzMapper()).
Fix the references in wicket-examples and fix some package mounts (using
PackageMapper which were disabled).
Modified:
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/hellobrowser/HelloBrowserApplication.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/niceurl/NiceUrlApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java
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=1001164&r1=1001163&r2=1001164&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
Sat Sep 25 08:21:34 2010
@@ -22,6 +22,7 @@ import org.apache.wicket.examples.ajax.b
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;
/**
@@ -46,31 +47,30 @@ public class AjaxApplication extends Wic
getResourceSettings().setThrowExceptionOnMissingResource(false);
- // TODO (NG)
- // getRequestCycleSettings().addResponseFilter(new
AjaxServerAndClientTimeFilter());
+ getRequestCycleSettings().addResponseFilter(new
AjaxServerAndClientTimeFilter());
getDebugSettings().setAjaxDebugModeEnabled(true);
- 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);
+ mountPage("autocomplete", AutoCompletePage.class);
+ mountPage("choice", ChoicePage.class);
+ mountPage("clock", ClockPage.class);
+ mountPage("editable-label", EditableLabelPage.class);
+ mountPage("effects", EffectsPage.class);
+ mountPage("form", FormPage.class);
+ mountPage("guest-book", GuestBook.class);
+ mountPage("lazy-loading", LazyLoadingPage.class);
+ mountPage("links", LinksPage.class);
+ mountPage("modal-window", ModalWindowPage.class);
+ mountPage("on-change-ajax-behavior",
OnChangeAjaxBehaviorPage.class);
+ mountPage("pageables", PageablesPage.class);
+ mountPage("ratings", RatingsPage.class);
+ mountPage("tabbed-panel", TabbedPanelPage.class);
+ mountPage("todo-list", TodoList.class);
+ mountPage("world-clock", WorldClockPage.class);
+ mountPage("tree/simple", SimpleTreePage.class);
+ mountPage("tree/table", TreeTablePage.class);
+ mountPage("tree/table/editable", EditableTreeTablePage.class);
+ mountPage("upload", FileUploadPage.class);
}
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=1001164&r1=1001163&r2=1001164&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
Sat Sep 25 08:21:34 2010
@@ -51,6 +51,6 @@ public class HelloBrowserApplication ext
super.init();
getRequestCycleSettings().setGatherExtendedBrowserInfo(true);
- mountBookmarkablePage("howdy", HelloBrowser.class);
+ mountPage("howdy", HelloBrowser.class);
}
}
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=1001164&r1=1001163&r2=1001164&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
Sat Sep 25 08:21:34 2010
@@ -46,7 +46,7 @@ public class LinkomaticApplication exten
{
super.init();
- mountBookmarkablePage("/home", Home.class);
+ mountPage("/home", Home.class);
getSharedResources().add("cancelButton", new
DefaultButtonImageResource("Cancel"));
// log host name and server time in the browser's status bar
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=1001164&r1=1001163&r2=1001164&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
Sat Sep 25 08:21:34 2010
@@ -18,6 +18,9 @@ package org.apache.wicket.examples.niceu
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
+import org.apache.wicket.examples.niceurl.mounted.Page3;
+import org.apache.wicket.request.mapper.PackageMapper;
+import org.apache.wicket.util.lang.PackageName;
/**
@@ -64,11 +67,10 @@ public class NiceUrlApplication extends
getPageSettings().setAutomaticMultiWindowSupport(false);
// mount single bookmarkable pages
- mountBookmarkablePage("/the/homepage/path", Home.class);
- mountBookmarkablePage("/a/nice/path/to/the/first/page",
Page1.class);
- mountBookmarkablePage("/path/to/page2", Page2.class);
-
-// mountBookmarkablePageWithUrlCoding("/path/to/page2qpencoded",
Page2QP.class);
+ mountPage("/the/homepage/path", Home.class);
+ mountPage("/a/nice/path/to/the/first/page", Page1.class);
+ mountPage("/path/to/page2", Page2.class);
+ mountPage("/path/to/page2qpencoded", Page2QP.class);
// mount a whole package at once (all bookmarkable pages,
// the relative class name will be part of the url
@@ -77,9 +79,9 @@ public class NiceUrlApplication extends
// 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));
+ getRootRequestMapperAsCompound().add(
+ new PackageMapper("/my/mounted/package",
PackageName.forClass(Page3.class)));
}
-
/**
* Sets up a request coding strategy that uses case-insensitive mounts
*
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=1001164&r1=1001163&r2=1001164&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
Sat Sep 25 08:21:34 2010
@@ -18,6 +18,8 @@ package org.apache.wicket.examples.state
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
+import org.apache.wicket.request.mapper.PackageMapper;
+import org.apache.wicket.util.lang.PackageName;
/**
* Application class for the stateless application.
@@ -50,11 +52,12 @@ public class StatelessApplication extend
{
super.init();
- mountBookmarkablePage("/statefull", StatefulPage.class);
- mountBookmarkablePage("/query", StatelessPage1.class);
- mountBookmarkablePage("/mixed", StatelessPage2.class);
- mountBookmarkablePage("/state-in-url", StatelessPage3.class);
- // mount("/public",
PackageName.forClass(StatelessApplication.class));
- // mountBookmarkablePage("foo", StatelessPage.class);
+ mountPage("/statefull", StatefulPage.class);
+ mountPage("/query", StatelessPage1.class);
+ mountPage("/mixed", StatelessPage2.class);
+ mountPage("/state-in-url", StatelessPage3.class);
+ getRootRequestMapperAsCompound().add(
+ new PackageMapper("/public",
PackageName.forClass(StatelessApplication.class)));
+ mountPage("foo", StatelessPage.class);
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=1001164&r1=1001163&r2=1001164&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Sat Sep 25 08:21:34 2010
@@ -297,45 +297,33 @@ public abstract class WebApplication ext
}
/**
- * Mounts a bookmarkable page class to the given path.
+ * Mounts a page class to the given path.
*
* @param <T>
* type of page
*
* @param path
- * the path to mount the bookmarkable page class on
- * @param bookmarkablePageClass
- * the bookmarkable page class to mount
- *
- * @deprecated use mounted mapper instead, this method can be
represented as
- * {...@code
- * getRootRequestMapperAsCompound().add(new
MountedMapper(path,
- * bookmarkablePageClass))}
- */
- @Deprecated
- public final <T extends Page> void mountBookmarkablePage(final String
path,
- final Class<T> bookmarkablePageClass)
+ * the path to mount the page class on
+ * @param pageClass
+ * the page class to be mounted
+ */
+ public final <T extends Page> void mountPage(final String path, final
Class<T> pageClass)
{
- mount(new MountedMapper(path, bookmarkablePageClass));
+ getRootRequestMapperAsCompound().add(new MountedMapper(path,
pageClass));
}
-
/**
* Mounts a shared resource class to the given path.
*
* @param path
- * the path to mount the resource class on
+ * the path to mount the resource reference on
* @param reference
* resource reference to be mounted
- *
- * @deprecated - this is the same as
- * {...@code getRootRequestMapperAsCompound().add(new
ResourceMapper(path, reference))}
*/
- @Deprecated
public final void mountSharedResource(final String path, final
ResourceReference reference)
{
getResourceReferenceRegistry().registerResourceReference(reference);
- mount(new ResourceMapper(path, reference));
+ getRootRequestMapperAsCompound().add(new ResourceMapper(path,
reference));
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java?rev=1001164&r1=1001163&r2=1001164&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/RestartWithMountedPageTest.java
Sat Sep 25 08:21:34 2010
@@ -28,7 +28,7 @@ public class RestartWithMountedPageTest
*/
public void testWithMountedLoginPage()
{
- tester.getApplication().mountBookmarkablePage("/login",
LoginPage.class);
+ tester.getApplication().mountPage("/login", LoginPage.class);
tester.startPage(ProtectedPage.class);
tester.assertRenderedPage(LoginPage.class);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java?rev=1001164&r1=1001163&r2=1001164&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java
Sat Sep 25 08:21:34 2010
@@ -26,7 +26,7 @@ public class RestartWithMountedPageTest
*/
public void testWithMountedLoginPage()
{
- tester.getApplication().mountBookmarkablePage("/login",
LoginPage.class);
+ tester.getApplication().mountPage("/login", LoginPage.class);
tester.startPage(ProtectedPage.class);
tester.assertRenderedPage(LoginPage.class);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java?rev=1001164&r1=1001163&r2=1001164&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/encodingtest/RequestEncodingTest.java
Sat Sep 25 08:21:34 2010
@@ -80,7 +80,7 @@ public class RequestEncodingTest extends
*/
public void testUmlautsInRequestUri()
{
- application.mountBookmarkablePage("Aparameter", A.class);
+ application.mountPage("Aparameter", A.class);
testDefault();
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java?rev=1001164&r1=1001163&r2=1001164&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
Sat Sep 25 08:21:34 2010
@@ -52,7 +52,7 @@ public class StatelessComponentTest exte
*/
public void testStatelessComponentPageWithMount() throws Exception
{
- tester.getApplication().mountBookmarkablePage("/stateless",
StatelessComponentPage.class);
+ tester.getApplication().mountPage("/stateless",
StatelessComponentPage.class);
// test is always the home page. it doesn't work then
executeTest(StatelessComponentPage.class,
"StatelessComponentPage_mount_result.html");
tester.getRequest()
@@ -104,8 +104,7 @@ public class StatelessComponentTest exte
PageParameters params = new PageParameters();
params.set("testParam1", "testValue1");
params.set("testParam2", "testValue2");
- tester.getApplication().mountBookmarkablePage("/stateless",
- StatelessComponentPageWithParams.class);
+ tester.getApplication().mountPage("/stateless",
StatelessComponentPageWithParams.class);
// test is always the home page. it doesn't work then
executeTest(StatelessComponentPageWithParams.class, params,
"StatelessComponentPageWithParams_mount_result.html");
@@ -131,8 +130,7 @@ public class StatelessComponentTest exte
PageParameters params = new PageParameters();
params.set(0, "testValue1");
params.set(1, "testValue2");
- tester.getApplication().mountBookmarkablePage("/stateless",
- StatelessComponentPageWithParams.class);
+ tester.getApplication().mountPage("/stateless",
StatelessComponentPageWithParams.class);
// test is always the home page. it doesn't work then
executeTest(StatelessComponentPageWithParams.class, params,
"StatelessComponentPageWithParams_indexed_mount_result.html");
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java?rev=1001164&r1=1001163&r2=1001164&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/StatelessFormTest.java
Sat Sep 25 08:21:34 2010
@@ -37,8 +37,8 @@ public class StatelessFormTest extends W
protected void init()
{
super.init();
- mountBookmarkablePage("page1", Page1.class);
- mountBookmarkablePage("page2", Page2.class);
+ mountPage("page1", Page1.class);
+ mountPage("page2", Page2.class);
}
@Override
