You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/04/01 17:06:56 UTC
svn commit: r643432 - in /cocoon/whiteboard/corona/trunk: corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/ corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ corona-core/src/main/java/org/apache/cocoon/corona/si...

Author: reinhard
Date: Tue Apr  1 08:06:41 2008
New Revision: 643432

URL: http://svn.apache.org/viewvc?rev=643432&view=rev
Log:
fix package name of resourceresolver

Added:
    cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/
      - copied from r643428, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/resource/
Removed:
    cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/sitemap/
Modified:
    cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/FileGenerator.java
    cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/FileReaderComponent.java
    cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ClassPathResourceResolver.java
    cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ResourceResolver.java
    cocoon/whiteboard/corona/trunk/corona-core/src/main/resources/META-INF/cocoon/spring/applicationContext.xml
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java

Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/FileGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/FileGenerator.java?rev=643432&r1=643431&r2=643432&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/FileGenerator.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/FileGenerator.java Tue Apr  1 08:06:41 2008
@@ -26,7 +26,7 @@
 
 import org.apache.cocoon.corona.pipeline.caching.CacheKey;
 import org.apache.cocoon.corona.pipeline.caching.TimestampCacheKey;
-import org.apache.cocoon.corona.sitemap.resource.ClassPathResourceResolver;
+import org.apache.cocoon.corona.pipeline.resource.ClassPathResourceResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;

Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/FileReaderComponent.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/FileReaderComponent.java?rev=643432&r1=643431&r2=643432&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/FileReaderComponent.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/FileReaderComponent.java Tue Apr  1 08:06:41 2008
@@ -26,7 +26,7 @@
 
 import org.apache.cocoon.corona.pipeline.caching.CacheKey;
 import org.apache.cocoon.corona.pipeline.caching.TimestampCacheKey;
-import org.apache.cocoon.corona.sitemap.resource.ClassPathResourceResolver;
+import org.apache.cocoon.corona.pipeline.resource.ClassPathResourceResolver;
 
 public class FileReaderComponent implements Starter, Finisher, CachingPipelineComponent {
 

Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ClassPathResourceResolver.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ClassPathResourceResolver.java?rev=643432&r1=643428&r2=643432&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ClassPathResourceResolver.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ClassPathResourceResolver.java Tue Apr  1 08:06:41 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.resource;
+package org.apache.cocoon.corona.pipeline.resource;
 
 import java.net.URL;
 
@@ -27,7 +27,7 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.apache.cocoon.corona.sitemap.resource.ResourceResolver#resolve(java.lang.String)
+     * @see org.apache.cocoon.corona.pipeline.resource.ResourceResolver#resolve(java.lang.String)
      */
     public URL resolve(String resource) {
         URL url = this.getClass().getResource(resource);

Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ResourceResolver.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ResourceResolver.java?rev=643432&r1=643428&r2=643432&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ResourceResolver.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/resource/ResourceResolver.java Tue Apr  1 08:06:41 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.resource;
+package org.apache.cocoon.corona.pipeline.resource;
 
 import java.net.URL;
 

Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/resources/META-INF/cocoon/spring/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/resources/META-INF/cocoon/spring/applicationContext.xml?rev=643432&r1=643431&r2=643432&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/resources/META-INF/cocoon/spring/applicationContext.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/resources/META-INF/cocoon/spring/applicationContext.xml Tue Apr  1 08:06:41 2008
@@ -21,14 +21,14 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-  <bean name="org.apache.cocoon.corona.sitemap.resource.ResourceResolver" class="org.apache.cocoon.corona.sitemap.resource.ClassPathResourceResolver" />
+  <bean name="org.apache.cocoon.corona.pipeline.resource.ResourceResolver" class="org.apache.cocoon.corona.pipeline.resource.ClassPathResourceResolver" />
 
   <bean name="org.apache.cocoon.corona.sitemap.ComponentProvider" class="org.apache.cocoon.corona.sitemap.SpringComponentProvider">
     <property name="actionFactory" ref="org.apache.cocoon.corona.pipeline.action.ActionFactory" />
     <property name="languageInterpreterFactory" ref="org.apache.cocoon.corona.sitemap.expression.LanguageInterpreterFactory" />
     <property name="pipelineComponentFactory" ref="org.apache.cocoon.corona.pipeline.component.PipelineComponentFactory" />
     <property name="pipelineFactory" ref="org.apache.cocoon.corona.pipeline.PipelineFactory" />
-    <property name="resourceResolver" ref="org.apache.cocoon.corona.sitemap.resource.ResourceResolver" />
+    <property name="resourceResolver" ref="org.apache.cocoon.corona.pipeline.resource.ResourceResolver" />
   </bean>
 
   <bean name="org.apache.cocoon.corona.sitemap.Invocation" class="org.apache.cocoon.corona.sitemap.InvocationImpl" scope="prototype">

Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java?rev=643432&r1=643431&r2=643432&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java Tue Apr  1 08:06:41 2008
@@ -26,9 +26,9 @@
 import org.apache.cocoon.corona.pipeline.action.ActionFactory;
 import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
 import org.apache.cocoon.corona.pipeline.component.PipelineComponentFactory;
+import org.apache.cocoon.corona.pipeline.resource.ResourceResolver;
 import org.apache.cocoon.corona.sitemap.expression.LanguageInterpreter;
 import org.apache.cocoon.corona.sitemap.expression.LanguageInterpreterFactory;
-import org.apache.cocoon.corona.sitemap.resource.ResourceResolver;
 
 public class SpringComponentProvider implements ComponentProvider {