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/17 23:04:16 UTC
svn commit: r539114 [1/2] - in
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF:
./ aggregate/ captcha/ dreamteam/ forms/ library/ pagination/ sql/ swan/
Author: felixk
Date: Thu May 17 14:04:15 2007
New Revision: 539114
URL: http://svn.apache.org/viewvc?view=rev&rev=539114
Log:
-use servlet services
-reformatted
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/imagemap.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap?view=diff&rev=539114&r1=539113&r2=539114
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/aggregate/sitemap.xmap Thu May 17 14:04:15 2007
@@ -23,58 +23,55 @@
+-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:views>
- <map:view name="content" from-label="content">
- <map:serialize type="xml"/>
- </map:view>
- <map:view from-label="content" name="pretty-content">
- <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize type="html"/>
- </map:view>
- <map:view name="links" from-position="last">
- <map:serialize type="links"/>
- </map:view>
- </map:views>
-
- <map:resources>
- <map:resource name="simple-page2html">
- <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="file" value="{file}"/>
- <map:parameter name="remove" value="{../0}"/>
- </map:transform>
- </map:resource>
- </map:resources>
-
- <map:flow language="javascript">
- <map:script src="example.js"/>
- </map:flow>
-
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="example">
- <map:call function="example"/>
- </map:match>
- <map:match pattern="*.continue">
- <map:call continuation="{1}"/>
- </map:match>
-
- <map:match pattern="*-display-pipeline">
- <!-- pipeline to show the form -->
- <map:generate type="jx" src="template-{1}.xml"/>
- <map:transform type="forms"/>
- <map:call resource="simple-page2html">
- <map:parameter name="file" value="{1}_template.xml"/>
- </map:call>
- <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 type="servletLinkRewriter"/>
- <map:serialize/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
+
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view from-label="content" name="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 from-position="last" name="links">
+ <map:serialize type="links" />
+ </map:view>
+ </map:views>
+
+ <!-- =========================== Flowscripts =================================== -->
+
+ <map:flow language="javascript">
+ <map:script src="example.js" />
+ </map:flow>
+
+ <!-- =========================== Pipelines =================================== -->
+
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="example">
+ <map:call function="example" />
+ </map:match>
+ <map:match pattern="*.continue">
+ <map:call continuation="{1}" />
+ </map:match>
+
+ <map:match pattern="*-display-pipeline">
+ <!-- pipeline to show the form -->
+ <map:generate type="jx" src="template-{1}.xml" />
+ <map:transform type="forms" />
+ <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
+ <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 type="servletLinkRewriter" />
+ <map:serialize />
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap?view=diff&rev=539114&r1=539113&r2=539114
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/captcha/sitemap.xmap Thu May 17 14:04:15 2007
@@ -17,105 +17,95 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
- <map:views>
- <map:view name="content" from-label="content">
- <map:serialize type="xml"/>
- </map:view>
-
- <map:view name="content1" from-label="content1">
- <map:serialize type="xml"/>
- </map:view>
-
- <map:view from-label="content" name="pretty-content">
- <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize type="html"/>
- </map:view>
-
- <map:view name="links" from-position="last">
- <map:serialize type="links"/>
- </map:view>
- </map:views>
-
- <map:resources>
- <!-- this will later become a virtual transformer -->
- <map:resource name="simple-page2html">
- <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="file" value="{file}"/>
- <map:parameter name="remove" value="{../0}"/>
- </map:transform>
- </map:resource>
- </map:resources>
-
- <!-- indicates what flowscript to attach to this sitemap -->
- <map:flow language="javascript">
- <map:script src="flow/captcha.js"/>
- </map:flow>
-
- <map:pipelines>
- <map:pipeline>
-
- <map:match pattern="">
- <map:call function="captcha"/>
- </map:match>
-
- <map:match pattern="*.cont">
- <map:call continuation="{1}"/>
- </map:match>
-
- <map:match pattern="success">
- <map:generate type="jx" src="success.xml"/>
- <map:call resource="simple-page2html">
- <map:parameter name="file" value="success.xml"/>
- </map:call>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize/>
- </map:match>
-
- <!--
- | Show a form, using the forms transformer
- -->
- <map:match pattern="*-display-pipeline">
- <map:generate type="file" src="forms/{1}.tpl.xml"/>
- <map:transform type="forms" label="content1"/>
- <map:transform type="i18n">
- <!--map:parameter name="locale" value="en-US"/-->
- </map:transform>
- <map:call resource="simple-page2html">
- <map:parameter name="file" value="forms/{1}.tpl.xml"/>
- </map:call>
- <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 type="i18n">
- </map:transform>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize/>
- </map:match>
-
- <!--
- | Generate the CAPTCHA image. Any type of generator can be used here,
- | as long as it reads the string to display from the session
- | attribute named "captcha-{1}".
- | Using an SVG file as input requires that the Batik block be
- | included in the build.
- -->
- <map:match pattern="captcha-*.jpg">
- <map:generate type="jx" src="captcha-image.xml">
- <map:parameter name="value" value="{session-attr:captcha-{1}}"/>
- </map:generate>
- <map:serialize type="svg2jpeg"/>
- </map:match>
-
- <map:match pattern="*">
- <map:redirect-to uri="{1}/"/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view name="content" from-label="content">
+ <map:serialize type="xml" />
+ </map:view>
+
+ <map:view name="content1" from-label="content1">
+ <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>
+
+ <!-- =========================== Flowscripts =================================== -->
+
+ <map:flow language="javascript">
+ <map:script src="flow/captcha.js" />
+ </map:flow>
+
+ <!-- =========================== Pipelines =================================== -->
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="">
+ <map:call function="captcha" />
+ </map:match>
+
+ <map:match pattern="*.cont">
+ <map:call continuation="{1}" />
+ </map:match>
+
+ <map:match pattern="success">
+ <map:generate type="jx" src="success.xml" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/common/simple-page2html" />
+ </map:serialize>
+ </map:match>
+
+ <!--
+ | Show a form, using the forms transformer
+ -->
+ <map:match pattern="*-display-pipeline">
+ <map:generate type="file" src="forms/{1}.tpl.xml" />
+ <map:transform type="forms" label="content1" />
+ <map:transform type="i18n">
+ <!--map:parameter name="locale" value="en-US"/-->
+ </map:transform>
+ <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
+ <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 type="i18n"></map:transform>
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize />
+ </map:match>
+
+ <!--
+ | Generate the CAPTCHA image. Any type of generator can be used here,
+ | as long as it reads the string to display from the session
+ | attribute named "captcha-{1}".
+ | Using an SVG file as input requires that the Batik block be
+ | included in the build.
+ -->
+ <map:match pattern="captcha-*.jpg">
+ <map:generate type="jx" src="captcha-image.xml">
+ <map:parameter name="value" value="{session-attr:captcha-{1}}" />
+ </map:generate>
+ <map:serialize type="svg2jpeg" />
+ </map:match>
+
+ <map:match pattern="*">
+ <map:redirect-to uri="{1}/" />
+ </map:match>
+
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap?view=diff&rev=539114&r1=539113&r2=539114
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/dreamteam/sitemap.xmap Thu May 17 14:04:15 2007
@@ -16,137 +16,154 @@
limitations under the License.
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:components>
- <map:transformers default="xslt">
- <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
- <catalogues default="dreamteam">
- <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n"/>
- <catalogue id="dreamteam" name="DreamTeamMessages" location="messages"/>
- </catalogues>
- </map:transformer>
- </map:transformers>
- <!-- map:selectors default="browser">
- <map:selector name="request-method"
+
+ <!-- =========================== Components =================================== -->
+
+ <map:components>
+
+ <!-- =========================== Transformers =================================== -->
+
+ <map:transformers default="xslt">
+ <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+ <catalogues default="dreamteam">
+ <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n" />
+ <catalogue id="dreamteam" name="DreamTeamMessages" location="messages" />
+ </catalogues>
+ </map:transformer>
+ </map:transformers>
+ <!-- map:selectors default="browser">
+ <map:selector name="request-method"
src="org.apache.cocoon.selection.RequestMethodSelector"/>
- </map:selectors -->
- <map:pipes default="caching"/>
- </map:components>
-
- <map:views>
- <map:view name="content" from-label="content">
- <map:serialize type="xml"/>
- </map:view>
- <map:view from-label="content" name="pretty-content">
- <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize type="html"/>
- </map:view>
- <map:view name="links" from-position="last">
- <map:serialize type="links"/>
- </map:view>
- </map:views>
-
- <!-- ========================================= -->
- <!-- flow scripts -->
- <!-- ========================================= -->
- <map:flow language="javascript">
- <map:script src="flow/team.js"/>
- </map:flow>
- <map:pipelines>
- <map:pipeline>
- <!-- ========================================= -->
- <!-- flow script continuations -->
- <!-- ========================================= -->
- <map:match pattern="**/*.continue">
- <map:call continuation="{2}"/>
- </map:match>
- <map:match pattern="*.continue">
- <map:call continuation="{1}"/>
- </map:match>
- <!-- ========================================= -->
- <!-- Redirections for page requests on homepage -->
- <!-- ========================================= -->
- <map:match pattern="">
- <map:redirect-to session="true" uri="home.html"/>
- </map:match>
- <map:match pattern="/">
- <map:redirect-to session="true" uri="home.html"/>
- </map:match>
- <map:match pattern="home.html">
- <map:call function="initDreamTeamChooser">
- <map:parameter name="documentURI" value="content/soccer.xml"/>
- </map:call>
- </map:match>
- <!-- ========================================= -->
- <!-- Actual pages -->
- <!-- ========================================= -->
- <map:match pattern="showteam.html">
- <map:call function="prot_showTeam"/>
- </map:match>
- <map:match pattern="buildteam.html">
- <map:call function="prot_buildTeam"/>
- </map:match>
- <!-- ========================================= -->
- <!-- Pipelines to display the actual pages -->
- <!-- ========================================= -->
- <map:match pattern="team.form">
- <map:generate type="jx" src="content/teamTemplate.jx"/>
- <map:transform type="browser-update"/>
- <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:select type="ajax-request">
- <map:when test="true">
- <map:transform type="i18n"/>
- <map:serialize type="xml"/>
- </map:when>
- <map:otherwise>
- <map:transform src="servlet:style-default:/common/style/xsl/html/adding-header.xsl">
- <map:parameter name="servletPath" value="{request:servletPath}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="file" value="content/teamTemplate.jx"/>
- </map:transform>
- <map:transform type="i18n"/>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize type="html"/>
- </map:otherwise>
- </map:select>
- </map:match>
- <map:match pattern="showTeam.form">
- <map:generate type="jx" src="content/showTeam.jx"/>
- <map:transform src="servlet:style-default:/common/style/xsl/html/adding-header.xsl">
- <map:parameter name="servletPath" value="{request:servletPath}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="file" value="content/teamTemplate.jx"/>
- </map:transform>
- <map:transform type="i18n"/>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize type="html"/>
- </map:match>
- <map:match pattern="home.form">
- <map:generate type="jx" src="content/main.jx"/>
- <map:transform src="servlet:style-default:/common/style/xsl/html/adding-header.xsl">
- <map:parameter name="servletPath" value="{request:servletPath}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="file" value="content/teamTemplate.jx"/>
- </map:transform>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize type="html"/>
- </map:match>
- <!-- ========================================= -->
- <!-- images -->
- <!-- ========================================= -->
- <map:match pattern="flags/*.gif">
- <map:read mime-type="image/gif" src="resources/flags/{1}.gif"/>
- </map:match>
- <!-- ========================================= -->
- <!-- CSS stylesheets and JavaScript files -->
- <!-- ========================================= -->
- <map:match pattern="local-resources/*.css">
- <map:read mime-type="text/css" src="resources/styles/{1}.css"/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:selectors -->
+
+ <!-- =========================== Pipes =================================== -->
+
+ <map:pipes default="caching" />
+ </map:components>
+
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view from-label="content" name="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 from-position="last" name="links">
+ <map:serialize type="links" />
+ </map:view>
+ </map:views>
+
+ <!-- =========================== Flowscripts =================================== -->
+
+ <map:flow language="javascript">
+ <map:script src="flow/team.js" />
+ </map:flow>
+
+ <!-- =========================== Pipelines =================================== -->
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <!-- ========================================= -->
+ <!-- flow script continuations -->
+ <!-- ========================================= -->
+ <map:match pattern="**/*.continue">
+ <map:call continuation="{2}" />
+ </map:match>
+ <map:match pattern="*.continue">
+ <map:call continuation="{1}" />
+ </map:match>
+
+ <!-- ========================================= -->
+ <!-- Redirections for page requests on homepage -->
+ <!-- ========================================= -->
+ <map:match pattern="">
+ <map:redirect-to session="true" uri="home.html" />
+ </map:match>
+ <map:match pattern="/">
+ <map:redirect-to session="true" uri="home.html" />
+ </map:match>
+ <map:match pattern="home.html">
+ <map:call function="initDreamTeamChooser">
+ <map:parameter name="documentURI" value="content/soccer.xml" />
+ </map:call>
+ </map:match>
+
+ <!-- ========================================= -->
+ <!-- Actual pages -->
+ <!-- ========================================= -->
+ <map:match pattern="showteam.html">
+ <map:call function="prot_showTeam" />
+ </map:match>
+ <map:match pattern="buildteam.html">
+ <map:call function="prot_buildTeam" />
+ </map:match>
+
+ <!-- ========================================= -->
+ <!-- Pipelines to display the actual pages -->
+ <!-- ========================================= -->
+ <map:match pattern="team.form">
+ <map:generate type="jx" src="content/teamTemplate.jx" />
+ <map:transform type="browser-update" />
+ <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:select type="ajax-request">
+ <map:when test="true">
+ <map:transform type="i18n" />
+ <map:serialize type="xml" />
+ </map:when>
+ <map:otherwise>
+ <map:transform src="servlet:style-default:/common/style/xsl/html/adding-header.xsl">
+ <map:parameter name="servletPath" value="{request:servletPath}" />
+ <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
+ <map:parameter name="file" value="content/teamTemplate.jx" />
+ </map:transform>
+ <map:transform type="i18n" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/adding-header" />
+ </map:serialize>
+ </map:otherwise>
+ </map:select>
+ </map:match>
+ <map:match pattern="showTeam.form">
+ <map:generate type="jx" src="content/showTeam.jx" />
+ <map:transform type="i18n" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/adding-header" />
+ </map:serialize>
+ </map:match>
+ <map:match pattern="home.form">
+ <map:generate type="jx" src="content/main.jx" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/adding-header" />
+ </map:serialize>
+ </map:match>
+
+ <!-- ========================================= -->
+ <!-- images -->
+ <!-- ========================================= -->
+ <map:match pattern="flags/*.gif">
+ <map:read mime-type="image/gif" src="resources/flags/{1}.gif" />
+ </map:match>
+
+ <!-- ========================================= -->
+ <!-- CSS stylesheets and JavaScript files -->
+ <!-- ========================================= -->
+ <map:match pattern="local-resources/*.css">
+ <map:read mime-type="text/css" src="resources/styles/{1}.css" />
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
-<!-- end of file -->
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/imagemap.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/imagemap.xml?view=diff&rev=539114&r1=539113&r2=539114
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/imagemap.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/forms/imagemap.xml Thu May 17 14:04:15 2007
@@ -28,7 +28,7 @@
</fd:datatype>
</fd:output>
<fd:imagemap id="map">
- <fd:imageuri>/images/cocoon.gif</fd:imageuri>
+ <fd:imageuri>servlet:style-default:/images/cocoon.gif</fd:imageuri>
<fd:hint>Click to show coordinates</fd:hint>
<fd:on-action>
<javascript>onClickMap(event);</javascript>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap?view=diff&rev=539114&r1=539113&r2=539114
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/library/sitemap.xmap Thu May 17 14:04:15 2007
@@ -17,147 +17,137 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
- <map:components>
-
- <map:transformers default="xslt">
- <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
- <catalogues default="other">
- <catalogue id="other" name="OtherMessages" location="messages"/>
- <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n"/>
- </catalogues>
- </map:transformer>
- </map:transformers>
-
- <map:actions>
- <map:action name="make-form" src="org.apache.cocoon.forms.acting.MakeFormAction" logger="forms"/>
- <map:action name="init-form" src="org.apache.cocoon.forms.samples.InitForm1Action" logger="forms"/>
- <map:action name="handle-form-submit" src="org.apache.cocoon.forms.acting.HandleFormSubmitAction" logger="forms"/>
- </map:actions>
-
- <map:pipes default="caching">
- <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
- <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
- </map:pipes>
-
- </map:components>
-
- <map:views>
- <map:view name="content" from-label="content">
- <map:serialize type="xml"/>
- </map:view>
-
- <map:view from-label="content" name="pretty-content">
- <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize type="html"/>
- </map:view>
-
- <map:view name="form" from-label="form">
- <map:serialize type="xml"/>
- </map:view>
-
- <map:view name="links" from-position="last">
- <map:serialize type="links"/>
- </map:view>
- </map:views>
-
- <map:resources>
- <!-- this will later become a virtual transformer -->
- <map:resource name="simple-page2html">
- <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="file" value="{file}"/>
- <map:parameter name="remove" value="{../0}"/>
- </map:transform>
- </map:resource>
- </map:resources>
-
- <!-- indicates what flowscript to attach to this sitemap -->
- <map:flow language="javascript">
- <map:script src="flow/library.js"/>
- </map:flow>
-
- <map:pipelines>
-
- <map:pipeline type="caching">
-
- <map:match pattern="library/**">
- <map:read src="libraries/{1}"/>
- </map:match>
-
- </map:pipeline>
- <map:pipeline type="noncaching">
-
- <map:match pattern="">
- <map:generate src="index.xml"/>
- <map:serialize/>
- </map:match>
-
-
-
- <map:match pattern="*.continue">
- <map:call continuation="{1}"/>
- </map:match>
-
- <map:match pattern="*-display-pipeline">
- <!-- pipeline to show the form -->
- <map:generate type="jx" src="forms/{1}_template.xml"/>
- <map:transform type="forms"/>
- <map:transform type="i18n" label="form">
- <map:parameter name="locale" value="en-US"/>
- </map:transform>
- <map:call resource="simple-page2html">
- <map:parameter name="file" value="forms/{1}_template.xml"/>
- </map:call>
- <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 type="servletLinkRewriter"/>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="*-error-pipeline">
- <map:generate src="error.xml"/>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="*-success-pipeline.jx">
- <map:generate type="jx" src="resources/result_jx.xml"/>
- <map:call resource="simple-page2html">
- <map:parameter name="file" value="resources/result_jx.xml"/>
- </map:call>
- <map:serialize type="xml"/>
- </map:match>
-
-
-
- <!--
- | Sample building a forms-form-gui editor in forms
- | Doubles as a showcase for class, new, struct, union widgets
- -->
-
- <!-- TODO: Fix edit-any-file security hole! -->
- <map:match pattern="*.flow">
- <map:call function="handleForm">
- <map:parameter name="function" value="show_{1}"/>
- <map:parameter name="form-definition" value="forms/{1}_model.xml"/>
- <map:parameter name="bindingURI" value="forms/{1}_binding.xml"/>
- </map:call>
- </map:match>
-
-
- <map:match pattern="*">
- <map:redirect-to uri="{1}/"/>
- </map:match>
-
- <map:match pattern="*/**">
- <map:mount src="{1}/" uri-prefix="{1}"/>
- </map:match>
-
- </map:pipeline>
- </map:pipelines>
-
+
+ <!-- =========================== Components =================================== -->
+
+ <map:components>
+
+ <!-- =========================== Transformers =================================== -->
+
+ <map:transformers default="xslt">
+ <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+ <catalogues default="other">
+ <catalogue id="other" name="OtherMessages" location="messages" />
+ <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n" />
+ </catalogues>
+ </map:transformer>
+ </map:transformers>
+
+ <!-- =========================== Actions =================================== -->
+
+ <map:actions>
+ <map:action name="make-form" src="org.apache.cocoon.forms.acting.MakeFormAction" logger="forms" />
+ <map:action name="init-form" src="org.apache.cocoon.forms.samples.InitForm1Action" logger="forms" />
+ <map:action name="handle-form-submit" src="org.apache.cocoon.forms.acting.HandleFormSubmitAction" logger="forms" />
+ </map:actions>
+
+ <!-- =========================== Pipes =================================== -->
+
+ <map:pipes default="caching">
+ <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline" />
+ <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline" />
+ </map:pipes>
+
+ </map:components>
+
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view from-label="content" name="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="form" from-label="form">
+ <map:serialize type="xml" />
+ </map:view>
+
+ <map:view name="links" from-position="last">
+ <map:serialize type="links" />
+ </map:view>
+ </map:views>
+
+ <!-- =========================== Flowscripts =================================== -->
+
+ <map:flow language="javascript">
+ <map:script src="flow/library.js" />
+ </map:flow>
+
+ <!-- =========================== Pipelines =================================== -->
+
+ <map:pipelines>
+ <map:pipeline type="caching">
+ <map:match pattern="library/**">
+ <map:read src="libraries/{1}" />
+ </map:match>
+ </map:pipeline>
+
+ <map:pipeline type="noncaching">
+ <map:match pattern="">
+ <map:generate src="index.xml" />
+ <map:serialize />
+ </map:match>
+
+ <map:match pattern="*.continue">
+ <map:call continuation="{1}" />
+ </map:match>
+
+ <map:match pattern="*-display-pipeline">
+ <!-- pipeline to show the form -->
+ <map:generate type="jx" src="forms/{1}_template.xml" />
+ <map:transform type="forms" />
+ <map:transform type="i18n" label="form">
+ <map:parameter name="locale" value="en-US" />
+ </map:transform>
+ <map:transform src="servlet:style:default:/common/style/xsl/html/simple-page2html.xsl" />
+ <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 type="servletLinkRewriter" />
+ <map:serialize />
+ </map:match>
+
+ <map:match pattern="*-error-pipeline">
+ <map:generate src="error.xml" />
+ <map:serialize />
+ </map:match>
+
+ <map:match pattern="*-success-pipeline.jx">
+ <map:generate type="jx" src="resources/result_jx.xml" />
+ <map:transform src="servlet:style:default:/common/style/xsl/html/simple-page2html.xsl" />
+ <map:serialize type="xml" />
+ </map:match>
+
+ <!--
+ | Sample building a forms-form-gui editor in forms
+ | Doubles as a showcase for class, new, struct, union widgets
+ -->
+
+ <!-- TODO: Fix edit-any-file security hole! -->
+ <map:match pattern="*.flow">
+ <map:call function="handleForm">
+ <map:parameter name="function" value="show_{1}" />
+ <map:parameter name="form-definition" value="forms/{1}_model.xml" />
+ <map:parameter name="bindingURI" value="forms/{1}_binding.xml" />
+ </map:call>
+ </map:match>
+
+ <map:match pattern="*">
+ <map:redirect-to uri="{1}/" />
+ </map:match>
+
+ <map:match pattern="*/**">
+ <map:mount src="{1}/" uri-prefix="{1}" />
+ </map:match>
+
+ </map:pipeline>
+ </map:pipelines>
+
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap?view=diff&rev=539114&r1=539113&r2=539114
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/pagination/sitemap.xmap Thu May 17 14:04:15 2007
@@ -18,88 +18,88 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:components>
- </map:components>
+ <!-- =========================== Views =================================== -->
- <map:views>
- <map:view name="content" from-label="content">
- <map:serialize type="xml"/>
- </map:view>
- </map:views>
-
- <map:resources>
- <!-- this will later become a virtual transformer -->
- <map:resource name="simple-page2html">
- <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="file" value="{file}"/>
- <map:parameter name="remove" value="{../0}"/>
- </map:transform>
- </map:resource>
- </map:resources>
-
- <!-- indicates what flowscript to attach to this sitemap -->
- <map:flow language="javascript">
- <map:script src="flow.js"/>
- </map:flow>
-
- <map:pipelines>
-
- <map:pipeline type="noncaching">
-
- <map:match pattern="*.continue">
- <map:call continuation="{1}"/>
- </map:match>
-
- <map:match pattern="*-display-pipeline">
- <!-- pipeline to show the form -->
- <map:generate src="{1}.tpl.xml" type="jx"/>
- <map:transform type="browser-update"/>
- <map:transform type="i18n">
- <map:parameter name="locale" value="en-US"/>
- </map:transform>
- <map:call resource="simple-page2html">
- <map:parameter name="file" value="{1}.tpl.xml"/>
- </map:call>
- <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 type="servletLinkRewriter"/>
- <map:select type="ajax-request">
- <map:when test="true"><!-- sending a partial Browser Update -->
- <map:select type="request-parameter">
- <map:parameter name="parameter-name" value="dojo.transport" />
- <map:when test="iframe"><!-- sending BU via iFrameIO -->
- <map:transform src="servlet:forms:/resource/internal/xsl/IframeTransport-bu-styling.xsl" />
- <map:serialize type="xhtml" /><!-- this is REALLY important -->
- </map:when>
- <map:otherwise><!-- sending BU via XHR -->
- <map:serialize type="xml" />
- </map:otherwise>
- </map:select>
- </map:when>
- <map:otherwise><!-- sending a complete page -->
- <map:serialize type="html" />
- </map:otherwise>
- </map:select>
- </map:match>
-
- <map:match pattern="*-result-pipeline.jx">
- <map:generate type="jx" src="{1}-result.xml"/>
- <map:call resource="simple-page2html">
- <map:parameter name="file" value="{1}-success.xml"/>
- </map:call>
- <map:transform type="servletLinkRewriter"/>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="*.do">
- <map:call function="do_{1}"/>
- </map:match>
+ <map:views>
+ <map:view from-label="content" name="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="form" from-label="form">
+ <map:serialize type="xml" />
+ </map:view>
+
+ <map:view name="links" from-position="last">
+ <map:serialize type="links" />
+ </map:view>
+ </map:views>
+
+ <!-- =========================== Flowscripts =================================== -->
+
+ <map:flow language="javascript">
+ <map:script src="flow.js" />
+ </map:flow>
+
+ <!-- =========================== Pipelines =================================== -->
+
+ <map:pipelines>
+ <map:pipeline type="noncaching">
+ <map:match pattern="*.continue">
+ <map:call continuation="{1}" />
+ </map:match>
+
+ <map:match pattern="*-display-pipeline">
+ <!-- pipeline to show the form -->
+ <map:generate src="{1}.tpl.xml" type="jx" />
+ <map:transform type="browser-update" />
+ <map:transform type="i18n">
+ <map:parameter name="locale" value="en-US" />
+ </map:transform>
+ <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
+ <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 type="servletLinkRewriter" />
+ <map:select type="ajax-request">
+ <map:when test="true"><!-- sending a partial Browser Update -->
+ <map:select type="request-parameter">
+ <map:parameter name="parameter-name" value="dojo.transport" />
+ <map:when test="iframe"><!-- sending BU via iFrameIO -->
+ <map:transform src="servlet:forms:/resource/internal/xsl/IframeTransport-bu-styling.xsl" />
+ <map:serialize type="xhtml" /><!-- this is REALLY important -->
+ </map:when>
+ <map:otherwise><!-- sending BU via XHR -->
+ <map:serialize type="xml" />
+ </map:otherwise>
+ </map:select>
+ </map:when>
+ <map:otherwise><!-- sending a complete page -->
+ <map:serialize type="html" />
+ </map:otherwise>
+ </map:select>
+ </map:match>
+
+ <map:match pattern="*-result-pipeline.jx">
+ <map:generate type="jx" src="{1}-result.xml" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
+ </map:serialize>
+ </map:match>
+
+ <map:match pattern="*.do">
+ <map:call function="do_{1}" />
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>