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/28 22:17:18 UTC
svn commit: r542312 [12/14] - in /cocoon/trunk/blocks:
cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/
cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/
cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ co...
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,119 +18,119 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Components =================================== -->
+ <!-- =========================== Components =================================== -->
- <map:components>
+ <map:components>
- <!-- =========================== Transformers =================================== -->
+ <!-- =========================== 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" />
- </catalogues>
- <cache-at-startup>true</cache-at-startup>
- </map:transformer>
- </map:transformers>
-
- </map:components>
-
- <!-- =========================== Flowscripts =================================== -->
-
- <map:flow language="groovy">
- <map:script src="flow/CalculatorFlow.gy" />
- <map:script src="flow/FormFlow.gy" />
- <map:script src="flow/PersistenceFlow.gy" />
- </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>
- <!--+
- | produces the screens called by the flowscript
- +-->
- <map:match pattern="page/*">
- <map:generate type="jx" src="../screens/{1}.xml" />
- <!-- 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:transform type="i18n">
- <map:parameter name="locale" value="en-US" />
- </map:transform>
- <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>
- <!-- 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>
-
- <map:pipeline>
- <map:match pattern="">
- <map:generate src="samples.xml" />
- <!-- 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>
-
- <!--+
- | matches the page with the continuation ID and calls the flowscript
- | associated to this sitemap with the given continuation ID. The flow
- | engine will then look into the continuation store, retrieve
- | the correct continuation and resume execution of the flowscript
- | with that continuation. This guarantees transparent state
- | resumption between requests without the need for anything else
- | (cookies or URL-encoded session IDs)
- +-->
- <map:match pattern="*.cont">
- <map:call continuation="{1}" />
- </map:match>
-
- <!--+
- | matches the call to the beginning of the flow and calls the flow
- | from its entry point which, in this case is the 'calculator()'
- | javascript function.
- +-->
- <map:match pattern="*.do">
- <map:call function="{1}" />
- </map:match>
-
- <map:match pattern="resources/**">
- <map:redirect-to uri="{servlet:forms:/}/resources/{1}" />
- </map:match>
+ <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" />
+ </catalogues>
+ <cache-at-startup>true</cache-at-startup>
+ </map:transformer>
+ </map:transformers>
+
+ </map:components>
+
+ <!-- =========================== Flowscripts =================================== -->
+
+ <map:flow language="groovy">
+ <map:script src="flow/CalculatorFlow.gy" />
+ <map:script src="flow/FormFlow.gy" />
+ <map:script src="flow/PersistenceFlow.gy" />
+ </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>
+ <!--+
+ | produces the screens called by the flowscript
+ +-->
+ <map:match pattern="page/*">
+ <map:generate type="jx" src="../screens/{1}.xml" />
+ <!-- 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:transform type="i18n">
+ <map:parameter name="locale" value="en-US" />
+ </map:transform>
+ <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>
+ <!-- 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>
+
+ <map:pipeline>
+ <map:match pattern="">
+ <map:generate src="samples.xml" />
+ <!-- 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>
+
+ <!--+
+ | matches the page with the continuation ID and calls the flowscript
+ | associated to this sitemap with the given continuation ID. The flow
+ | engine will then look into the continuation store, retrieve
+ | the correct continuation and resume execution of the flowscript
+ | with that continuation. This guarantees transparent state
+ | resumption between requests without the need for anything else
+ | (cookies or URL-encoded session IDs)
+ +-->
+ <map:match pattern="*.cont">
+ <map:call continuation="{1}" />
+ </map:match>
+
+ <!--+
+ | matches the call to the beginning of the flow and calls the flow
+ | from its entry point which, in this case is the 'calculator()'
+ | javascript function.
+ +-->
+ <map:match pattern="*.do">
+ <map:call function="{1}" />
+ </map:match>
+
+ <map:match pattern="resources/**">
+ <map:redirect-to uri="{servlet:forms:/}/resources/{1}" />
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/intercepted-flow/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/intercepted-flow/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/intercepted-flow/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/intercepted-flow/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,56 +18,56 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Views =================================== -->
+ <!-- =========================== 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>
-
- <!-- =========================== Flowscripts ================================= -->
-
- <map:flow language="intercepted-javascript">
- <map:script src="basescript.js" />
- </map:flow>
-
- <!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
- <map:pipeline>
-
- <map:match pattern="*.js">
- <map:read src="{0}" mime-type="text/plain" />
- </map:match>
-
- <!--+
- | produces the screens called by the flowscript
- +-->
- <map:match pattern="page/*">
- <map:generate src="screens/{1}.xml" />
- <!-- 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>
- </map:pipeline>
-
- <map:pipeline>
- <map:match pattern="">
- <map:call function="interceptionTest" />
- </map:match>
- </map:pipeline>
- </map:pipelines>
+ <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>
+
+ <!-- =========================== Flowscripts ================================= -->
+
+ <map:flow language="intercepted-javascript">
+ <map:script src="basescript.js" />
+ </map:flow>
+
+ <!-- =========================== Pipelines ================================= -->
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="*.js">
+ <map:read src="{0}" mime-type="text/plain" />
+ </map:match>
+
+ <!--+
+ | produces the screens called by the flowscript
+ +-->
+ <map:match pattern="page/*">
+ <map:generate src="screens/{1}.xml" />
+ <!-- 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>
+ </map:pipeline>
+
+ <map:pipeline>
+ <map:match pattern="">
+ <map:call function="interceptionTest" />
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/module-source/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/module-source/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/module-source/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/module-source/sitemap.xmap Mon May 28 13:17:10 2007
@@ -20,71 +20,71 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Views =================================== -->
+ <!-- =========================== 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>
-
- <map:match pattern="test1">
- <map:generate type="text" src="module:request:requestURI" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="test2">
- <map:generate src="form2.html" />
- <map:serialize />
- </map:match>
-
- <map:match pattern="test2-post">
- <map:generate type="text" src="module:request-param:text" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
- </map:serialize>
- </map:match>
-
- <!-- post an xml file to test3 with e.g.
- curl -T "test.xml" http://localhost:8888/samples/scratchpad/module-source/test3 -->
- <map:match pattern="test3">
- <map:generate src="module:request:inputStream" />
- <map:serialize type="xml" />
- </map:match>
-
- <map:match pattern="test4">
- <map:generate src="form4.html" />
- <map:serialize />
- </map:match>
-
- <map:match pattern="test4-post">
- <map:generate src="module:raw-request-param:text" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
- </map:serialize>
- </map:match>
+ <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>
+
+ <map:match pattern="test1">
+ <map:generate type="text" src="module:request:requestURI" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
+ </map:match>
+
+ <map:match pattern="test2">
+ <map:generate src="form2.html" />
+ <map:serialize />
+ </map:match>
+
+ <map:match pattern="test2-post">
+ <map:generate type="text" src="module:request-param:text" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
+ </map:match>
+
+ <!-- post an xml file to test3 with e.g.
+ curl -T "test.xml" http://localhost:8888/samples/scratchpad/module-source/test3 -->
+ <map:match pattern="test3">
+ <map:generate src="module:request:inputStream" />
+ <map:serialize type="xml" />
+ </map:match>
+
+ <map:match pattern="test4">
+ <map:generate src="form4.html" />
+ <map:serialize />
+ </map:match>
+
+ <map:match pattern="test4-post">
+ <map:generate src="module:raw-request-param:text" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap-viewer/sitemap.xmap Mon May 28 13:17:10 2007
@@ -17,282 +17,279 @@
-->
<!-- minimal sitemap for Cocoon 2 -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- ======= Components ======= -->
+ <!-- ======= Components ======= -->
- <map:components>
- <map:serializers default="html">
+ <map:components>
+ <map:serializers default="html">
- <map:serializer name="xhtml-transitional" src="org.apache.cocoon.serialization.XMLSerializer" mime-type="text/html" logger="sitemap.serializer.xhtml"
- pool-max="64">
- <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
- <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
- <encoding>UTF-8</encoding>
- </map:serializer>
-</map:serializers>
-
- </map:components>
-
-<!-- =========================== Resources =============================== -->
-<map:resources>
-
- <map:resource name="show-sitemap">
-
- <map:aggregate element="sitemapandfiles">
- <map:part src="cocoon:/{filename}.descr?location={location}"/>
- <map:part src="cocoon:/allfiles-list?location={location}"/>
- </map:aggregate>
-
- <map:transform src="transforms/sitemapdescr2html.xsl">
-
- <!-- change showsources to 0 if you don't want the link to the sources (secure) or to 1
- if you want to show the sources (unsecure) -->
- <map:parameter name="showsources" value="{showsources}"/>
- </map:transform>
-
- <map:select type="browser">
- <map:when test="explorer">
- </map:when>
- <map:when test="mozilla5">
- </map:when>
- <map:otherwise>
- <map:transform src="transforms/kill-dynamic.xsl"/>
- </map:otherwise>
- </map:select>
-
- <map:serialize/>
-
-
- </map:resource>
-
-
- <!-- load a page of a section if page is not available load default page/image
- of this section
- -->
-
- <map:resource name="load-page">
- <map:select type="parameter">
- <map:parameter name="parameter-selector-test" value="{resource-exists}"/>
- <map:when test="true">
- <map:read src="{sect}/{page}" mime-type="{mime-type}" />
- </map:when>
- <map:otherwise>
- <map:read src="{sect}/{default}" mime-type="{mime-type}" />
- </map:otherwise>
- </map:select>
- <map:serialize type="xml"/>
- </map:resource>
-
-</map:resources>
-
- <map:views>
- <map:view name="aggregate" from-label="aggregate">
- <map:serialize type="xml"/>
- </map:view>
- </map:views>
-
- <!-- ======= Pipelines ======= -->
- <map:pipelines>
-
- <map:pipeline>
- <map:match pattern="">
- <map:redirect-to uri="index.html"/>
- </map:match>
- </map:pipeline>
-
-
- <!--
- If you set the internal-only value to "no", you'll get the unsecure version of the viewer,
- set it to "yes" to make it secure. -->
-
- <map:pipeline internal-only="yes">
-
- <map:match pattern="src/**">
- <map:mount uri-prefix="src" src="unsecure.xmap"/>
- </map:match>
-
- <map:match pattern="*._xmap">
- <map:act type="request">
- <map:parameter name="parameters" value="true"/>
- <map:call resource="show-sitemap">
- <map:parameter name="filename" value="{../1}"/>
- <map:parameter name="location" value="{location}"/>
- <map:parameter name="showsources" value="1"/>
- </map:call>
- </map:act>
- </map:match>
-
- </map:pipeline>
-
-
- <map:pipeline internal-only="no">
-
- <map:match pattern="*._xmap">
- <map:act type="request">
- <map:parameter name="parameters" value="true"/>
- <map:call resource="show-sitemap">
- <map:parameter name="filename" value="{../1}"/>
- <map:parameter name="location" value="{location}"/>
- <map:parameter name="showsources" value="0"/>
- </map:call>
- </map:act>
- </map:match>
-
- </map:pipeline>
-
- <map:pipeline internal-only="no">
-
- <map:match pattern="*.descr01">
- <map:act type="request">
- <map:parameter name="parameters" value="true"/>
- <map:generate src="../{location}/{../1}.xmap"/>
- <map:transform src="transforms/sitemap2descr01.xsl">
- <map:parameter name="location" value="{location}"/>
- <map:parameter name="filename" value="{../1}.xmap"/>
- </map:transform>
- <map:serialize type="xml"/>
- </map:act>
- </map:match>
-
- <map:match pattern="*.descr">
- <map:act type="request">
- <map:parameter name="parameters" value="true"/>
- <map:generate src="cocoon:/{../1}.descr01?location={location}"/>
- <map:transform src="transforms/sitemap2descr02.xsl"/>
- <map:serialize type="xml"/>
- </map:act>
- </map:match>
-
- </map:pipeline>
-
-
- <map:pipeline>
- <map:match pattern="src/**._xmap">
- <map:act type="request">
- <map:parameter name="parameters" value="true"/>
- <map:redirect-to uri="../disabled.html"/>
- </map:act>
- </map:match>
- <map:match pattern="**/src/**._xmap">
- <map:act type="request">
- <map:parameter name="parameters" value="true"/>
- <map:redirect-to uri="../../src/{../2}._xmap?location={location}"/>
- </map:act>
- </map:match>
- </map:pipeline>
-
-
- <map:pipeline internal-only="yes">
-
-
- </map:pipeline>
-
- <map:pipeline internal-only="yes">
-
- <map:match pattern="allfiles-list">
- <map:act type="request">
- <map:parameter name="parameters" value="true"/>
- <map:generate type="directory" src="../{location}">
- <map:parameter name="depth" value="20"/>
- </map:generate>
- <map:transform src="transforms/dirlist2filelist.xsl"/>
- <map:serialize type="xml"/>
- </map:act>
- </map:match>
-
- </map:pipeline>
-
-
- <map:pipeline>
-
- <map:match pattern="*_*.gif">
- <map:act type="resource-exists" src="images/{1}_{2}.gif">
- <map:call resource="load-page">
- <map:parameter name="sect" value="images"/>
- <map:parameter name="page" value="{../1}_{../2}.gif"/>
- <map:parameter name="default" value="default_{../2}.gif"/>
- <map:parameter name="mime-type" value="image/gif"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
- </map:call>
- </map:act>
- </map:match>
-
- <map:match pattern="*.gif">
- <map:act type="resource-exists" src="images/{1}.gif">
- <map:call resource="load-page">
- <map:parameter name="sect" value="images"/>
- <map:parameter name="page" value="{../1}.gif"/>
- <map:parameter name="default" value="default.gif"/>
- <map:parameter name="mime-type" value="image/gif"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
- </map:call>
- </map:act>
- </map:match>
-
-
- <map:match pattern="*.js">
- <map:read mime-type="text/txt" src="scripts/{1}.javascript"/>
- </map:match>
-
- <map:match pattern="*.css">
- <map:read mime-type="text/css" src="styles/{1}.css"/>
- </map:match>
-
- <map:match pattern="dirlinks.xml">
- <map:generate type="directory" src="..">
- <map:parameter name="depth" value="20"/>
- </map:generate>
- <map:transform src="transforms/sitemaplinks.xsl"/>
- <map:serialize type="xml"/>
- </map:match>
-
-
- <map:match pattern="index.html">
- <map:generate src="html/intro.xml" />
- <map:transform src="transforms/sitemaplist2index.xsl"/>
- <map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="index-list.html">
- <map:aggregate element="index">
- <map:part element="files" src="cocoon:/dirlinks.xml"/>
- <map:part element="introhtml" src="html/intro.xml" strip-root="yes"/>
- </map:aggregate>
- <map:transform src="transforms/sitemaplist2index.xsl"/>
- <map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="**/sitemap-list.html">
- <map:redirect-to uri="../sitemap-list.html"/>
- </map:match>
-
- <map:match pattern="sitemap-list.html">
- <map:generate src="cocoon:/dirlinks.xml"/>
- <map:transform src="transforms/sitemaplist2index.xsl"/>
- <map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="*.html">
- <map:aggregate element="html">
- <map:part element="head" src="html/head.xml" strip-root="yes"/>
- <map:part element="body" src="html/{1}.xml" strip-root="yes"/>
- </map:aggregate>
- <map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="dir.xml">
- <map:generate type="directory" src="..">
- <map:parameter name="depth" value="20"/>
- </map:generate>
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="**">
- <map:generate src="cocoon:/{1}._xmap"/>
- <map:serialize type="html"/>
- </map:match>
+ <map:serializer name="xhtml-transitional" src="org.apache.cocoon.serialization.XMLSerializer" mime-type="text/html" logger="sitemap.serializer.xhtml" pool-max="64">
+ <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
+ <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
+ <encoding>UTF-8</encoding>
+ </map:serializer>
+ </map:serializers>
+
+ </map:components>
+
+ <!-- =========================== Resources =============================== -->
+ <map:resources>
+
+ <map:resource name="show-sitemap">
+
+ <map:aggregate element="sitemapandfiles">
+ <map:part src="cocoon:/{filename}.descr?location={location}" />
+ <map:part src="cocoon:/allfiles-list?location={location}" />
+ </map:aggregate>
+
+ <map:transform src="transforms/sitemapdescr2html.xsl">
+
+ <!-- change showsources to 0 if you don't want the link to the sources (secure) or to 1
+ if you want to show the sources (unsecure) -->
+ <map:parameter name="showsources" value="{showsources}" />
+ </map:transform>
+
+ <map:select type="browser">
+ <map:when test="explorer"></map:when>
+ <map:when test="mozilla5"></map:when>
+ <map:otherwise>
+ <map:transform src="transforms/kill-dynamic.xsl" />
+ </map:otherwise>
+ </map:select>
+
+ <map:serialize />
+
+
+ </map:resource>
+
+
+ <!-- load a page of a section if page is not available load default page/image
+ of this section
+ -->
+
+ <map:resource name="load-page">
+ <map:select type="parameter">
+ <map:parameter name="parameter-selector-test" value="{resource-exists}" />
+ <map:when test="true">
+ <map:read src="{sect}/{page}" mime-type="{mime-type}" />
+ </map:when>
+ <map:otherwise>
+ <map:read src="{sect}/{default}" mime-type="{mime-type}" />
+ </map:otherwise>
+ </map:select>
+ <map:serialize type="xml" />
+ </map:resource>
+
+ </map:resources>
+
+ <map:views>
+ <map:view name="aggregate" from-label="aggregate">
+ <map:serialize type="xml" />
+ </map:view>
+ </map:views>
+
+ <!-- ======= Pipelines ======= -->
+ <map:pipelines>
+
+ <map:pipeline>
+ <map:match pattern="">
+ <map:redirect-to uri="index.html" />
+ </map:match>
+ </map:pipeline>
+
+
+ <!--
+ If you set the internal-only value to "no", you'll get the unsecure version of the viewer,
+ set it to "yes" to make it secure. -->
+
+ <map:pipeline internal-only="yes">
+
+ <map:match pattern="src/**">
+ <map:mount uri-prefix="src" src="unsecure.xmap" />
+ </map:match>
+
+ <map:match pattern="*._xmap">
+ <map:act type="request">
+ <map:parameter name="parameters" value="true" />
+ <map:call resource="show-sitemap">
+ <map:parameter name="filename" value="{../1}" />
+ <map:parameter name="location" value="{location}" />
+ <map:parameter name="showsources" value="1" />
+ </map:call>
+ </map:act>
+ </map:match>
+
+ </map:pipeline>
+
+
+ <map:pipeline internal-only="no">
+
+ <map:match pattern="*._xmap">
+ <map:act type="request">
+ <map:parameter name="parameters" value="true" />
+ <map:call resource="show-sitemap">
+ <map:parameter name="filename" value="{../1}" />
+ <map:parameter name="location" value="{location}" />
+ <map:parameter name="showsources" value="0" />
+ </map:call>
+ </map:act>
+ </map:match>
+
+ </map:pipeline>
+
+ <map:pipeline internal-only="no">
+
+ <map:match pattern="*.descr01">
+ <map:act type="request">
+ <map:parameter name="parameters" value="true" />
+ <map:generate src="../{location}/{../1}.xmap" />
+ <map:transform src="transforms/sitemap2descr01.xsl">
+ <map:parameter name="location" value="{location}" />
+ <map:parameter name="filename" value="{../1}.xmap" />
+ </map:transform>
+ <map:serialize type="xml" />
+ </map:act>
+ </map:match>
+
+ <map:match pattern="*.descr">
+ <map:act type="request">
+ <map:parameter name="parameters" value="true" />
+ <map:generate src="cocoon:/{../1}.descr01?location={location}" />
+ <map:transform src="transforms/sitemap2descr02.xsl" />
+ <map:serialize type="xml" />
+ </map:act>
+ </map:match>
+
+ </map:pipeline>
+
+
+ <map:pipeline>
+ <map:match pattern="src/**._xmap">
+ <map:act type="request">
+ <map:parameter name="parameters" value="true" />
+ <map:redirect-to uri="../disabled.html" />
+ </map:act>
+ </map:match>
+ <map:match pattern="**/src/**._xmap">
+ <map:act type="request">
+ <map:parameter name="parameters" value="true" />
+ <map:redirect-to uri="../../src/{../2}._xmap?location={location}" />
+ </map:act>
+ </map:match>
+ </map:pipeline>
+
+
+ <map:pipeline internal-only="yes">
+
+
+ </map:pipeline>
+
+ <map:pipeline internal-only="yes">
+
+ <map:match pattern="allfiles-list">
+ <map:act type="request">
+ <map:parameter name="parameters" value="true" />
+ <map:generate type="directory" src="../{location}">
+ <map:parameter name="depth" value="20" />
+ </map:generate>
+ <map:transform src="transforms/dirlist2filelist.xsl" />
+ <map:serialize type="xml" />
+ </map:act>
+ </map:match>
+
+ </map:pipeline>
+
+
+ <map:pipeline>
+
+ <map:match pattern="*_*.gif">
+ <map:act type="resource-exists" src="images/{1}_{2}.gif">
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="images" />
+ <map:parameter name="page" value="{../1}_{../2}.gif" />
+ <map:parameter name="default" value="default_{../2}.gif" />
+ <map:parameter name="mime-type" value="image/gif" />
+ <map:parameter name="resource-exists" value="{resource-exists}" />
+ </map:call>
+ </map:act>
+ </map:match>
+
+ <map:match pattern="*.gif">
+ <map:act type="resource-exists" src="images/{1}.gif">
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="images" />
+ <map:parameter name="page" value="{../1}.gif" />
+ <map:parameter name="default" value="default.gif" />
+ <map:parameter name="mime-type" value="image/gif" />
+ <map:parameter name="resource-exists" value="{resource-exists}" />
+ </map:call>
+ </map:act>
+ </map:match>
+
+
+ <map:match pattern="*.js">
+ <map:read mime-type="text/txt" src="scripts/{1}.javascript" />
+ </map:match>
+
+ <map:match pattern="*.css">
+ <map:read mime-type="text/css" src="styles/{1}.css" />
+ </map:match>
+
+ <map:match pattern="dirlinks.xml">
+ <map:generate type="directory" src="..">
+ <map:parameter name="depth" value="20" />
+ </map:generate>
+ <map:transform src="transforms/sitemaplinks.xsl" />
+ <map:serialize type="xml" />
+ </map:match>
+
+
+ <map:match pattern="index.html">
+ <map:generate src="html/intro.xml" />
+ <map:transform src="transforms/sitemaplist2index.xsl" />
+ <map:serialize type="html" />
+ </map:match>
+
+ <map:match pattern="index-list.html">
+ <map:aggregate element="index">
+ <map:part element="files" src="cocoon:/dirlinks.xml" />
+ <map:part element="introhtml" src="html/intro.xml" strip-root="yes" />
+ </map:aggregate>
+ <map:transform src="transforms/sitemaplist2index.xsl" />
+ <map:serialize type="html" />
+ </map:match>
+
+ <map:match pattern="**/sitemap-list.html">
+ <map:redirect-to uri="../sitemap-list.html" />
+ </map:match>
+
+ <map:match pattern="sitemap-list.html">
+ <map:generate src="cocoon:/dirlinks.xml" />
+ <map:transform src="transforms/sitemaplist2index.xsl" />
+ <map:serialize type="html" />
+ </map:match>
+
+ <map:match pattern="*.html">
+ <map:aggregate element="html">
+ <map:part element="head" src="html/head.xml" strip-root="yes" />
+ <map:part element="body" src="html/{1}.xml" strip-root="yes" />
+ </map:aggregate>
+ <map:serialize type="html" />
+ </map:match>
+
+ <map:match pattern="dir.xml">
+ <map:generate type="directory" src="..">
+ <map:parameter name="depth" value="20" />
+ </map:generate>
+ <map:serialize type="xml" />
+ </map:match>
+
+ <map:match pattern="**">
+ <map:generate src="cocoon:/{1}._xmap" />
+ <map:serialize type="html" />
+ </map:match>
- </map:pipeline>
+ </map:pipeline>
- </map:pipelines>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -23,47 +23,47 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Views =================================== -->
+ <!-- =========================== 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>
-
- <!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
- <map:pipeline type="caching">
- <map:match pattern="">
- <map:redirect-to uri="welcome" />
- </map:match>
-
- <!-- list of samples -->
- <map:match pattern="welcome">
- <map:generate src="scratchpad-samples.xml" />
- <!-- 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>
-
- <!-- ======================== Automount =============================== -->
-
- <map:match pattern="*/**">
- <map:mount src="{1}/" uri-prefix="{1}" />
- </map:match>
- </map:pipeline>
- </map:pipelines>
+ <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>
+
+ <!-- =========================== Pipelines ================================= -->
+
+ <map:pipelines>
+ <map:pipeline type="caching">
+ <map:match pattern="">
+ <map:redirect-to uri="welcome" />
+ </map:match>
+
+ <!-- list of samples -->
+ <map:match pattern="welcome">
+ <map:generate src="scratchpad-samples.xml" />
+ <!-- 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>
+
+ <!-- ======================== Automount =============================== -->
+
+ <map:match pattern="*/**">
+ <map:mount src="{1}/" uri-prefix="{1}" />
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/xmodule-source/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/xmodule-source/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/xmodule-source/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/xmodule-source/sitemap.xmap Mon May 28 13:17:10 2007
@@ -20,57 +20,57 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Views =================================== -->
+ <!-- =========================== 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>
-
- <!-- =========================== Flowscripts =================================== -->
-
- <map:flow language="javascript">
- <map:script src="xmodule.js" />
- </map:flow>
-
- <!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
- <map:pipeline>
-
- <map:match pattern="insert">
- <map:call function="insert">
- <map:parameter name="documentURI" value="{request-param:file}" />
- <map:parameter name="outputAttributeURI" value="{request-param:url}#{request-param:xPathOut}" />
- </map:call>
- </map:match>
-
- <map:match pattern="delete">
- <map:call function="deletePath">
- <map:parameter name="uri" value="{request-param:url}#{request-param:xPath}" />
- </map:call>
- </map:match>
-
- <map:match pattern="test-view">
- <map:generate src="{request-param:url}#{request-param:xPathIn}" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
- </map:serialize>
- </map:match>
+ <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>
+
+ <!-- =========================== Flowscripts =================================== -->
+
+ <map:flow language="javascript">
+ <map:script src="xmodule.js" />
+ </map:flow>
+
+ <!-- =========================== Pipelines ================================= -->
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="insert">
+ <map:call function="insert">
+ <map:parameter name="documentURI" value="{request-param:file}" />
+ <map:parameter name="outputAttributeURI" value="{request-param:url}#{request-param:xPathOut}" />
+ </map:call>
+ </map:match>
+
+ <map:match pattern="delete">
+ <map:call function="deletePath">
+ <map:parameter name="uri" value="{request-param:url}#{request-param:xPath}" />
+ </map:call>
+ </map:match>
+
+ <map:match pattern="test-view">
+ <map:generate src="{request-param:url}#{request-param:xPathIn}" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,13 +23,13 @@
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.scratchpad.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-scratchpad-sample" context-path="blockcontext:/cocoon-scratchpad-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>
+ <bean id="org.apache.cocoon.scratchpad.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-scratchpad-sample" context-path="blockcontext:/cocoon-scratchpad-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>
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-session-fw_components.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-session-fw_components.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-session-fw_components.xconf (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-session-fw_components.xconf Mon May 28 13:17:10 2007
@@ -22,32 +22,29 @@
+-->
<components>
<!-- Include roles -->
- <include src="resource://org/apache/cocoon/webapps/session/session.roles"/>
+ <include src="resource://org/apache/cocoon/webapps/session/session.roles" />
<input-modules>
- <!-- This input module provides access to the information of a session context -->
- <component-instance logger="core.modules.input" name="session-context" class="org.apache.cocoon.webapps.session.components.ContextInputModule"/>
+ <!-- This input module provides access to the information of a session context -->
+ <component-instance logger="core.modules.input" name="session-context" class="org.apache.cocoon.webapps.session.components.ContextInputModule" />
</input-modules>
- <session-manager logger="core.session-manager"/>
- <session-form-manager logger="core.session-manager"/>
- <session-transaction-manager logger="core.session-manager"/>
- <session-context-manager logger="core.session-manager"/>
+ <session-manager logger="core.session-manager" />
+ <session-form-manager logger="core.session-manager" />
+ <session-transaction-manager logger="core.session-manager" />
+ <session-context-manager logger="core.session-manager" />
- <session-media-manager logger="core.media-manager"
- pool-max="32">
- <mediatypes default="html">
- <media name="wap" useragent="Nokia"/>
- <media name="wap" useragent="UP"/>
- <media name="wap" useragent="Wapalizer"/>
- </mediatypes>
+ <session-media-manager logger="core.media-manager" pool-max="32">
+ <mediatypes default="html">
+ <media name="wap" useragent="Nokia" />
+ <media name="wap" useragent="UP" />
+ <media name="wap" useragent="Wapalizer" />
+ </mediatypes>
</session-media-manager>
<session-context-providers>
- <component-instance name="request"
- class="org.apache.cocoon.webapps.session.context.StandardSessionContextProvider"/>
- <component-instance name="temporary"
- class="org.apache.cocoon.webapps.session.context.StandardSessionContextProvider"/>
+ <component-instance name="request" class="org.apache.cocoon.webapps.session.context.StandardSessionContextProvider" />
+ <component-instance name="temporary" class="org.apache.cocoon.webapps.session.context.StandardSessionContextProvider" />
</session-context-providers>
</components>
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,19 +24,19 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-<!-- =========================== Pipelines ================================= -->
+ <!-- =========================== Pipelines ================================= -->
<map:pipelines>
<map:pipeline>
<map:match pattern="">
- <map:redirect-to uri="request-test"/>
+ <map:redirect-to uri="request-test" />
</map:match>
<map:match pattern="request-test">
- <map:generate src="docs/request-test.xml"/>
- <map:transform type="session"/>
- <map:transform src="stylesheets/simple-page2html.xsl"/>
- <map:serialize/>
+ <map:generate src="docs/request-test.xml" />
+ <map:transform type="session" />
+ <map:transform src="stylesheets/simple-page2html.xsl" />
+ <map:serialize />
</map:match>
</map:pipeline>
</map:pipelines>
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,7 +23,7 @@
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.session.fw.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-session-fw-sample" context-path="blockcontext:/cocoon-session-fw-sample/" />
- </bean>
+ <bean id="org.apache.cocoon.session.fw.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-session-fw-sample" context-path="blockcontext:/cocoon-session-fw-sample/" />
+ </bean>
</beans>
Modified: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,73 +18,73 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Componenets ================================= -->
+ <!-- =========================== Componenets ================================= -->
- <map:components>
- <map:include-properties dir="properties" />
- </map:components>
+ <map:components>
+ <map:include-properties dir="properties" />
+ </map:components>
- <!-- ========================== Flowscript ================================= -->
+ <!-- ========================== Flowscript ================================= -->
- <map:flow language="javascript">
- <map:script src="flow.js" />
- </map:flow>
+ <map:flow language="javascript">
+ <map:script src="flow.js" />
+ </map:flow>
- <!-- =========================== Views =================================== -->
+ <!-- =========================== Views =================================== -->
- <map:views>
- <map:view name="content" from-label="content">
- <map:serialize type="xml" />
- </map:view>
+ <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 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>
+ <map:view name="links" from-position="last">
+ <map:serialize type="links" />
+ </map:view>
+ </map:views>
- <!-- =========================== Pipelines ================================= -->
+ <!-- =========================== Pipelines ================================= -->
- <map:pipelines>
- <!-- =========================== Screens ================================= -->
+ <map:pipelines>
+ <!-- =========================== Screens ================================= -->
- <map:pipeline internal-only="false" type="noncaching">
+ <map:pipeline internal-only="false" type="noncaching">
- <map:match pattern="screens/*.html">
- <map:generate type="jx" src="screens/{1}.jx" />
- <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl" />
- <map:transform type="xinclude" />
- <map:serialize />
- </map:match>
+ <map:match pattern="screens/*.html">
+ <map:generate type="jx" src="screens/{1}.jx" />
+ <map:transform src="servlet:style-default:/common/style/xsl/html/complex-page2html.xsl" />
+ <map:transform type="xinclude" />
+ <map:serialize />
+ </map:match>
- </map:pipeline>
+ </map:pipeline>
- <!-- ======================== Flow handling ============================== -->
+ <!-- ======================== Flow handling ============================== -->
- <map:pipeline type="noncaching">
- <map:match pattern="">
- <map:redirect-to uri="viewcontent.do?path=/" />
- </map:match>
+ <map:pipeline type="noncaching">
+ <map:match pattern="">
+ <map:redirect-to uri="viewcontent.do?path=/" />
+ </map:match>
- <map:match pattern="*.cont">
- <map:call continuation="{request-param:continuationId}" />
- </map:match>
+ <map:match pattern="*.cont">
+ <map:call continuation="{request-param:continuationId}" />
+ </map:match>
- <map:match pattern="*.do">
- <map:call function="{1}" />
- </map:match>
+ <map:match pattern="*.do">
+ <map:call function="{1}" />
+ </map:match>
- <map:match pattern="**">
- <map:read src="slide://{session-attr:slide-principal}@{global:namespace}/{1}" />
- </map:match>
- </map:pipeline>
+ <map:match pattern="**">
+ <map:read src="slide://{session-attr:slide-principal}@{global:namespace}/{1}" />
+ </map:match>
+ </map:pipeline>
- </map:pipelines>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slide-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slide-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slide-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slide-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
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.slide.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-slide-sample" context-path="blockcontext:/cocoon-slide-sample/">
- <servlet:connections>
- <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
- </servlet:connections>
- </servlet:context>
- </bean>
+ <bean id="org.apache.cocoon.slide.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-slide-sample" context-path="blockcontext:/cocoon-slide-sample/">
+ <servlet:connections>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
</beans>
Modified: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/yapt/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/yapt/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/yapt/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/COB-INF/yapt/sitemap.xmap Mon May 28 13:17:10 2007
@@ -20,92 +20,92 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:views>
- <map:view from-label="raw-content" name="raw-content">
- <map:serialize type="xml"/>
- </map:view>
- <map:view from-label="phase2" name="phase2">
- <map:serialize type="xml"/>
- </map:view>
- <map:view from-label="yapt-content" name="yapt-content">
- <map:serialize type="xml"/>
- </map:view>
-
- </map:views>
-
- <map:pipelines>
-
- <map:pipeline type="caching">
-
- <map:match pattern="">
- <map:redirect-to uri="index"/>
- </map:match>
-
- <!-- CSS stylesheets, from common directory -->
- <map:match pattern="**/*.css">
- <map:read src="css/{2}.css" mime-type="text/css"/>
- </map:match>
-
- <!-- images, from slides directory -->
- <map:match pattern="presentations/**/*.jpg">
- <map:read src="presentations/{1}/{2}.jpg" mime-type="image/jpeg"/>
- </map:match>
- <map:match pattern="presentations/**/*.png">
- <map:read src="presentations/{1}/{2}.png" mime-type="image/png"/>
- </map:match>
- <map:match pattern="presentations/**/*.gif">
- <map:read src="presentations/{1}/{2}.gif" mime-type="image/gif"/>
- </map:match>
-
- <!-- index of available presentations -->
- <map:match pattern="index">
- <map:generate label="raw-content" type="directory" src="presentations"/>
- <map:transform src="stylesheets/dir-to-html.xsl">
- <map:parameter name="baseDir" value="presentations"/>
- </map:transform>
- <map:serialize type="html"/>
- </map:match>
-
- <!-- Raw ASCII data of a complete presentation -->
- <map:match pattern="presentations/**/txt/presentation">
- <map:read src="presentations/{1}.txt" mime-type="text/plain"/>
- </map:match>
-
- <!-- XML data of a complete presentation -->
- <map:match pattern="presentations/**/xml/presentation">
- <map:generate label="raw-content" type="slop" src="presentations/{1}.txt">
- <map:parameter name="encoding" value="iso-8859-1"/>
- <map:parameter name="preserve-space" value="true"/>
- </map:generate>
- <map:transform src="stylesheets/filter-slop-output.xsl"/>
- <map:serialize type="xml"/>
- </map:match>
-
- <!-- XML data of a single slide -->
- <map:match pattern="presentations/**/xml/slide-*">
- <map:generate src="cocoon:/presentations/{1}/xml/presentation"/>
- <map:transform src="stylesheets/select-slide.xsl">
- <map:parameter name="slideId" value="{2}"/>
- </map:transform>
- <map:serialize type="xml"/>
- </map:match>
-
- <!-- index (list of slides) of a presentation -->
- <map:match pattern="presentations/**/html/index">
- <map:generate src="cocoon:/presentations/{1}/xml/presentation"/>
- <map:transform src="stylesheets/html-index.xsl"/>
- <map:serialize type="html"/>
- </map:match>
-
- <!-- single slide or full presentation in HTML -->
- <map:match pattern="presentations/**/html/*">
- <map:generate src="cocoon:/presentations/{1}/xml/{2}"/>
- <map:transform src="stylesheets/html-slides.xsl"/>
- <map:serialize type="html"/>
- </map:match>
+ <map:views>
+ <map:view from-label="raw-content" name="raw-content">
+ <map:serialize type="xml" />
+ </map:view>
+ <map:view from-label="phase2" name="phase2">
+ <map:serialize type="xml" />
+ </map:view>
+ <map:view from-label="yapt-content" name="yapt-content">
+ <map:serialize type="xml" />
+ </map:view>
+
+ </map:views>
+
+ <map:pipelines>
+
+ <map:pipeline type="caching">
+
+ <map:match pattern="">
+ <map:redirect-to uri="index" />
+ </map:match>
+
+ <!-- CSS stylesheets, from common directory -->
+ <map:match pattern="**/*.css">
+ <map:read src="css/{2}.css" mime-type="text/css" />
+ </map:match>
+
+ <!-- images, from slides directory -->
+ <map:match pattern="presentations/**/*.jpg">
+ <map:read src="presentations/{1}/{2}.jpg" mime-type="image/jpeg" />
+ </map:match>
+ <map:match pattern="presentations/**/*.png">
+ <map:read src="presentations/{1}/{2}.png" mime-type="image/png" />
+ </map:match>
+ <map:match pattern="presentations/**/*.gif">
+ <map:read src="presentations/{1}/{2}.gif" mime-type="image/gif" />
+ </map:match>
+
+ <!-- index of available presentations -->
+ <map:match pattern="index">
+ <map:generate label="raw-content" type="directory" src="presentations" />
+ <map:transform src="stylesheets/dir-to-html.xsl">
+ <map:parameter name="baseDir" value="presentations" />
+ </map:transform>
+ <map:serialize type="html" />
+ </map:match>
+
+ <!-- Raw ASCII data of a complete presentation -->
+ <map:match pattern="presentations/**/txt/presentation">
+ <map:read src="presentations/{1}.txt" mime-type="text/plain" />
+ </map:match>
+
+ <!-- XML data of a complete presentation -->
+ <map:match pattern="presentations/**/xml/presentation">
+ <map:generate label="raw-content" type="slop" src="presentations/{1}.txt">
+ <map:parameter name="encoding" value="iso-8859-1" />
+ <map:parameter name="preserve-space" value="true" />
+ </map:generate>
+ <map:transform src="stylesheets/filter-slop-output.xsl" />
+ <map:serialize type="xml" />
+ </map:match>
+
+ <!-- XML data of a single slide -->
+ <map:match pattern="presentations/**/xml/slide-*">
+ <map:generate src="cocoon:/presentations/{1}/xml/presentation" />
+ <map:transform src="stylesheets/select-slide.xsl">
+ <map:parameter name="slideId" value="{2}" />
+ </map:transform>
+ <map:serialize type="xml" />
+ </map:match>
+
+ <!-- index (list of slides) of a presentation -->
+ <map:match pattern="presentations/**/html/index">
+ <map:generate src="cocoon:/presentations/{1}/xml/presentation" />
+ <map:transform src="stylesheets/html-index.xsl" />
+ <map:serialize type="html" />
+ </map:match>
+
+ <!-- single slide or full presentation in HTML -->
+ <map:match pattern="presentations/**/html/*">
+ <map:generate src="cocoon:/presentations/{1}/xml/{2}" />
+ <map:transform src="stylesheets/html-slides.xsl" />
+ <map:serialize type="html" />
+ </map:match>
- </map:pipeline>
+ </map:pipeline>
- </map:pipelines>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
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.slop.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-slop-sample" context-path="blockcontext:/cocoon-slop-sample/">
- <servlet:connections>
- <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
- </servlet:connections>
- </servlet:context>
- </bean>
+ <bean id="org.apache.cocoon.slop.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-slop-sample" context-path="blockcontext:/cocoon-slop-sample/">
+ <servlet:connections>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
</beans>
Modified: cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -17,69 +17,69 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Views =================================== -->
+ <!-- =========================== 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>
- <map:match pattern="">
- <map:redirect-to uri="welcome" />
- </map:match>
-
- <map:match pattern="welcome">
- <map:generate src="samples.xml" />
- <!-- 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>
-
- <map:match pattern="hello.html">
- <map:generate src="hello.xml" />
- <map:transform type="stx" src="page2html.stx" />
- <map:transform type="servletLinkRewriter" />
- <map:serialize />
- </map:match>
-
- <map:match pattern="data.html">
- <map:generate src="data.xml" />
- <map:transform type="stx" src="sql2html.stx" />
- <map:transform type="servletLinkRewriter" />
- <map:serialize type="html" />
- </map:match>
-
- <map:match pattern="data.txt">
- <map:generate src="data.xml" />
- <map:transform type="stx" src="sql2txt.stx" />
- <map:transform type="servletLinkRewriter" />
- <map:serialize type="text" />
- </map:match>
-
- <map:match pattern="*.html">
- <map:generate src="{1}.xml" />
- <map:transform type="stx" src="{1}.stx" />
- <map:transform type="servletLinkRewriter" />
- <map:serialize />
- </map:match>
- </map:pipeline>
+ <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>
+ <map:match pattern="">
+ <map:redirect-to uri="welcome" />
+ </map:match>
+
+ <map:match pattern="welcome">
+ <map:generate src="samples.xml" />
+ <!-- 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>
+
+ <map:match pattern="hello.html">
+ <map:generate src="hello.xml" />
+ <map:transform type="stx" src="page2html.stx" />
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize />
+ </map:match>
+
+ <map:match pattern="data.html">
+ <map:generate src="data.xml" />
+ <map:transform type="stx" src="sql2html.stx" />
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize type="html" />
+ </map:match>
+
+ <map:match pattern="data.txt">
+ <map:generate src="data.xml" />
+ <map:transform type="stx" src="sql2txt.stx" />
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize type="text" />
+ </map:match>
+
+ <map:match pattern="*.html">
+ <map:generate src="{1}.xml" />
+ <map:transform type="stx" src="{1}.stx" />
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize />
+ </map:match>
+ </map:pipeline>
- </map:pipelines>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/META-INF/cocoon/spring/cocoon-stx-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/META-INF/cocoon/spring/cocoon-stx-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/META-INF/cocoon/spring/cocoon-stx-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/META-INF/cocoon/spring/cocoon-stx-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
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.stx.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-stx-sample" context-path="blockcontext:/cocoon-stx-sample/">
- <servlet:connections>
- <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
- </servlet:connections>
- </servlet:context>
- </bean>
+ <bean id="org.apache.cocoon.stx.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-stx-sample" context-path="blockcontext:/cocoon-stx-sample/">
+ <servlet:connections>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
</beans>
Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,72 +18,72 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Components =================================== -->
+ <!-- =========================== Components =================================== -->
- <map:components>
+ <map:components>
- <!-- =========================== Transformers =================================== -->
+ <!-- =========================== Transformers =================================== -->
- <map:transformers default="xslt">
- <map:transformer name="tag" src="org.apache.cocoon.transformation.TagTransformer" pool-max="64" logger="sitemap.transformer.newtag">
- <transformer-hint>tag</transformer-hint>
- </map:transformer>
- </map:transformers>
-
- <!-- =========================== Actions =================================== -->
-
- <map:actions>
- <map:action name="tagtest" logger="sitemap.action.locale" src="org.apache.cocoon.taglib.test.acting.TagtestAction" />
- <map:action name="locale" logger="sitemap.action.locale" src="org.apache.cocoon.acting.LocaleAction">
- <store-in-session>true</store-in-session>
- <create-session>true</create-session>
- </map:action>
- </map:actions>
-
- </map:components>
-
- <!-- =========================== 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>
- <map:match pattern="">
- <map:redirect-to uri="welcome" />
- </map:match>
-
- <map:match pattern="welcome">
- <map:generate src="samples.xml" />
- <!-- 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>
-
- <map:match pattern="**.xhtml">
- <map:act type="locale" />
- <map:act type="tagtest" />
- <map:generate src="{1}.xhtml" />
- <map:transform type="tag" label="tag" />
- <map:serialize />
- </map:match>
- </map:pipeline>
- </map:pipelines>
+ <map:transformers default="xslt">
+ <map:transformer name="tag" src="org.apache.cocoon.transformation.TagTransformer" pool-max="64" logger="sitemap.transformer.newtag">
+ <transformer-hint>tag</transformer-hint>
+ </map:transformer>
+ </map:transformers>
+
+ <!-- =========================== Actions =================================== -->
+
+ <map:actions>
+ <map:action name="tagtest" logger="sitemap.action.locale" src="org.apache.cocoon.taglib.test.acting.TagtestAction" />
+ <map:action name="locale" logger="sitemap.action.locale" src="org.apache.cocoon.acting.LocaleAction">
+ <store-in-session>true</store-in-session>
+ <create-session>true</create-session>
+ </map:action>
+ </map:actions>
+
+ </map:components>
+
+ <!-- =========================== 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>
+ <map:match pattern="">
+ <map:redirect-to uri="welcome" />
+ </map:match>
+
+ <map:match pattern="welcome">
+ <map:generate src="samples.xml" />
+ <!-- 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>
+
+ <map:match pattern="**.xhtml">
+ <map:act type="locale" />
+ <map:act type="tagtest" />
+ <map:generate src="{1}.xhtml" />
+ <map:transform type="tag" label="tag" />
+ <map:serialize />
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/META-INF/cocoon/spring/cocoon-taglib-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/META-INF/cocoon/spring/cocoon-taglib-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/META-INF/cocoon/spring/cocoon-taglib-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/META-INF/cocoon/spring/cocoon-taglib-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
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.taglib.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-taglib-sample" context-path="blockcontext:/cocoon-taglib-sample/">
- <servlet:connections>
- <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
- </servlet:connections>
- </servlet:context>
- </bean>
+ <bean id="org.apache.cocoon.taglib.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-taglib-sample" context-path="blockcontext:/cocoon-taglib-sample/">
+ <servlet:connections>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
</beans>