cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r696953 [1/2] - in /cocoon/cocoon3/trunk: cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/node/ cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ cocoon-sample/src/main/java/org/apache/cocoon/corona/sam...
Date Fri, 19 Sep 2008 07:19:46 GMT
Author: reinhard
Date: Fri Sep 19 00:19:44 2008
New Revision: 696953

URL: http://svn.apache.org/viewvc?rev=696953&view=rev
Log:
Corona -> Cocoon3: Sitemap

Added:
    cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/corona/sitemap/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/ComponentProvider.java   (contents, props changed)
      - copied, changed from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/Invocation.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationException.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationException.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java   (contents, props changed)
      - copied, changed from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/NoMatchingPipelineException.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/NoMatchingPipelineException.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapBuilder.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SitemapBuilder.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SitemapParameters.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SpringComponentProvider.java   (contents, props changed)
      - copied, changed from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/action/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/action/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ExceptionGenerator.java
      - copied, changed from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/expression/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/matcher/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/AbstractSitemapNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ActNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/ActNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ErrorNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/ErrorNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/FlowNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/FlowNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/GenerateNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/InvocationResult.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/InvocationResult.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/MatchNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/MatchNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/Node.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/Node.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/OtherwiseNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/OtherwiseNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ParameterNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/ParameterNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/PipelineNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/PipelineNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/PipelinesNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/PipelinesNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ReadNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/ReadNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/SelectNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/SelectNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/SerializeNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/SerializeNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/Sitemap.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/Sitemap.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/SitemapNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/SitemapNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/SitemapNodeFactory.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/SitemapNodeFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/TransformNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/TransformNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/WhenNode.java   (contents, props changed)
      - copied, changed from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/WhenNode.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/annotations/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/annotations/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/objectmodel/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/objectmodel/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/PipelineComponentFactory.java
      - copied, changed from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineComponentFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/PipelineFactory.java
      - copied, changed from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PipelineFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/PrototypePipelineComponentFactory.java
      - copied, changed from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineComponentFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/PrototypePipelineFactory.java
      - copied, changed from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/PrototypePipelineFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/ReflectionPipelineComponentFactory.java
      - copied, changed from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineComponentFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/ReflectionPipelineFactory.java
      - copied, changed from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/spring/ReflectionPipelineFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/util/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/util/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/xml/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/xml/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/matcher/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/corona/sitemap/matcher/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/node/   (props changed)
      - copied from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/corona/sitemap/node/
Removed:
    cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/corona/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/
    cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/corona/
Modified:
    cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/node/CallNode.java
    cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java
    cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/corona/sample/action/ErrorThrowingAction.java
    cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockHttpServletRequest.java
    cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockHttpServletResponse.java
    cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/SitemapBuilderTest.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/RedirectNode.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/ObjectModelProvider.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/action/Action.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/JexlLanguageInterpreter.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/LanguageInterpreter.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/LanguageInterpreterFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/PrototypeLanguageInterpreterFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/SitemapLanguageInterpreter.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/ContainsMatcher.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/EndsWithMatcher.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/EqualsMatcher.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/Matcher.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/RegexpMatcher.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/StartsWithMatcher.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/WildcardMatcher.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/annotations/NodeChild.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/annotations/Parameter.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/objectmodel/ObjectModel.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/ActionFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/PrototypeActionFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/ReflectionActionFactory.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/SitemapNodeNameGenerator.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/spring/SitemapNodeScopeResolver.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/util/ExceptionHandler.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/util/ParameterHelper.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/util/WildcardMatcherHelper.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/xml/AttributeTypes.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/xml/AttributesImpl.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/applicationContext.xml
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/corona-expression-language.xml
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-action.xml
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline.xml
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/corona-sitemap-node.xml
    cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/matcher/WildcardMatcherTest.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/test/java/org/apache/cocoon/sitemap/node/MatchNodeTest.java
    cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java
    cocoon/cocoon3/trunk/parent/it.bat

