Updated Branches: refs/heads/master 43945b3fd -> 8b6efc432
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/8b6efc43 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8b6efc43 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8b6efc43 Branch: refs/heads/master Commit: 8b6efc432afb2a527f5be5957db4347414b0ae0a Parents: 43945b3 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:09:27 2012 +0200 ---------------------------------------------------------------------- .../ResourceDecorationApplication.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8b6efc43/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 0ee8177..98b812e 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 @@ -20,6 +20,8 @@ import org.apache.wicket.Application; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse; 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.request.resource.CssResourceReference; @@ -55,6 +57,13 @@ public class ResourceDecorationApplication extends WebApplication return new JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS"); } }); + + IPackageResourceGuard guard = getResourceSettings().getPackageResourceGuard(); + if (guard instanceof SecurePackageResourceGuard) + { + SecurePackageResourceGuard secureGuard = (SecurePackageResourceGuard) guard; + secureGuard.addPattern("+org/apache/wicket/merged-resources"); + } } @Override
