Repository: wicket Updated Branches: refs/heads/wicket-7.x d519b75f1 -> 884018dcf
WICKET-6481 Added JavaDoc to avoid mount paths starting with reserved URL segments Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/884018dc Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/884018dc Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/884018dc Branch: refs/heads/wicket-7.x Commit: 884018dcfd11408767e4a22b9f9d18cf0f0ede1e Parents: d519b75 Author: Andrea Del Bene <[email protected]> Authored: Wed Oct 18 17:28:06 2017 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Wed Oct 18 17:28:06 2017 +0200 ---------------------------------------------------------------------- .../wicket/core/request/mapper/IMapperContext.java | 4 +++- .../apache/wicket/protocol/http/WebApplication.java | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/884018dc/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/IMapperContext.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/IMapperContext.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/IMapperContext.java index 52366d3..5c6e91f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/IMapperContext.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/IMapperContext.java @@ -21,7 +21,9 @@ import org.apache.wicket.request.component.IRequestablePage; import org.apache.wicket.request.resource.ResourceReferenceRegistry; /** - * Utility interface for providing and creating new page instances. + * Utility interface for providing and creating new page instances. This interface is used also to + * define which segments are reserved for internal use (see methods {@link #getNamespace()}, {@link #getPageIdentifier()}, + * {@link #getBookmarkableIdentifier()} and {@link #getResourceIdentifier()}). * * @author Matej Knopp */ http://git-wip-us.apache.org/repos/asf/wicket/blob/884018dc/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java index 5ed6fb0..97b657b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java @@ -328,6 +328,10 @@ public abstract class WebApplication extends Application /** * Mounts a page class to the given path. * + * <p> + * NOTE: mount path must not start with reserved URL segments! See {@link IMapperContext} to know + * which segments are reserved for internal use. + * </p> * @param <T> * type of page * @@ -345,7 +349,11 @@ public abstract class WebApplication extends Application /** * Mounts a shared resource to the given path. - * + * + * <p> + * NOTE: mount path must not start with reserved URL segments! See {@link IMapperContext} to know + * which segments are reserved for internal use. + * </p> * @param path * the path to mount the resource reference on * @param reference @@ -364,7 +372,11 @@ public abstract class WebApplication extends Application /** * Mounts mounts all bookmarkable pages in a the pageClass's package to the given path. - * + * + * <p> + * NOTE: mount path must not start with reserved URL segments! See {@link IMapperContext} to know + * which segments are reserved for internal use. + * </p> * @param <P> * type of page *
