cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1347905 - in /cocoon/cocoon3/trunk: cocoon-sax/src/main/java/org/apache/cocoon/sax/component/ cocoon-sax/src/main/java/org/apache/cocoon/sax/util/ cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ cocoon-stringtemplate/src/...
Date Fri, 08 Jun 2012 07:26:15 GMT
Author: ilgrosso
Date: Fri Jun  8 07:26:14 2012
New Revision: 1347905

URL: http://svn.apache.org/viewvc?rev=1347905&view=rev
Log:
Renaming URLManipulationUtils to URLUtils

Added:
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/URLUtils.java
      - copied, changed from r1347888, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/URLManipulationUtils.java
Removed:
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/URLManipulationUtils.java
Modified:
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLGenerator.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.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/SchemaProcessorTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java?rev=1347905&r1=1347904&r2=1347905&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java
Fri Jun  8 07:26:14 2012
@@ -33,7 +33,7 @@ import org.apache.cocoon.sax.AbstractSAX
 import org.apache.cocoon.sax.SAXConsumer;
 import org.apache.cocoon.sax.util.InMemoryLRUResourceCache;
 import org.apache.cocoon.sax.util.SAXConsumerAdapter;
-import org.apache.cocoon.sax.util.URLManipulationUtils;
+import org.apache.cocoon.sax.util.URLUtils;
 import org.apache.cocoon.sax.util.ValidityValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -93,7 +93,7 @@ public final class SchemaProcessorTransf
 
         this.source = source;
 
-        Long lastModified = URLManipulationUtils.getLastModified(this.source);
+        Long lastModified = URLUtils.getLastModified(this.source);
 
         if (SCHEMA_CACHE.containsKey(source.toExternalForm())) {
             ValidityValue<Schema> cacheEntry = SCHEMA_CACHE.get(source.toExternalForm());
@@ -125,6 +125,6 @@ public final class SchemaProcessorTransf
             throw new SetupException(this.getClass().getSimpleName() + " has no source.");
         }
 
-        return new TimestampCacheKey(this.source, URLManipulationUtils.getLastModified(this.source));
+        return new TimestampCacheKey(this.source, URLUtils.getLastModified(this.source));
     }
 }

Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java?rev=1347905&r1=1347904&r2=1347905&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java
Fri Jun  8 07:26:14 2012
@@ -37,7 +37,7 @@ import org.apache.cocoon.pipeline.cachin
 import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
 import org.apache.cocoon.sax.AbstractSAXTransformer;
 import org.apache.cocoon.sax.SAXConsumer;
-import org.apache.cocoon.sax.util.URLManipulationUtils;
+import org.apache.cocoon.sax.util.URLUtils;
 import org.apache.cocoon.sax.util.XMLUtils;
 import org.apache.cocoon.sax.xpointer.ParseException;
 import org.apache.cocoon.sax.xpointer.XPointer;
@@ -651,11 +651,11 @@ public final class XIncludeTransformer e
 
         if (this.baseUrl != null) {
             cacheKey.addCacheKey(new TimestampCacheKey(this.baseUrl,
-                    URLManipulationUtils.getLastModified(this.baseUrl)));
+                    URLUtils.getLastModified(this.baseUrl)));
         }
         for (URL xincludeURL : this.xincludeURLs) {
             cacheKey.addCacheKey(new TimestampCacheKey(xincludeURL,
-                    URLManipulationUtils.getLastModified(xincludeURL)));
+                    URLUtils.getLastModified(xincludeURL)));
         }
 
         return cacheKey;

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=1347905&r1=1347904&r2=1347905&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
Fri Jun  8 07:26:14 2012
@@ -38,7 +38,7 @@ import org.apache.cocoon.pipeline.compon
 import org.apache.cocoon.pipeline.util.StringRepresentation;
 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.URLUtils;
 import org.apache.cocoon.sax.util.XMLUtils;
 import org.apache.cocoon.xml.dom.DOMStreamer;
 import org.apache.cocoon.xml.sax.SAXBuffer;
