You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/02/16 14:57:35 UTC
[1/2] wicket git commit: WICKET-5827 bugfixes
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 1a6f1bde1 -> 1a4844f5c
WICKET-5827 bugfixes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c92ad134
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c92ad134
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c92ad134
Branch: refs/heads/wicket-6.x
Commit: c92ad1348eec047453e0980f01d5a1713927b69f
Parents: 1a6f1bd
Author: klopfdreh <kl...@192.168.2.110>
Authored: Mon Feb 16 12:19:21 2015 +0100
Committer: klopfdreh <kl...@192.168.2.110>
Committed: Mon Feb 16 12:19:21 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/resource/CompositeCssCompressor.java | 4 ++--
.../src/main/java/org/apache/wicket/resource/CssUrlReplacer.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c92ad134/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java b/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java
index d8fdcc0..6e7b1c3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java
@@ -42,7 +42,7 @@ import org.apache.wicket.css.ICssCompressor;
* @author Tobias Soloschenko
*
*/
-public class CompositeCssCompressor implements IScopeAwareTextResourceProcessor
+public class CompositeCssCompressor implements IScopeAwareTextResourceProcessor, ICssCompressor
{
/* Compressors to compress the CSS content */
private final List<ICssCompressor> compressors = new ArrayList<ICssCompressor>();
@@ -71,7 +71,7 @@ public class CompositeCssCompressor implements IScopeAwareTextResourceProcessor
if (compressor instanceof IScopeAwareTextResourceProcessor)
{
IScopeAwareTextResourceProcessor processor = (IScopeAwareTextResourceProcessor)compressor;
- processor.process(compressed, scope, name);
+ compressed = processor.process(compressed, scope, name);
}
else
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/c92ad134/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java b/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java
index 6ad891c..7734e91 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java
@@ -19,6 +19,7 @@ package org.apache.wicket.resource;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.wicket.css.ICssCompressor;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.resource.PackageResourceReference;
@@ -37,7 +38,7 @@ import org.apache.wicket.request.resource.PackageResourceReference;
* @since 6.20.0
* @author Tobias Soloschenko
*/
-public class CssUrlReplacer implements IScopeAwareTextResourceProcessor
+public class CssUrlReplacer implements IScopeAwareTextResourceProcessor, ICssCompressor
{
// The pattern to find URLs in CSS resources
private static final Pattern URL_PATTERN = Pattern.compile("url\\(['|\"]*(.*?)['|\"]*\\)");
[2/2] wicket git commit: WICKET-5827 Allow to apply multiple
Javascript / CSS compressors
Posted by mg...@apache.org.
WICKET-5827 Allow to apply multiple Javascript / CSS compressors
Allow IJavaScriptCompressors to be IScopeAwareTextResourceProcessor too
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1a4844f5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1a4844f5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1a4844f5
Branch: refs/heads/wicket-6.x
Commit: 1a4844f5c8da09d0055909c436fa20a9fb292158
Parents: c92ad13
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Feb 16 15:56:14 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Feb 16 15:56:14 2015 +0200
----------------------------------------------------------------------
.../resource/JavaScriptPackageResource.java | 25 +++++++++++++------
.../wicket/resource/CompositeCssCompressor.java | 3 +--
.../resource/CompositeJavaScriptCompressor.java | 26 +++++++++++++++-----
3 files changed, 38 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1a4844f5/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
index 210fee1..49f393a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptPackageResource.java
@@ -20,11 +20,12 @@ import java.util.Locale;
import org.apache.wicket.Application;
import org.apache.wicket.javascript.IJavaScriptCompressor;
+import org.apache.wicket.resource.IScopeAwareTextResourceProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Package resource for javascript files. It strips comments and whitespace from javascript.
+ * Package resource for javascript files.
*/
public class JavaScriptPackageResource extends PackageResource
{
@@ -32,20 +33,18 @@ public class JavaScriptPackageResource extends PackageResource
private static final Logger log = LoggerFactory.getLogger(JavaScriptPackageResource.class);
+ private final String name;
+
/**
* Construct.
- *
- * @param scope
- * @param name
- * @param locale
- * @param style
- * @param variation
*/
public JavaScriptPackageResource(Class<?> scope, String name, Locale locale, String style,
String variation)
{
super(scope, name, locale, style, variation);
+ this.name = name;
+
// JS resources can be compressed if there is configured IJavaScriptCompressor
setCompress(true);
}
@@ -62,7 +61,17 @@ public class JavaScriptPackageResource extends PackageResource
try
{
String nonCompressed = new String(processedResponse, "UTF-8");
- return compressor.compress(nonCompressed).getBytes("UTF-8");
+ String output;
+ if (compressor instanceof IScopeAwareTextResourceProcessor)
+ {
+ IScopeAwareTextResourceProcessor scopeAwareProcessor = (IScopeAwareTextResourceProcessor)compressor;
+ output = scopeAwareProcessor.process(nonCompressed, getScope(), name);
+ }
+ else
+ {
+ output = compressor.compress(nonCompressed);
+ }
+ return output.getBytes();
}
catch (Exception e)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/1a4844f5/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java b/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java
index 6e7b1c3..7d0dc8b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java
@@ -40,7 +40,6 @@ import org.apache.wicket.css.ICssCompressor;
*
* @since 6.20.0
* @author Tobias Soloschenko
- *
*/
public class CompositeCssCompressor implements IScopeAwareTextResourceProcessor, ICssCompressor
{
@@ -98,4 +97,4 @@ public class CompositeCssCompressor implements IScopeAwareTextResourceProcessor,
compressors.add(compressor);
return this;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1a4844f5/wicket-core/src/main/java/org/apache/wicket/resource/CompositeJavaScriptCompressor.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/CompositeJavaScriptCompressor.java b/wicket-core/src/main/java/org/apache/wicket/resource/CompositeJavaScriptCompressor.java
index c1f0c15..fb94a75 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/CompositeJavaScriptCompressor.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/CompositeJavaScriptCompressor.java
@@ -40,9 +40,8 @@ import org.apache.wicket.javascript.IJavaScriptCompressor;
*
* @since 6.20.0
* @author Tobias Soloschenko
- *
*/
-public class CompositeJavaScriptCompressor implements IJavaScriptCompressor
+public class CompositeJavaScriptCompressor implements IScopeAwareTextResourceProcessor, IJavaScriptCompressor
{
/* Compressors to compress javascript content */
private final List<IJavaScriptCompressor> compressors = new ArrayList<IJavaScriptCompressor>();
@@ -65,16 +64,31 @@ public class CompositeJavaScriptCompressor implements IJavaScriptCompressor
* given the original content is going to be returned.
*/
@Override
- public String compress(String original)
+ public String process(String input, Class<?> scope, String name)
{
- String compressed = original;
+ String compressed = input;
for (IJavaScriptCompressor compressor : compressors)
{
- compressed = compressor.compress(compressed);
+ if (compressor instanceof IScopeAwareTextResourceProcessor)
+ {
+ IScopeAwareTextResourceProcessor processor = (IScopeAwareTextResourceProcessor)compressor;
+ compressed = processor.process(compressed, scope, name);
+ }
+ else
+ {
+ compressed = compressor.compress(compressed);
+ }
}
return compressed;
}
+ @Override
+ public String compress(String original)
+ {
+ throw new UnsupportedOperationException(CompositeCssCompressor.class.getSimpleName() +
+ ".process() should be used instead!");
+ }
+
/**
* Adds a IJavaScriptCompressor to the list of delegates.
*
@@ -85,4 +99,4 @@ public class CompositeJavaScriptCompressor implements IJavaScriptCompressor
compressors.add(compressor);
return this;
}
-}
\ No newline at end of file
+}