You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2007/10/10 10:44:52 UTC
svn commit: r583387 - in /cocoon/trunk/blocks:
cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/
cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/
cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/
cocoon-tour/co...
Author: lgawron
Date: Wed Oct 10 01:44:49 2007
New Revision: 583387
URL: http://svn.apache.org/viewvc?rev=583387&view=rev
Log:
jx template generator/transformer shouldn't be declared in sitemap
Modified:
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/sitemap.xmap
cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/flow/sitemap.xmap
cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/sitemap.xmap
cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap?rev=583387&r1=583386&r2=583387&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap Wed Oct 10 01:44:49 2007
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,10 +24,6 @@
<!-- =========================== Components =================================== -->
<map:components>
- <map:generators>
- <!-- use the new implementation of JX -->
- <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator" />
- </map:generators>
</map:components>
<!-- =========================== Resources =================================== -->
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap?rev=583387&r1=583386&r2=583387&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sitemap.xmap Wed Oct 10 01:44:49 2007
@@ -25,8 +25,6 @@
<!-- =========================== Generators =================================== -->
<map:generators default="file">
- <!-- use the new implementation of JX -->
- <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator" />
<map:generator name="suggestion-list" src="org.apache.cocoon.forms.generation.SuggestionListGenerator" />
</map:generators>
@@ -115,7 +113,7 @@
<map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
</map:serialize>
</map:match>
-
+
<map:match pattern="sitemap.xmap">
<map:read src="sitemap.xmap"/>
</map:match>
@@ -204,7 +202,7 @@
</map:match>
<!--
- | Show a suggestion list
+ | Show a suggestion list
-->
<map:match pattern="_cocoon/forms/suggest">
<map:generate type="suggestion-list" />
@@ -577,7 +575,7 @@
<map:parameter name="form-method" value="POST" />
</map:transform>
</map:when>
- <!--
+ <!--
| If the template file does not exist, the code below generates the
| form, but results in a document fragment rather than a correct HTML
| tagged page (i.e. it lacks the HTML, HEAD and BODY tags).
Modified: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/sitemap.xmap?rev=583387&r1=583386&r2=583387&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/bean-editor/sitemap.xmap Wed Oct 10 01:44:49 2007
@@ -23,7 +23,6 @@
<map:components>
<map:generators default="file">
- <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator" label="content" logger="sitemap.generator.jx" />
</map:generators>
</map:components>
Modified: cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/flow/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/flow/sitemap.xmap?rev=583387&r1=583386&r2=583387&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/flow/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/COB-INF/flow/sitemap.xmap Wed Oct 10 01:44:49 2007
@@ -24,7 +24,6 @@
<!-- make sure we have the required components -->
<map:components>
<map:generators id="generators" default="file">
- <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator" label="content" logger="sitemap.generator.jx" />
</map:generators>
</map:components>
Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/sitemap.xmap?rev=583387&r1=583386&r2=583387&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/sitemap.xmap Wed Oct 10 01:44:49 2007
@@ -23,49 +23,44 @@
<map:include-properties dir="properties"/>
<map:generators default="file">
- <map:generator
- name="traverse"
- src="org.apache.cocoon.generation.TraversableSourceDescriptionGenerator"
- logger="generator.traverse"
- label="content"
+ <map:generator
+ name="traverse"
+ src="org.apache.cocoon.generation.TraversableSourceDescriptionGenerator"
+ logger="generator.traverse"
+ label="content"
pool-max="16"
/>
- <map:generator name="jx"
- src="org.apache.cocoon.template.JXTemplateGenerator"
- logger="generator.jx"
- pool-max="16"
- />
</map:generators>
-
- <map:transformers default="xslt">
- <map:transformer
- name="spw"
- src="org.apache.cocoon.transformation.SourcePropsWritingTransformer"
- logger="transformer.spw"
- pool-max="16"
+
+ <map:transformers default="xslt">
+ <map:transformer
+ name="spw"
+ src="org.apache.cocoon.transformation.SourcePropsWritingTransformer"
+ logger="transformer.spw"
+ pool-max="16"
/>
</map:transformers>
-
+
<!-- If event caching is enabled you'll need to uncomment this in order
- for PROPPATCH to work properly
+ for PROPPATCH to work properly
<map:pipes default="caching">
- <map:pipe name="event-caching"
+ <map:pipe name="event-caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"
>
<parameter name="cache-role" value="org.apache.cocoon.caching.Cache/EventAware"/>
</map:pipe>
</map:pipes>
-->
-
+
<map:matchers default="wildcard">
- <map:matcher
+ <map:matcher
name="destination"
- src="org.apache.cocoon.matching.WildcardHeaderMatcher"
+ src="org.apache.cocoon.matching.WildcardHeaderMatcher"
>
<header-name>Destination</header-name>
</map:matcher>
</map:matchers>
-
+
</map:components>
<!-- ========================== Flowscript ================================= -->
@@ -76,7 +71,7 @@
<!-- =========================== Views ===================================== -->
- <map:views>
+ <map:views>
<map:view name="content" from-label="content">
<map:serialize type="xml" />
</map:view>
@@ -86,20 +81,20 @@
<!-- ========================= Private Resources =========================== -->
<map:pipeline type="noncaching" internal-only="true">
-
+
<!-- Read the request for binaries PUT -->
<!--
<map:match pattern="request/read">
<map:read type="request" />
</map:match>
-->
-
+
<map:match pattern="request/generate">
<map:generate type="stream" />
<map:serialize type="xml" />
</map:match>
-
- <!--+
+
+ <!--+
| If you need to check or change the XML that is being PUT
| you can do that here. This is the pipeline that will
| generate the input for the PUT method.
@@ -110,15 +105,15 @@
</map:generate>
<map:serialize type="xml" />
</map:match>
-
+
</map:pipeline>
-
+
<!-- ========================= Public Resources =========================== -->
-
+
<!--map:pipeline type="event-caching"-->
-
+
<map:pipeline type="caching">
-
+
<map:match pattern="repo">
<map:call function="selectMethod">
<map:parameter name="page" value=""/>
@@ -131,7 +126,7 @@
<map:parameter name="requestURI" value="{request:requestURI}" />
</map:call>
</map:match>
-
+
<map:match pattern="GET/**">
<map:match pattern="GET/**.*">
<map:generate src="{global:staging}{1}.{2}"/>
@@ -148,12 +143,12 @@
</map:generate>
<map:transform src="styles/collection2html.xsl">
<map:parameter name="requestURI" value="{request:requestURI}" />
- <map:parameter name="footer"
+ <map:parameter name="footer"
value="{cocoon-properties:fullname} {cocoon-properties:released.version}" />
</map:transform>
<map:serialize type="html"/>
</map:match>
-
+
<map:match pattern="PROPFIND/**">
<map:generate type="traverse" src="{global:staging}{1}">
<map:parameter name="depth" value="{request-header:Depth}" />
@@ -170,13 +165,13 @@
</map:transform>
<map:serialize type="xml" status-code="207" />
</map:match>
-
+
<map:match pattern="OPTIONS/**">
<map:call function="options">
<map:parameter name="uri" value="{request:requestURI}" />
</map:call>
</map:match>
-
+
<map:match pattern="HEAD/**">
<map:generate src="dummy.xml"/>
<map:serialize type="xml"/>
@@ -189,18 +184,18 @@
<map:generate src="dummy.xml"/>
<map:serialize type="xml"/>
</map:match>
-
+
</map:pipeline>
-
+
<map:pipeline type="noncaching">
-
+
<map:match pattern="PUT/**.*">
<map:call function="put">
<map:parameter name="src" value="cocoon:/request/PUT" />
<map:parameter name="dest" value="{global:staging}{1}.{2}" />
</map:call>
</map:match>
-
+
<map:match pattern="MKCOL/**">
<map:match pattern="MKCOL/**.*">
<map:call function="sendStatus">
@@ -211,13 +206,13 @@
<map:parameter name="location" value="{global:staging}{1}" />
</map:call>
</map:match>
-
+
<map:match pattern="DELETE/**">
<map:call function="remove">
<map:parameter name="location" value="{global:staging}{1}" />
</map:call>
</map:match>
-
+
<map:match pattern="COPY/**">
<map:match pattern="http://**/repo/**" type="destination">
<map:call function="copy">
@@ -231,7 +226,7 @@
<map:parameter name="status" value="405" />
</map:call>
</map:match>
-
+
<map:match pattern="MOVE/**">
<map:match pattern="http://**/repo/**" type="destination">
<map:call function="move">
@@ -245,7 +240,7 @@
<map:parameter name="status" value="405" />
</map:call>
</map:match>
-
+
<!--+
| In order for proppatch to work you need to uncomment
| the simple jdbc source descriptor in cocoon.xconf
@@ -259,12 +254,12 @@
<map:transform type="spw" />
<map:serialize type="xml" />
</map:match>
-
+
<map:match pattern="LOCK/**">
<map:generate src="dummy.xml"/>
<map:serialize type="xml"/>
</map:match>
-
+
</map:pipeline>
</map:pipelines>
Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap?rev=583387&r1=583386&r2=583387&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap Wed Oct 10 01:44:49 2007
@@ -20,10 +20,8 @@
<map:include-properties dir="properties" />
<map:generators default="file">
<map:generator name="traverse" src="org.apache.cocoon.generation.TraversableGenerator" />
- <map:generator name="jx" src="org.apache.cocoon.template.JXTemplateGenerator" />
</map:generators>
<map:transformers default="xslt">
- <map:transformer name="jx" src="org.apache.cocoon.template.JXTemplateTransformer" />
</map:transformers>
</map:components>
<map:flow language="javascript">