svn commit: r1087501 - in /tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5: internal/yuicompressor/CSSResourceMinimizer.java yuicompressor/services/YuiCompressorModule.java

[hl...@apache.org]

Author: hlship
Date: Thu Mar 31 23:16:24 2011
New Revision: 1087501

URL: http://svn.apache.org/viewvc?rev=1087501&view=rev
Log:
TAP5-73: Add support for CSS minification

Added:
    tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/CSSResourceMinimizer.java
Modified:
    tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/YuiCompressorModule.java

Added: tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/CSSResourceMinimizer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/CSSResourceMinimizer.java?rev=1087501&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/CSSResourceMinimizer.java (added)
+++ tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/CSSResourceMinimizer.java Thu Mar 31 23:16:24 2011
@@ -0,0 +1,44 @@
+// Copyright 2011 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.internal.yuicompressor;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+
+import org.apache.tapestry5.ioc.OperationTracker;
+import org.slf4j.Logger;
+
+import com.yahoo.platform.yui.compressor.CssCompressor;
+
+/**
+ * Uses {@link CssCompressor} to reduce the size of CSS content.
+ * 
+ * @since 5.3.0
+ */
+public class CSSResourceMinimizer extends AbstractMinimizer
+{
+    public CSSResourceMinimizer(Logger logger, OperationTracker tracker)
+    {
+        super(logger, tracker, "CSS");
+    }
+
+    @Override
+    protected void doMinimize(Reader input, Writer output) throws IOException
+    {
+        new CssCompressor(input).compress(output, -1);
+    }
+
+}

Modified: tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/YuiCompressorModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/YuiCompressorModule.java?rev=1087501&r1=1087500&r2=1087501&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/YuiCompressorModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/YuiCompressorModule.java Thu Mar 31 23:16:24 2011
@@ -14,6 +14,7 @@
 
 package org.apache.tapestry5.yuicompressor.services;
 
+import org.apache.tapestry5.internal.yuicompressor.CSSResourceMinimizer;
 import org.apache.tapestry5.internal.yuicompressor.JavaScriptResourceMinimizer;
 import org.apache.tapestry5.ioc.MappedConfiguration;
 import org.apache.tapestry5.ioc.annotations.Contribute;
@@ -29,10 +30,16 @@ import com.yahoo.platform.yui.compressor
  */
 public class YuiCompressorModule
 {
+    /**
+     * Contibutes minimizers for <code>text/javascript</code> and <code>test/css</code>.
+     * 
+     * @param configuration
+     */
     @Contribute(ResourceMinimizer.class)
     @Primary
-    public static void setupJavaScriptMinimizer(MappedConfiguration<String, ResourceMinimizer> configuration)
+    public static void contributeMinimizers(MappedConfiguration<String, ResourceMinimizer> configuration)
     {
         configuration.addInstance("text/javascript", JavaScriptResourceMinimizer.class);
+        configuration.addInstance("text/css", CSSResourceMinimizer.class);
     }
 }