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:24:32 UTC
svn commit: r539308 - in
/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample: ./
src/main/resources/COB-INF/ src/main/resources/COB-INF/resources/
src/main/resources/META-INF/ src/main/resources/META-INF/cocoon/
src/main/resources/META-INF/coco...
Author: felixk
Date: Fri May 18 01:24:31 2007
New Revision: 539308
URL: http://svn.apache.org/viewvc?view=rev&rev=539308
Log:
- move to servlet-service
- add blockServlet bean
Added:
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/resources/
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/resources/forms-sample-styling.xsl (with props)
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/javaflow.xsamples
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml?view=diff&rev=539308&r1=539307&r2=539308
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml Fri May 18 01:24:31 2007
@@ -38,12 +38,22 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-javaflow-impl</artifactId>
-
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-template-impl</artifactId>
-
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-ajax-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-forms-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-samples-style-default</artifactId>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/javaflow.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/javaflow.xsamples?view=diff&rev=539308&r1=539307&r2=539308
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/javaflow.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/javaflow.xsamples Fri May 18 01:24:31 2007
@@ -19,7 +19,7 @@
<xsamples xpath="/samples" unless="group[@name='Java Flow']">
<group name="Java Flow">
- <sample name="Java Flow Block" href="javaflow/">
+ <sample name="Java Flow Block" href="/cocoon-javaflow-sample/">
Cocoon Java Flow examples.
</sample>
</group>
Added: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/resources/forms-sample-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/resources/forms-sample-styling.xsl?view=auto&rev=539308
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/resources/forms-sample-styling.xsl (added)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/resources/forms-sample-styling.xsl Fri May 18 01:24:31 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <!--+ Include styling stylesheets, one for the widgets, the other one for the
+ | page. As 'forms-advanced-field-styling.xsl' is a specialization of
+ | 'forms-field-styling.xsl' the latter one is imported there. If you don't
+ | want advanced styling of widgets, change it here!
+ | See xsl:include as composition and xsl:import as extension/inheritance.
+ +-->
+ <xsl:include href="servlet:forms:/resource/internal/xsl/forms-page-styling.xsl"/>
+ <xsl:include href="servlet:forms:/resource/internal/xsl/forms-advanced-field-styling.xsl"/>
+
+ <!-- Location of the resources directories, where JS libs and icons are stored -->
+ <xsl:param name="dojo-resources"/>
+ <xsl:param name="forms-resources"/>
+
+ <xsl:template match="head">
+ <head>
+ <xsl:apply-templates select="." mode="forms-page"/>
+ <xsl:apply-templates select="." mode="forms-field"/>
+ <xsl:apply-templates/>
+ </head>
+ </xsl:template>
+
+ <xsl:template match="body">
+ <body>
+ <!--+ !!! If template with mode 'forms-page' adds text or elements
+ | template with mode 'forms-field' can no longer add attributes!!!
+ +-->
+ <xsl:apply-templates select="." mode="forms-page"/>
+ <xsl:apply-templates select="." mode="forms-field"/>
+ <xsl:apply-templates/>
+ </body>
+ </xsl:template>
+
+</xsl:stylesheet>
Propchange: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/resources/forms-sample-styling.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/resources/forms-sample-styling.xsl
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539308&r1=539307&r2=539308
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/sitemap.xmap Fri May 18 01:24:31 2007
@@ -18,22 +18,30 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <!-- =========================== Components =================================== -->
+
<map:components>
+ <!-- =========================== Generators =================================== -->
+
<map:generators default="file">
<map:generator name="mygenerator" src="org.apache.cocoon.samples.reloading.MyGenerator" />
</map:generators>
+ <!-- =========================== Transformers =================================== -->
+
<map:transformers default="xslt">
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="other">
- <catalogue id="other" name="OtherMessages" location="context://samples/blocks/forms/messages" />
- <catalogue id="forms" name="FormsMessages" location="context://samples/blocks/forms/messages" />
+ <catalogue id="other" name="OtherMessages" location="servlet:forms:/resource/internal/i18n" />
+ <catalogue id="forms" name="FormsMessages" location="servlet:forms:/resource/internal/i18n" />
</catalogues>
<cache-at-startup>true</cache-at-startup>
</map:transformer>
</map:transformers>
+ <!-- =========================== Classloader =================================== -->
+
<map:classloader factory-role="org.apache.cocoon.classloader.ClassLoaderFactory/reloading">
<class-dir src="../../../../../../blocks/cocoon-javaflow/cocoon-javaflow-sample/target/classes">
<store class="org.apache.cocoon.components.flow.java.JavaflowResourceStore" />
@@ -53,10 +61,10 @@
<include-classes pattern="org.apache.cocoon.samples.reloading.java.**"/>
</map:classloader-->
-
</map:components>
- <!-- indicates what flow classes to attach to this sitemap -->
+ <!-- =========================== Flows =================================== -->
+
<map:flow language="java">
<map:script src="org.apache.cocoon.samples.flow.java.CalculatorFlow" />
<!--
@@ -65,6 +73,27 @@
-->
</map:flow>
+ <!-- =========================== 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>
<!--+
@@ -72,26 +101,27 @@
+-->
<map:match pattern="page/*">
<map:generate type="jx" src="screens/{1}.xml" />
- <map:transform src="context://samples/common/style/xsl/html/complex-page2html.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/complex-page2html" />
+ </map:serialize>
</map:match>
- <!--
- <map:match pattern="form/*">
- <map:generate src="forms/{1}-template.xml"/>
- <map:transform type="forms"/>
+ <map:match pattern="form/*">
+ <map:generate src="forms/{1}-template.xml" />
+ <map:transform type="forms" />
<map:transform type="i18n">
- <map:parameter name="locale" value="en-US"/>
+ <map:parameter name="locale" value="en-US" />
</map:transform>
- <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
+ <map:transform src="resources/forms-samples-styling.xsl">
+ <map:parameter name="dojo-resources" value="{servlet:ajax:/resource/external/dojo}" />
+ <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}" />
</map:transform>
- <map:transform src="context://samples/blocks/forms/resources/forms-samples-styling.xsl"/>
- <map:serialize/>
- </map:match>
- -->
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+ </map:serialize>
+ </map:match>
</map:pipeline>
@@ -104,10 +134,10 @@
<map:match pattern="">
<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>
<!--+
@@ -133,7 +163,7 @@
</map:match>
<map:match pattern="resources/**">
- <map:redirect-to uri="/samples/blocks/forms/resources/{1}" />
+ <map:redirect-to uri="servlet:forms:/resources/{1}" />
</map:match>
</map:pipeline>
Added: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml?view=auto&rev=539308
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml Fri May 18 01:24:31 2007
@@ -0,0 +1,35 @@
+<?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.javaflow.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-javaflow-sample" context-path="blockcontext:/cocoon-javaflow-sample/">
+ <servlet:connections>
+ <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
+ <entry key="forms" value-ref="org.apache.cocoon.forms.impl.servlet"/>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
+</beans>
Propchange: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id