You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/04/23 17:00:55 UTC
svn commit: r650898 - in /cocoon/whiteboard/corona/trunk: corona-sample/ corona-sample/src/main/resources/ corona-sample/src/main/resources/COB-INF/ corona-sample/src/main/resources/COB-INF/aggregation/ corona-sample/src/main/resources/COB-INF/error-ha...

Author: reinhard
Date: Wed Apr 23 08:00:50 2008
New Revision: 650898

URL: http://svn.apache.org/viewvc?rev=650898&view=rev
Log:
. use correct directory structure for a Cocoon block
. fix naming of servlet-service beans

Added:
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/aggregation/
      - copied from r650854, cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/aggregation/
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/corona-servlet-1.0.xsd
      - copied unchanged from r650854, cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/corona-servlet-1.0.xsd
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/error-handling/
      - copied from r650854, cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/error-handling/
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/overview.html
      - copied unchanged from r650854, cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/overview.html
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/read/
      - copied from r650854, cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/read/
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/sax-pipeline/
      - copied from r650854, cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/sax-pipeline/
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/COB-INF/xslt/
      - copied from r650854, cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/xslt/
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/corona-sample-servlet-service.xml
      - copied, changed from r650854, cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
    cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/
      - copied from r650873, cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/
    cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/
      - copied from r650873, cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/
    cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/
      - copied from r650873, cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/
    cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/
      - copied from r650873, cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/
    cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/
      - copied from r650873, cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/
    cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/MockHttpServletRequest.java
      - copied unchanged from r650873, cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/MockHttpServletRequest.java
    cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/MockHttpServletResponse.java
      - copied unchanged from r650873, cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/MockHttpServletResponse.java
    cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java
      - copied unchanged from r650873, cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/apache/cocoon/corona/sitemap/SitemapBuilderTest.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml
Removed:
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/aggregation/
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/corona-servlet-1.0.xsd
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/error-handling/
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/overview.html
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/read/
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/sax-pipeline/
    cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/xslt/
Modified:
    cocoon/whiteboard/corona/trunk/corona-sample/rcl.properties

Modified: cocoon/whiteboard/corona/trunk/corona-sample/rcl.properties
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sample/rcl.properties?rev=650898&r1=650897&r2=650898&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sample/rcl.properties (original)
+++ cocoon/whiteboard/corona/trunk/corona-sample/rcl.properties Wed Apr 23 08:00:50 2008
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-org.apache.cocoon.corona.demo.servlet%classes-dir=./target/classes
+org.apache.cocoon.corona.sample.servlet%classes-dir=./target/classes
 
 # Cocoon Corona Core
 #%classes-dir=../corona-core/target/classes

Copied: cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/corona-sample-servlet-service.xml (from r650854, cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/servlet-service.xml)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/corona-sample-servlet-service.xml?p2=cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/corona-sample-servlet-service.xml&p1=cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/servlet-service.xml&r1=650854&r2=650898&rev=650898&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/servlet-service.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sample/src/main/resources/META-INF/cocoon/spring/corona-sample-servlet-service.xml Wed Apr 23 08:00:50 2008
@@ -24,8 +24,8 @@
   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.demo.servlet" class="org.apache.cocoon.corona.servlet.SitemapServlet">
-    <servlet:context mount-path="" context-path="blockcontext:/corona-servlet/"/>
+  <bean id="org.apache.cocoon.corona.sample.servlet" class="org.apache.cocoon.corona.servlet.SitemapServlet">
+    <servlet:context mount-path="" context-path="blockcontext:/corona-sample/"/>
   </bean>
 
 </beans>

Added: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml?rev=650898&view=auto
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml (added)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-component.xml Wed Apr 23 08:00:50 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  und
+-->
+<!-- $Id: corona-servlet-component.xml 647856 2008-04-14 15:40:50Z reinhard $ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <bean name="redirector" class="org.apache.cocoon.corona.servlet.component.RedirectorComponent" scope="prototype" />
+
+  <bean name="generator:request-parameters" class="org.apache.cocoon.corona.servlet.component.RequestParametersGenerator" scope="prototype" />
+
+</beans>

Added: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml?rev=650898&view=auto
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml (added)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/cocoon/spring/corona-servlet-node.xml Wed Apr 23 08:00:50 2008
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  und
+-->
+<!-- $Id: corona-servlet-node.xml 647814 2008-04-14 14:28:00Z reinhard $ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+  http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+  <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.corona.servlet.node.MimeTypeCollector" class="org.apache.cocoon.corona.servlet.node.MimeTypeCollector" />
+
+</beans>