stephan 2004/03/11 08:25:50
Modified: . gump.xml
src/blocks/apples/samples sitemap.xmap
src/blocks/axis/samples sitemap.xmap
src/blocks/cron/samples sitemap.xmap
src/blocks/databases/samples sitemap.xmap
src/blocks/databases/samples/mod-db sitemap.xmap
src/blocks/databases/samples/org-db sitemap.xmap
src/blocks/databases/samples/transform sitemap.xmap
src/blocks/databases/samples/tutorial sitemap.xmap
src/blocks/databases/samples/xsp sitemap.xmap
src/blocks/deli/samples sitemap.xmap
src/blocks/eventcache/samples sitemap.xmap
src/blocks/forms/samples sitemap.xmap
src/blocks/forms/samples/forms sitemap.xmap
src/blocks/forms/samples/v2 sitemap.xmap
src/blocks/html/conf tidy.xmap
src/blocks/jms/samples/database sitemap.xmap
src/blocks/jsp/samples sitemap.xmap
src/blocks/jxforms/samples sitemap.xmap
src/blocks/linkrewriter/samples sitemap.xmap
src/blocks/linkrewriter/samples/bookdemo sitemap.xmap
src/blocks/linkrewriter/samples/sitedemo sitemap.xmap
src/blocks/lucene/samples sitemap.xmap
src/blocks/mail/samples/mail sitemap.xmap
src/blocks/mail/samples/sendmail sitemap.xmap
src/blocks/midi/samples sitemap.xmap
src/blocks/petstore/samples sitemap.xmap
src/blocks/poi/samples sitemap.xmap
src/blocks/portal-fw/samples sitemap.xmap
src/blocks/profiler/samples sitemap.xmap
src/blocks/scratchpad/samples/betwixt sitemap.xmap
src/blocks/scratchpad/samples/castor sitemap.xmap
src/blocks/scratchpad/samples/image-auth sitemap.xmap
src/blocks/scratchpad/samples/jelly sitemap.xmap
src/blocks/scratchpad/samples/othello sitemap.xmap
src/blocks/scratchpad/samples/sitemap-viewer sitemap.xmap
src/blocks/slide/samples sitemap.xmap
src/blocks/swf/samples sitemap.xmap
src/blocks/web3/samples sitemap.xmap
src/blocks/webdav/samples sitemap.xmap
src/blocks/xmlform/samples sitemap.xmap
src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java
form-validator.xsl
src/blocks/xsp/samples sitemap.xmap
src/webapp sitemap.xmap
src/webapp/samples/filter sitemap.xmap
src/webapp/samples/imagereader sitemap.xmap
src/webapp/samples/paginator sitemap.xmap
src/webapp/samples/protected sitemap.xmap
src/webapp/samples/simpleform/four sitemap.xmap
src/webapp/samples/simpleform/one sitemap.xmap
src/webapp/samples/simpleform/three sitemap.xmap
src/webapp/samples/simpleform/two sitemap.xmap
src/webapp/samples/slides sitemap.xmap
Added: src/blocks/asciiart/conf asciiart-generator.xmap
src/blocks/scratchpad/conf regex-matcher.xmap
Log:
One declaration of a sitemap component should be enough.
I try to reduce the maintenance costs.
Revision Changes Path
1.125 +2 -1 cocoon-2.1/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/gump.xml,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- gump.xml 11 Mar 2004 00:12:11 -0000 1.124
+++ gump.xml 11 Mar 2004 16:25:46 -0000 1.125
@@ -695,6 +695,7 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-asciiart"/>
+ <depend project="cocoon-block-scratchpad"/>
<depend project="javamail"/>
<depend project="jaf"/>
1.7 +1 -7 cocoon-2.1/src/blocks/apples/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 6 Mar 2004 02:26:12 -0000 1.6
+++ sitemap.xmap 11 Mar 2004 16:25:46 -0000 1.7
@@ -26,7 +26,6 @@
<map:components>
<map:generators default="file">
<map:generator name="woody"
src="org.apache.cocoon.woody.generation.WoodyGenerator" logger="woody"/>
- <map:generator name="jx"
src="org.apache.cocoon.generation.JXTemplateGenerator" label="content,data"
logger="sitemap.generator.jx"/>
</map:generators>
<map:transformers default="xalan">
<map:transformer name="woody"
src="org.apache.cocoon.woody.transformation.WoodyTemplateTransformer"
logger="woody"/>
@@ -38,11 +37,6 @@
<cache-at-startup>true</cache-at-startup>
</map:transformer>
</map:transformers>
- <map:selectors default="browser">
- <map:selector name="request-method"
src="org.apache.cocoon.selection.RequestMethodSelector"/>
- </map:selectors>
- <map:actions/>
- <map:pipes default="caching"/>
</map:components>
<!-- =========================== Views ===================================
-->
1.1
cocoon-2.1/src/blocks/asciiart/conf/asciiart-generator.xmap
Index: asciiart-generator.xmap
===================================================================
<?xml version="1.0"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<xmap xpath="/sitemap/components/generators" unless="[EMAIL
PROTECTED]'asciiart-svg']">
<map:generator name="asciiart-svg" logger="sitemap.generator.asciiart-svg"
src="org.apache.cocoon.generation.asciiart.AsciiArtSVGGenerator"/>
</xmap>
1.5 +5 -14 cocoon-2.1/src/blocks/axis/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/axis/samples/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 6 Mar 2004 02:26:11 -0000 1.4
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.5
@@ -21,22 +21,13 @@
<map:components>
-<map:generators default="file"/>
-<map:transformers default="xslt"/>
+ <map:readers default="resource">
-<map:readers default="resource">
-
- <!-- Defines a SOAP RPC reader that will serve SOAP requests via
HTTP-POST. -->
- <map:reader logger="sitemap.reader.soap-rpc" name="soap-rpc"
- src="org.apache.cocoon.reading.AxisRPCReader"/>
-
-</map:readers>
-
-<map:serializers default="html"/>
-<map:matchers default="wildcard"/>
-<map:selectors default="browser"/>
-<map:actions/>
+ <!-- Defines a SOAP RPC reader that will serve SOAP requests via
HTTP-POST. -->
+ <map:reader logger="sitemap.reader.soap-rpc" name="soap-rpc"
+ src="org.apache.cocoon.reading.AxisRPCReader"/>
+ </map:readers>
</map:components>
1.4 +0 -15 cocoon-2.1/src/blocks/cron/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/cron/samples/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:25:47 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.4
@@ -16,21 +16,6 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-<!-- ========================= Components ================================
-->
-
- <map:components>
- <map:generators default="file">
- <map:generator name="jx"
- src="org.apache.cocoon.generation.JXTemplateGenerator"
- logger="jx.sitemap.generator"/>
- </map:generators>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- </map:components>
-
<!-- =========================== Views ===================================
-->
<map:views>
1.7 +2 -12 cocoon-2.1/src/blocks/databases/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/samples/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 6 Mar 2004 02:25:55 -0000 1.6
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.7
@@ -20,23 +20,13 @@
<!-- ========================= Components ================================
-->
<map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
<map:readers default="resource">
- <map:reader name="databasereader"
- src="org.apache.cocoon.reading.DatabaseReader"
- logger="sitemap.reader.databasereader"
- pool-max="32" pool-min="1" pool-grow="4">
+ <map:reader name="databasereader" logger="sitemap.reader.databasereader"
+ src="org.apache.cocoon.reading.DatabaseReader">
<use-connection>personnel</use-connection>
</map:reader>
-
-
</map:readers>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
</map:components>
-
<!-- =========================== Views ===================================
-->
1.4 +0 -17
cocoon-2.1/src/blocks/databases/samples/mod-db/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/databases/samples/mod-db/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:25:38 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.4
@@ -23,18 +23,6 @@
<!-- most components are inherited from parent sitemap -->
<!-- just make sure that defaults suit our needs -->
- <map:generators default="file"/>
-
- <map:transformers default="xslt"/>
-
- <map:readers default="resource"/>
-
- <map:serializers default="html"/>
-
- <map:matchers default="wildcard"/>
-
- <map:selectors default="browser"/>
-
<map:actions>
<!-- these action are in addition to the ones inherited -->
@@ -67,11 +55,6 @@
<descriptor>database.xml</descriptor>
<throw-exception>false</throw-exception>
</map:action>
-
-
- <!-- a real world application would use the form validation here -->
- <!-- this action just checks for existence of request parameters -->
- <map:action name="req-params"
src="org.apache.cocoon.acting.RequestParameterExistsAction"/>
</map:actions>
1.5 +0 -7
cocoon-2.1/src/blocks/databases/samples/org-db/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/databases/samples/org-db/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 6 Mar 2004 02:25:48 -0000 1.4
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.5
@@ -19,13 +19,6 @@
<!-- ========================= Components ================================
-->
<map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
-
<!-- original database actions -->
<map:actions>
<map:action logger="sitemap.action.add-employee" name="add-employee"
src="org.apache.cocoon.acting.DatabaseAddAction"/>
1.5 +0 -12
cocoon-2.1/src/blocks/databases/samples/transform/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/databases/samples/transform/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 6 Mar 2004 02:26:11 -0000 1.4
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.5
@@ -16,18 +16,6 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-<!-- ========================= Components ================================
-->
-
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
-
- </map:components>
-
<!-- ============================ Views ====================================
-->
<map:views>
1.6 +4 -25
cocoon-2.1/src/blocks/databases/samples/tutorial/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/databases/samples/tutorial/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.xmap 6 Mar 2004 02:25:42 -0000 1.5
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.6
@@ -21,24 +21,6 @@
<map:components>
- <map:generators default="file">
- </map:generators>
-
- <map:transformers default="xslt">
- </map:transformers>
-
- <map:readers default="resource">
- </map:readers>
-
- <map:serializers default="html">
- </map:serializers>
-
- <map:matchers default="wildcard">
- </map:matchers>
-
- <map:selectors default="browser">
- </map:selectors>
-
<map:actions>
<map:action name="dbAdd" logger="sitemap.tutorial.action.dbAdd"
src="org.apache.cocoon.acting.DatabaseAddAction"/>
@@ -48,9 +30,6 @@
<map:action name="dbUpd" logger="sitemap.tutorial.action.dbUpd"
src="org.apache.cocoon.acting.DatabaseUpdateAction"/>
-
- <map:action name="form" logger="sitemap.tutorial.action.form"
- src="org.apache.cocoon.acting.FormValidatorAction"/>
</map:actions>
</map:components>
@@ -59,20 +38,20 @@
<map:action-sets>
<map:action-set name="process">
- <map:act type="form" action="Create Department">
+ <map:act type="form-validator" action="Create Department">
<map:parameter name="validate-set" value="add"/>
<map:act type="dbAdd"/>
</map:act>
- <map:act type="form" action="Update Department">
+ <map:act type="form-validator" action="Update Department">
<map:parameter name="validate-set" value="update"/>
<map:act type="dbUpd"/>
</map:act>
<map:act type="dbDel" action="Delete Department"/>
- <map:act type="form" action="Create Employee">
+ <map:act type="form-validator" action="Create Employee">
<map:parameter name="validate-set" value="add"/>
<map:act type="dbAdd"/>
</map:act>
- <map:act type="form" action="Update Employee">
+ <map:act type="form-validator" action="Update Employee">
<map:parameter name="validate-set" value="update"/>
<map:act type="dbUpd"/>
</map:act>
1.4 +0 -11 cocoon-2.1/src/blocks/databases/samples/xsp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/samples/xsp/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:26:16 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.4
@@ -16,17 +16,6 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-<!-- ========================= Components ================================
-->
-
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- </map:components>
-
<!-- =========================== Pipelines =================================
-->
<map:pipelines>
1.8 +0 -6 cocoon-2.1/src/blocks/deli/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/deli/samples/sitemap.xmap,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sitemap.xmap 6 Mar 2004 02:25:47 -0000 1.7
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.8
@@ -16,12 +16,6 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-<!-- ========================= Components ================================
-->
-
-<!-- =========================== Views ===================================
-->
-
-<!-- =========================== Pipelines =================================
-->
-
<!-- =========================== Hello ===================================
-->
<map:pipelines>
1.7 +0 -6 cocoon-2.1/src/blocks/eventcache/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/samples/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 6 Mar 2004 02:25:32 -0000 1.6
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.7
@@ -23,12 +23,6 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
<map:actions>
<map:action name="cacheevent"
src="org.apache.cocoon.acting.CacheEventAction"/>
</map:actions>
1.4 +0 -4 cocoon-2.1/src/blocks/forms/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 11 Mar 2004 11:23:36 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.4
@@ -29,10 +29,6 @@
</map:transformer>
</map:transformers>
- <map:selectors default="browser">
- <map:selector name="request-method"
src="org.apache.cocoon.selection.RequestMethodSelector"/>
- </map:selectors>
-
<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"/>
1.2 +4 -17 cocoon-2.1/src/blocks/forms/samples/forms/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/forms/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 9 Mar 2004 10:33:48 -0000 1.1
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.2
@@ -19,13 +19,7 @@
<map:components>
- <map:generators default="file">
- <map:generator name="forms"
src="org.apache.cocoon.forms.generation.FormsGenerator" logger="forms"/>
- <map:generator name="jx"
src="org.apache.cocoon.generation.JXTemplateGenerator" label="content"
logger="sitemap.generator.jx"/>
- </map:generators>
-
<map:transformers default="xalan">
- <map:transformer name="forms"
src="org.apache.cocoon.forms.transformation.FormsTemplateTransformer"
logger="forms"/>
<map:transformer name="i18n"
src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="other">
<catalogue id="other" name="OtherMessages" location="messages"/>
@@ -35,19 +29,12 @@
</map:transformer>
</map:transformers>
- <map:selectors default="browser">
- <map:selector name="request-method"
src="org.apache.cocoon.selection.RequestMethodSelector"/>
- </map:selectors>
-
<map:actions>
<map:action name="forms-make-form"
src="org.apache.cocoon.forms.acting.MakeFormAction" logger="forms"/>
<map:action name="init-form1"
src="org.apache.cocoon.forms.samples.InitForm1Action" logger="forms"/>
<map:action name="forms-handle-form-submit"
src="org.apache.cocoon.forms.acting.HandleFormSubmitAction" logger="forms"/>
</map:actions>
- <map:pipes default="caching">
- </map:pipes>
-
</map:components>
<map:views>
@@ -139,7 +126,7 @@
<!-- pipeline to show the form -->
<map:generate src="forms/form1_template_action.xml"/>
- <map:transform type="forms">
+ <map:transform type="form">
<map:parameter name="attribute-name" value="form1"/>
</map:transform>
<map:transform type="i18n">
@@ -171,7 +158,7 @@
<map:match pattern="*-display-pipeline">
<!-- pipeline to show the form -->
<map:generate src="forms/{1}_template.xml"/>
- <map:transform type="forms"/>
+ <map:transform type="form"/>
<map:transform type="i18n">
<map:parameter name="locale" value="en-US"/>
</map:transform>
@@ -339,7 +326,7 @@
<map:match pattern="htmlarea-display-pipeline">
<map:generate src="forms/htmlarea_template.xml"/>
- <map:transform type="forms"/>
+ <map:transform type="form"/>
<map:transform type="i18n">
<map:parameter name="locale" value="en-US"/>
</map:transform>
@@ -402,7 +389,7 @@
</map:match>
<map:match pattern="binding.form">
- <map:generate type="forms">
+ <map:generate type="form">
<map:parameter name="form-action"
value="#\{$continuation/id}.continue" />
</map:generate>
<!--TODO: fix xsl for use with forms-generator -->
1.4 +0 -8 cocoon-2.1/src/blocks/forms/samples/v2/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/v2/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 11 Mar 2004 02:56:32 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:47 -0000 1.4
@@ -16,9 +16,6 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:components>
- <map:generators default="file">
- <map:generator name="jx"
src="org.apache.cocoon.generation.JXTemplateGenerator" label="content"
logger="sitemap.generator.jx"/>
- </map:generators>
<map:transformers default="xalan">
<map:transformer name="i18n"
src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="other">
@@ -28,11 +25,6 @@
<cache-at-startup>true</cache-at-startup>
</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:pipes>
</map:components>
<map:views>
<map:view name="content" from-label="content">
1.4 +1 -1 cocoon-2.1/src/blocks/html/conf/tidy.xmap
Index: tidy.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/html/conf/tidy.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tidy.xmap 6 Mar 2004 02:26:10 -0000 1.3
+++ tidy.xmap 11 Mar 2004 16:25:47 -0000 1.4
@@ -18,7 +18,7 @@
<xmap xpath="/sitemap/components/generators"
unless="[EMAIL PROTECTED]'html']">
- <map:generator name="html"
+ <map:generator name="html" logger="sitemap.generator.html"
src="org.apache.cocoon.generation.HTMLGenerator"
label="content"/>
</xmap>
1.3 +23 -28 cocoon-2.1/src/blocks/jms/samples/database/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jms/samples/database/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 6 Mar 2004 02:25:38 -0000 1.2
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.3
@@ -23,10 +23,6 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
<map:matchers default="wildcard">
<map:matcher name="host-matcher"
logger="sitemap.matcher.wildcard"
@@ -35,16 +31,15 @@
<parameter-name>serverName</parameter-name>
</map:matcher>
</map:matchers>
- <map:selectors default="browser"/>
<map:actions>
- <map:action name="cacheevent"
src="org.apache.cocoon.acting.CacheEventAction"/>
- <map:action name="jmsevent"
src="org.apache.cocoon.components.jms.JMSPublisherAction">
+ <map:action name="cacheevent"
src="org.apache.cocoon.acting.CacheEventAction"/>
+ <map:action name="jmsevent"
src="org.apache.cocoon.components.jms.JMSPublisherAction">
<parameter name="connection" value="OpenJMS-demo"/>
- </map:action>
+ </map:action>
</map:actions>
<map:pipes default="caching">
- <!-- A pipe must be defined configured to use the EventAware cache.
-->
+ <!-- A pipe must be defined configured to use the EventAware cache. -->
<map:pipe name="event-aware"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline">
<parameter name="cache-role"
value="org.apache.cocoon.caching.Cache/EventAware"/>
</map:pipe>
@@ -63,13 +58,13 @@
<map:pipeline type="event-aware">
<map:match pattern="eventcache">
<map:generate type="serverpages" src="{0}.xsp"/>
- <map:transform
src="context://samples/stylesheets/dynamic-page2html.xsl">
- <map:parameter name="servletPath"
value="{request:servletPath}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="contextPath"
value="{request:contextPath}"/>
- <map:parameter name="file" value="{0}.xsp"/>
- <map:parameter name="remove" value="{0}"/>
- </map:transform>
+ <map:transform
src="context://samples/stylesheets/dynamic-page2html.xsl">
+ <map:parameter name="servletPath" value="{request:servletPath}"/>
+ <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ <map:parameter name="file" value="{0}.xsp"/>
+ <map:parameter name="remove" value="{0}"/>
+ </map:transform>
<map:serialize/>
</map:match>
</map:pipeline>
@@ -80,7 +75,7 @@
<map:redirect-to uri="eventcache"/>
</map:match>
- <map:match pattern="invalidate">
+ <map:match pattern="invalidate">
<map:match type="host-matcher" pattern="localhost">
<map:act type="cacheevent">
<map:parameter name="event" value="{request-param:table}"/>
@@ -88,9 +83,9 @@
<map:read src="invalidated.xml"/>
</map:match>
<map:read src="access-error.xml"/>
- </map:match>
+ </map:match>
- <map:match pattern="jms-invalidate">
+ <map:match pattern="jms-invalidate">
<map:match type="host-matcher" pattern="localhost">
<map:act type="jmsevent">
<map:parameter name="event"
value="action|{request-param:table}"/>
@@ -98,17 +93,17 @@
<map:read src="invalidated.xml"/>
</map:match>
<map:read src="access-error.xml"/>
- </map:match>
+ </map:match>
<map:match pattern="*">
<map:generate type="serverpages" src="{1}.xsp"/>
- <map:transform
src="context://samples/stylesheets/dynamic-page2html.xsl">
- <map:parameter name="servletPath"
value="{request:servletPath}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="contextPath"
value="{request:contextPath}"/>
- <map:parameter name="file" value="{1}.xsp"/>
- <map:parameter name="remove" value="{0}"/>
- </map:transform>
+ <map:transform
src="context://samples/stylesheets/dynamic-page2html.xsl">
+ <map:parameter name="servletPath" value="{request:servletPath}"/>
+ <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ <map:parameter name="file" value="{1}.xsp"/>
+ <map:parameter name="remove" value="{0}"/>
+ </map:transform>
<map:serialize/>
</map:match>
</map:pipeline>
1.5 +0 -4 cocoon-2.1/src/blocks/jsp/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jsp/samples/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 6 Mar 2004 02:26:13 -0000 1.4
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.5
@@ -25,7 +25,6 @@
<map:generator logger="sitemap.generator.jsp" name="jsp"
src="org.apache.cocoon.generation.JSPGenerator"/>
</map:generators>
- <map:transformers default="xslt"/>
<map:readers default="resource">
<!-- JSPReader is used to serve direct output from
a JSP page. Note, that JSP result can be non XML -->
@@ -37,9 +36,6 @@
-->
</map:reader>
</map:readers>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
</map:components>
<!-- =========================== Pipelines
================================= -->
1.6 +0 -3 cocoon-2.1/src/blocks/jxforms/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jxforms/samples/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.xmap 6 Mar 2004 02:26:20 -0000 1.5
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.6
@@ -21,10 +21,7 @@
<map:generators default="file">
<map:generator name="jxforms"
src="org.apache.cocoon.generation.JXFormsGenerator"
logger="jxforms.sitemap.generator"/>
</map:generators>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
</map:components>
-
<!-- =========================== Views ===================================
-->
1.4 +0 -10 cocoon-2.1/src/blocks/linkrewriter/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/linkrewriter/samples/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:25:51 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.4
@@ -16,16 +16,6 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <!-- =========================== Components
================================ -->
-
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- </map:components>
<!-- =========================== Pipelines
================================= -->
1.5 +0 -5
cocoon-2.1/src/blocks/linkrewriter/samples/bookdemo/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/linkrewriter/samples/bookdemo/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 6 Mar 2004 02:26:11 -0000 1.4
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.5
@@ -20,7 +20,6 @@
<!-- =========================== Components ================================
-->
<map:components>
- <map:generators default="file"/>
<map:transformers default="xslt">
<map:transformer name="linkrewriter"
src="org.apache.cocoon.transformation.LinkRewriterTransformer">
@@ -36,10 +35,6 @@
</input-module>
</map:transformer>
</map:transformers>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
</map:components>
<!-- =========================== Pipelines =================================
-->
1.6 +0 -5
cocoon-2.1/src/blocks/linkrewriter/samples/sitedemo/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/linkrewriter/samples/sitedemo/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.xmap 6 Mar 2004 02:26:18 -0000 1.5
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.6
@@ -20,7 +20,6 @@
<!-- =========================== Components ================================
-->
<map:components>
- <map:generators default="file"/>
<map:transformers default="xslt">
<map:transformer name="linkrewriter"
src="org.apache.cocoon.transformation.LinkRewriterTransformer">
@@ -36,10 +35,6 @@
</input-module>
</map:transformer>
</map:transformers>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
</map:components>
<!-- =========================== Pipelines =================================
-->
1.6 +4 -19 cocoon-2.1/src/blocks/lucene/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/lucene/samples/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.xmap 6 Mar 2004 02:25:53 -0000 1.5
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.6
@@ -21,33 +21,18 @@
<map:components>
<map:generators default="file">
- <map:generator name="search"
- src="org.apache.cocoon.generation.SearchGenerator"
- label="content"/>
+ <map:generator name="search" logger="sitemap.generator.search"
label="content"
+ src="org.apache.cocoon.generation.SearchGenerator"/>
</map:generators>
<map:transformers default="xslt">
- <map:transformer name="log"
- src="org.apache.cocoon.transformation.LogTransformer"/>
- <map:transformer name="index"
- logger="sitemap.transformer.luceneindextransformer"
- src="org.apache.cocoon.transformation.LuceneIndexTransformer"/>
+ <map:transformer name="index"
logger="sitemap.transformer.luceneindextransformer"
+
src="org.apache.cocoon.transformation.LuceneIndexTransformer"/>
</map:transformers>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
<map:actions>
<!-- FIXME: Has this action moved somewhere else?
<map:action name="lang-select"
src="org.apache.cocoon.acting.LangSelect"/>
-->
- <map:action name="locale" src="org.apache.cocoon.acting.LocaleAction"/>
- <map:action name="request"
- src="org.apache.cocoon.acting.RequestParamAction"/>
- <map:action name="form-validator"
- src="org.apache.cocoon.acting.FormValidatorAction"/>
- <map:action name="resource-exists"
- src="org.apache.cocoon.acting.ResourceExistsAction"/>
</map:actions>
</map:components>
1.3 +1 -84 cocoon-2.1/src/blocks/mail/samples/mail/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/samples/mail/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 6 Mar 2004 02:25:59 -0000 1.2
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.3
@@ -27,89 +27,10 @@
<map:components>
- <!-- ===== generators =====
- -->
- <map:generators default="file">
- <map:generator name="file"
src="org.apache.cocoon.generation.FileGenerator"
- label="content"
- logger="sitemap.generator.file"
- pool-max="32" pool-min="1" pool-grow="4"
- />
- <map:generator name="html"
src="org.apache.cocoon.generation.HTMLGenerator"
- label="content"
- logger="sitemap.generator.file"
- pool-max="32" pool-min="1" pool-grow="4"
- />
- <map:generator name="asciiart-svg"
src="org.apache.cocoon.generation.asciiart.AsciiArtSVGGenerator"
- label="content"
- logger="sitemap.generator.asciiart-svg"
- />
- </map:generators>
-
- <!-- ===== transformers =====
- -->
- <map:transformers default="xslt">
- <map:transformer name="xslt"
src="org.apache.cocoon.transformation.TraxTransformer"
- logger="sitemap.transformer.xslt" pool-max="32" pool-min="1"
pool-grow="2">
- <use-request-parameters>false</use-request-parameters>
- <use-browser-capabilities-db>false</use-browser-capabilities-db>
- <use-deli>false</use-deli>
- </map:transformer>
- <!--map:transformer name="tofile"
src="org.apache.cocoon.transformation.SourceWritingTransformer">
- <map:parameter name="serializer" value="xml"/>
- </map:transformer-->
- <map:transformer name="paginate"
src="org.apache.cocoon.transformation.pagination.Paginator"/>
- </map:transformers>
-
- <!-- ===== readers =====
- -->
- <map:readers default="resource">
- <map:reader name="resource"
src="org.apache.cocoon.reading.ResourceReader" logger="sitemap.reader.resource"
pool-max="32" pool-min="1" pool-grow="4"/>
- </map:readers>
- <!-- ===== serializers =====
- -->
- <map:serializers default="html">
- <map:serializer name="html"
src="org.apache.cocoon.serialization.HTMLSerializer"
- mime-type="text/html">
- <encoding>iso8859-1</encoding>
- </map:serializer>
- <map:serializer name="wml"
src="org.apache.cocoon.serialization.XMLSerializer"
- mime-type="text/vnd.wap.wml"
- logger="sitemap.serializer.wml">
- <doctype-public>-//WAPFORUM//DTD WML 1.1//EN</doctype-public>
-
<doctype-system>http://www.wapforum.org/DTD/wml_1.1.xml</doctype-system>
- <encoding>iso8859-1</encoding>
- <omit-xml-declaration>no</omit-xml-declaration>
- </map:serializer>
- <map:serializer name="xml"
src="org.apache.cocoon.serialization.XMLSerializer"
- mime-type="text/xml">
- <indent>yes</indent>
- </map:serializer>
- <map:serializer name="links"
src="org.apache.cocoon.serialization.LinkSerializer"
- />
- <map:serializer name="svg2jpeg"
src="org.apache.cocoon.serialization.SVGSerializer"
- mime-type="image/jpeg">
- <parameter name="quality" type="float" value="0.75"/>
- </map:serializer>
- </map:serializers>
-
- <!-- ===== matchers =====
- -->
- <map:matchers default="wildcard">
- <map:matcher name="wildcard"
src="org.apache.cocoon.matching.WildcardURIMatcher"
- logger="sitemap.matcher.wildcard"/>
- <map:matcher name="regexp"
src="org.apache.cocoon.matching.RegexpURIMatcher"
- logger="sitemap.matcher.regexp"/>
- <map:matcher name="regexp-defaults"
src="org.apache.cocoon.matching.RegexpURIDefaultsMatcher"
- logger="sitemap.matcher.regexp"/>
- </map:matchers>
-
<!-- ===== selectors =====
-->
<map:selectors default="parameter">
- <map:selector name="parameter"
src="org.apache.cocoon.selection.ParameterSelector"
- logger="sitemap.selector.parameter"/>
<map:selector name="request-parameter"
src="org.apache.cocoon.selection.RequestParameterSelector"
logger="sitemap.selector.request-parameter">
<parameter-name>cmd</parameter-name>
@@ -123,10 +44,6 @@
<!-- ===== actions =====
-->
<map:actions>
- <map:action name="simple-resource-exists"
src="org.apache.cocoon.acting.ResourceExistsAction"
- logger="sitemap.action.simple-resource-exists"/>
- <map:action name="resource-exists"
src="org.apache.cocoon.acting.ExtendedResourceExistsAction"
- logger="sitemap.action.resource-exists"/>
<map:action name="link-translator-map"
src="org.apache.cocoon.acting.LinkTranslatorMapAction"
logger="sitemap.action.link-translator-map"/>
<map:action name="mail" src="org.apache.cocoon.mail.MailAction"
1.3 +0 -12 cocoon-2.1/src/blocks/mail/samples/sendmail/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/samples/sendmail/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 6 Mar 2004 02:25:41 -0000 1.2
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.3
@@ -19,15 +19,6 @@
<!-- ========================= Components ================================
-->
<map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt">
- <map:transformer name="simpleform"
- logger="sitemap.transformer.simpleform"
-
src="org.apache.cocoon.transformation.SimpleFormTransformer"/>
- </map:transformers>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
-
<map:matchers default="wildcard">
<map:matcher name="host-matcher"
logger="sitemap.matcher.wildcard"
@@ -45,9 +36,6 @@
<map:action name="old-sendmail"
logger="sitemap.action.sendmail"
src="org.apache.cocoon.acting.SendmailAction"/>
- <map:action name="req-params"
- logger="sitemap.action.requestParamExists"
-
src="org.apache.cocoon.acting.RequestParameterExistsAction"/>
</map:actions>
</map:components>
1.6 +0 -2 cocoon-2.1/src/blocks/midi/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/midi/samples/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.xmap 6 Mar 2004 02:26:16 -0000 1.5
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.6
@@ -21,11 +21,9 @@
<map:generators default="file">
<map:generator name="xmidi"
src="org.apache.cocoon.generation.XMidiGenerator"
logger="midi.sitemap.generator"/>
</map:generators>
- <map:transformers default="xslt"/>
<map:serializers default="html">
<map:serializer name="xmidi"
src="org.apache.cocoon.serialization.XMidiSerializer"
logger="midi.sitemap.serializer"/>
</map:serializers>
- <map:matchers default="wildcard"/>
</map:components>
<!-- =========================== Views ===================================
-->
1.11 +1 -15 cocoon-2.1/src/blocks/petstore/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/sitemap.xmap,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sitemap.xmap 9 Mar 2004 15:09:41 -0000 1.10
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.11
@@ -15,20 +15,6 @@
limitations under the License.
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <!-- ======================== Components =========================== -->
- <map:components>
- <map:transformers default="xslt">
- <map:transformer name="jx"
src="org.apache.cocoon.transformation.JXTemplateTransformer"
logger="jx.sitemap.transformer"/>
- <map:transformer name="forms"
src="org.apache.cocoon.forms.transformation.FormsTemplateTransformer"
logger="forms"/>
- </map:transformers>
- <map:generators default="file">
- <map:generator logger="sitemap.generator.velocity" name="velocity"
src="org.apache.cocoon.generation.VelocityGenerator"/>
- <map:generator logger="sitemap.generator.jx" name="jx"
src="org.apache.cocoon.generation.JXTemplateGenerator"/>
- <map:generator name="forms"
src="org.apache.cocoon.forms.generation.FormsGenerator" logger="forms"/>
- </map:generators>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- </map:components>
<!-- ======================== Views ================================ -->
<!--
The debug view can be used to output an intermediate
@@ -95,7 +81,7 @@
</map:match>
<map:match pattern="view/*.cforms">
<map:generate src="view/forms/{1}_t.xml" label="debug"/>
- <map:transform type="forms" label="debug1"/>
+ <map:transform type="form" label="debug1"/>
<map:call resource="html"/>
</map:match>
</map:pipeline>
1.7 +0 -7 cocoon-2.1/src/blocks/poi/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/poi/samples/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 6 Mar 2004 02:26:17 -0000 1.6
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.7
@@ -17,16 +17,9 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:components>
- <map:generators default="file">
- <map:generator label="content" logger="sitemap.generator.serverpages"
name="serverpages" pool-grow="2" pool-max="32" pool-min="4"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
- </map:generators>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
<map:serializers default="html">
<map:serializer name="xls"
src="org.apache.cocoon.serialization.HSSFSerializer"/>
</map:serializers>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
</map:components>
<map:pipelines>
1.4 +0 -10 cocoon-2.1/src/blocks/portal-fw/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal-fw/samples/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:26:13 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.4
@@ -16,16 +16,6 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-<!-- =========================== Components ================================
-->
-
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- </map:components>
<!-- =========================== Pipelines =================================
-->
1.10 +0 -11 cocoon-2.1/src/blocks/profiler/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/profiler/samples/sitemap.xmap,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sitemap.xmap 6 Mar 2004 02:25:55 -0000 1.9
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.10
@@ -17,17 +17,6 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- <map:actions/>
- <map:pipes default="caching"/>
- </map:components>
-
<!-- =========================== Views ===================================
-->
<map:views>
1.1 cocoon-2.1/src/blocks/scratchpad/conf/regex-matcher.xmap
Index: regex-matcher.xmap
===================================================================
<?xml version="1.0"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<xmap xpath="/sitemap/components/matchers" unless="[EMAIL
PROTECTED]'regexp-defaults']">
<map:matcher logger="sitemap.matcher.regexp" name="regexp-defaults"
src="org.apache.cocoon.matching.RegexpURIDefaultsMatcher"/>
</xmap>
1.3 +4 -0
cocoon-2.1/src/blocks/scratchpad/samples/betwixt/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/betwixt/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 6 Mar 2004 02:26:14 -0000 1.2
+++ sitemap.xmap 11 Mar 2004 16:25:48 -0000 1.3
@@ -15,6 +15,7 @@
limitations under the License.
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
+
<map:components>
<map:transformers>
<map:transformer name="betwixt"
src="org.apache.cocoon.transformation.BetwixtTransformer"
logger="sitemap.transfomer.betwixt">
@@ -22,9 +23,11 @@
</map:transformer>
</map:transformers>
</map:components>
+
<map:flow language="javascript">
<map:script src="flow.js"/>
</map:flow>
+
<map:pipelines>
<map:pipeline>
<map:match pattern="">
@@ -37,4 +40,5 @@
</map:match>
</map:pipeline>
</map:pipelines>
+
</map:sitemap>
1.5 +0 -5
cocoon-2.1/src/blocks/scratchpad/samples/castor/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/castor/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 6 Mar 2004 02:26:08 -0000 1.4
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.5
@@ -19,16 +19,11 @@
<!-- =========================== Components
================================ -->
<map:components>
- <map:generators default="file"/>
<map:transformers default="xslt">
<map:transformer name="castor"
src="org.apache.cocoon.transformation.CastorTransformer">
<mapping>castor-mappings/test-mapping.xml</mapping>
</map:transformer>
</map:transformers>
- <map:readers default="resource"/>
- <map:serializers default="xml"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
<map:actions>
<map:action name="TestBeanAction"
src="org.apache.cocoon.samples.castor.TestBeanAction"/>
</map:actions>
1.3 +7 -27
cocoon-2.1/src/blocks/scratchpad/samples/image-auth/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/image-auth/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 6 Mar 2004 02:25:50 -0000 1.2
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.3
@@ -16,31 +16,12 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-<map:components>
- <map:generators default="file">
- <map:generator label="content,data" logger="sitemap.generator.jxt"
name="jxt" src="org.apache.cocoon.generation.JXTemplateGenerator"/>
- </map:generators>
- <map:transformers default="xslt"/>
-
- <map:serializers default="xhtml">
- <map:serializer logger="sitemap.serializer.svg2png"
mime-type="image/jpeg" name="svg2jpeg"
src="org.apache.cocoon.serialization.SVGSerializer">
- <parameter name="quality" type="float" value="0.9"/>
- </map:serializer>
- </map:serializers>
-
- <map:matchers default="wildcard"/>
-
-</map:components>
-
-<map:views/>
-<map:resources/>
-
-<map:flow language="intercepted-javascript">
+ <map:flow language="intercepted-javascript">
<map:script src="flow/image.js"/>
-</map:flow>
+ </map:flow>
-<map:pipelines>
+ <map:pipelines>
<map:component-configurations>
<global-variables/>
@@ -62,7 +43,7 @@
<map:match pattern="*.jxt">
- <map:generate type="jxt" src="documents/{1}.jxt"/>
+ <map:generate type="jx" src="documents/{1}.jxt"/>
<map:serialize type="xhtml"/>
</map:match>
@@ -79,12 +60,11 @@
<map:pipeline internal-only="true">
<map:match pattern="auth.jpg">
- <map:generate type="jxt" src="documents/auth-jxt.svg"/>
+ <map:generate type="jx" src="documents/auth-jxt.svg"/>
<map:serialize type="svg2jpeg"/>
</map:match>
</map:pipeline>
+ </map:pipelines>
-</map:pipelines>
-
-</map:sitemap>
\ No newline at end of file
+</map:sitemap>
1.5 +0 -5
cocoon-2.1/src/blocks/scratchpad/samples/jelly/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/jelly/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 6 Mar 2004 02:25:57 -0000 1.4
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.5
@@ -26,11 +26,6 @@
<map:generators default="file">
<map:generator name="jelly"
src="org.apache.cocoon.generation.JellyGenerator"/>
</map:generators>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
</map:components>
<map:pipelines>
1.5 +0 -7
cocoon-2.1/src/blocks/scratchpad/samples/othello/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/othello/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 6 Mar 2004 02:25:39 -0000 1.4
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.5
@@ -17,7 +17,6 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<!-- =========================== Components
================================ -->
<map:components>
- <map:generators default="file"/>
<map:transformers default="xslt">
<!-- Configure i18n transformer -->
<map:transformer name="i18n" logger="sitemap.transformer.i18n"
src="org.apache.cocoon.transformation.I18nTransformer">
@@ -32,12 +31,6 @@
<cache-at-startup>true</cache-at-startup> -->
</map:transformer>
</map:transformers>
- <map:readers default="resource"/>
- <map:serializers default="html">
- <map:serializer name="html" mime-type="text/html"
src="org.apache.cocoon.serialization.HTMLSerializer"/>
- <map:serializer name="xml" mime-type="text/xml"
src="org.apache.cocoon.serialization.XMLSerializer"/>
- </map:serializers>
- <map:selectors default="browser"/>
<!-- =========================== Actions
================================= -->
<map:actions>
<!-- LocaleAction is used to set/get current users locale. See
Javadocs for details. -->
1.6 +1 -23
cocoon-2.1/src/blocks/scratchpad/samples/sitemap-viewer/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/sitemap-viewer/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.xmap 6 Mar 2004 02:26:17 -0000 1.5
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.6
@@ -17,28 +17,8 @@
<!-- minimal sitemap for Cocoon 2 -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<!-- ======= Components ======= -->
-
-
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser">
- <map:selector name="resource-exists"
- logger="sitemap.selector.resource-exists"
- src="org.apache.cocoon.selection.ResourceExistsSelector" />
- </map:selectors>
- <map:actions>
- <map:action logger="sitemap.action.request" name="request"
src="org.apache.cocoon.acting.RequestParamAction"/>
- <map:action name="simple-resource-exists"
src="org.apache.cocoon.acting.ResourceExistsAction"
- logger="sitemap.action.simple-resource-exists"/>
- <map:action name="resource-exists"
src="org.apache.cocoon.acting.ExtendedResourceExistsAction"
- logger="sitemap.action.resource-exists"/>
- </map:actions>
-
- <map:pipes default="caching"/>
+ <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"
@@ -48,10 +28,8 @@
<encoding>UTF-8</encoding>
</map:serializer>
</map:serializers>
-
</map:components>
-
<!-- =========================== Resources ===============================
-->
<map:resources>
1.23 +0 -6 cocoon-2.1/src/blocks/slide/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/sitemap.xmap,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sitemap.xmap 6 Mar 2004 02:26:14 -0000 1.22
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.23
@@ -29,12 +29,6 @@
/>
</map:generators>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
-
<!--
<map:pipes default="noncaching">
<map:pipe name="event-caching"
1.4 +1 -6 cocoon-2.1/src/blocks/swf/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/swf/samples/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:26:00 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.4
@@ -22,14 +22,9 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
<map:serializers default="html">
<map:serializer name="swf"
src="org.apache.cocoon.serialization.SWFSerializer"
mime-type="application/x-shockwave-flash"/>
</map:serializers>
- <map:readers default="resource"/>
- <map:matchers default="wildcard"/>
- <map:pipes default="caching"/>
</map:components>
<!-- =========================== Views
=================================== -->
1.7 +0 -5 cocoon-2.1/src/blocks/web3/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/web3/samples/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 6 Mar 2004 02:26:07 -0000 1.6
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.7
@@ -17,7 +17,6 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<!-- =========================== Components
================================ -->
<map:components>
- <map:generators default="file"/>
<map:transformers default="xslt">
<!-- include the transformer like this:
-->
@@ -25,10 +24,6 @@
<system>indy</system>
</map:transformer>
</map:transformers>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:selectors default="browser"/>
- <map:matchers default="wildcard"/>
</map:components>
<!-- =========================== Views
=================================== -->
1.3 +0 -2 cocoon-2.1/src/blocks/webdav/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/webdav/samples/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 6 Mar 2004 02:26:10 -0000 1.2
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.3
@@ -16,8 +16,6 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <map:components/>
-
<map:views>
<map:view from-label="content" name="content">
<map:serialize type="xml"/>
1.7 +0 -4 cocoon-2.1/src/blocks/xmlform/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/samples/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 6 Mar 2004 02:25:32 -0000 1.6
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.7
@@ -31,10 +31,6 @@
<map:action name="CalculatorAction"
logger="xmlform.sitemap.action.Calculator"
src="org.apache.cocoon.samples.xmlform.CalculatorAction"/>
</map:actions>
-
- <map:serializers default="html"/>
-
- <map:matchers default="wildcard"/>
</map:components>
<!-- =========================== Views ===================================
-->
1.2 +19 -19
cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/form-validator.xsl
Index: form-validator.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/form-validator.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- form-validator.xsl 10 Mar 2004 12:58:06 -0000 1.1
+++ form-validator.xsl 11 Mar 2004 16:25:49 -0000 1.2
@@ -110,7 +110,7 @@
</xsl:for-each>
</xsl:for-each>
<xsp:include>org.apache.cocoon.acting.ValidatorActionResult</xsp:include>
-
<xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPFormValidatorHelper</xsp:include>
+
<xsp:include>org.apache.cocoon.transformation.helpers.FormValidatorHelper</xsp:include>
</xsp:structure>
<xsl:apply-templates/>
</xsp:page>
@@ -150,7 +150,7 @@
</xsl:variable>
<xsp:logic>
{
- XSPFormValidatorHelper __formval_fvh = new
XSPFormValidatorHelper(<xsl:copy-of select="$descriptor"/>, <xsl:copy-of
select="$reloadable"/>, getLogger(), resolver, <xsl:copy-of
select="$constraintset"/>);
+ FormValidatorHelper __formval_fvh = new
FormValidatorHelper(<xsl:copy-of select="$descriptor"/>, <xsl:copy-of
select="$reloadable"/>, getLogger(), resolver, <xsl:copy-of
select="$constraintset"/>);
</xsp:logic>
<xsl:apply-templates/>
<xsp:logic>
@@ -162,7 +162,7 @@
<xspdoc:desc>
Returns a Map containg all validation results.
</xspdoc:desc>
- <xsl:template
match="xsp-formval:results"><xsp:expr>XSPFormValidatorHelper.getResults(objectModel)</xsp:expr></xsl:template>
+ <xsl:template
match="xsp-formval:results"><xsp:expr>FormValidatorHelper.getResults(objectModel)</xsp:expr></xsl:template>
<xspdoc:desc>
@@ -182,7 +182,7 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="string($name)!='-1'">
-
<xsp:expr>XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.OK)</xsp:expr>
+
<xsp:expr>FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.OK)</xsp:expr>
</xsl:when>
<xsl:otherwise>
<xsp:expr>__formval_fvh.getParamResult(objectModel).equals(ValidatorActionResult.OK)</xsp:expr>
@@ -208,7 +208,7 @@
<xsl:choose>
<xsl:when test="string($name)!='-1'">
<xsp:logic>
- if (XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.OK)) {
+ if (FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.OK)) {
<xsp:content><xsl:apply-templates/></xsp:content>
}
</xsp:logic>
@@ -242,7 +242,7 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="string($name)!='-1'">
-
<xsp:expr>XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.TOOSMALL)</xsp:expr>
+
<xsp:expr>FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.TOOSMALL)</xsp:expr>
</xsl:when>
<xsl:otherwise>
<xsp:expr>__formval_fvh.getParamResult(objectModel).equals(ValidatorActionResult.TOOSMALL)</xsp:expr>
@@ -270,7 +270,7 @@
<xsl:choose>
<xsl:when test="string($name)!='-1'">
<xsp:logic>
- if (XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.TOOSMALL)) {
+ if (FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.TOOSMALL)) {
<xsp:content><xsl:apply-templates/></xsp:content>
}
</xsp:logic>
@@ -304,7 +304,7 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="string($name)!='-1'">
-
<xsp:expr>XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).ge(ValidatorActionResult.ERROR)</xsp:expr>
+
<xsp:expr>FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).ge(ValidatorActionResult.ERROR)</xsp:expr>
</xsl:when>
<xsl:otherwise>
<xsp:expr>__formval_fvh.getParamResult(objectModel).ge(ValidatorActionResult.ERROR)</xsp:expr>
@@ -332,7 +332,7 @@
<xsl:choose>
<xsl:when test="string($name)!='-1'">
<xsp:logic>
- if (XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).ge(ValidatorActionResult.ERROR)) {
+ if (FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).ge(ValidatorActionResult.ERROR)) {
<xsp:content><xsl:apply-templates/></xsp:content>
}
</xsp:logic>
@@ -366,7 +366,7 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="string($name)!='-1'">
-
<xsp:expr>XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.TOOLARGE)</xsp:expr>
+
<xsp:expr>FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.TOOLARGE)</xsp:expr>
</xsl:when>
<xsl:otherwise>
<xsp:expr>__formval_fvh.getParamResult(objectModel).equals(ValidatorActionResult.TOOLARGE)</xsp:expr>
@@ -394,7 +394,7 @@
<xsl:choose>
<xsl:when test="string($name)!='-1'">
<xsp:logic>
- if (XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.TOOLARGE)) {
+ if (FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.TOOLARGE)) {
<xsp:content><xsl:apply-templates/></xsp:content>
}
</xsp:logic>
@@ -428,7 +428,7 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="string($name)!='-1'">
-
<xsp:expr>XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.NOMATCH)</xsp:expr>
+
<xsp:expr>FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.NOMATCH)</xsp:expr>
</xsl:when>
<xsl:otherwise>
<xsp:expr>__formval_fvh.getParamResult(objectModel).equals(ValidatorActionResult.NOMATCH)</xsp:expr>
@@ -456,7 +456,7 @@
<xsl:choose>
<xsl:when test="string($name)!='-1'">
<xsp:logic>
- if (XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.NOMATCH)) {
+ if (FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.NOMATCH)) {
<xsp:content><xsl:apply-templates/></xsp:content>
}
</xsp:logic>
@@ -490,7 +490,7 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="string($name)!='-1'">
-
<xsp:expr>XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.ISNULL)</xsp:expr>
+
<xsp:expr>FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.ISNULL)</xsp:expr>
</xsl:when>
<xsl:otherwise>
<xsp:expr>__formval_fvh.getParamResult(objectModel).equals(ValidatorActionResult.ISNULL)</xsp:expr>
@@ -518,7 +518,7 @@
<xsl:choose>
<xsl:when test="string($name)!='-1'">
<xsp:logic>
- if (XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.ISNULL)) {
+ if (FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.ISNULL)) {
<xsp:content><xsl:apply-templates/></xsp:content>
}
</xsp:logic>
@@ -552,7 +552,7 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="string($name)!='-1'">
-
<xsp:expr>XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.NOTPRESENT)</xsp:expr>
+
<xsp:expr>FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.NOTPRESENT)</xsp:expr>
</xsl:when>
<xsl:otherwise>
<xsp:expr>__formval_fvh.getParamResult(objectModel).equals(ValidatorActionResult.NOTPRESENT)</xsp:expr>
@@ -580,7 +580,7 @@
<xsl:choose>
<xsl:when test="string($name)!='-1'">
<xsp:logic>
- if (XSPFormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.NOTPRESENT)) {
+ if (FormValidatorHelper.getParamResult(objectModel,<xsl:copy-of
select="$name"/>).equals(ValidatorActionResult.NOTPRESENT)) {
<xsp:content><xsl:apply-templates/></xsp:content>
}
</xsp:logic>
1.4 +1 -1 cocoon-2.1/src/blocks/xsp/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xsp/samples/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 10 Mar 2004 15:37:54 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.4
@@ -96,7 +96,7 @@
<map:pipeline internal-only="true">
<map:match pattern="view-source">
<!-- colourize files that are known to be XML -->
- <map:match type="filename" pattern="((xml)|(xsp)|(xmap)|(xconf))$">
+ <map:match type="regexp" pattern="((xml)|(xsp)|(xmap)|(xconf))$">
<map:generate src="util/view-source.xsp" type="serverpages"/>
<map:serialize/>
</map:match>
1.49 +9 -1 cocoon-2.1/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/sitemap.xmap,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sitemap.xmap 10 Mar 2004 12:58:13 -0000 1.48
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.49
@@ -127,6 +127,7 @@
<map:transformer logger="sitemap.transformer.readDOMsession"
name="readDOMsession"
src="org.apache.cocoon.transformation.ReadDOMSessionTransformer"/>
<map:transformer logger="sitemap.transformer.log" name="log"
pool-grow="2" pool-max="16" pool-min="2"
src="org.apache.cocoon.transformation.LogTransformer"/>
<map:transformer logger="sitemap.transformer.jx" name="jx" pool-grow="2"
pool-max="16" pool-min="2"
src="org.apache.cocoon.transformation.JXTemplateTransformer"/>
+ <map:transformer logger="sitemap.transformer.paginate" name="paginate"
src="org.apache.cocoon.transformation.pagination.Paginator"/>
</map:transformers>
<!--+
@@ -198,6 +199,7 @@
+-->
<map:readers default="resource">
<map:reader logger="sitemap.reader.resource" name="resource"
pool-max="32" src="org.apache.cocoon.reading.ResourceReader"/>
+ <map:reader logger="sitemap.reader.image" name="image"
src="org.apache.cocoon.reading.ImageReader"/>
</map:readers>
<!--+
@@ -268,6 +270,7 @@
<exception class="java.lang.Throwable" unroll="true"/>
</map:selector>
+ <map:selector logger="sitemap.selector.request-method"
name="request-method" src="org.apache.cocoon.selection.RequestMethodSelector"/>
<map:selector logger="sitemap.selector.resource-exists"
name="resource-exists"
src="org.apache.cocoon.selection.ResourceExistsSelector"/>
<map:selector logger="sitemap.selector.request-parameter"
name="request-parameter"
src="org.apache.cocoon.selection.RequestParameterSelector">
<!-- Define now which request parameter to use; or do it later,
@@ -286,6 +289,7 @@
<!-- <header-name>myparam</header-name> -->
</map:selector>
<map:selector logger="sitemap.selector.host" name="host"
src="org.apache.cocoon.selection.HostSelector"/>
+ <map:selector logger="sitemap.selector.simple" name="simple"
src="org.apache.cocoon.selection.SimpleSelector"/>
</map:selectors>
<!--+
@@ -299,13 +303,17 @@
+-->
<map:actions>
<map:action logger="sitemap.action.request" name="request"
src="org.apache.cocoon.acting.RequestParamAction"/>
+ <map:action logger="sitemap.action.requestParamExists" name="req-params"
src="org.apache.cocoon.acting.RequestParameterExistsAction"/>
<map:action logger="sitemap.action.form-validator" name="form-validator"
src="org.apache.cocoon.acting.FormValidatorAction"/>
<map:action logger="sitemap.action.session-state" name="session-state"
src="org.apache.cocoon.acting.SessionStateAction"/>
<map:action logger="sitemap.action.session-isvalid"
name="session-isvalid" src="org.apache.cocoon.acting.SessionIsValidAction"/>
+ <map:action logger="sitemap.action.session-validator"
name="session-validator" src="org.apache.cocoon.acting.SessionValidatorAction"/>
+ <map:action logger="sitemap.action.session-invalidator"
name="session-invalidator"
src="org.apache.cocoon.acting.SessionInvalidatorAction"/>
<map:action logger="sitemap.action.resource-exists"
name="resource-exists" src="org.apache.cocoon.acting.ResourceExistsAction"/>
<map:action logger="sitemap.action.set-header" name="set-header"
src="org.apache.cocoon.acting.HttpHeaderAction"/>
<map:action logger="sitemap.action.clear-cache" name="clear-cache"
src="org.apache.cocoon.acting.ClearCacheAction"/>
<map:action logger="sitemap.action.clear-persistent-store"
name="clear-persistent-store"
src="org.apache.cocoon.acting.ClearPersistentStoreAction"/>
+ <map:action logger="sitemap.action.locale" name="locale"
src="org.apache.cocoon.acting.LocaleAction"/>
</map:actions>
<!--+
1.3 +0 -11 cocoon-2.1/src/webapp/samples/filter/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/filter/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 9 Mar 2004 01:43:50 -0000 1.2
+++ sitemap.xmap 11 Mar 2004 16:25:49 -0000 1.3
@@ -17,17 +17,6 @@
<!-- CVS $ID$ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-<!-- =========================== Components ================================
-->
-
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- </map:components>
-
<!-- =========================== Views ===================================
-->
<map:views>
1.5 +1 -11 cocoon-2.1/src/webapp/samples/imagereader/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/imagereader/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 8 Mar 2004 23:32:50 -0000 1.4
+++ sitemap.xmap 11 Mar 2004 16:25:50 -0000 1.5
@@ -22,16 +22,6 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource">
- <map:reader name="image" src="org.apache.cocoon.reading.ImageReader"
logger="sitemap.reader.image" pool-max="32" pool-min="1" pool-grow="4"/>
- </map:readers>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- </map:components>
<map:pipelines>
<map:pipeline>
1.4 +1 -11 cocoon-2.1/src/webapp/samples/paginator/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/paginator/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:26:15 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:50 -0000 1.4
@@ -18,16 +18,6 @@
<!-- CVS: $Id$ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt">
- <map:transformer name="paginate"
src="org.apache.cocoon.transformation.pagination.Paginator"/>
- </map:transformers>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- </map:components>
<map:pipelines>
<map:pipeline>
1.8 +2 -8 cocoon-2.1/src/webapp/samples/protected/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/protected/sitemap.xmap,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sitemap.xmap 10 Mar 2004 16:16:12 -0000 1.7
+++ sitemap.xmap 11 Mar 2004 16:25:50 -0000 1.8
@@ -22,12 +22,6 @@
<!-- ========================= Components ==============================
-->
<map:components>
<map:actions>
- <map:action name="session-validator"
- src="org.apache.cocoon.acting.SessionValidatorAction"/>
- <map:action name="session-invalidator"
- src="org.apache.cocoon.acting.SessionInvalidatorAction"/>
- <map:action name="form-validator"
- src="org.apache.cocoon.acting.FormValidatorAction"/>
<map:action name="db-authenticator"
src="org.apache.cocoon.acting.DatabaseAuthenticatorAction"/>
</map:actions>
@@ -72,7 +66,7 @@
<map:parameter name="contextPath" value="{request:contextPath}"/>
<map:parameter name="file" value="docs/login.xml"/>
<map:parameter name="remove" value="{0}"/>
- </map:transform>
+ </map:transform>
<map:serialize/>
</map:match>
1.4 +19 -63
cocoon-2.1/src/webapp/samples/simpleform/four/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/webapp/samples/simpleform/four/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:25:40 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:50 -0000 1.4
@@ -18,43 +18,6 @@
<map:components>
- <!--+
- | In order to use simple form validation, we need to make this action
- | available to the sitemap. Components are inherited, so this could
have
- | been done in a parent sitemap. However, to illustrate the usage, we
- | do it here.
- |
- | Note, there are several different validator actions available in
- | Cocoon. They share the same validation code but operate on different
- | values. Here, we're interested in validating request parameters, thus
- | the FormValidatorAction is the right choice.
- |
- | The action is the only component we need to declare - the logicsheet
- | has been added to cocoon.xconf for you already.
- +-->
- <map:actions>
- <map:action name="formval"
- logger="sitemap.action.form-validator"
- src="org.apache.cocoon.acting.FormValidatorAction"/>
- </map:actions>
-
-
-
- <!--+
- | Validation should only occurr when data has been submitted. Therefore
- | a selector is created that will be used to select upon the request
method.
- | This is optional if you don't mind to show validation results without
- | user input.
- |
- +-->
- <map:selectors>
- <map:selector name="simple"
- logger="sitemap.matcher.wildcard"
- src="org.apache.cocoon.selection.SimpleSelector"/>
- </map:selectors>
-
-
-
<map:transformers default="xslt">
<!--+
@@ -105,13 +68,13 @@
| this instance has been instructed to ignore validation results
because
| looking up the instance data requires to augment the element name
with
| the form name and thus differ from the validation result names.
- |
+ |
| The instance extractor places the form instances into a map with
the
| form name as key. Furthermore, it has been instructed to create a
root
| element wrapping the instance data with the same name as the form.
| Hence we need to included the form's name twice in the element name
| used for the lookup.
- |
+ |
| In addition, we may want to be able to select from a XSP if the
form
| data should be replaced with values from the instance or from the
| request. Therefore, a different attribute is used to protect
element
@@ -176,18 +139,15 @@
</map:views>
-
<!--+
| Pipelines
|
+-->
-
<map:pipelines>
<map:pipeline>
-
<!-- some redirections -->
<map:match pattern="">
<map:redirect-to uri="index"/>
@@ -202,23 +162,23 @@
<map:select type="simple">
<map:parameter name="value" value="{request:method}"/>
<map:when test="POST">
- <!--+
- | Check the request parameters using the
FormValidatorAction
- +-->
- <map:act type="formval">
- <map:parameter name="descriptor" value="descriptor.xml"/>
- <map:parameter name="validate-set" value="car-reservation"/>
- <!--+
- | this is the success case
- |
- +-->
- <map:generate src="success.xml"/>
- <map:transform type="simpleform"/>
- <map:call resource="static-page">
- <map:parameter name="file" value="success"/>
- </map:call>
- <!-- because of the resource above the "success" pipeline
ends here. -->
- </map:act>
+ <!--+
+ | Check the request parameters using the FormValidatorAction
+ +-->
+ <map:act type="form-validator">
+ <map:parameter name="descriptor" value="descriptor.xml"/>
+ <map:parameter name="validate-set" value="car-reservation"/>
+ <!--+
+ | this is the success case
+ |
+ +-->
+ <map:generate src="success.xml"/>
+ <map:transform type="simpleform"/>
+ <map:call resource="static-page">
+ <map:parameter name="file" value="success"/>
+ </map:call>
+ <!-- because of the resource above the "success" pipeline ends
here. -->
+ </map:act>
</map:when>
</map:select>
<!--+
@@ -245,8 +205,6 @@
</map:call>
</map:match>
-
-
<!-- some redirections -->
<map:match pattern="*">
<map:redirect-to uri="index"/>
@@ -256,5 +214,3 @@
</map:pipelines>
</map:sitemap>
-
-<!-- end of file -->
1.4 +1 -25 cocoon-2.1/src/webapp/samples/simpleform/one/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/webapp/samples/simpleform/one/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:26:13 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:50 -0000 1.4
@@ -16,30 +16,6 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <map:components>
-
- <!--+
- | In order to use simple form validation, we need to make this action
- | available to the sitemap. Components are inherited, so this could
have
- | been done in a parent sitemap. However, to illustrate the usage, we
- | do it here.
- |
- | Note, there are several different validator actions available in
- | Cocoon. They share the same validation code but operate on different
- | values. Here, we're interested in validating request parameters, thus
- | the FormValidatorAction is the right choice.
- |
- | The action is the only component we need to declare - the logicsheet
- | has been added to cocoon.xconf for you already.
- +-->
- <map:actions>
- <map:action name="formval"
- logger="sitemap.action.form-validator"
- src="org.apache.cocoon.acting.FormValidatorAction"/>
- </map:actions>
-
- </map:components>
-
<!--+
| This is a standard resource for rendering a XSP page.
+-->
@@ -97,7 +73,7 @@
<map:match pattern="index">
- <map:act type="formval">
+ <map:act type="form-validator">
<map:parameter name="descriptor" value="descriptor.xml"/>
<map:parameter name="validate-set" value="car-reservation"/>
<!--+
1.4 +0 -2
cocoon-2.1/src/webapp/samples/simpleform/three/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/webapp/samples/simpleform/three/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:25:43 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:50 -0000 1.4
@@ -18,7 +18,6 @@
<map:components>
-
<map:transformers default="xslt">
<!--+
| This transformer is used to extract the form instance data from the
@@ -82,7 +81,6 @@
<input-module name="request-attr"/>
</input-module>
</map:transformer>
-
</map:transformers>
1.4 +20 -65 cocoon-2.1/src/webapp/samples/simpleform/two/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/webapp/samples/simpleform/two/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 6 Mar 2004 02:26:10 -0000 1.3
+++ sitemap.xmap 11 Mar 2004 16:25:50 -0000 1.4
@@ -16,44 +16,7 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <map:components>
-
- <!--+
- | In order to use simple form validation, we need to make this action
- | available to the sitemap. Components are inherited, so this could
have
- | been done in a parent sitemap. However, to illustrate the usage, we
- | do it here.
- |
- | Note, there are several different validator actions available in
- | Cocoon. They share the same validation code but operate on different
- | values. Here, we're interested in validating request parameters, thus
- | the FormValidatorAction is the right choice.
- |
- | The action is the only component we need to declare - the logicsheet
- | has been added to cocoon.xconf for you already.
- +-->
- <map:actions>
- <map:action name="formval"
- logger="sitemap.action.form-validator"
- src="org.apache.cocoon.acting.FormValidatorAction"/>
- </map:actions>
-
-
-
- <!--+
- | Validation should only occurr when data has been submitted. Therefore
- | a selector is created that will be used to select upon the request
method.
- | This is optional if you don't mind to show validation results without
- | user input.
- |
- +-->
- <map:selectors>
- <map:selector name="simple"
- logger="sitemap.matcher.wildcard"
- src="org.apache.cocoon.selection.SimpleSelector"/>
- </map:selectors>
-
-
+ <map:components>
<!--+ the SimpleFormTransformer acts upon HTML4 form element tags and
replaces their
| value attribute or their content in case of the textarea element
with data obtained
@@ -116,44 +79,40 @@
|
+-->
-
<map:pipelines>
<map:pipeline>
-
<!-- some redirections -->
<map:match pattern="">
<map:redirect-to uri="index"/>
</map:match>
-
-
<map:match pattern="index">
<!--+
| Only validate when data was submitted
+-->
- <map:select type="simple">
+ <map:select type="simple">
<map:parameter name="value" value="{request:method}"/>
<map:when test="POST">
- <!--+
- | Check the request parameters using the
FormValidatorAction
- +-->
- <map:act type="formval">
- <map:parameter name="descriptor" value="descriptor.xml"/>
- <map:parameter name="validate-set" value="car-reservation"/>
- <!--+
- | this is the success case
- |
- +-->
- <map:generate src="success.xml"/>
- <map:transform type="simpleform"/>
- <map:call resource="static-page">
- <map:parameter name="file" value="success"/>
- </map:call>
- <!-- because of the resource above the "success" pipeline
ends here. -->
- </map:act>
- </map:when>
+ <!--+
+ | Check the request parameters using the FormValidatorAction
+ +-->
+ <map:act type="form-validator">
+ <map:parameter name="descriptor" value="descriptor.xml"/>
+ <map:parameter name="validate-set" value="car-reservation"/>
+ <!--+
+ | this is the success case
+ |
+ +-->
+ <map:generate src="success.xml"/>
+ <map:transform type="simpleform"/>
+ <map:call resource="static-page">
+ <map:parameter name="file" value="success"/>
+ </map:call>
+ <!-- because of the resource above the "success" pipeline ends
here. -->
+ </map:act>
+ </map:when>
</map:select>
<!--+
| this branch contains the failed validation.
@@ -171,8 +130,6 @@
</map:call>
</map:match>
-
-
<!-- some redirections -->
<map:match pattern="*">
<map:redirect-to uri="index"/>
@@ -182,5 +139,3 @@
</map:pipelines>
</map:sitemap>
-
-<!-- end of file -->
1.5 +24 -24 cocoon-2.1/src/webapp/samples/slides/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/slides/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 6 Mar 2004 02:26:00 -0000 1.4
+++ sitemap.xmap 11 Mar 2004 16:25:50 -0000 1.5
@@ -19,33 +19,33 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <map:pipelines>
+ <map:pipelines>
- <map:pipeline>
+ <map:pipeline>
- <map:match pattern="slides">
- <map:generate src="slides.xml"/>
- <map:transform src="stylesheets/navigation.xsl">
- <map:parameter name="use-request-parameters" value="true"/>
- </map:transform>
- <map:transform src="stylesheets/slides2html.xsl"/>
- <map:serialize/>
- </map:match>
+ <map:match pattern="slides">
+ <map:generate src="slides.xml"/>
+ <map:transform src="stylesheets/navigation.xsl">
+ <map:parameter name="use-request-parameters" value="true"/>
+ </map:transform>
+ <map:transform src="stylesheets/slides2html.xsl"/>
+ <map:serialize/>
+ </map:match>
- <map:match pattern="style">
- <map:read mime-type="text/css"
src="stylesheets/slides.css"/>
- </map:match>
-
- <map:match pattern="figures/**">
- <map:read src="figures/{1}"/>
- </map:match>
-
- <map:match pattern="images/**">
- <map:read src="images/{1}"/>
- </map:match>
+ <map:match pattern="style">
+ <map:read mime-type="text/css" src="stylesheets/slides.css"/>
+ </map:match>
+
+ <map:match pattern="figures/**">
+ <map:read src="figures/{1}"/>
+ </map:match>
+
+ <map:match pattern="images/**">
+ <map:read src="images/{1}"/>
+ </map:match>
- </map:pipeline>
+ </map:pipeline>
- </map:pipelines>
+ </map:pipelines>
</map:sitemap>
