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 18:23:41 UTC
svn commit: r643471 - in /cocoon/whiteboard/corona/trunk: corona-core/
corona-core/src/main/java/org/apache/cocoon/corona/pipeline/
corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/
corona-core/src/main/java/org/apache/cocoon/corona/p...
Author: reinhard
Date: Tue Apr 1 09:23:39 2008
New Revision: 643471
URL: http://svn.apache.org/viewvc?rev=643471&view=rev
Log:
move Spring related classes to corona-sitemap
Added:
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ActionFactory.java
- copied, changed from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/ActionFactory.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineComponentFactory.java
- copied, changed from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/PipelineComponentFactory.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineFactory.java
- copied, changed from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/PipelineFactory.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypeActionFactory.java
- copied, changed from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/PrototypeActionFactory.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineComponentFactory.java
- copied, changed from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/PrototypePipelineComponentFactory.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineFactory.java
- copied, changed from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/PrototypePipelineFactory.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionActionFactory.java
- copied, changed from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/ReflectionActionFactory.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineComponentFactory.java
- copied, changed from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/ReflectionPipelineComponentFactory.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineFactory.java
- copied, changed from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/ReflectionPipelineFactory.java
Removed:
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/PipelineFactory.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/PrototypePipelineFactory.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/ReflectionPipelineFactory.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/ActionFactory.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/PrototypeActionFactory.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/ReflectionActionFactory.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/PipelineComponentFactory.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/PrototypePipelineComponentFactory.java
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/ReflectionPipelineComponentFactory.java
Modified:
cocoon/whiteboard/corona/trunk/corona-core/pom.xml
cocoon/whiteboard/corona/trunk/corona-sitemap/pom.xml
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/applicationContext.xml
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-action.xml
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline.xml
Modified: cocoon/whiteboard/corona/trunk/corona-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/pom.xml?rev=643471&r1=643470&r2=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/pom.xml Tue Apr 1 09:23:39 2008
@@ -38,14 +38,6 @@
<dependencies>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/pom.xml?rev=643471&r1=643470&r2=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/pom.xml Tue Apr 1 09:23:39 2008
@@ -42,6 +42,10 @@
<artifactId>corona-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
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=643471&r1=643470&r2=643471&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 09:23:39 2008
@@ -21,14 +21,14 @@
import java.net.URL;
import org.apache.cocoon.corona.pipeline.Pipeline;
-import org.apache.cocoon.corona.pipeline.PipelineFactory;
import org.apache.cocoon.corona.pipeline.action.Action;
-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.spring.ActionFactory;
+import org.apache.cocoon.corona.sitemap.spring.PipelineComponentFactory;
+import org.apache.cocoon.corona.sitemap.spring.PipelineFactory;
public class SpringComponentProvider implements ComponentProvider {
Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ActionFactory.java (from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/ActionFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ActionFactory.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ActionFactory.java&p1=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/ActionFactory.java&r1=643435&r2=643471&rev=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/ActionFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ActionFactory.java Tue Apr 1 09:23:39 2008
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.action;
+package org.apache.cocoon.corona.sitemap.spring;
+
+import org.apache.cocoon.corona.pipeline.action.Action;
public interface ActionFactory {
Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineComponentFactory.java (from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/PipelineComponentFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineComponentFactory.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineComponentFactory.java&p1=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/PipelineComponentFactory.java&r1=643435&r2=643471&rev=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/PipelineComponentFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineComponentFactory.java Tue Apr 1 09:23:39 2008
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.sitemap.spring;
+
+import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
public interface PipelineComponentFactory {
Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineFactory.java (from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/PipelineFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineFactory.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineFactory.java&p1=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/PipelineFactory.java&r1=643435&r2=643471&rev=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/PipelineFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineFactory.java Tue Apr 1 09:23:39 2008
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline;
+package org.apache.cocoon.corona.sitemap.spring;
+
+import org.apache.cocoon.corona.pipeline.Pipeline;
public interface PipelineFactory {
Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypeActionFactory.java (from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/PrototypeActionFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypeActionFactory.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypeActionFactory.java&p1=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/PrototypeActionFactory.java&r1=643435&r2=643471&rev=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/PrototypeActionFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypeActionFactory.java Tue Apr 1 09:23:39 2008
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.action;
+package org.apache.cocoon.corona.sitemap.spring;
+import org.apache.cocoon.corona.pipeline.action.Action;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -29,7 +30,7 @@
/**
* {@inheritDoc}
*
- * @see org.apache.cocoon.corona.pipeline.action.ActionFactory#createAction(java.lang.String)
+ * @see org.apache.cocoon.corona.sitemap.spring.ActionFactory#createAction(java.lang.String)
*/
public Action createAction(String type) {
return (Action) this.applicationContext.getBean(type, Action.class);
Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineComponentFactory.java (from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/PrototypePipelineComponentFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineComponentFactory.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineComponentFactory.java&p1=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/PrototypePipelineComponentFactory.java&r1=643435&r2=643471&rev=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/PrototypePipelineComponentFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineComponentFactory.java Tue Apr 1 09:23:39 2008
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.sitemap.spring;
+import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -29,7 +30,7 @@
/**
* {@inheritDoc}
*
- * @see org.apache.cocoon.corona.pipeline.component.PipelineComponentFactory#createComponent(java.lang.String)
+ * @see org.apache.cocoon.corona.sitemap.spring.PipelineComponentFactory#createComponent(java.lang.String)
*/
public PipelineComponent createComponent(String type) {
return (PipelineComponent) this.applicationContext.getBean(type, PipelineComponent.class);
Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineFactory.java (from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/PrototypePipelineFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineFactory.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineFactory.java&p1=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/PrototypePipelineFactory.java&r1=643435&r2=643471&rev=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/PrototypePipelineFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineFactory.java Tue Apr 1 09:23:39 2008
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline;
+package org.apache.cocoon.corona.sitemap.spring;
+import org.apache.cocoon.corona.pipeline.Pipeline;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -29,7 +30,7 @@
/**
* {@inheritDoc}
*
- * @see org.apache.cocoon.corona.pipeline.PipelineFactory#createPipeline(java.lang.String)
+ * @see org.apache.cocoon.corona.sitemap.spring.PipelineFactory#createPipeline(java.lang.String)
*/
public Pipeline createPipeline(String type) {
return (Pipeline) this.applicationContext.getBean(type, Pipeline.class);
Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionActionFactory.java (from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/ReflectionActionFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionActionFactory.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionActionFactory.java&p1=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/ReflectionActionFactory.java&r1=643435&r2=643471&rev=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/action/ReflectionActionFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionActionFactory.java Tue Apr 1 09:23:39 2008
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.action;
+package org.apache.cocoon.corona.sitemap.spring;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.cocoon.corona.pipeline.action.Action;
+
public class ReflectionActionFactory implements ActionFactory {
private final Map<String, Class<? extends Action>> types = new HashMap<String, Class<? extends Action>>();
@@ -29,7 +31,7 @@
/**
* {@inheritDoc}
*
- * @see org.apache.cocoon.corona.pipeline.action.ActionFactory#createAction(java.lang.String)
+ * @see org.apache.cocoon.corona.sitemap.spring.ActionFactory#createAction(java.lang.String)
*/
public Action createAction(String type) {
Class<? extends Action> actionClass = this.types.get(type);
Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineComponentFactory.java (from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/ReflectionPipelineComponentFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineComponentFactory.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineComponentFactory.java&p1=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/ReflectionPipelineComponentFactory.java&r1=643435&r2=643471&rev=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/ReflectionPipelineComponentFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineComponentFactory.java Tue Apr 1 09:23:39 2008
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline.component;
+package org.apache.cocoon.corona.sitemap.spring;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
+
public class ReflectionPipelineComponentFactory implements PipelineComponentFactory {
private Map<String, Class<? extends PipelineComponent>> types = new HashMap<String, Class<? extends PipelineComponent>>();
@@ -49,7 +51,7 @@
/**
* {@inheritDoc}
*
- * @see org.apache.cocoon.corona.pipeline.component.PipelineComponentFactory#createComponent(java.lang.String)
+ * @see org.apache.cocoon.corona.sitemap.spring.PipelineComponentFactory#createComponent(java.lang.String)
*/
public PipelineComponent createComponent(String type) {
Class<? extends PipelineComponent> componentClass = this.types.get(type);
Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineFactory.java (from r643435, cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/ReflectionPipelineFactory.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineFactory.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineFactory.java&p1=cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/ReflectionPipelineFactory.java&r1=643435&r2=643471&rev=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/ReflectionPipelineFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineFactory.java Tue Apr 1 09:23:39 2008
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocoon.corona.pipeline;
+package org.apache.cocoon.corona.sitemap.spring;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.cocoon.corona.pipeline.Pipeline;
+
public class ReflectionPipelineFactory implements PipelineFactory {
private Map<String, Class<? extends Pipeline>> types = new HashMap<String, Class<? extends Pipeline>>();
@@ -29,7 +31,7 @@
/**
* {@inheritDoc}
*
- * @see org.apache.cocoon.corona.pipeline.PipelineFactory#createPipeline(java.lang.String)
+ * @see org.apache.cocoon.corona.sitemap.spring.PipelineFactory#createPipeline(java.lang.String)
*/
public Pipeline createPipeline(String type) {
Class<? extends Pipeline> pipelineClass = this.types.get(type);
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/applicationContext.xml?rev=643471&r1=643470&r2=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/applicationContext.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/applicationContext.xml Tue Apr 1 09:23:39 2008
@@ -24,10 +24,10 @@
<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="actionFactory" ref="org.apache.cocoon.corona.sitemap.spring.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="pipelineComponentFactory" ref="org.apache.cocoon.corona.sitemap.spring.PipelineComponentFactory" />
+ <property name="pipelineFactory" ref="org.apache.cocoon.corona.sitemap.spring.PipelineFactory" />
<property name="resourceResolver" ref="org.apache.cocoon.corona.pipeline.resource.ResourceResolver" />
</bean>
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-action.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-action.xml?rev=643471&r1=643470&r2=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-action.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-action.xml Tue Apr 1 09:23:39 2008
@@ -22,8 +22,8 @@
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.pipeline.action.ActionFactory"
- class="org.apache.cocoon.corona.pipeline.action.ReflectionActionFactory">
+ <bean name="org.apache.cocoon.corona.sitemap.spring.ActionFactory"
+ class="org.apache.cocoon.corona.sitemap.spring.ReflectionActionFactory">
<property name="types">
<map>
<entry key="error-throwing" value="org.apache.cocoon.corona.pipeline.action.ErrorThrowingAction" />
@@ -32,8 +32,8 @@
</bean>
-->
- <bean name="org.apache.cocoon.corona.pipeline.action.ActionFactory"
- class="org.apache.cocoon.corona.pipeline.action.PrototypeActionFactory">
+ <bean name="org.apache.cocoon.corona.sitemap.spring.ActionFactory"
+ class="org.apache.cocoon.corona.sitemap.spring.PrototypeActionFactory">
</bean>
<bean name="action:error-throwing" class="org.apache.cocoon.corona.pipeline.action.ErrorThrowingAction" scope="prototype" />
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml?rev=643471&r1=643470&r2=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml Tue Apr 1 09:23:39 2008
@@ -22,8 +22,8 @@
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.pipeline.component.PipelineComponentFactory"
- class="org.apache.cocoon.corona.pipeline.component.ReflectionPipelineComponentFactory">
+ <bean name="org.apache.cocoon.corona.sitemap.spring.PipelineComponentFactory"
+ class="org.apache.cocoon.corona.sitemap.spring.ReflectionPipelineComponentFactory">
<property name="types">
<map>
<entry key="redirector" value="org.apache.cocoon.corona.servlet.component.RedirectorComponent" />
@@ -35,8 +35,8 @@
</bean>
-->
- <bean name="org.apache.cocoon.corona.pipeline.component.PipelineComponentFactory"
- class="org.apache.cocoon.corona.pipeline.component.PrototypePipelineComponentFactory">
+ <bean name="org.apache.cocoon.corona.sitemap.spring.PipelineComponentFactory"
+ class="org.apache.cocoon.corona.sitemap.spring.PrototypePipelineComponentFactory">
</bean>
<bean name="serializer:xhtml" class="org.apache.cocoon.corona.pipeline.component.XMLSerializer" scope="prototype">
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline.xml?rev=643471&r1=643470&r2=643471&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline.xml Tue Apr 1 09:23:39 2008
@@ -21,7 +21,7 @@
<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.pipeline.PipelineFactory" class="org.apache.cocoon.corona.pipeline.PrototypePipelineFactory" />
+ <bean name="org.apache.cocoon.corona.sitemap.spring.PipelineFactory" class="org.apache.cocoon.corona.sitemap.spring.PrototypePipelineFactory" />
<bean name="pipeline:caching" class="org.apache.cocoon.corona.pipeline.CachingPipeline" scope="prototype">
<property name="pipelineCache" ref="pipelineCache" />