You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2014/09/03 23:14:25 UTC

[5/6] git commit: Ensure correct ordering of interceptors

Ensure correct ordering of interceptors


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/820ffe77
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/820ffe77
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/820ffe77

Branch: refs/heads/master
Commit: 820ffe77946e5803065b57fffa59e3fc7534fd0b
Parents: deb317e
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Wed Sep 3 14:14:08 2014 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Wed Sep 3 14:14:08 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/tapestry5/modules/AssetsModule.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/820ffe77/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
index b41e36e..4eab1ec 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
@@ -123,7 +123,7 @@ public class AssetsModule
 
     // Goes after cache, to ensure that what we are caching is the minified version.
     @Decorate(id = "Minification", serviceInterface = StreamableResourceSource.class)
-    @Order("after:Cache")
+    @Order("after:Cache,TextUTF8")
     public StreamableResourceSource enableMinification(StreamableResourceSource delegate, ResourceMinimizer minimizer,
                                                        @Symbol(SymbolConstants.MINIFICATION_ENABLED)
                                                        boolean enabled)
@@ -166,7 +166,7 @@ public class AssetsModule
      * @since 5.4
      */
     @Decorate(id = "TextUTF8", serviceInterface = StreamableResourceSource.class)
-    @Order("before:CSSURLRewrite")
+    @Order("after:Cache")
     public StreamableResourceSource setupTextAssetsAsUTF8(StreamableResourceSource delegate)
     {
         return new UTF8ForTextAssets(delegate);