You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/05/18 02:16:42 UTC
svn commit: r539188 - in
/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample: ./
src/main/resources/COB-INF/ src/main/resources/META-INF/
src/main/resources/META-INF/cocoon/
src/main/resources/META-INF/cocoon/spring/
Author: felixk
Date: Thu May 17 17:16:41 2007
New Revision: 539188
URL: http://svn.apache.org/viewvc?view=rev&rev=539188
Log:
- move to servlet-service
- add blockServlet bean
Added:
cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/
cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/
cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/pom.xml
cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/slop.xsamples
Modified: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/pom.xml?view=diff&rev=539188&r1=539187&r2=539188
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/pom.xml Thu May 17 17:16:41 2007
@@ -38,7 +38,10 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-slop-impl</artifactId>
-
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-samples-style-default</artifactId>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539188&r1=539187&r2=539188
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 17:16:41 2007
@@ -20,8 +20,28 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:pipelines>
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view name="content" from-label="content">
+ <map:serialize type="xml" />
+ </map:view>
+
+ <map:view from-label="content" name="pretty-content">
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
+ </map:view>
+ <map:view name="links" from-position="last">
+ <map:serialize type="links" />
+ </map:view>
+ </map:views>
+
+ <!-- =========================== Pipelines ================================= -->
+
+ <map:pipelines>
<map:pipeline type="caching">
<map:match pattern="">
@@ -30,10 +50,9 @@
<map:match pattern="welcome">
<map:generate src="welcome.xml" />
- <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}" />
- </map:transform>
- <map:serialize />
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ </map:serialize>
</map:match>
<!--
Modified: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/slop.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/slop.xsamples?view=diff&rev=539188&r1=539187&r2=539188
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/slop.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/slop.xsamples Thu May 17 17:16:41 2007
@@ -23,7 +23,7 @@
Examples showing how to use SLOP
(the Simple Line Oriented Parser) to parse text files
</sample>
- <sample name="SLOP Block: YAPT Presentation Tool" href="slop/yapt/">
+ <sample name="SLOP Block: YAPT Presentation Tool" href="/cocoon-slop-sample/yapt/">
Yet Another Presentation Tool!
Uses simple structured ASCII files to quickly create
XML-based presentations
Added: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml?view=auto&rev=539188
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml Thu May 17 17:16:41 2007
@@ -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 under the License.
+-->
+
+<!-- @version $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+ <bean id="org.apache.cocoon.slop.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-slop-sample" context-path="blockcontext:/cocoon-slop-sample/">
+ <servlet:connections>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
+</beans>
Propchange: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id