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 10:48:51 UTC
svn commit: r539317 - in
/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample: ./
src/main/resources/COB-INF/ src/main/resources/COB-INF/mod-db/
src/main/resources/COB-INF/org-db/ src/main/resources/COB-INF/stylesheets/
src/main/resources/COB-...
Author: felixk
Date: Fri May 18 01:48:49 2007
New Revision: 539317
URL: http://svn.apache.org/viewvc?view=rev&rev=539317
Log:
- move to servlet-service
- add blockServlet bean
Added:
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/databases.xsamples
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/mod-db/sitemap.xmap
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/org-db/sitemap.xmap
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/stylesheets/sql2html.xsl
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/transform/sitemap.xmap
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/tutorial/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml?view=diff&rev=539317&r1=539316&r2=539317
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml Fri May 18 01:48:49 2007
@@ -39,17 +39,22 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-databases-impl</artifactId>
-
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-databases-hsqldb-server</artifactId>
-
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-databases-hsqldb-client</artifactId>
-
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-samples-style-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-xsp-impl</artifactId>
</dependency>
</dependencies>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/databases.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/databases.xsamples?view=diff&rev=539317&r1=539316&r2=539317
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/databases.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/databases.xsamples Fri May 18 01:48:49 2007
@@ -19,7 +19,7 @@
<xsamples xpath="/samples" unless="group[@name='Databases']">
<group name="Databases">
- <sample name="Databases Block" href="databases/samples">
+ <sample name="Databases Block" href="/cocoon-databases-sample/">
Continue to databases block samples.
</sample>
</group>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/mod-db/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/mod-db/sitemap.xmap?view=diff&rev=539317&r1=539316&r2=539317
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/mod-db/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/mod-db/sitemap.xmap Fri May 18 01:48:49 2007
@@ -62,7 +62,7 @@
</map:components>
- <!-- ======================= Views ================================= -->
+ <!-- =========================== Views =================================== -->
<map:views>
<map:view name="content" from-label="content">
@@ -70,8 +70,10 @@
</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">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
</map:view>
<map:view name="links" from-position="last">
@@ -79,7 +81,7 @@
</map:view>
</map:views>
- <!-- ======================= Pipelines ================================= -->
+ <!-- =========================== Pipelines ================================= -->
<map:pipelines>
<map:pipeline>
@@ -220,12 +222,7 @@
<!-- ______________________________ content ______________________________ -->
<map:generate type="serverpages" src="{1}.xsp" />
- <map:transform src="context://samples/blocks/dynamic-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="file" value=".xsp" />
- </map:transform>
+ <map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl" />
<map:transform src="stupid.xsl" />
<map:serialize />
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/org-db/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/org-db/sitemap.xmap?view=diff&rev=539317&r1=539316&r2=539317
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/org-db/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/org-db/sitemap.xmap Fri May 18 01:48:49 2007
@@ -21,6 +21,9 @@
<!-- ========================= Components ================================ -->
<map:components>
+
+ <!-- ========================= Actions ================================ -->
+
<map:actions>
<!--
- Original database actions
@@ -29,6 +32,7 @@
<map:action logger="sitemap.action.del-employee" name="del-employee" src="org.apache.cocoon.acting.DatabaseDeleteAction" />
<map:action logger="sitemap.action.upd-employee" name="upd-employee" src="org.apache.cocoon.acting.DatabaseUpdateAction" />
</map:actions>
+
</map:components>
<!-- ========================== Action sets ================================ -->
@@ -46,7 +50,7 @@
</map:action-set>
</map:action-sets>
- <!-- ============================ Views ==================================== -->
+ <!-- =========================== Views =================================== -->
<map:views>
<map:view name="content" from-label="content">
@@ -54,8 +58,10 @@
</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">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
</map:view>
<map:view name="links" from-position="last">
@@ -86,25 +92,19 @@
- successfully.
-->
<map:generate src="employee.xsp" type="serverpages" />
- <map:transform src="context://samples/blocks/dynamic-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="file" value=".xsp" />
- </map:transform>
- <map:serialize />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+ </map:serialize>
</map:act>
</map:match>
<map:match pattern="*">
<map:generate src="{1}.xsp" type="serverpages" />
- <map:transform src="context://samples/blocks/dynamic-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="file" value=".xsp" />
- </map:transform>
- <map:serialize />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+ </map:serialize>
</map:match>
<map:match pattern="">
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539317&r1=539316&r2=539317
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/sitemap.xmap Fri May 18 01:48:49 2007
@@ -36,8 +36,10 @@
</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">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
</map:view>
<map:view name="links" from-position="last">
@@ -64,10 +66,10 @@
<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 />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ </map:serialize>
</map:match>
<!-- samples automount -->
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/stylesheets/sql2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/stylesheets/sql2html.xsl?view=diff&rev=539317&r1=539316&r2=539317
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/stylesheets/sql2html.xsl (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/stylesheets/sql2html.xsl Fri May 18 01:48:49 2007
@@ -24,7 +24,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:sql="http://apache.org/cocoon/SQL/2.0">
- <xsl:import href="../../../common/style/xsl/html/simple-page2html.xsl"/>
+ <xsl:import href="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl"/>
<xsl:template match="sql:rowset">
<xsl:choose>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/transform/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/transform/sitemap.xmap?view=diff&rev=539317&r1=539316&r2=539317
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/transform/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/transform/sitemap.xmap Fri May 18 01:48:49 2007
@@ -17,7 +17,7 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- ============================ Views ==================================== -->
+ <!-- =========================== Views =================================== -->
<map:views>
<map:view name="content" from-label="content">
@@ -25,8 +25,10 @@
</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">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
</map:view>
<map:view name="links" from-position="last">
@@ -50,12 +52,8 @@
<map:transform type="sql">
<map:parameter name="use-connection" value="personnel" />
</map:transform>
- <map:transform src="../stylesheets/sql2html.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="file" value=".xml" />
- </map:transform>
+ <map:transform src="../stylesheets/sql2html.xsl" />
+ <map:transform type="servletLinkRewriter" />
<map:serialize type="html" />
</map:match>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/tutorial/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/tutorial/sitemap.xmap?view=diff&rev=539317&r1=539316&r2=539317
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/tutorial/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/COB-INF/tutorial/sitemap.xmap Fri May 18 01:48:49 2007
@@ -22,6 +22,8 @@
<map:components>
+ <!-- =========================== Actions ================================ -->
+
<map:actions>
<map:action name="dbAdd" logger="sitemap.tutorial.action.dbAdd" src="org.apache.cocoon.acting.DatabaseAddAction" />
@@ -68,7 +70,7 @@
<map:match pattern="*-dept.html">
<map:act set="process">
- <map:parameter name="descriptor" value="context://samples/databases/tutorial/docs/department-form.xml" />
+ <map:parameter name="descriptor" value="{servlet:/}/tutorial/docs/department-form.xml" />
<map:generate type="serverpages" src="docs/confirm-dept.xsp" />
<map:transform src="apache.xsl" />
<map:serialize />
@@ -81,7 +83,7 @@
<map:match pattern="*-empl.html">
<map:act set="process">
- <map:parameter name="descriptor" value="context://samples/databases/tutorial/docs/employee-form.xml" />
+ <map:parameter name="descriptor" value="{servlet:/}/tutorial/docs/employee-form.xml" />
<map:generate type="serverpages" src="docs/confirm-empl.xsp" />
<map:transform src="apache.xsl" />
<map:serialize />
Added: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml?view=auto&rev=539317
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml Fri May 18 01:48:49 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.databases.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-databases-sample" context-path="blockcontext:/cocoon-databases-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-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id