crossley 2002/10/20 05:25:46
Modified: src/blocks/authentication-fw/samples sitemap.xmap
src/blocks/portal-fw/samples sitemap.xmap
src/scratchpad/webapp/samples/castor sitemap.xmap
src/scratchpad/webapp/samples/charts sitemap.xmap
src/scratchpad/webapp/samples/editor sitemap.xmap
src/scratchpad/webapp/samples/precept sitemap.xmap
src/scratchpad/webapp/samples/slide sitemap.xmap
src/scratchpad/webapp/samples/soap-server sitemap.xmap
src/webapp/WEB-INF/entities sitemap-v03.dtd
src/webapp/samples sitemap.xmap
src/webapp/samples/hello-world sitemap.xmap
src/webapp/samples/i18n sitemap.xmap
src/webapp/samples/jsp sitemap.xmap
src/webapp/samples/linkstatus sitemap.xmap
src/webapp/samples/mod-db sitemap.xmap
src/webapp/samples/protected sitemap.xmap
src/webapp/samples/sub sitemap.xmap
src/webapp/samples/system sitemap.xmap
src/webapp/samples/tutorial sitemap.xmap
src/webapp/samples/xmlform sitemap.xmap
Log:
* Various sitemap.xmap files updated to re-order the components, so that they
will validate against the draft sitemap-v03.dtd
* Added many new rules to the draft DTD to reflect the current sitemaps.
PR: 13791
Submitted by: Colin Adams <[EMAIL PROTECTED]>
Revision Changes Path
1.2 +1 -1 xml-cocoon2/src/blocks/authentication-fw/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/blocks/authentication-fw/samples/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 27 Sep 2002 12:11:17 -0000 1.1
+++ sitemap.xmap 20 Oct 2002 12:25:44 -0000 1.2
@@ -7,10 +7,10 @@
<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:readers default="resource"/>
</map:components>
1.3 +1 -1 xml-cocoon2/src/blocks/portal-fw/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/blocks/portal-fw/samples/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 4 Oct 2002 12:00:38 -0000 1.2
+++ sitemap.xmap 20 Oct 2002 12:25:44 -0000 1.3
@@ -7,10 +7,10 @@
<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:readers default="resource"/>
</map:components>
1.4 +1 -1 xml-cocoon2/src/scratchpad/webapp/samples/castor/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/castor/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 1 Jul 2002 15:09:12 -0000 1.3
+++ sitemap.xmap 20 Oct 2002 12:25:44 -0000 1.4
@@ -10,11 +10,11 @@
</map:transformers>
<map:readers default="resource"/>
<map:serializers default="xml"/>
- <map:selectors default="browser"/>
<map:matchers default="wildcard">
<map:matcher name="wildcard"
src="org.apache.cocoon.matching.WildcardURIMatcher"/>
</map:matchers>
+ <map:selectors default="browser"/>
<map:actions>
<map:action name="TestBeanAction"
src="org.apache.cocoon.samples.castor.TestBeanAction"/>
1.3 +2 -3 xml-cocoon2/src/scratchpad/webapp/samples/charts/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/charts/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 21 Aug 2002 12:10:09 -0000 1.2
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.3
@@ -24,15 +24,14 @@
<map:selectors default="browser"/>
+ </map:components>
+
<map:views>
<map:view name="transformed" from-label="transformed">
<map:serialize type="xml"/>
</map:view>
</map:views>
-
- </map:components>
-
<map:pipelines>
<map:pipeline>
1.2 +1 -1 xml-cocoon2/src/scratchpad/webapp/samples/editor/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/editor/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 1 Jul 2002 15:09:17 -0000 1.1
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.2
@@ -3,9 +3,9 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:components>
<map:generators default="file"/>
- <map:serializers default="html"/>
<map:transformers default="xslt"/>
<map:readers default="resource"/>
+ <map:serializers default="html"/>
<map:matchers default="wildcard"/>
<map:selectors default="browser"/>
</map:components>
1.2 +4 -4 xml-cocoon2/src/scratchpad/webapp/samples/precept/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/precept/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 1 Jul 2002 15:09:20 -0000 1.1
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.2
@@ -7,13 +7,13 @@
<map:transformers default="xslt">
<map:transformer name="instance"
src="org.apache.cocoon.precept.InstanceTransformer" logger="webapp.validation"/>
</map:transformers>
- <map:actions>
- <map:action name="demoflow"
src="org.apache.cocoon.precept.acting.PreceptorDemoAction"
logger="webapp.validation"/>
- </map:actions>
<map:readers default="resource"/>
<map:serializers default="html"/>
- <map:selectors default="browser"/>
<map:matchers default="wildcard"/>
+ <map:selectors default="browser"/>
+ <map:actions>
+ <map:action name="demoflow"
src="org.apache.cocoon.precept.acting.PreceptorDemoAction"
logger="webapp.validation"/>
+ </map:actions>
</map:components>
<map:action-sets>
1.16 +2 -1 xml-cocoon2/src/scratchpad/webapp/samples/slide/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/slide/sitemap.xmap,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sitemap.xmap 25 Sep 2002 09:02:51 -0000 1.15
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.16
@@ -22,6 +22,7 @@
<map:transformer name="log"
src="org.apache.cocoon.transformation.LogTransformer"/>
</map:transformers>
+ <map:readers default="resource"/>
<map:serializers default="html">
<map:serializer logger="sitemap.serializer.xml" mime-type="text/xml" name="xml"
src="org.apache.cocoon.serialization.XMLSerializer"/>
@@ -33,7 +34,7 @@
</map:serializer>
</map:serializers>
- <map:readers default="resource"/>
+
<map:matchers default="wildcard"/>
<map:selectors default="browser"/>
1.2 +6 -4
xml-cocoon2/src/scratchpad/webapp/samples/soap-server/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/soap-server/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 9 Sep 2002 17:53:18 -0000 1.1
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.2
@@ -8,10 +8,6 @@
<map:generators default="file"/>
<map:transformers default="xslt"/>
-<map:serializers default="html"/>
-<map:matchers default="wildcard"/>
-<map:selectors default="browser"/>
-<map:actions/>
<map:readers default="resource">
@@ -20,6 +16,12 @@
src="org.apache.cocoon.reading.AxisRPCReader"/>
</map:readers>
+
+<map:serializers default="html"/>
+<map:matchers default="wildcard"/>
+<map:selectors default="browser"/>
+<map:actions/>
+
</map:components>
1.2 +157 -17 xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v03.dtd
Index: sitemap-v03.dtd
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v03.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap-v03.dtd 18 Oct 2002 08:56:12 -0000 1.1
+++ sitemap-v03.dtd 20 Oct 2002 12:25:45 -0000 1.2
@@ -60,6 +60,7 @@
20011116 V0.2 Changes from label/view discussion cocoon-dev 20011115 (DC)
20011219 V0.2 Deprecated 'redirect-to resource'. Added 'map:call resource'(CH)
20021017 V0.3 Updated so validation works again (CPA)
+20021019 V0.3 Further changes made to cope with all current sitemaps (CPA)
==================================================================== -->
<!-- CPA: made map:components optional, as the modules sitemap
@@ -110,12 +111,14 @@
default CDATA #IMPLIED
>
<!ELEMENT map:transformer (use-store | use-request-parameters |
- use-browser-capabilities-db | catalogue-name |
+ use-browser-capabilities-db |
+ catalogue-name | mapping |
catalogue-location | use-deli | cache-at-startup)* >
<!-- RNG: surely the content is not ANY. However, there were so many
children here that I did not know where to begin -->
<!-- DC: here are some that are currently used -->
<!-- CPA: added use-deli and cache-at-startup - changed ANY -->
+<!-- CPA: added mapping -->
<!ELEMENT use-store (#PCDATA)>
<!ELEMENT use-request-parameters (#PCDATA)>
<!ELEMENT use-browser-capabilities-db (#PCDATA)>
@@ -123,6 +126,7 @@
<!ELEMENT catalogue-location (#PCDATA)>
<!ELEMENT use-deli (#PCDATA)>
<!ELEMENT cache-at-startup (#PCDATA)>
+<!ELEMENT mapping (#PCDATA)>
<!-- CPA: add mime-type -->
<!ATTLIST map:transformer
name CDATA #REQUIRED
@@ -188,7 +192,7 @@
<!ATTLIST map:selectors
default CDATA #IMPLIED
>
-<!ELEMENT map:selector (browser*)>
+<!ELEMENT map:selector ANY>
<!-- CPA: added logger -->
<!ATTLIST map:selector
name CDATA #REQUIRED
@@ -258,18 +262,21 @@
<!-- =============================================================== -->
<!ELEMENT map:views (map:view*)>
-<!ELEMENT map:view (map:transform*,map:serialize)>
+<!-- CPA: added, match,act,serialize option -->
+<!ELEMENT map:view ((map:transform*|map:match)?,map:act?,map:serialize)>
<!ATTLIST map:view
name CDATA #REQUIRED
from-label CDATA #IMPLIED
from-position (first|last) "last"
>
-<!ELEMENT map:serialize (map:parameter*)>
+<!-- CPA: added encoding -->
+<!ELEMENT map:serialize (map:parameter*,encoding?)>
<!-- CPA: type changed from #REQUIRED -->
<!ATTLIST map:serialize
type CDATA #IMPLIED
mime-type CDATA #IMPLIED
status-code CDATA #IMPLIED
+ src CDATA #IMPLIED
>
<!-- =============================================================== -->
@@ -278,7 +285,8 @@
<!ELEMENT map:resources (map:resource*)>
<!-- CPA: added a third possibility for contents of resource -->
-<!ELEMENT map:resource (((map:generate |
map:aggregate),map:transform+,map:serialize) | map:act)>
+<!ELEMENT map:resource (((map:generate | map:aggregate),
+ (map:transform+ | (map:match,map:act)), map:serialize) |
map:act)>
<!ATTLIST map:resource
name CDATA #REQUIRED
>
@@ -293,12 +301,14 @@
<!ATTLIST map:action-set
name CDATA #REQUIRED
>
-<!ELEMENT map:act (map:parameter|map:redirect-to|map:call|map:generate|
- map:transform|map:serialize|map:act|map:match)*>
+<!-- CPA: added map:read,map:mount,map:aggregate and map:select -->
+<!ELEMENT map:act
(map:parameter|map:redirect-to|map:call|map:generate|map:mount|map:aggregate|
+
map:transform|map:serialize|map:act|map:select|map:match|map:read)*>
<!ATTLIST map:act
type CDATA #IMPLIED
action CDATA #IMPLIED
set CDATA #IMPLIED
+ src CDATA #IMPLIED
>
<!-- =============================================================== -->
@@ -311,29 +321,52 @@
default CDATA #IMPLIED
>
<!-- CPA: added id, type, internal-only, name and src attributes, and
- autoCachingPoint and map:act elements -->
-<!-- CPA: N.B. we appear to have two different sorts of pipeline elements -->
-<!ELEMENT map:pipeline (map:act | (map:match*,
map:handle-errors?,autoCachingPoint?))>
+ autoCachingPoint and map:act elements.
+ added select, generate/transform/serialize for lint -->
+<!ELEMENT map:pipeline ((map:act | map:match | map:select |
+ map:aggregate | map:call |
+ (map:generate,map:transform*,map:serialize))*,
+ map:handle-errors?,autoCachingPoint?)>
+<!-- CPA: pool* and logger attributes added -->
<!ATTLIST map:pipeline
id CDATA #IMPLIED
internal-only CDATA #IMPLIED
name CDATA #IMPLIED
src CDATA #IMPLIED
type CDATA #IMPLIED
+ pool-max CDATA #IMPLIED
+ pool-min CDATA #IMPLIED
+ pool-grow CDATA #IMPLIED
+ logger CDATA #IMPLIED
>
+<!-- CPA: added map:select -->
<!ELEMENT map:match (map:mount | map:redirect-to | map:call | map:generate |
- map:transform | map:serialize | map:read |
+ map:transform | map:serialize | map:read | map:select |
map:aggregate | map:act | map:match)*>
<!-- RNG: It seemed from the example that match should be defined as
match
(map:mount*|map:redirect-to*|(map:generate*,map:transform*,map:serialize*)*|map:read*|map:aggregate*)
- but I have no way of knowing.
--->
+ but I have no way of knowing. -->
<!-- DC: Now map:act complicates the content model even further -->
<!ATTLIST map:match
type CDATA #IMPLIED
pattern CDATA #REQUIRED
>
+<!-- CPA guessing at semantics of select/when/otherwise -->
+<!ELEMENT map:select (map:when*,map:otherwise?)>
+<!ATTLIST map:select
+ type CDATA #IMPLIED
+>
+<!ELEMENT map:when ((map:match | map:act | map:read | map:mount |
+ map:select | map:generate)*,
+ map:transform*,map:serialize*)>
+<!ATTLIST map:when
+ test CDATA #REQUIRED
+>
+<!ELEMENT map:otherwise ((map:match | map:act | map:read | map:mount |
+ map:select | map:generate)*,
+ map:transform*,map:serialize*)>
+
<!ELEMENT autoCachingPoint (#PCDATA)>
<!-- map:act is already defined in the Action Sets section -->
@@ -392,8 +425,9 @@
<!-- CPA: added optional map:parameter contents -->
<!ELEMENT map:read (map:parameter)*>
<!-- CPA: mime-type changed from #REQUIRED (??!) -->
+<!-- CPA: src changed from #REQUIRED for soap-rpc -->
<!ATTLIST map:read
- src CDATA #REQUIRED
+ src CDATA #IMPLIED
mime-type CDATA #IMPLIED
type CDATA #IMPLIED
>
@@ -412,21 +446,124 @@
ns CDATA #IMPLIED
strip-root CDATA #IMPLIED
label CDATA #IMPLIED
+ prefix CDATA #IMPLIED
>
-<!ELEMENT map:handle-errors (map:generate*,map:transform*,map:serialize*)>
+<!-- CPA: added alternates for generate -->
+<!ELEMENT map:handle-errors
((map:act|map:match|map:select|map:generate)*,map:transform*,map:serialize*)>
<!-- CPA: added type -->
<!ATTLIST map:handle-errors
type CDATA #IMPLIED
>
-<!-- CPA: not sure what this really ought to be yet -->
-<!ELEMENT map:component-configurations (global-variables?)>
+<!-- CPA: not sure what this really ought to be -->
+<!-- CPA: added authentication manager -->
+<!ELEMENT map:component-configurations (global-variables?,authentication-manager?)>
<!ELEMENT global-variables (#PCDATA)>
<!-- ??? If I specify EMPTY, I get validation errors, even though the -->
<!-- only example has only white space and comments. So why do we have -->
<!-- this if noone is using it??? -->
+<!-- CPA: defined to match slide and portal-fw sitemaps - N.B. great namespace
confusions -->
+<!ELEMENT authentication-manager (handlers)>
+<!ELEMENT handlers (handler)+>
+<!ELEMENT handler (redirect-to,authentication,applications?)>
+<!ATTLIST handler
+ name CDATA #REQUIRED
+ xmlns:map CDATA #FIXED "http://apache.org/cocoon/sitemap/1.0";
+>
+<!ELEMENT redirect-to EMPTY>
+<!ATTLIST redirect-to
+ uri CDATA #REQUIRED
+>
+<!ELEMENT authentication EMPTY>
+<!ATTLIST authentication
+ uri CDATA #REQUIRED
+>
+<!ELEMENT applications (application+)>
+<!ELEMENT application (configuration+)>
+<!ATTLIST application
+ loadondemand CDATA #REQUIRED
+ name CDATA #REQUIRED
+>
+<!ELEMENT configuration (auth-redirect|portal-uri|profile-cache|
+ default-coplet-timeout|profile|
+ load-users|load-roles|new-user|new-role|
+ change-user|delete-role|delete-user|
+ process-coplets-parallel)*>
+<!ATTLIST configuration
+ name CDATA #REQUIRED
+>
+<!ELEMENT auth-redirect (#PCDATA)>
+<!ELEMENT portal-uri (#PCDATA)>
+<!ELEMENT profile-cache (#PCDATA)>
+<!ELEMENT default-coplet-timeout (#PCDATA)>
+<!ELEMENT process-coplets-parallel (#PCDATA)>
+<!ELEMENT profile
(layout-base,coplet-base,coplet-base-save,type-base,admin-type-base,
+ global-delta-load,global-delta-save,role-delta-load,
+ role-delta-save,user-delta-load,user-delta-save,user-status-load,
+ user-status-save)>
+<!ELEMENT layout-base EMPTY>
+<!ATTLIST layout-base
+ uri CDATA #REQUIRED>
+<!ELEMENT coplet-base EMPTY>
+<!ATTLIST coplet-base
+ uri CDATA #REQUIRED>
+<!ELEMENT coplet-base-save EMPTY>
+<!ATTLIST coplet-base-save
+ uri CDATA #REQUIRED>
+<!ELEMENT type-base EMPTY>
+<!ATTLIST type-base
+ uri CDATA #REQUIRED>
+<!ELEMENT admin-type-base EMPTY>
+<!ATTLIST admin-type-base
+ uri CDATA #REQUIRED>
+<!ELEMENT global-delta-load EMPTY>
+<!ATTLIST global-delta-load
+ uri CDATA #REQUIRED>
+<!ELEMENT global-delta-save EMPTY>
+<!ATTLIST global-delta-save
+ uri CDATA #REQUIRED>
+<!ELEMENT role-delta-load EMPTY>
+<!ATTLIST role-delta-load
+ uri CDATA #REQUIRED>
+<!ELEMENT role-delta-save EMPTY>
+<!ATTLIST role-delta-save
+ uri CDATA #REQUIRED>
+<!ELEMENT user-delta-load EMPTY>
+<!ATTLIST user-delta-load
+ uri CDATA #REQUIRED>
+<!ELEMENT user-delta-save EMPTY>
+<!ATTLIST user-delta-save
+ uri CDATA #REQUIRED>
+<!ELEMENT user-status-load EMPTY>
+<!ATTLIST user-status-load
+ uri CDATA #REQUIRED>
+<!ELEMENT user-status-save EMPTY>
+<!ATTLIST user-status-save
+ uri CDATA #REQUIRED>
+<!ELEMENT load-users EMPTY>
+<!ATTLIST load-users
+ uri CDATA #REQUIRED>
+<!ELEMENT load-roles EMPTY>
+<!ATTLIST load-roles
+ uri CDATA #REQUIRED>
+<!ELEMENT new-user EMPTY>
+<!ATTLIST new-user
+ uri CDATA #REQUIRED>
+<!ELEMENT new-role EMPTY>
+<!ATTLIST new-role
+ uri CDATA #REQUIRED>
+<!ELEMENT change-user EMPTY>
+<!ATTLIST change-user
+ uri CDATA #REQUIRED>
+<!ELEMENT delete-user EMPTY>
+<!ATTLIST delete-user
+ uri CDATA #REQUIRED>
+<!ELEMENT delete-role EMPTY>
+<!ATTLIST delete-role
+ uri CDATA #REQUIRED>
+
<!ELEMENT map:flow-interpreters EMPTY>
<!-- CPA: obviously it should NOT be empty for non-default usage, so this -->
<!-- needs correcting -->
@@ -444,6 +581,9 @@
<!ATTLIST map:script
src CDATA #REQUIRED
>
+
+<!-- CPA: purely for lint -->
+<!ELEMENT unknown-tag EMPTY>
<!-- =============================================================== -->
<!-- End of DTD -->
1.23 +5 -6 xml-cocoon2/src/webapp/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/sitemap.xmap,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sitemap.xmap 8 Oct 2002 09:48:00 -0000 1.22
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.23
@@ -51,14 +51,13 @@
All components follow this schema.
-->
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- <!-- <map:actions/> -->
-
<map:generators default="file"/>
<map:transformers default="xslt"/>
<map:readers default="resource"/>
<map:serializers default="html"/>
+ <map:matchers default="wildcard"/>
+ <map:selectors default="browser"/>
+
<!--
Actions are executed during pipeline setup. Their purpose is to
execute some arbitrary complex code. They are the work horses of
@@ -283,7 +282,7 @@
<!--
This pipeline specifies a different error handler.
-->
- <map:transform src="../stylesheets/system/error2html.xsl"/>
+ <map:transform src="context://samples/stylesheets/system/error2html.xsl"/>
<map:serialize status-code="500"/>
</map:handle-errors>
</map:pipeline>
@@ -918,7 +917,7 @@
</map:match>-->
<map:handle-errors>
- <map:transform src="context://stylesheets/system/error2html.xsl"/>
+ <map:transform src="context://samples/stylesheets/system/error2html.xsl"/>
<map:serialize status-code="500"/>
</map:handle-errors>
1.8 +5 -5 xml-cocoon2/src/webapp/samples/hello-world/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/hello-world/sitemap.xmap,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sitemap.xmap 28 Jul 2002 14:49:25 -0000 1.7
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.8
@@ -5,10 +5,6 @@
<map:components>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- <!-- <map:actions/> -->
-
<map:generators default="file"/>
<map:transformers default="xslt"/>
<map:readers default="resource"/>
@@ -54,7 +50,11 @@
src="org.apache.cocoon.serialization.SWFSerializer"
mime-type="application/x-shockwave-flash"/>
</map:serializers>
-
+
+ <map:matchers default="wildcard"/>
+ <map:selectors default="browser"/>
+ <!-- <map:actions/> -->
+
</map:components>
<!-- =========================== Views =================================== -->
1.5 +1 -1 xml-cocoon2/src/webapp/samples/i18n/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/i18n/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 30 May 2002 10:13:14 -0000 1.4
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.5
@@ -18,8 +18,8 @@
<map:readers default="resource"/>
<map:serializers default="html"/>
- <map:selectors default="browser"/>
<map:matchers default="wildcard"/>
+ <map:selectors default="browser"/>
<!-- =========================== Actions =================================
-->
<map:actions>
1.3 +1 -1 xml-cocoon2/src/webapp/samples/jsp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/jsp/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 27 Apr 2002 18:22:43 -0000 1.2
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.3
@@ -18,8 +18,8 @@
src="org.apache.cocoon.reading.JSPReader"/>
</map:readers>
<map:serializers default="html"/>
- <map:selectors default="browser"/>
<map:matchers default="wildcard"/>
+ <map:selectors default="browser"/>
</map:components>
<!-- =========================== Pipelines ================================= -->
1.4 +1 -1 xml-cocoon2/src/webapp/samples/linkstatus/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/linkstatus/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 11 Jul 2002 05:14:35 -0000 1.3
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.4
@@ -13,8 +13,8 @@
<map:transformers default="xslt"/>
<map:readers default="resource"/>
<map:serializers default="html"/>
- <map:selectors default="browser"/>
<map:matchers default="wildcard"/>
+ <map:selectors default="browser"/>
</map:components>
<map:views>
1.5 +2 -2 xml-cocoon2/src/webapp/samples/mod-db/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/mod-db/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 9 Aug 2002 08:36:43 -0000 1.4
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.5
@@ -16,8 +16,6 @@
<map:serializers default="html"/>
- <map:selectors default="browser"/>
-
<map:matchers default="wildcard">
<map:matcher logger="sitemap.matcher.modular.non-cached" name="uri"
src="org.apache.cocoon.matching.modular.WildcardMatcher">
<input-module name="URI"/>
@@ -26,6 +24,8 @@
<input-module name="URI"/>
</map:matcher>
</map:matchers>
+
+ <map:selectors default="browser"/>
<map:actions>
<!-- these action are in addition to the ones inherited -->
1.4 +2 -2 xml-cocoon2/src/webapp/samples/protected/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/protected/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 4 Jul 2002 05:20:44 -0000 1.3
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.4
@@ -14,9 +14,9 @@
<map:serializers default="html"/>
- <map:selectors default="browser"/>
-
<map:matchers default="wildcard"/>
+
+ <map:selectors default="browser"/>
<map:actions>
<map:action name="session-validator"
1.3 +1 -1 xml-cocoon2/src/webapp/samples/sub/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/sub/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 4 Jul 2002 05:20:44 -0000 1.2
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.3
@@ -9,8 +9,8 @@
<map:transformers default="xslt"/>
<map:readers default="resource"/>
<map:serializers default="html"/>
- <map:selectors default="browser"/>
<map:matchers default="wildcard"/>
+ <map:selectors default="browser"/>
</map:components>
<!-- =========================== Pipelines ================================= -->
1.2 +4 -4 xml-cocoon2/src/webapp/samples/system/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/system/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 18 Mar 2002 19:22:40 -0000 1.1
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.2
@@ -5,10 +5,6 @@
<map:components>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- <!-- <map:actions/> -->
-
<map:generators default="file">
<map:generator name="request"
src="org.apache.cocoon.generation.RequestGenerator"
logger="sitemap.generator.request"
@@ -20,6 +16,10 @@
<map:readers default="resource"/>
<map:serializers default="html"/>
+ <map:matchers default="wildcard"/>
+ <map:selectors default="browser"/>
+ <!-- <map:actions/> -->
+
</map:components>
<!-- =========================== Views =================================== -->
1.3 +3 -3 xml-cocoon2/src/webapp/samples/tutorial/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/tutorial/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 13 Oct 2002 01:46:48 -0000 1.2
+++ sitemap.xmap 20 Oct 2002 12:25:45 -0000 1.3
@@ -18,11 +18,11 @@
<map:serializers default="html">
</map:serializers>
- <map:selectors default="browser">
- </map:selectors>
-
<map:matchers default="wildcard">
</map:matchers>
+
+ <map:selectors default="browser">
+ </map:selectors>
<map:actions>
<map:action name="dbAdd" logger="sitemap.tutorial.action.dbAdd"
1.11 +4 -4 xml-cocoon2/src/webapp/samples/xmlform/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/xmlform/sitemap.xmap,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sitemap.xmap 23 Sep 2002 03:56:42 -0000 1.10
+++ sitemap.xmap 20 Oct 2002 12:25:46 -0000 1.11
@@ -3,10 +3,6 @@
<!-- =========================== Components ================================ -->
<map:components>
- <map:actions>
- <map:action name="WizardAction"
src="org.apache.cocoon.samples.xmlform.WizardAction" logger="xmlform"/>
- <map:action name="UsageFeedbackAction"
src="org.apache.cocoon.samples.xmlform.UsageFeedbackAction" logger="xmlform"/>
- </map:actions>
<map:generators default="file"/>
<map:transformers default="xslt">
<map:transformer name="xmlform"
src="org.apache.cocoon.transformation.XMLFormTransformer" logger="xmlform"/>
@@ -14,6 +10,10 @@
<map:readers default="resource"/>
<map:serializers default="html"/>
<map:selectors default="browser"/>
+ <map:actions>
+ <map:action name="WizardAction"
src="org.apache.cocoon.samples.xmlform.WizardAction" logger="xmlform"/>
+ <map:action name="UsageFeedbackAction"
src="org.apache.cocoon.samples.xmlform.UsageFeedbackAction" logger="xmlform"/>
+ </map:actions>
</map:components>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
