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/16 16:58:17 UTC
svn commit: r538621 - in
/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-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: Wed May 16 07:58:16 2007
New Revision: 538621
URL: http://svn.apache.org/viewvc?view=rev&rev=538621
Log:
- move to servlet-service
- add blockServlet bean
Added:
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/pom.xml
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/web3.xsamples
Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/pom.xml?view=diff&rev=538621&r1=538620&r2=538621
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/pom.xml Wed May 16 07:58:16 2007
@@ -38,7 +38,10 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-web3-impl</artifactId>
-
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-samples-style-default</artifactId>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538621&r1=538620&r2=538621
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap Wed May 16 07:58:16 2007
@@ -35,10 +35,12 @@
</map:view>
<map:view from-label="content" name="pretty-content">
- <map:transform src="context://stylesheets/system/xml2html.xslt"/>
- <map:serialize type="html"/>
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService" mime-type="text/html">
+ <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>
@@ -61,14 +63,14 @@
</map:match>
<map:match pattern="samples">
- <map:generate src="samples.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:generate src="samples.xml" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService" mime-type="text/html">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ </map:serialize>
</map:match>
- <map:match pattern="">
+ <map:match pattern="">
<map:redirect-to uri="info.html"/>
</map:match>
<map:match pattern="*.html">
Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/web3.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/web3.xsamples?view=diff&rev=538621&r1=538620&r2=538621
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/web3.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/web3.xsamples Wed May 16 07:58:16 2007
@@ -19,7 +19,7 @@
<xsamples xpath="/samples" unless="group[@name='Web3']">
<group name="Web3">
- <sample name="Web3 Block" href="web3/samples">
+ <sample name="Web3 Block" href="/cocoon-web3-samples/">
Continue to Web3 block samples.
</sample>
</group>
Added: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml?view=auto&rev=538621
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml Wed May 16 07:58:16 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.web3.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-web3-sample" context-path="blockcontext:/cocoon-web3-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-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id