Updated Branches: refs/heads/5.3 c5600a8de -> e08ac9ee2
TAP5-1992: Switch YUICompressor dependency back to com.yahoo version 2.4.7# Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e08ac9ee Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e08ac9ee Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e08ac9ee Branch: refs/heads/5.3 Commit: e08ac9ee259261ae7c87c1c3530cb05eca9883f2 Parents: 958a68e Author: Howard M. Lewis Ship <[email protected]> Authored: Tue Aug 21 10:12:17 2012 -0700 Committer: Howard M. Lewis Ship <[email protected]> Committed: Tue Aug 21 10:13:55 2012 -0700 ---------------------------------------------------------------------- .../internal/yuicompressor/AbstractMinimizer.java | 12 ++++++------ .../yuicompressor/JavaScriptResourceMinimizer.java | 4 ---- .../src/test/resources/log4j.properties | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e08ac9ee/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/AbstractMinimizer.java ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/AbstractMinimizer.java b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/AbstractMinimizer.java index bb4b243..9370f54 100644 --- a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/AbstractMinimizer.java +++ b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/AbstractMinimizer.java @@ -37,9 +37,9 @@ public abstract class AbstractMinimizer implements ResourceMinimizer { private static final double NANOS_TO_MILLIS = 1.0d / 1000000.0d; - private final Logger logger; + protected final Logger logger; - private final OperationTracker tracker; + protected final OperationTracker tracker; private final String resourceType; @@ -82,10 +82,10 @@ public abstract class AbstractMinimizer implements ResourceMinimizer input.getContentType(), CompressionStatus.COMPRESSABLE, input.getLastModified(), new BytestreamCache(bos)); - long elapsedNanos = System.nanoTime() - startNanos; - - if (logger.isDebugEnabled()) + if (logger.isInfoEnabled()) { + long elapsedNanos = System.nanoTime() - startNanos; + int inputSize = input.getSize(); int outputSize = output.getSize(); @@ -93,7 +93,7 @@ public abstract class AbstractMinimizer implements ResourceMinimizer // e.g., reducing 100 bytes to 25 would be a (100-25)/100 reduction, or 75% double reduction = 100d * ((double) (inputSize - outputSize)) / ((double) inputSize); - logger.debug(String.format("Minimized %s (%,d input bytes of %s to %,d output bytes in %.2f ms, %.2f%% reduction)", + logger.info(String.format("Minimized %s (%,d input bytes of %s to %,d output bytes in %.2f ms, %.2f%% reduction)", input.getDescription(), inputSize, resourceType, outputSize, elapsedMillis, reduction)); } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e08ac9ee/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java index 598f977..7ae612a 100644 --- a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java +++ b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/internal/yuicompressor/JavaScriptResourceMinimizer.java @@ -37,8 +37,6 @@ import java.util.concurrent.atomic.AtomicInteger; */ public class JavaScriptResourceMinimizer extends AbstractMinimizer { - private final Logger logger; - private final static int RANGE = 5; private enum Where @@ -55,8 +53,6 @@ public class JavaScriptResourceMinimizer extends AbstractMinimizer public JavaScriptResourceMinimizer(final Logger logger, OperationTracker tracker) { super(logger, tracker, "JavaScript"); - - this.logger = logger; } protected void doMinimize(final StreamableResource resource, Writer output) throws IOException http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e08ac9ee/tapestry-yuicompressor/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/src/test/resources/log4j.properties b/tapestry-yuicompressor/src/test/resources/log4j.properties index e659dc0..9442cec 100644 --- a/tapestry-yuicompressor/src/test/resources/log4j.properties +++ b/tapestry-yuicompressor/src/test/resources/log4j.properties @@ -12,6 +12,6 @@ log4j.appender.A1.layout.ConversionPattern=[%p] %c{1} %m%n log4j.category.org.apache.tapestry5.services.assets.AssetsModule.ResourceMinimizer=debug #log4j.category.org.apache.tapestry5.services.assets.AssetsModule.ResourceMinimizer=error log4j.category.org.apache.tapestry5.yuicompressor=debug -log4j.category.org.apache.tapestry5.internal.yuicompressor=debug +log4j.category.org.apache.tapestry5.internal.yuicompressor=info
