Updated Branches: refs/heads/wicket-1.5.x 7711bf6b3 -> 2ab7df583
WICKET-4451 Resource decoration fail on wicket examples Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2ab7df58 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2ab7df58 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2ab7df58 Branch: refs/heads/wicket-1.5.x Commit: 2ab7df5832f08e7d17702285b5c8ffb6072d6605 Parents: 7711bf6 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Mar 15 12:08:26 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Mar 15 12:08:26 2012 +0200 ---------------------------------------------------------------------- .../ResourceDecorationApplication.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2ab7df58/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java index 185559d..a7bceae 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java @@ -19,6 +19,8 @@ package org.apache.wicket.examples.resourcedecoration; import org.apache.wicket.Application; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.IHeaderResponseDecorator; +import org.apache.wicket.markup.html.IPackageResourceGuard; +import org.apache.wicket.markup.html.SecurePackageResourceGuard; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.resource.filtering.JavaScriptFilteredIntoFooterHeaderResponse; @@ -62,6 +64,13 @@ public class ResourceDecorationApplication extends WebApplication javaScriptFooterResponse); } }); + + IPackageResourceGuard guard = getResourceSettings().getPackageResourceGuard(); + if (guard instanceof SecurePackageResourceGuard) + { + SecurePackageResourceGuard secureGuard = (SecurePackageResourceGuard) guard; + secureGuard.addPattern("+org/apache/wicket/merged-resources"); + } } @Override