Modified: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/node/CallNode.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/node/CallNode.java?rev=696953&r1=696952&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/node/CallNode.java (original)
+++ cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/node/CallNode.java Fri Sep 19 00:19:44 2008
@@ -22,11 +22,11 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.cocoon.corona.sitemap.Invocation;
-import org.apache.cocoon.corona.sitemap.node.AbstractSitemapNode;
-import org.apache.cocoon.corona.sitemap.node.InvocationResult;
-import org.apache.cocoon.corona.sitemap.node.Node;
-import org.apache.cocoon.corona.sitemap.node.annotations.Parameter;
+import org.apache.cocoon.sitemap.Invocation;
+import org.apache.cocoon.sitemap.node.AbstractSitemapNode;
+import org.apache.cocoon.sitemap.node.InvocationResult;
+import org.apache.cocoon.sitemap.node.Node;
+import org.apache.cocoon.sitemap.node.annotations.Parameter;
 
 @Node(name = "call")
 public class CallNode extends AbstractSitemapNode {

Modified: cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java?rev=696953&r1=696952&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java (original)
+++ cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java Fri Sep 19 00:19:44 2008
@@ -45,8 +45,8 @@
 import org.apache.cocoon.corona.servlet.controller.ControllerContextHelper;
 import org.apache.cocoon.corona.servlet.node.StatusCodeCollector;
 import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
-import org.apache.cocoon.corona.sitemap.util.ExceptionHandler;
 import org.apache.cocoon.pipeline.util.URLConnectionUtils;
+import org.apache.cocoon.sitemap.util.ExceptionHandler;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/corona/sample/action/ErrorThrowingAction.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/corona/sample/action/ErrorThrowingAction.java?rev=696953&r1=696952&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/corona/sample/action/ErrorThrowingAction.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/corona/sample/action/ErrorThrowingAction.java Fri Sep 19 00:19:44 2008
@@ -20,15 +20,14 @@
 
 import java.util.Map;
 
-import org.apache.cocoon.corona.sitemap.action.Action;
+import org.apache.cocoon.sitemap.action.Action;
 
 public class ErrorThrowingAction implements Action {
 
-
     /**
      * {@inheritDoc}
-     *
-     * @see org.apache.cocoon.corona.sitemap.action.Action#setup(java.util.Map)
+     * 
+     * @see org.apache.cocoon.sitemap.action.Action#setup(java.util.Map)
      */
     public void setup(Map<String, Object> parameters) throws Exception {
         // nothing to do
@@ -36,8 +35,8 @@
 
     /**
      * {@inheritDoc}
-     *
-     * @see org.apache.cocoon.corona.sitemap.action.Action#execute()
+     * 
+     * @see org.apache.cocoon.sitemap.action.Action#execute()
      */
     public void execute() throws Exception {
         throw new CustomException();
@@ -45,7 +44,7 @@
 
     /**
      * {@inheritDoc}
-     *
+     * 
      * @see java.lang.Object#toString()
      */
     @Override

Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockHttpServletRequest.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockHttpServletRequest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockHttpServletRequest.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockHttpServletResponse.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockHttpServletResponse.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockHttpServletResponse.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/MockHttpServletResponse.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/SitemapBuilderTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/SitemapBuilderTest.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/SitemapBuilderTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/test/java/org/apache/cocoon/sitemap/SitemapBuilderTest.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
 import java.net.URL;
 import java.util.HashMap;
@@ -29,9 +29,9 @@
 import org.apache.cocoon.corona.sample.action.CustomException;
 import org.apache.cocoon.corona.servlet.node.StatusCodeCollector;
 import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
-import org.apache.cocoon.corona.sitemap.node.InvocationResult;
-import org.apache.cocoon.corona.sitemap.node.Sitemap;
-import org.apache.cocoon.corona.sitemap.objectmodel.ObjectModel;
+import org.apache.cocoon.sitemap.node.InvocationResult;
+import org.apache.cocoon.sitemap.node.Sitemap;
+import org.apache.cocoon.sitemap.objectmodel.ObjectModel;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -199,11 +199,11 @@
                 "META-INF/cocoon/spring/corona-servlet-component.xml", "META-INF/cocoon/spring/corona-controller.xml" });
 
         this.componentProvider = (ComponentProvider) applicationContext
-                .getBean("org.apache.cocoon.corona.sitemap.ComponentProvider");
+                .getBean("org.apache.cocoon.sitemap.ComponentProvider");
 
         URL sitemapURL = this.getClass().getResource("/COB-INF/sitemap.xmap");
         this.sitemapBuilder = (SitemapBuilder) applicationContext
-                .getBean("org.apache.cocoon.corona.sitemap.SitemapBuilder");
+                .getBean("org.apache.cocoon.sitemap.SitemapBuilder");
         this.sitemap = this.sitemapBuilder.build(sitemapURL);
     }
 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java?rev=696953&r1=696952&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java Fri Sep 19 00:19:44 2008
@@ -41,10 +41,10 @@
 import org.apache.cocoon.corona.servlet.util.ManifestUtils;
 import org.apache.cocoon.corona.servlet.util.ObjectModelProvider;
 import org.apache.cocoon.corona.servlet.util.SettingsHelper;
-import org.apache.cocoon.corona.sitemap.Invocation;
-import org.apache.cocoon.corona.sitemap.InvocationImpl;
-import org.apache.cocoon.corona.sitemap.SitemapBuilder;
-import org.apache.cocoon.corona.sitemap.node.Sitemap;
+import org.apache.cocoon.sitemap.Invocation;
+import org.apache.cocoon.sitemap.InvocationImpl;
+import org.apache.cocoon.sitemap.SitemapBuilder;
+import org.apache.cocoon.sitemap.node.Sitemap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeansException;

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java?rev=696953&r1=696952&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java Fri Sep 19 00:19:44 2008
@@ -24,9 +24,9 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
-import org.apache.cocoon.corona.sitemap.InvocationException;
 import org.apache.cocoon.pipeline.component.Starter;
 import org.apache.cocoon.pipeline.component.sax.AbstractXMLProducer;
+import org.apache.cocoon.sitemap.InvocationException;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/RedirectNode.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/RedirectNode.java?rev=696953&r1=696952&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/RedirectNode.java (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/RedirectNode.java Fri Sep 19 00:19:44 2008
@@ -18,10 +18,10 @@
  */
 package org.apache.cocoon.corona.servlet.node;
 
-import org.apache.cocoon.corona.sitemap.Invocation;
-import org.apache.cocoon.corona.sitemap.node.AbstractSitemapNode;
-import org.apache.cocoon.corona.sitemap.node.InvocationResult;
-import org.apache.cocoon.corona.sitemap.node.Node;
+import org.apache.cocoon.sitemap.Invocation;
+import org.apache.cocoon.sitemap.node.AbstractSitemapNode;
+import org.apache.cocoon.sitemap.node.InvocationResult;
+import org.apache.cocoon.sitemap.node.Node;
 
 @Node(name="redirect-to")
 public class RedirectNode extends AbstractSitemapNode {
@@ -29,7 +29,7 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.apache.cocoon.corona.sitemap.node.AbstractSitemapNode#invoke(org.apache.cocoon.corona.sitemap.Invocation)
+     * @see org.apache.cocoon.sitemap.node.AbstractSitemapNode#invoke(org.apache.cocoon.sitemap.Invocation)
      */
     @Override
     public InvocationResult invoke(Invocation invocation) {
@@ -43,7 +43,7 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.apache.cocoon.corona.sitemap.node.AbstractSitemapNode#toString()
+     * @see org.apache.cocoon.sitemap.node.AbstractSitemapNode#toString()
      */
     @Override
     public String toString() {

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java?rev=696953&r1=696952&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java Fri Sep 19 00:19:44 2008
@@ -20,9 +20,9 @@
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.cocoon.corona.sitemap.Invocation;
-import org.apache.cocoon.corona.sitemap.node.InvocationResult;
-import org.apache.cocoon.corona.sitemap.node.SerializeNode;
+import org.apache.cocoon.sitemap.Invocation;
+import org.apache.cocoon.sitemap.node.InvocationResult;
+import org.apache.cocoon.sitemap.node.SerializeNode;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -50,7 +50,7 @@
         THREAD_LOCAL.set(statusCode);
     }
 
-    @Around("execution(* org.apache.cocoon.corona.sitemap.node.SerializeNode.invoke(..)) && args(invocation)")
+    @Around("execution(* org.apache.cocoon.sitemap.node.SerializeNode.invoke(..)) && args(invocation)")
     public Object interceptInvoke(ProceedingJoinPoint proceedingJoinPoint, Invocation invocation) throws Throwable {
         SerializeNode target = (SerializeNode) proceedingJoinPoint.getTarget();
         String statusCode = invocation.resolveParameter(target.getParameters().get("status-code"));

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/ObjectModelProvider.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/ObjectModelProvider.java?rev=696953&r1=696952&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/ObjectModelProvider.java (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/ObjectModelProvider.java Fri Sep 19 00:19:44 2008
@@ -22,7 +22,7 @@
 import javax.servlet.http.HttpServletRequestWrapper;
 
 import org.apache.cocoon.corona.servlet.controller.ControllerContextHelper;
-import org.apache.cocoon.corona.sitemap.objectmodel.ObjectModel;
+import org.apache.cocoon.sitemap.objectmodel.ObjectModel;
 
 public class ObjectModelProvider {
 

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/ComponentProvider.java (from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/ComponentProvider.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/ComponentProvider.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java&r1=696943&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/ComponentProvider.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/ComponentProvider.java Fri Sep 19 00:19:44 2008
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
-import org.apache.cocoon.corona.sitemap.action.Action;
-import org.apache.cocoon.corona.sitemap.expression.LanguageInterpreter;
 import org.apache.cocoon.pipeline.Pipeline;
 import org.apache.cocoon.pipeline.component.PipelineComponent;
+import org.apache.cocoon.sitemap.action.Action;
+import org.apache.cocoon.sitemap.expression.LanguageInterpreter;
 
 public interface ComponentProvider {
 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/ComponentProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/ComponentProvider.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/ComponentProvider.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/ComponentProvider.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/Invocation.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/Invocation.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/Invocation.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
 import java.io.OutputStream;
 import java.net.URL;

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/Invocation.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationException.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationException.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationException.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationException.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationException.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationException.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationException.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
 public class InvocationException extends RuntimeException {
 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationException.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationException.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java (from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java&r1=696943&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/InvocationImpl.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
 import java.io.OutputStream;
 import java.net.MalformedURLException;
@@ -28,14 +28,14 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-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.ExceptionHandler;
-import org.apache.cocoon.corona.sitemap.util.ParameterHelper;
 import org.apache.cocoon.pipeline.Pipeline;
 import org.apache.cocoon.pipeline.component.Finisher;
 import org.apache.cocoon.pipeline.component.PipelineComponent;
+import org.apache.cocoon.sitemap.action.Action;
+import org.apache.cocoon.sitemap.expression.LanguageInterpreter;
+import org.apache.cocoon.sitemap.objectmodel.ObjectModel;
+import org.apache.cocoon.sitemap.util.ExceptionHandler;
+import org.apache.cocoon.sitemap.util.ParameterHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -105,7 +105,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#reset()
+     * @see org.apache.cocoon.sitemap.Invocation#reset()
      */
     public void reset() {
         this.actions.clear();
@@ -115,7 +115,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#execute()
+     * @see org.apache.cocoon.sitemap.Invocation#execute()
      */
     public void execute() throws Exception {
         if (this.pipeline == null) {
@@ -138,7 +138,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#getOutputStream()
+     * @see org.apache.cocoon.sitemap.Invocation#getOutputStream()
      */
     public OutputStream getOutputStream() {
         return this.outputStream;
@@ -147,7 +147,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#getParameter(java.lang.String)
+     * @see org.apache.cocoon.sitemap.Invocation#getParameter(java.lang.String)
      */
     public Object getParameter(String name) {
         if (this.parameters == null) {
@@ -159,7 +159,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#getParameters()
+     * @see org.apache.cocoon.sitemap.Invocation#getParameters()
      */
     public Map<String, Object> getParameters() {
         return this.parameters;
@@ -168,7 +168,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#getRequestURI()
+     * @see org.apache.cocoon.sitemap.Invocation#getRequestURI()
      */
     public String getRequestURI() {
         return this.requestURI;
@@ -177,7 +177,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#getThrowable()
+     * @see org.apache.cocoon.sitemap.Invocation#getThrowable()
      */
     public Throwable getThrowable() {
         return ParameterHelper.getThrowable(this.parameters);
@@ -186,7 +186,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#hasCompletePipeline()
+     * @see org.apache.cocoon.sitemap.Invocation#hasCompletePipeline()
      */
     public boolean hasCompletePipeline() {
         return this.hasFinisher;
@@ -195,7 +195,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#installAction(java.lang.String)
+     * @see org.apache.cocoon.sitemap.Invocation#installAction(java.lang.String)
      */
     public void installAction(String type) {
         if (this.pipeline == null) {
@@ -209,7 +209,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#installComponent(java.lang.String, java.util.Map)
+     * @see org.apache.cocoon.sitemap.Invocation#installComponent(java.lang.String, java.util.Map)
      */
     public void installComponent(String type, Map<String, ? extends Object> componentParameters) {
         if (this.pipeline == null) {
@@ -229,7 +229,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#installPipeline(java.lang.String)
+     * @see org.apache.cocoon.sitemap.Invocation#installPipeline(java.lang.String)
      */
     public void installPipeline(String type) {
         this.pipeline = this.componentProvider.createPipeline(type);
@@ -238,7 +238,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#isErrorInvocation()
+     * @see org.apache.cocoon.sitemap.Invocation#isErrorInvocation()
      */
     public boolean isErrorInvocation() {
         return this.getThrowable() != null;
@@ -247,7 +247,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#popSitemapParameters()
+     * @see org.apache.cocoon.sitemap.Invocation#popSitemapParameters()
      */
     public void popSitemapParameters() {
         this.objectModel.getSitemapParameters().popParameters();
@@ -256,7 +256,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#pushSitemapParameters(java.lang.String, java.util.Map)
+     * @see org.apache.cocoon.sitemap.Invocation#pushSitemapParameters(java.lang.String, java.util.Map)
      */
     public void pushSitemapParameters(String nodeName, Map<String, ? extends Object> sitemapParameters) {
         this.objectModel.getSitemapParameters().pushParameters(nodeName, sitemapParameters);
@@ -265,7 +265,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#resolve(java.lang.String)
+     * @see org.apache.cocoon.sitemap.Invocation#resolve(java.lang.String)
      */
     public URL resolve(String resource) {
         try {
@@ -282,7 +282,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#setOutputStream(java.io.OutputStream)
+     * @see org.apache.cocoon.sitemap.Invocation#setOutputStream(java.io.OutputStream)
      */
     public void setOutputStream(OutputStream outputStream) {
         this.outputStream = outputStream;
@@ -291,7 +291,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#setParameters(java.util.Map)
+     * @see org.apache.cocoon.sitemap.Invocation#setParameters(java.util.Map)
      */
     public void setParameters(Map<String, Object> parameters) {
         this.parameters = parameters;
@@ -304,7 +304,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#setThrowable(java.lang.Throwable)
+     * @see org.apache.cocoon.sitemap.Invocation#setThrowable(java.lang.Throwable)
      */
     public void setThrowable(final Throwable throwable) {
         Throwable cause = ExceptionHandler.getCause(throwable);
@@ -323,7 +323,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.Invocation#resolveParameter(java.lang.String)
+     * @see org.apache.cocoon.sitemap.Invocation#resolveParameter(java.lang.String)
      */
     public String resolveParameter(final String parameter) {
         if (parameter == null) {

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/InvocationImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/NoMatchingPipelineException.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/NoMatchingPipelineException.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/NoMatchingPipelineException.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/NoMatchingPipelineException.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/NoMatchingPipelineException.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/NoMatchingPipelineException.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/NoMatchingPipelineException.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
 public class NoMatchingPipelineException extends InvocationException {
 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/NoMatchingPipelineException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/NoMatchingPipelineException.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/NoMatchingPipelineException.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/NoMatchingPipelineException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapBuilder.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SitemapBuilder.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapBuilder.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapBuilder.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SitemapBuilder.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SitemapBuilder.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapBuilder.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
 import java.io.InputStream;
 import java.net.URL;
@@ -27,9 +27,9 @@
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.validation.SchemaFactory;
 
-import org.apache.cocoon.corona.sitemap.node.Sitemap;
-import org.apache.cocoon.corona.sitemap.node.SitemapNode;
-import org.apache.cocoon.corona.sitemap.node.SitemapNodeFactory;
+import org.apache.cocoon.sitemap.node.Sitemap;
+import org.apache.cocoon.sitemap.node.SitemapNode;
+import org.apache.cocoon.sitemap.node.SitemapNodeFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapBuilder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SitemapParameters.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SitemapParameters.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SitemapParameters.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
 import java.util.Map;
 import java.util.Stack;

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SitemapParameters.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SpringComponentProvider.java (from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SpringComponentProvider.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SpringComponentProvider.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java&r1=696943&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/SpringComponentProvider.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SpringComponentProvider.java Fri Sep 19 00:19:44 2008
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap;
+package org.apache.cocoon.sitemap;
 
-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;
-import org.apache.cocoon.corona.sitemap.spring.PipelineComponentFactory;
-import org.apache.cocoon.corona.sitemap.spring.PipelineFactory;
 import org.apache.cocoon.pipeline.Pipeline;
 import org.apache.cocoon.pipeline.component.PipelineComponent;
+import org.apache.cocoon.sitemap.action.Action;
+import org.apache.cocoon.sitemap.expression.LanguageInterpreter;
+import org.apache.cocoon.sitemap.expression.LanguageInterpreterFactory;
+import org.apache.cocoon.sitemap.spring.ActionFactory;
+import org.apache.cocoon.sitemap.spring.PipelineComponentFactory;
+import org.apache.cocoon.sitemap.spring.PipelineFactory;
 
 public class SpringComponentProvider implements ComponentProvider {
 
@@ -40,7 +40,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.ComponentProvider#createAction(java.lang.String)
+     * @see org.apache.cocoon.sitemap.ComponentProvider#createAction(java.lang.String)
      */
     public Action createAction(String type) {
         return this.actionFactory.createAction(type);
@@ -49,7 +49,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.ComponentProvider#createComponent(java.lang.String)
+     * @see org.apache.cocoon.sitemap.ComponentProvider#createComponent(java.lang.String)
      */
     public PipelineComponent createComponent(String type) {
         return this.pipelineComponentFactory.createComponent(type);
@@ -58,7 +58,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.ComponentProvider#createPipeline(java.lang.String)
+     * @see org.apache.cocoon.sitemap.ComponentProvider#createPipeline(java.lang.String)
      */
     public Pipeline createPipeline(String type) {
         return this.pipelineFactory.createPipeline(type);

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SpringComponentProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SpringComponentProvider.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SpringComponentProvider.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/SpringComponentProvider.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/action/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/action/Action.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/action/Action.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/action/Action.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/action/Action.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.action;
+package org.apache.cocoon.sitemap.action;
 
 import java.util.Map;
 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ExceptionGenerator.java (from r696943, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ExceptionGenerator.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ExceptionGenerator.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java&r1=696943&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/component/ExceptionGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ExceptionGenerator.java Fri Sep 19 00:19:44 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.sitemap.component;
+package org.apache.cocoon.sitemap.component;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -23,10 +23,10 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.cocoon.corona.sitemap.util.ParameterHelper;
-import org.apache.cocoon.corona.sitemap.xml.AttributesImpl;
 import org.apache.cocoon.pipeline.component.Starter;
 import org.apache.cocoon.pipeline.component.sax.AbstractXMLProducer;
+import org.apache.cocoon.sitemap.util.ParameterHelper;
+import org.apache.cocoon.sitemap.xml.AttributesImpl;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/JexlLanguageInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/JexlLanguageInterpreter.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/JexlLanguageInterpreter.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/JexlLanguageInterpreter.java Fri Sep 19 00:19:44 2008
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.expression;
+package org.apache.cocoon.sitemap.expression;
 
-import org.apache.cocoon.corona.sitemap.objectmodel.ObjectModel;
+import org.apache.cocoon.sitemap.objectmodel.ObjectModel;
 import org.apache.commons.jexl.Expression;
 import org.apache.commons.jexl.ExpressionFactory;
 import org.apache.commons.jexl.JexlContext;

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/LanguageInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/LanguageInterpreter.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/LanguageInterpreter.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/LanguageInterpreter.java Fri Sep 19 00:19:44 2008
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.sitemap.expression;
+package org.apache.cocoon.sitemap.expression;
 
-import org.apache.cocoon.corona.sitemap.objectmodel.ObjectModel;
+import org.apache.cocoon.sitemap.objectmodel.ObjectModel;
 
 public interface LanguageInterpreter {
 

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/LanguageInterpreterFactory.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/LanguageInterpreterFactory.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/LanguageInterpreterFactory.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/LanguageInterpreterFactory.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.expression;
+package org.apache.cocoon.sitemap.expression;
 
 public interface LanguageInterpreterFactory {
 

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/PrototypeLanguageInterpreterFactory.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/PrototypeLanguageInterpreterFactory.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/PrototypeLanguageInterpreterFactory.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/PrototypeLanguageInterpreterFactory.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.expression;
+package org.apache.cocoon.sitemap.expression;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/SitemapLanguageInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/SitemapLanguageInterpreter.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/SitemapLanguageInterpreter.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/expression/SitemapLanguageInterpreter.java Fri Sep 19 00:19:44 2008
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.expression;
+package org.apache.cocoon.sitemap.expression;
 
-import org.apache.cocoon.corona.sitemap.objectmodel.ObjectModel;
+import org.apache.cocoon.sitemap.objectmodel.ObjectModel;
 
 public class SitemapLanguageInterpreter implements LanguageInterpreter {
 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/ContainsMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/ContainsMatcher.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/ContainsMatcher.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/ContainsMatcher.java Fri Sep 19 00:19:44 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.sitemap.matcher;
+package org.apache.cocoon.sitemap.matcher;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/EndsWithMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/EndsWithMatcher.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/EndsWithMatcher.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/EndsWithMatcher.java Fri Sep 19 00:19:44 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.sitemap.matcher;
+package org.apache.cocoon.sitemap.matcher;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/EqualsMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/EqualsMatcher.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/EqualsMatcher.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/EqualsMatcher.java Fri Sep 19 00:19:44 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.sitemap.matcher;
+package org.apache.cocoon.sitemap.matcher;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/Matcher.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/Matcher.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/Matcher.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/Matcher.java Fri Sep 19 00:19:44 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.sitemap.matcher;
+package org.apache.cocoon.sitemap.matcher;
 
 import java.util.Map;
 

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/RegexpMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/RegexpMatcher.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/RegexpMatcher.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/RegexpMatcher.java Fri Sep 19 00:19:44 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.sitemap.matcher;
+package org.apache.cocoon.sitemap.matcher;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/StartsWithMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/StartsWithMatcher.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/StartsWithMatcher.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/StartsWithMatcher.java Fri Sep 19 00:19:44 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.sitemap.matcher;
+package org.apache.cocoon.sitemap.matcher;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/WildcardMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/WildcardMatcher.java?rev=696953&r1=696826&r2=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/WildcardMatcher.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/matcher/WildcardMatcher.java Fri Sep 19 00:19:44 2008
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.sitemap.matcher;
+package org.apache.cocoon.sitemap.matcher;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import org.apache.cocoon.corona.sitemap.util.WildcardMatcherHelper;
+import org.apache.cocoon.sitemap.util.WildcardMatcherHelper;
 
 public class WildcardMatcher implements Matcher {
 

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/AbstractSitemapNode.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/AbstractSitemapNode.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/AbstractSitemapNode.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.node;
+package org.apache.cocoon.sitemap.node;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -27,9 +27,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.cocoon.corona.sitemap.Invocation;
-import org.apache.cocoon.corona.sitemap.node.annotations.NodeChild;
-import org.apache.cocoon.corona.sitemap.node.annotations.Parameter;
+import org.apache.cocoon.sitemap.Invocation;
+import org.apache.cocoon.sitemap.node.annotations.NodeChild;
+import org.apache.cocoon.sitemap.node.annotations.Parameter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ActNode.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/ActNode.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ActNode.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ActNode.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/ActNode.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/ActNode.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ActNode.java Fri Sep 19 00:19:44 2008
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.node;
+package org.apache.cocoon.sitemap.node;
 
-import org.apache.cocoon.corona.sitemap.Invocation;
-import org.apache.cocoon.corona.sitemap.node.annotations.Parameter;
+import org.apache.cocoon.sitemap.Invocation;
+import org.apache.cocoon.sitemap.node.annotations.Parameter;
 
 @Node(name="act")
 public class ActNode extends AbstractSitemapNode {

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ActNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ActNode.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ActNode.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ActNode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ErrorNode.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/ErrorNode.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ErrorNode.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ErrorNode.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/ErrorNode.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/ErrorNode.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ErrorNode.java Fri Sep 19 00:19:44 2008
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.node;
+package org.apache.cocoon.sitemap.node;
 
-import org.apache.cocoon.corona.sitemap.Invocation;
+import org.apache.cocoon.sitemap.Invocation;
 
 @Node(name = "handle-errors")
 public class ErrorNode extends PipelineNode {

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ErrorNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ErrorNode.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ErrorNode.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/ErrorNode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/FlowNode.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/FlowNode.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/FlowNode.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/FlowNode.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/FlowNode.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/FlowNode.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/FlowNode.java Fri Sep 19 00:19:44 2008
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.node;
+package org.apache.cocoon.sitemap.node;
 
-import org.apache.cocoon.corona.sitemap.node.annotations.Parameter;
+import org.apache.cocoon.sitemap.node.annotations.Parameter;
 
 @Node(name="flow")
 public class FlowNode extends AbstractSitemapNode {

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/FlowNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/FlowNode.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/FlowNode.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/FlowNode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/GenerateNode.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/GenerateNode.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/GenerateNode.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java Fri Sep 19 00:19:44 2008
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.node;
+package org.apache.cocoon.sitemap.node;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.cocoon.corona.sitemap.Invocation;
-import org.apache.cocoon.corona.sitemap.node.annotations.Parameter;
+import org.apache.cocoon.sitemap.Invocation;
+import org.apache.cocoon.sitemap.node.annotations.Parameter;
 
 @Node(name = "generate")
 public class GenerateNode extends AbstractSitemapNode {
@@ -38,7 +38,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.node.AbstractSitemapNode#invoke(org.apache.cocoon.corona.sitemap.Invocation)
+     * @see org.apache.cocoon.sitemap.node.AbstractSitemapNode#invoke(org.apache.cocoon.sitemap.Invocation)
      */
     @Override
     public InvocationResult invoke(Invocation invocation) {
@@ -61,7 +61,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.corona.sitemap.node.AbstractSitemapNode#toString()
+     * @see org.apache.cocoon.sitemap.node.AbstractSitemapNode#toString()
      */
     @Override
     public String toString() {

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/GenerateNode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/InvocationResult.java (from r696826, cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/InvocationResult.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/InvocationResult.java?p2=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/InvocationResult.java&p1=cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/InvocationResult.java&r1=696826&r2=696953&rev=696953&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/node/InvocationResult.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/InvocationResult.java Fri Sep 19 00:19:44 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.sitemap.node;
+package org.apache.cocoon.sitemap.node;
 
 public enum InvocationResult {
 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/InvocationResult.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/InvocationResult.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/InvocationResult.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/InvocationResult.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message