cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r676852 - in /cocoon/whiteboard/corona/trunk: corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/ corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/ corona-sample/src/test/java/org/apache/cocoon/corona/site...
Date Tue, 15 Jul 2008 09:52:32 GMT
Author: cziegeler
Date: Tue Jul 15 02:52:31 2008
New Revision: 676852

URL: http://svn.apache.org/viewvc?rev=676852&view=rev
Log:
Move actions into sitemap module.

Added:
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/Action.java
  (contents, props changed)
      - copied, changed from r676827, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/Action.java
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/CustomException.java
  (contents, props changed)
      - copied, changed from r676827, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/CustomException.java
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/ErrorThrowingAction.java
  (contents, props changed)
      - copied, changed from r676827, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/ErrorThrowingAction.java
Removed:
    cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/Action.java
    cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/CustomException.java
    cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/ErrorThrowingAction.java
Modified:
    cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/AbstractPipeline.java
    cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/AsyncCachePipeline.java
    cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/CachingPipeline.java
    cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/Pipeline.java
    cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ActionFactory.java
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypeActionFactory.java
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionActionFactory.java

Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/AbstractPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/AbstractPipeline.java?rev=676852&r1=676851&r2=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/AbstractPipeline.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/AbstractPipeline.java
Tue Jul 15 02:52:31 2008
@@ -20,11 +20,9 @@
 
 import java.io.OutputStream;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
-import org.apache.cocoon.corona.pipeline.action.Action;
 import org.apache.cocoon.corona.pipeline.component.Consumer;
 import org.apache.cocoon.corona.pipeline.component.Finisher;
 import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
@@ -41,22 +39,11 @@
 
     private final Log logger = LogFactory.getLog(this.getClass());
 
