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 2013/06/26 11:35:43 UTC
[1/2] git commit: WICKET-5251
Updated Branches:
refs/heads/master bfcd615e8 -> 3d2393c78
WICKET-5251
We now correctly detect if the resource already ends with .min to avoid further unnecessary compression.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6ce34ccf
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6ce34ccf
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6ce34ccf
Branch: refs/heads/master
Commit: 6ce34ccf84c48055dad46d4ed90372f9684f2296
Parents: 5c6f59e
Author: Cedric Gatay <ce...@gatay.fr>
Authored: Tue Jun 25 22:09:19 2013 +0200
Committer: Cedric Gatay <ce...@gatay.fr>
Committed: Tue Jun 25 22:09:19 2013 +0200
----------------------------------------------------------------------
.../resource/PackageResourceReference.java | 9 ++++++++-
.../resource/PackageResourceReferenceTest.java | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6ce34ccf/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
index cc72731..710eef2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
@@ -207,7 +207,14 @@ public class PackageResourceReference extends ResourceReference
if (idxOfExtension > -1)
{
String extension = name.substring(idxOfExtension);
- minifiedName = name.substring(0, name.length() - extension.length() + 1) + "min" + extension;
+ final String baseName = name.substring(0, name.length() - extension.length() + 1);
+ if (!".min".equals(extension) && !baseName.endsWith(".min."))
+ {
+ minifiedName = baseName + "min" + extension;
+ } else
+ {
+ minifiedName = name;
+ }
} else
{
minifiedName = name + ".min";
http://git-wip-us.apache.org/repos/asf/wicket/blob/6ce34ccf/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
index cbde900..63cb6ec 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
@@ -22,6 +22,7 @@ import org.apache.wicket.WicketTestCase;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.request.resource.ResourceReference.UrlAttributes;
import org.apache.wicket.response.ByteArrayResponse;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -184,4 +185,23 @@ public class PackageResourceReferenceTest extends WicketTestCase
}
}
+ /**
+ * see WICKET-5251 : Proper detection of already minified resources
+ */
+ @Test
+ public void testMinifiedNameDetectMinInName() throws Exception
+ {
+ final PackageResourceReference html5minjs = new PackageResourceReference("html5.min.js");
+ Assert.assertEquals("html5.min.js", html5minjs.getMinifiedName());
+
+ final PackageResourceReference html5notminjs = new PackageResourceReference("html5.notmin.js");
+ Assert.assertEquals("html5.notmin.min.js", html5notminjs.getMinifiedName());
+
+ final PackageResourceReference html5notmin = new PackageResourceReference("html5notmin");
+ Assert.assertEquals("html5notmin.min", html5notmin.getMinifiedName());
+
+ final PackageResourceReference html5min = new PackageResourceReference("html5.min");
+ Assert.assertEquals("html5.min", html5min.getMinifiedName());
+
+ }
}
[2/2] git commit: Merge branch 'WICKET-5251' of
https://github.com/CedricGatay/wicket into WICKET-5251
Posted by mg...@apache.org.
Merge branch 'WICKET-5251' of https://github.com/CedricGatay/wicket into WICKET-5251
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3d2393c7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3d2393c7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3d2393c7
Branch: refs/heads/master
Commit: 3d2393c78814c33de39ad046adcc41d8deec96f9
Parents: bfcd615 6ce34cc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jun 26 12:33:15 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 26 12:33:15 2013 +0300
----------------------------------------------------------------------
.../resource/PackageResourceReference.java | 9 ++++++++-
.../resource/PackageResourceReferenceTest.java | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------