This is an automated email from the ASF dual-hosted git repository. thiagohp pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push: new c35d46b TAP5-2656: CSS URL rewriting still throws exceptions c35d46b is described below commit c35d46bb3e01efcfa6145777a1d1a126c895c228 Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br> AuthorDate: Wed Dec 30 15:55:39 2020 -0300 TAP5-2656: CSS URL rewriting still throws exceptions for non-existing files even when configured to ignore them. --- .../tapestry5/internal/services/AssetSourceImpl.java | 20 ++++++++++---------- .../internal/services/assets/CSSURLRewriter.java | 19 ++++++++++++------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java index 966e2e2..d83cfb1 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java @@ -12,6 +12,16 @@ package org.apache.tapestry5.internal.services; +import java.lang.ref.Reference; +import java.lang.ref.SoftReference; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.tapestry5.Asset; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.commons.Resource; @@ -33,16 +43,6 @@ import org.apache.tapestry5.services.AssetNotFoundException; import org.apache.tapestry5.services.AssetSource; import org.slf4j.Logger; -import java.lang.ref.Reference; -import java.lang.ref.SoftReference; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; - @SuppressWarnings("all") public class AssetSourceImpl extends LockSupport implements AssetSource { diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/CSSURLRewriter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/CSSURLRewriter.java index e84e230..267159e 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/CSSURLRewriter.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/CSSURLRewriter.java @@ -12,6 +12,12 @@ package org.apache.tapestry5.internal.services.assets; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.apache.tapestry5.Asset; import org.apache.tapestry5.SymbolConstants; import org.apache.tapestry5.commons.Resource; @@ -20,16 +26,15 @@ import org.apache.tapestry5.ioc.IOOperation; import org.apache.tapestry5.ioc.OperationTracker; import org.apache.tapestry5.services.AssetNotFoundException; import org.apache.tapestry5.services.AssetSource; -import org.apache.tapestry5.services.assets.*; +import org.apache.tapestry5.services.assets.AssetChecksumGenerator; +import org.apache.tapestry5.services.assets.CompressionStatus; +import org.apache.tapestry5.services.assets.ResourceDependencies; +import org.apache.tapestry5.services.assets.StreamableResource; +import org.apache.tapestry5.services.assets.StreamableResourceProcessing; +import org.apache.tapestry5.services.assets.StreamableResourceSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** * Rewrites the {@code url()} attributes inside a CSS (MIME type "text/css")) resource. * Each {@code url} is expanded to a complete path; this allows for CSS aggregation, where the location of the