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 13:03:01 UTC
svn commit: r538531 - in
/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample: ./
src/main/resources/COB-INF/ src/main/resources/COB-INF/sendmail/
src/main/resources/META-INF/ src/main/resources/META-INF/cocoon/
src/main/resources/META-INF/cocoon/spring/
Author: felixk
Date: Wed May 16 04:03:00 2007
New Revision: 538531
URL: http://svn.apache.org/viewvc?view=rev&rev=538531
Log:
- move to servlet-service
- add blockServlet bean
Added:
cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/META-INF/
cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/META-INF/cocoon/
cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/META-INF/cocoon/spring/cocoon-mail-sample-blockServlet.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/pom.xml
cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail.xsamples
cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sendmail/sitemap.xmap
cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/pom.xml?view=diff&rev=538531&r1=538530&r2=538531
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/pom.xml Wed May 16 04:03:00 2007
@@ -39,7 +39,10 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-mail-impl</artifactId>
-
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-samples-style-default</artifactId>
</dependency>
</dependencies>
Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail.xsamples?view=diff&rev=538531&r1=538530&r2=538531
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/mail.xsamples Wed May 16 04:03:00 2007
@@ -19,7 +19,7 @@
<xsamples xpath="/samples" unless="group[@name='Mail']">
<group name="Mail">
- <sample name="Mail Block" href="mail/samples">
+ <sample name="Mail Block" href="/cocoon-mail-samples/">
Continue to mail block samples.
</sample>
</group>
Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sendmail/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sendmail/sitemap.xmap?view=diff&rev=538531&r1=538530&r2=538531
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sendmail/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sendmail/sitemap.xmap Wed May 16 04:03:00 2007
@@ -61,14 +61,14 @@
<map:resources>
<map:resource name="show-page">
<map:generate type="serverpages" src="{target}"/>
- <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
+ <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl">
<map:parameter name="servletPath" value="{request:servletPath}"/>
<map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="contextPath" value="{request:contextPath}"/>
<map:parameter name="remove" value="{remove}"/>
<map:parameter name="file" value="{target}"/>
</map:transform>
<map:transform type="simpleform"/>
+ <map:transform type="servletLinkRewriter" />
<map:serialize/>
</map:resource>
</map:resources>
Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538531&r1=538530&r2=538531
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/COB-INF/sitemap.xmap Wed May 16 04:03:00 2007
@@ -25,7 +25,8 @@
</map:view>
<map:view from-label="content" name="pretty-content">
- <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+ <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
+ <map:transform type="servletLinkRewriter" />
<map:serialize type="html"/>
</map:view>
@@ -49,9 +50,8 @@
<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:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl" />
+ <map:transform type="servletLinkRewriter" />
<map:serialize/>
</map:match>
Added: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/META-INF/cocoon/spring/cocoon-mail-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/META-INF/cocoon/spring/cocoon-mail-sample-blockServlet.xml?view=auto&rev=538531
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/META-INF/cocoon/spring/cocoon-mail-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/META-INF/cocoon/spring/cocoon-mail-sample-blockServlet.xml Wed May 16 04:03:00 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.mail.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-mail-sample" context-path="blockcontext:/cocoon-mail-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-mail/cocoon-mail-sample/src/main/resources/META-INF/cocoon/spring/cocoon-mail-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-sample/src/main/resources/META-INF/cocoon/spring/cocoon-mail-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id