cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r697072 - in /cocoon/cocoon3/trunk: cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ cocoon-sample/src/main/resources/META-INF/cocoon/spring/ cocoon-sample/src/test/java/org/apache/cocoon/sitemap/ cocoon-servlet/src/main/...
Date Fri, 19 Sep 2008 12:46:24 GMT
Author: reinhard
Date: Fri Sep 19 05:46:22 2008
New Revision: 697072

URL: http://svn.apache.org/viewvc?rev=697072&view=rev
Log:
Corona -> Cocoon 3: Servlet

Added:
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/DebugFilter.java
  (contents, props changed)
      - copied, changed from r696951, cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/DebugFilter.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/SitemapDelegator.java
  (contents, props changed)
      - copied, changed from r696951, cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapDelegator.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/XMLSitemapServlet.java
  (contents, props changed)
      - copied, changed from r696953, 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/servlet/component/
  (props changed)
      - copied from r696951, cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RequestParametersGenerator.java
      - copied, changed from r696953, 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/servlet/controller/
  (props changed)
      - copied from r696951, cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/controller/
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/   (props
changed)
      - copied from r696951, cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/RedirectNode.java
      - copied, changed from r696953, 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/servlet/node/StatusCodeCollector.java
      - copied, changed from r696953, 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/servlet/ssf/   (props
changed)
      - copied from r696951, cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/ssf/
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/   (props
changed)
      - copied from r696951, cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/ObjectModelProvider.java
      - copied, changed from r696953, cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/ObjectModelProvider.java
Removed:
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/
Modified:
    cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/corona-sample-servlet-service.xml
    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/servlet/component/RedirectorComponent.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/LastModifiedCollector.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/MimeTypeCollector.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServiceConsumerGenerator.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceGenerator.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceSerializer.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceTransformer.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/HttpContextHelper.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/ManifestUtils.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/SettingsHelper.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml
    cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java

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=697072&r1=697071&r2=697072&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 05:46:22 2008
@@ -42,10 +42,10 @@
 import org.apache.cocoon.corona.rest.controller.response.RestResponse;
 import org.apache.cocoon.corona.rest.controller.response.Status;
 import org.apache.cocoon.corona.rest.util.AnnotationCollector;
-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.pipeline.util.URLConnectionUtils;
+import org.apache.cocoon.servlet.controller.ControllerContextHelper;
+import org.apache.cocoon.servlet.node.StatusCodeCollector;
+import org.apache.cocoon.servlet.util.HttpContextHelper;
 import org.apache.cocoon.sitemap.util.ExceptionHandler;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/corona-sample-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/corona-sample-servlet-service.xml?rev=697072&r1=697071&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/corona-sample-servlet-service.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/corona-sample-servlet-service.xml
Fri Sep 19 05:46:22 2008
@@ -24,7 +24,7 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
   http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-  <bean id="org.apache.cocoon.corona.sample.servlet" class="org.apache.cocoon.corona.servlet.SitemapServlet">
+  <bean id="org.apache.cocoon.corona.sample.servlet" class="org.apache.cocoon.servlet.XMLSitemapServlet">
     <servlet:context mount-path="" context-path="blockcontext:/cocoon-sample/"/>
   </bean>
 

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=697072&r1=697071&r2=697072&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 05:46:22 2008
@@ -27,8 +27,8 @@
 import junit.framework.TestCase;
 
 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.servlet.node.StatusCodeCollector;
+import org.apache.cocoon.servlet.util.HttpContextHelper;
 import org.apache.cocoon.sitemap.node.InvocationResult;
 import org.apache.cocoon.sitemap.node.Sitemap;
 import org.apache.cocoon.sitemap.objectmodel.ObjectModel;
@@ -202,8 +202,7 @@
                 .getBean("org.apache.cocoon.sitemap.ComponentProvider");
 
         URL sitemapURL = this.getClass().getResource("/COB-INF/sitemap.xmap");
-        this.sitemapBuilder = (SitemapBuilder) applicationContext
-                .getBean("org.apache.cocoon.sitemap.SitemapBuilder");
+        this.sitemapBuilder = (SitemapBuilder) applicationContext.getBean("org.apache.cocoon.sitemap.SitemapBuilder");
         this.sitemap = this.sitemapBuilder.build(sitemapURL);
     }
 

