svn commit: r1347569 - in /cocoon/cocoon3/trunk: cocoon-sax/src/main/java/org/apache/cocoon/sax/component/ cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/

Author: ilgrosso
Date: Thu Jun  7 11:12:42 2012
New Revision: 1347569

URL: http://svn.apache.org/viewvc?rev=1347569&view=rev
Log:
Using URLManipulationUtils.getLastModified() as much as possible

Modified:
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLGenerator.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java
    cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java
    cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateReader.java

Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLGenerator.java?rev=1347569&r1=1347568&r2=1347569&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLGenerator.java Thu Jun  7 11:12:42 2012
@@ -26,7 +26,6 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.Arrays;
 import java.util.Map;
 import org.apache.cocoon.pipeline.PipelineException;
@@ -37,9 +36,9 @@ import org.apache.cocoon.pipeline.cachin
 import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
 import org.apache.cocoon.pipeline.component.Starter;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
-import org.apache.cocoon.pipeline.util.URLConnectionUtils;
 import org.apache.cocoon.sax.AbstractSAXGenerator;
 import org.apache.cocoon.sax.AbstractSAXProducer;
+import org.apache.cocoon.sax.util.URLManipulationUtils;
 import org.apache.cocoon.sax.util.XMLUtils;
 import org.apache.cocoon.xml.dom.DOMStreamer;
 import org.apache.cocoon.xml.sax.SAXBuffer;
@@ -384,25 +383,7 @@ public class XMLGenerator extends Abstra
          */
         @Override
         public CacheKey constructCacheKey() {
-            if (this.source == null) {
-                throw new SetupException(this.getClass().getSimpleName() + " has no source.");
-            }
-
-            CacheKey cacheKey = null;
-            URLConnection connection = null;
-            try {
-                connection = this.source.openConnection();
-                cacheKey = new TimestampCacheKey(this.source,
-                        connection.getLastModified());
-            } catch (IOException e) {
-                LOG.error("Can't construct cache key. " + "Error while connecting to " + this.source, e);
-            } finally {
-                if (connection != null) {
-                    URLConnectionUtils.closeQuietly(connection);
-                }
-            }
-
-            return cacheKey;
+            return new TimestampCacheKey(this.source, URLManipulationUtils.getLastModified(this.source));
         }
 
         /**

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java?rev=1347569&r1=1347568&r2=1347569&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java Thu Jun  7 11:12:42 2012
@@ -27,6 +27,7 @@ import org.apache.cocoon.pipeline.cachin
 import org.apache.cocoon.pipeline.caching.TimestampCacheKey;
 import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
 import org.apache.cocoon.pipeline.util.URLConnectionUtils;
+import org.apache.cocoon.sax.util.URLManipulationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,16 +53,7 @@ public class FileReaderComponent extends
      */
     @Override
     public CacheKey constructCacheKey() {
-        try {
-            URLConnection connection = this.source.openConnection();
-            TimestampCacheKey timestampCacheKey = new TimestampCacheKey(this.source, connection.getLastModified());
-            URLConnectionUtils.closeQuietly(connection);
-            return timestampCacheKey;
-        } catch (IOException e) {
-            LOG.error("Can't construct cache key. Error while connecting to " + this.source, e);
-        }
-
-        return null;
+        return new TimestampCacheKey(this.source, URLManipulationUtils.getLastModified(this.source));
     }
 
     /**

Modified: cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java?rev=1347569&r1=1347568&r2=1347569&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java Thu Jun  7 11:12:42 2012
@@ -33,6 +33,7 @@ import org.apache.cocoon.pipeline.cachin
 import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
 import org.apache.cocoon.pipeline.component.Starter;
 import org.apache.cocoon.sax.AbstractSAXProducer;
+import org.apache.cocoon.sax.util.URLManipulationUtils;
 import org.apache.cocoon.sax.util.XMLUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
@@ -96,13 +97,8 @@ public class StringTemplateGenerator ext
         }
 
         final CompoundCacheKey cacheKey = new CompoundCacheKey();
-
-        try {
-            cacheKey.addCacheKey(new TimestampCacheKey(this.url, this.url.openConnection().getLastModified()));
-            cacheKey.addCacheKey(new ParameterCacheKey("contextParameters", this.parameters));
-        } catch (IOException e) {
-            throw new SetupException(e);
-        }
+        cacheKey.addCacheKey(new TimestampCacheKey(this.url, URLManipulationUtils.getLastModified(this.url)));
+        cacheKey.addCacheKey(new ParameterCacheKey("contextParameters", this.parameters));
 
         return cacheKey;
     }

Modified: cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateReader.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateReader.java?rev=1347569&r1=1347568&r2=1347569&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateReader.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateReader.java Thu Jun  7 11:12:42 2012
@@ -34,6 +34,7 @@ import org.apache.cocoon.pipeline.compon
 import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
 import org.apache.cocoon.pipeline.component.Finisher;
 import org.apache.cocoon.pipeline.component.Starter;
+import org.apache.cocoon.sax.util.URLManipulationUtils;
 import org.apache.cocoon.servlet.controller.ControllerContextHelper;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -72,12 +73,8 @@ public class StringTemplateReader extend
         }
 
         final CompoundCacheKey cacheKey = new CompoundCacheKey();
-        try {
-            cacheKey.addCacheKey(new TimestampCacheKey(this.source, this.source.openConnection().getLastModified()));
-            cacheKey.addCacheKey(new ParameterCacheKey("contextParameters", this.parameters));
-        } catch (IOException e) {
-            throw new SetupException("Could not create cache key.", e);
-        }
+        cacheKey.addCacheKey(new TimestampCacheKey(this.source, URLManipulationUtils.getLastModified(this.source)));
+        cacheKey.addCacheKey(new ParameterCacheKey("contextParameters", this.parameters));
 
         return cacheKey;
     }