@@ -383,7 +383,7 @@ public class XMLGenerator extends Abstra
          */
         @Override
         public CacheKey constructCacheKey() {
-            return new TimestampCacheKey(this.source, URLManipulationUtils.getLastModified(this.source));
+            return new TimestampCacheKey(this.source, URLUtils.getLastModified(this.source));
         }
 
         /**

Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.java?rev=1347905&r1=1347904&r2=1347905&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.java
Fri Jun  8 07:26:14 2012
@@ -38,7 +38,7 @@ import org.apache.cocoon.sax.AbstractSAX
 import org.apache.cocoon.sax.SAXConsumer;
 import org.apache.cocoon.sax.util.InMemoryLRUResourceCache;
 import org.apache.cocoon.sax.util.SAXConsumerAdapter;
-import org.apache.cocoon.sax.util.URLManipulationUtils;
+import org.apache.cocoon.sax.util.URLUtils;
 import org.apache.cocoon.sax.util.ValidityValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -127,7 +127,7 @@ public class XSLTTransformer extends Abs
 
         this.source = source;
 
-        Long lastModified = URLManipulationUtils.getLastModified(this.source);
+        Long lastModified = URLUtils.getLastModified(this.source);
 
         this.templates = null;
         // check the XSLT is in the cache first
@@ -260,7 +260,7 @@ public class XSLTTransformer extends Abs
             throw new SetupException(this.getClass().getSimpleName() + " has no source.");
         }
 
-        return new TimestampCacheKey(this.source, URLManipulationUtils.getLastModified(this.source));
+        return new TimestampCacheKey(this.source, URLUtils.getLastModified(this.source));
     }
 
     /**

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/URLUtils.java
(from r1347888, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/URLManipulationUtils.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/URLUtils.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/URLUtils.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/URLManipulationUtils.java&r1=1347888&r2=1347905&rev=1347905&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/URLManipulationUtils.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/URLUtils.java
Fri Jun  8 07:26:14 2012
@@ -25,12 +25,12 @@ import org.apache.cocoon.pipeline.util.U
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class URLManipulationUtils {
+public class URLUtils {
 
     /**
      * Logger.
      */
-    private static final Logger LOG = LoggerFactory.getLogger(URLManipulationUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(URLUtils.class);
 
     /**
      * Find the actual last modification timestamp for the given URL,

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=1347905&r1=1347904&r2=1347905&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
Fri Jun  8 07:26:14 2012
@@ -27,7 +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.apache.cocoon.sax.util.URLUtils;
 
 public class FileReaderComponent extends AbstractReader implements CachingPipelineComponent
{
 
@@ -46,7 +46,7 @@ public class FileReaderComponent extends
      */
     @Override
     public CacheKey constructCacheKey() {
-        return new TimestampCacheKey(this.source, URLManipulationUtils.getLastModified(this.source));
+        return new TimestampCacheKey(this.source, URLUtils.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=1347905&r1=1347904&r2=1347905&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
Fri Jun  8 07:26:14 2012
@@ -32,7 +32,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.URLUtils;
 import org.apache.cocoon.sax.util.XMLUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
@@ -96,7 +96,7 @@ public class StringTemplateGenerator ext
         }
 
         final CompoundCacheKey cacheKey = new CompoundCacheKey();
-        cacheKey.addCacheKey(new TimestampCacheKey(this.url, URLManipulationUtils.getLastModified(this.url)));
+        cacheKey.addCacheKey(new TimestampCacheKey(this.url, URLUtils.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=1347905&r1=1347904&r2=1347905&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
Fri Jun  8 07:26:14 2012
@@ -25,7 +25,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import org.apache.cocoon.pipeline.ProcessingException;
-import org.apache.cocoon.pipeline.SetupException;
 import org.apache.cocoon.pipeline.caching.CacheKey;
 import org.apache.cocoon.pipeline.caching.CompoundCacheKey;
 import org.apache.cocoon.pipeline.caching.ParameterCacheKey;
@@ -34,7 +33,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.sax.util.URLUtils;
 import org.apache.cocoon.servlet.controller.ControllerContextHelper;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -73,7 +72,7 @@ public class StringTemplateReader extend
         }
 
         final CompoundCacheKey cacheKey = new CompoundCacheKey();
-        cacheKey.addCacheKey(new TimestampCacheKey(this.source, URLManipulationUtils.getLastModified(this.source)));
+        cacheKey.addCacheKey(new TimestampCacheKey(this.source, URLUtils.getLastModified(this.source)));
         cacheKey.addCacheKey(new ParameterCacheKey("contextParameters", this.parameters));
 
         return cacheKey;



Mime
View raw message