Copied: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/DebugFilter.java
(from r696951, cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/DebugFilter.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/DebugFilter.java?p2=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/DebugFilter.java&p1=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/DebugFilter.java&r1=696951&r2=697072&rev=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/DebugFilter.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/DebugFilter.java
Fri Sep 19 05:46:22 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet;
+package org.apache.cocoon.servlet;
 
 import java.io.IOException;
 import java.util.Enumeration;

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

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

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

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

Copied: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/SitemapDelegator.java
(from r696951, cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapDelegator.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/SitemapDelegator.java?p2=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/SitemapDelegator.java&p1=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapDelegator.java&r1=696951&r2=697072&rev=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapDelegator.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/SitemapDelegator.java
Fri Sep 19 05:46:22 2008
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet;
+package org.apache.cocoon.servlet;
 
 import java.io.OutputStream;
 import java.util.Map;
 
 public class SitemapDelegator {
 
-    private static final ThreadLocal<SitemapServlet> SITEMAP_SERVLET = new ThreadLocal<SitemapServlet>();
+    private static final ThreadLocal<XMLSitemapServlet> SITEMAP_SERVLET = new ThreadLocal<XMLSitemapServlet>();
 
     public static void delegate(String requestURI, Map<String, Object> parameters,
OutputStream outputStream)
             throws Exception {
-        SitemapServlet sitemapServlet = SITEMAP_SERVLET.get();
+        XMLSitemapServlet sitemapServlet = SITEMAP_SERVLET.get();
 
         if (sitemapServlet == null) {
-            throw new IllegalStateException("No current SitemapServlet.");
+            throw new IllegalStateException("No current XMLSitemapServlet.");
         }
 
         sitemapServlet.invoke(requestURI, parameters, outputStream);
@@ -38,7 +38,7 @@
         SITEMAP_SERVLET.set(null);
     }
 
-    public static final void setSitemapServlet(SitemapServlet sitemapServlet) {
+    public static final void setSitemapServlet(XMLSitemapServlet sitemapServlet) {
         SITEMAP_SERVLET.set(sitemapServlet);
     }
 }

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

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

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

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

Copied: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/XMLSitemapServlet.java
(from r696953, 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/servlet/XMLSitemapServlet.java?p2=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/XMLSitemapServlet.java&p1=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java&r1=696953&r2=697072&rev=697072&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/servlet/XMLSitemapServlet.java
Fri Sep 19 05:46:22 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.servlet;
+package org.apache.cocoon.servlet;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -34,13 +34,13 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.corona.servlet.node.LastModifiedCollector;
-import org.apache.cocoon.corona.servlet.node.MimeTypeCollector;
-import org.apache.cocoon.corona.servlet.node.StatusCodeCollector;
-import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
-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.servlet.node.LastModifiedCollector;
+import org.apache.cocoon.servlet.node.MimeTypeCollector;
+import org.apache.cocoon.servlet.node.StatusCodeCollector;
+import org.apache.cocoon.servlet.util.HttpContextHelper;
+import org.apache.cocoon.servlet.util.ManifestUtils;
+import org.apache.cocoon.servlet.util.ObjectModelProvider;
+import org.apache.cocoon.servlet.util.SettingsHelper;
 import org.apache.cocoon.sitemap.Invocation;
 import org.apache.cocoon.sitemap.InvocationImpl;
 import org.apache.cocoon.sitemap.SitemapBuilder;
@@ -51,7 +51,7 @@
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 
-public class SitemapServlet extends HttpServlet implements BeanFactoryAware {
+public class XMLSitemapServlet extends HttpServlet implements BeanFactoryAware {
 
     private final Log logger = LogFactory.getLog(this.getClass());
     private static final long serialVersionUID = 1L;

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

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

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

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

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

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RedirectorComponent.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RedirectorComponent.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RedirectorComponent.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RedirectorComponent.java
Fri Sep 19 05:46:22 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.servlet.component;
+package org.apache.cocoon.servlet.component;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,10 +26,10 @@
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
 import org.apache.cocoon.pipeline.component.AbstractPipelineComponent;
 import org.apache.cocoon.pipeline.component.Finisher;
 import org.apache.cocoon.pipeline.component.Starter;
+import org.apache.cocoon.servlet.util.HttpContextHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RequestParametersGenerator.java
(from r696953, 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/servlet/component/RequestParametersGenerator.java?p2=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RequestParametersGenerator.java&p1=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/component/RequestParametersGenerator.java&r1=696953&r2=697072&rev=697072&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/servlet/component/RequestParametersGenerator.java
Fri Sep 19 05:46:22 2008
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.servlet.component;
+package org.apache.cocoon.servlet.component;
 
 import java.util.Enumeration;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
 import org.apache.cocoon.pipeline.component.Starter;
 import org.apache.cocoon.pipeline.component.sax.AbstractXMLProducer;
+import org.apache.cocoon.servlet.util.HttpContextHelper;
 import org.apache.cocoon.sitemap.InvocationException;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;

Propchange: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/controller/ControllerContextHelper.java
Fri Sep 19 05:46:22 2008
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet.controller;
+package org.apache.cocoon.servlet.controller;
 
 import java.util.Collections;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
+import org.apache.cocoon.servlet.util.HttpContextHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

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

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/LastModifiedCollector.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/LastModifiedCollector.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/LastModifiedCollector.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/LastModifiedCollector.java
Fri Sep 19 05:46:22 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet.node;
+package org.apache.cocoon.servlet.node;
 
 import org.apache.cocoon.pipeline.Pipeline;
 import org.aspectj.lang.ProceedingJoinPoint;

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/MimeTypeCollector.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/MimeTypeCollector.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/MimeTypeCollector.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/MimeTypeCollector.java
Fri Sep 19 05:46:22 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet.node;
+package org.apache.cocoon.servlet.node;
 
 import org.apache.cocoon.pipeline.Pipeline;
 import org.aspectj.lang.ProceedingJoinPoint;

Copied: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/RedirectNode.java
(from r696953, 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/servlet/node/RedirectNode.java?p2=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/RedirectNode.java&p1=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/RedirectNode.java&r1=696953&r2=697072&rev=697072&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/servlet/node/RedirectNode.java
Fri Sep 19 05:46:22 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.servlet.node;
+package org.apache.cocoon.servlet.node;
 
 import org.apache.cocoon.sitemap.Invocation;
 import org.apache.cocoon.sitemap.node.AbstractSitemapNode;

Copied: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/StatusCodeCollector.java
(from r696953, 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/servlet/node/StatusCodeCollector.java?p2=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/StatusCodeCollector.java&p1=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/node/StatusCodeCollector.java&r1=696953&r2=697072&rev=697072&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/servlet/node/StatusCodeCollector.java
Fri Sep 19 05:46:22 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.servlet.node;
+package org.apache.cocoon.servlet.node;
 
 import javax.servlet.http.HttpServletResponse;
 

Propchange: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServiceConsumerGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServiceConsumerGenerator.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServiceConsumerGenerator.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServiceConsumerGenerator.java
Fri Sep 19 05:46:22 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet.ssf;
+package org.apache.cocoon.servlet.ssf;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,11 +22,11 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.cocoon.corona.servlet.util.HttpContextHelper;
 import org.apache.cocoon.pipeline.ProcessingException;
 import org.apache.cocoon.pipeline.component.Starter;
 import org.apache.cocoon.pipeline.component.sax.AbstractXMLProducer;
 import org.apache.cocoon.pipeline.util.XMLUtils;
+import org.apache.cocoon.servlet.util.HttpContextHelper;
 
 public class ServiceConsumerGenerator extends AbstractXMLProducer implements Starter {
 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceGenerator.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceGenerator.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceGenerator.java
Fri Sep 19 05:46:22 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet.ssf;
+package org.apache.cocoon.servlet.ssf;
 
 import java.net.URL;
 import java.util.Map;

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceSerializer.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceSerializer.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceSerializer.java
Fri Sep 19 05:46:22 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet.ssf;
+package org.apache.cocoon.servlet.ssf;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceTransformer.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceTransformer.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceTransformer.java
Fri Sep 19 05:46:22 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet.ssf;
+package org.apache.cocoon.servlet.ssf;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

Propchange: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/HttpContextHelper.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/HttpContextHelper.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/HttpContextHelper.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/HttpContextHelper.java
Fri Sep 19 05:46:22 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.servlet.util;
+package org.apache.cocoon.servlet.util;
 
 import java.util.Map;
 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/ManifestUtils.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/ManifestUtils.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/ManifestUtils.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/ManifestUtils.java
Fri Sep 19 05:46:22 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet.util;
+package org.apache.cocoon.servlet.util;
 
 import java.io.IOException;
 import java.net.URL;

Copied: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/ObjectModelProvider.java
(from r696953, 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/servlet/util/ObjectModelProvider.java?p2=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/ObjectModelProvider.java&p1=cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/corona/servlet/util/ObjectModelProvider.java&r1=696953&r2=697072&rev=697072&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/servlet/util/ObjectModelProvider.java
Fri Sep 19 05:46:22 2008
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet.util;
+package org.apache.cocoon.servlet.util;
 
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
-import org.apache.cocoon.corona.servlet.controller.ControllerContextHelper;
+import org.apache.cocoon.servlet.controller.ControllerContextHelper;
 import org.apache.cocoon.sitemap.objectmodel.ObjectModel;
 
 public class ObjectModelProvider {

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/SettingsHelper.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/SettingsHelper.java?rev=697072&r1=696951&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/SettingsHelper.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/util/SettingsHelper.java
Fri Sep 19 05:46:22 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.corona.servlet.util;
+package org.apache.cocoon.servlet.util;
 
 import java.util.Map;
 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml?rev=697072&r1=697071&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml
Fri Sep 19 05:46:22 2008
@@ -22,14 +22,14 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-  <bean name="redirector" class="org.apache.cocoon.corona.servlet.component.RedirectorComponent"
scope="prototype" />
+  <bean name="redirector" class="org.apache.cocoon.servlet.component.RedirectorComponent"
scope="prototype" />
 
-  <bean name="generator:request-parameters" class="org.apache.cocoon.corona.servlet.component.RequestParametersGenerator"
scope="prototype" />
+  <bean name="generator:request-parameters" class="org.apache.cocoon.servlet.component.RequestParametersGenerator"
scope="prototype" />
   
-  <bean name="generator:service-consumer" class="org.apache.cocoon.corona.servlet.ssf.ServiceConsumerGenerator"
scope="prototype" />
+  <bean name="generator:service-consumer" class="org.apache.cocoon.servlet.ssf.ServiceConsumerGenerator"
scope="prototype" />
   
-  <bean name="transformer:servlet-service" class="org.apache.cocoon.corona.servlet.ssf.ServletServiceTransformer"
scope="prototype" />
+  <bean name="transformer:servlet-service" class="org.apache.cocoon.servlet.ssf.ServletServiceTransformer"
scope="prototype" />
   
-  <bean name="serializer:servlet-service" class="org.apache.cocoon.corona.servlet.ssf.ServletServiceSerializer"
scope="prototype" init-method="init" />
+  <bean name="serializer:servlet-service" class="org.apache.cocoon.servlet.ssf.ServletServiceSerializer"
scope="prototype" init-method="init" />
 
 </beans>

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml?rev=697072&r1=697071&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml
Fri Sep 19 05:46:22 2008
@@ -26,10 +26,10 @@
 
   <aop:aspectj-autoproxy proxy-target-class="false" />
 
-  <bean id="org.apache.cocoon.corona.servlet.node.StatusCodeCollector" class="org.apache.cocoon.corona.servlet.node.StatusCodeCollector"
/>
+  <bean id="org.apache.cocoon.servlet.node.StatusCodeCollector" class="org.apache.cocoon.servlet.node.StatusCodeCollector"
/>
 
-  <bean id="org.apache.cocoon.corona.servlet.node.MimeTypeCollector" class="org.apache.cocoon.corona.servlet.node.MimeTypeCollector"
/>
+  <bean id="org.apache.cocoon.servlet.node.MimeTypeCollector" class="org.apache.cocoon.servlet.node.MimeTypeCollector"
/>
   
-  <bean id="org.apache.cocoon.corona.servlet.node.LastModifiedCollector" class="org.apache.cocoon.corona.servlet.node.LastModifiedCollector"
/>
+  <bean id="org.apache.cocoon.servlet.node.LastModifiedCollector" class="org.apache.cocoon.servlet.node.LastModifiedCollector"
/>
 
 </beans>

Modified: cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java?rev=697072&r1=697071&r2=697072&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java
Fri Sep 19 05:46:22 2008
@@ -26,7 +26,6 @@
 
 import org.antlr.stringtemplate.AttributeRenderer;
 import org.antlr.stringtemplate.StringTemplate;
-import org.apache.cocoon.corona.servlet.controller.ControllerContextHelper;
 import org.apache.cocoon.pipeline.caching.CacheKey;
 import org.apache.cocoon.pipeline.caching.CompoundCacheKey;
 import org.apache.cocoon.pipeline.caching.ParameterCacheKey;
@@ -34,6 +33,7 @@
 import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
 import org.apache.cocoon.pipeline.component.Starter;
 import org.apache.cocoon.pipeline.component.sax.AbstractXMLProducer;
+import org.apache.cocoon.servlet.controller.ControllerContextHelper;
 import org.apache.cocoon.sitemap.util.ExceptionHandler;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringEscapeUtils;



Mime
View raw message