-    private final List<Action> actions = new LinkedList<Action>();
-
     private final LinkedList<PipelineComponent> components = new LinkedList<PipelineComponent>();
 
     /**
      * {@inheritDoc}
-     * 
-     * @see org.apache.cocoon.corona.pipeline.Pipeline#addAction(org.apache.cocoon.corona.pipeline.action.Action)
-     */
-    public void addAction(Action action) {
-        this.actions.add(action);
-    }
-
-    /**
-     * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.pipeline.Pipeline#addComponent(org.apache.cocoon.corona.pipeline.component.PipelineComponent)
      */
     public void addComponent(PipelineComponent pipelineComponent) {
@@ -68,12 +55,10 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.pipeline.Pipeline#execute(OutputStream)
      */
     public void execute(Map<String, Object> parameters, OutputStream outputStream)
throws Exception {
-        this.invokeActions(parameters);
-
         this.setupComponents(parameters, outputStream);
 
         this.invokeStarter();
@@ -81,7 +66,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.pipeline.Pipeline#getContentType()
      */
     public String getContentType() {
@@ -97,12 +82,6 @@
         return (Finisher) this.components.getLast();
     }
 
-    protected void invokeActions(Map<String, Object> parameters) throws Exception {
-        for (Action action : this.actions) {
-            action.execute(parameters);
-        }
-    }
-
     protected void invokeStarter() {
         if (this.logger.isDebugEnabled()) {
             this.logger.debug("Invoking first component of " + this);

Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/AsyncCachePipeline.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/AsyncCachePipeline.java?rev=676852&r1=676851&r2=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/AsyncCachePipeline.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/AsyncCachePipeline.java
Tue Jul 15 02:52:31 2008
@@ -51,7 +51,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.pipeline.CachingPipeline#execute(java.util.Map, java.io.OutputStream)
      */
     @Override
@@ -60,8 +60,6 @@
             this.logger.debug("Used cache: " + this.pipelineCache);
         }
 
-        this.invokeActions(parameters);
-
         // create a caching output stream to intercept the result
         CachingOutputStream cachingOutputStream = new CachingOutputStream(outputStream);
         this.setupComponents(parameters, cachingOutputStream);
@@ -101,7 +99,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.pipeline.caching.CacheRefreshJob#refresh(org.apache.cocoon.corona.pipeline.caching.CacheKey)
      */
     public void refresh(CacheKey cacheKey) {

Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/CachingPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/CachingPipeline.java?rev=676852&r1=676851&r2=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/CachingPipeline.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/CachingPipeline.java
Tue Jul 15 02:52:31 2008
@@ -52,8 +52,6 @@
             this.logger.debug("Used cache: " + this.pipelineCache);
         }
 
-        this.invokeActions(parameters);
-
         // create a caching output stream to intercept the result
         CachingOutputStream cachingOutputStream = new CachingOutputStream(outputStream);
         this.setupComponents(parameters, cachingOutputStream);

Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/Pipeline.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/Pipeline.java?rev=676852&r1=676851&r2=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/Pipeline.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/Pipeline.java
Tue Jul 15 02:52:31 2008
@@ -21,7 +21,6 @@
 import java.io.OutputStream;
 import java.util.Map;
 
-import org.apache.cocoon.corona.pipeline.action.Action;
 import org.apache.cocoon.corona.pipeline.component.Consumer;
 import org.apache.cocoon.corona.pipeline.component.Finisher;
 import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
@@ -34,17 +33,17 @@
  * {@link #addComponent(PipelineComponent)}. Then these components linked with each other
in the order they were passed
  * and the {@link #execute(Map, OutputStream)} method finally produces an {@link OutputStream}
as result.
  * </p>
- * 
+ *
  * <p>
  * A pipeline works based on two fundamental concepts:
- * 
+ *
  * <ul>
  * <li>The first component of a pipeline is of type {@link Starter}. The last component
is of type {@link Finisher}.
  * </li>
  * <li>In order to link components with each other, the first has to be a {@link Producer},
the latter
  * {@link Consumer}. </li>
  * </ul>
- * 
+ *
  * <p>
  * When the pipeline links the components, it merely checks whether the above mentioned interfaces
are present. So the
  * pipeline does not know about the specific capabilities or the compatibility of the components.
It is the
@@ -56,11 +55,9 @@
  */
 public interface Pipeline {
 
-    void addAction(Action action);
-
     /**
      * Add a {@link PipelineComponent} to the pipeline. The order of when the components
are passed is significant.
-     * 
+     *
      * @param pipelineComponent The {@link PipelineComponent}.
      */
     void addComponent(PipelineComponent pipelineComponent);
@@ -68,7 +65,7 @@
     /**
      * After the pipeline has been prepared ({@link #addComponent(PipelineComponent)}, this
method can be invoked in
      * order to produce the result.
-     * 
+     *
      * @param parameters A {@link Map} of parameters that are available to all {@link PipelineComponent}s.
      * @param outputStream The processing result.
      * @throws Exception Any problem that might occur while processing the pipeline.
@@ -79,7 +76,7 @@
 
     /**
      * Get the time of the last modification.
-     * 
+     *
      * @return The last modification date
      */
     long getLastModified();

Modified: cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java?rev=676852&r1=676851&r2=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java
Tue Jul 15 02:52:31 2008
@@ -26,9 +26,9 @@
 
 import junit.framework.TestCase;
 
-import org.apache.cocoon.corona.pipeline.action.CustomException;
 import org.apache.cocoon.corona.servlet.node.StatusCodeCollector;
 import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
+import org.apache.cocoon.corona.sitemap.action.CustomException;
 import org.apache.cocoon.corona.sitemap.node.InvocationResult;
 import org.apache.cocoon.corona.sitemap.node.Sitemap;
 import org.apache.cocoon.corona.sitemap.objectmodel.ObjectModel;

Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java?rev=676852&r1=676851&r2=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java
Tue Jul 15 02:52:31 2008
@@ -21,8 +21,8 @@
 import java.net.URL;
 
 import org.apache.cocoon.corona.pipeline.Pipeline;
-import org.apache.cocoon.corona.pipeline.action.Action;
 import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
+import org.apache.cocoon.corona.sitemap.action.Action;
 import org.apache.cocoon.corona.sitemap.expression.LanguageInterpreter;
 
 public interface ComponentProvider {

Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java?rev=676852&r1=676851&r2=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java
Tue Jul 15 02:52:31 2008
@@ -22,14 +22,16 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.cocoon.corona.pipeline.Pipeline;
-import org.apache.cocoon.corona.pipeline.action.Action;
 import org.apache.cocoon.corona.pipeline.component.Finisher;
 import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
+import org.apache.cocoon.corona.sitemap.action.Action;
 import org.apache.cocoon.corona.sitemap.expression.LanguageInterpreter;
 import org.apache.cocoon.corona.sitemap.objectmodel.ObjectModel;
 import org.apache.cocoon.corona.sitemap.util.ParameterHelper;
@@ -38,6 +40,8 @@
 
     private static final Pattern PARAMETER_PATTERN = Pattern.compile("\\{([a-zA-Z\\-]+):([^\\{]*)\\}");
 
+    private final List<Action> actions = new LinkedList<Action>();
+
     private ComponentProvider componentProvider;
     private OutputStream outputStream;
     private Map<String, Object> parameters = new HashMap<String, Object>();
@@ -55,7 +59,7 @@
 
     /**
      * Create a {@link InvocationImpl} object using the given output stream.
-     * 
+     *
      * @param outputStream The {@link OutputStream} where the result is written to.
      */
     public InvocationImpl(OutputStream outputStream) {
@@ -65,7 +69,7 @@
 
     /**
      * Create a {@link InvocationImpl} object using the given output stream and requestURI.
-     * 
+     *
      * @param outputStream The {@link OutputStream} where the result is written to.
      * @param requestURI The requested path.
      */
@@ -77,7 +81,7 @@
 
     /**
      * Create a {@link InvocationImpl} object using the given output stream, requestURI and
parameters.
-     * 
+     *
      * @param outputStream The {@link OutputStream} where the result is written to.
      * @param requestURI The requested path.
      * @param parameters A {@link Map} of parameters that are used when the pipeline is being
executed.
@@ -91,7 +95,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#execute()
      */
     public void execute() throws Exception {
@@ -99,12 +103,15 @@
             throw new IllegalStateException("InvocationImpl has been executed without having
a pipeline.");
         }
 
+        for(final Action action : this.actions) {
+            action.execute(this.parameters);
+        }
         this.pipeline.execute(this.parameters, this.outputStream);
     }
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#getOutputStream()
      */
     public OutputStream getOutputStream() {
@@ -113,7 +120,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#getParameter(java.lang.String)
      */
     public Object getParameter(String name) {
@@ -125,7 +132,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#getParameters()
      */
     public Map<String, Object> getParameters() {
@@ -134,7 +141,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#getRequestURI()
      */
     public String getRequestURI() {
@@ -143,7 +150,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#getThrowable()
      */
     public Throwable getThrowable() {
@@ -152,7 +159,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#hasCompletePipeline()
      */
     public boolean hasCompletePipeline() {
@@ -161,7 +168,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#installAction(java.lang.String)
      */
     public void installAction(String type) {
@@ -170,12 +177,12 @@
         }
 
         Action action = this.componentProvider.createAction(type);
-        this.pipeline.addAction(action);
+        this.actions.add(action);
     }
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#installComponent(java.lang.String,
java.util.Map)
      */
     public void installComponent(String type, Map<String, ? extends Object> componentParameters)
{
@@ -195,7 +202,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#installPipeline(java.lang.String)
      */
     public void installPipeline(String type) {
@@ -204,7 +211,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#isErrorInvocation()
      */
     public boolean isErrorInvocation() {
@@ -213,7 +220,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#popSitemapParameters()
      */
     public void popSitemapParameters() {
@@ -222,7 +229,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#pushSitemapParameters(java.lang.String,
java.util.Map)
      */
     public void pushSitemapParameters(String nodeName, Map<String, ? extends Object>
sitemapParameters) {
@@ -231,7 +238,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#resolve(java.lang.String)
      */
     public URL resolve(String resource) {
@@ -248,7 +255,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#setOutputStream(java.io.OutputStream)
      */
     public void setOutputStream(OutputStream outputStream) {
@@ -257,7 +264,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#setParameters(java.util.Map)
      */
     public void setParameters(Map<String, Object> parameters) {
@@ -270,7 +277,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @see org.apache.cocoon.corona.sitemap.Invocation#setThrowable(java.lang.Throwable)
      */
     public void setThrowable(Throwable throwable) {

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=676852&r1=676851&r2=676852&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 Jul 15 02:52:31 2008
@@ -21,9 +21,9 @@
 import java.net.URL;
 
 import org.apache.cocoon.corona.pipeline.Pipeline;
-import org.apache.cocoon.corona.pipeline.action.Action;
 import org.apache.cocoon.corona.pipeline.component.PipelineComponent;
 import org.apache.cocoon.corona.pipeline.resource.ResourceResolver;
+import org.apache.cocoon.corona.sitemap.action.Action;
 import org.apache.cocoon.corona.sitemap.expression.LanguageInterpreter;
 import org.apache.cocoon.corona.sitemap.expression.LanguageInterpreterFactory;
 import org.apache.cocoon.corona.sitemap.spring.ActionFactory;

Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/Action.java
(from r676827, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/Action.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/Action.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/Action.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/Action.java&r1=676827&r2=676852&rev=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/Action.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/Action.java
Tue Jul 15 02:52:31 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.pipeline.action;
+package org.apache.cocoon.corona.sitemap.action;
 
 import java.util.Map;
 

Propchange: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/Action.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/Action.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/Action.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/CustomException.java
(from r676827, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/CustomException.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/CustomException.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/CustomException.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/CustomException.java&r1=676827&r2=676852&rev=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/CustomException.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/CustomException.java
Tue Jul 15 02:52:31 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.pipeline.action;
+package org.apache.cocoon.corona.sitemap.action;
 
 public class CustomException extends Exception {
 

Propchange: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/CustomException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/CustomException.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/CustomException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/ErrorThrowingAction.java
(from r676827, cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/ErrorThrowingAction.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/ErrorThrowingAction.java?p2=cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/ErrorThrowingAction.java&p1=cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/ErrorThrowingAction.java&r1=676827&r2=676852&rev=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/action/ErrorThrowingAction.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/ErrorThrowingAction.java
Tue Jul 15 02:52:31 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.pipeline.action;
+package org.apache.cocoon.corona.sitemap.action;
 
 import java.util.Map;
 
@@ -25,7 +25,7 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.apache.cocoon.corona.pipeline.action.Action#execute(Map)
+     * @see org.apache.cocoon.corona.sitemap.action.Action#execute(Map)
      */
     public void execute(Map<String, Object> parameters) throws Exception {
         throw new CustomException();

Propchange: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/ErrorThrowingAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/ErrorThrowingAction.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/ErrorThrowingAction.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/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?rev=676852&r1=676851&r2=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ActionFactory.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ActionFactory.java
Tue Jul 15 02:52:31 2008
@@ -18,7 +18,7 @@
  */
 package org.apache.cocoon.corona.sitemap.spring;
 
-import org.apache.cocoon.corona.pipeline.action.Action;
+import org.apache.cocoon.corona.sitemap.action.Action;
 
 public interface ActionFactory {
 

Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/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?rev=676852&r1=676851&r2=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypeActionFactory.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypeActionFactory.java
Tue Jul 15 02:52:31 2008
@@ -18,7 +18,7 @@
  */
 package org.apache.cocoon.corona.sitemap.spring;
 
-import org.apache.cocoon.corona.pipeline.action.Action;
+import org.apache.cocoon.corona.sitemap.action.Action;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/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?rev=676852&r1=676851&r2=676852&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionActionFactory.java
(original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionActionFactory.java
Tue Jul 15 02:52:31 2008
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.cocoon.corona.pipeline.action.Action;
+import org.apache.cocoon.corona.sitemap.action.Action;
 
 public class ReflectionActionFactory implements ActionFactory {
 



Mime
View raw message