Remove resource guard rule. Special path "merged-resources" is not used since Wicket 6.0.0
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/54e65be6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/54e65be6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/54e65be6 Branch: refs/heads/master Commit: 54e65be62ed42d82ab155e272cdfdf683a51bbbe Parents: ca1cc84 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Sep 26 16:48:24 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Sep 26 16:49:31 2013 +0200 ---------------------------------------------------------------------- .../resourcedecoration/ResourceDecorationApplication.java | 9 --------- 1 file changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/54e65be6/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 087d8e1..80ce478 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,8 +20,6 @@ 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; @@ -57,13 +55,6 @@ 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
