You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/05/18 00:15:14 UTC
svn commit: r539144 - in /cocoon/trunk/blocks:
cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap
Author: felixk
Date: Thu May 17 15:15:13 2007
New Revision: 539144
URL: http://svn.apache.org/viewvc?view=rev&rev=539144
Log:
remove mime-type becuase this is fixed now
add views
Modified:
cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539144&r1=539143&r2=539144
==============================================================================
--- cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 15:15:13 2007
@@ -23,6 +23,27 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view from-label="content" name="content">
+ <map:serialize type="xml" />
+ </map:view>
+
+ <map:view from-label="content" name="pretty-content">
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
+ </map:view>
+
+ <map:view from-position="last" name="links">
+ <map:serialize type="links" />
+ </map:view>
+ </map:views>
+
+ <!-- =========================== Views =================================== -->
+
<map:pipelines>
<map:pipeline type="caching">
@@ -34,7 +55,7 @@
<map:match pattern="welcome">
<map:generate src="welcome.xml" />
<!-- Make use of servlet services -->
- <map:serialize type="servletService" mime-type="text/html">
+ <map:serialize type="servletService">
<map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
</map:serialize>
</map:match>
@@ -88,7 +109,7 @@
<map:generate src="source-no.xml" />
<map:transform type="validation-report" src="schema-ok.rng" />
<!-- Make use of servlet services -->
- <map:serialize type="servletService" mime-type="text/html">
+ <map:serialize type="servletService">
<map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
</map:serialize>
</map:match>
@@ -97,7 +118,7 @@
<map:generate src="source-no.xml" />
<map:transform type="validation-report" src="schema-ok.xsd" />
<!-- Make use of servlet services -->
- <map:serialize type="servletService" mime-type="text/html">
+ <map:serialize type="servletService">
<map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
</map:serialize>
</map:match>
@@ -106,7 +127,7 @@
<map:generate src="source-ok.xml" />
<map:transform type="validation-report" src="schema-ok.rng" />
<!-- Make use of servlet services -->
- <map:serialize type="servletService" mime-type="text/html">
+ <map:serialize type="servletService">
<map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
</map:serialize>
</map:match>
@@ -115,7 +136,7 @@
<map:generate src="source-ok.xml" />
<map:transform type="validation-report" src="schema-ok.xsd" />
<!-- Make use of servlet services -->
- <map:serialize type="servletService" mime-type="text/html">
+ <map:serialize type="servletService" ">
<map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
</map:serialize>
</map:match>
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap?view=diff&rev=539144&r1=539143&r2=539144
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/soap/sitemap.xmap Thu May 17 15:15:13 2007
@@ -20,13 +20,34 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view name="content" from-label="content">
+ <map:serialize type="xml" />
+ </map:view>
+
+ <map:view from-label="content" name="pretty-content">
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
+ </map:view>
+
+ <map:view name="links" from-position="last">
+ <map:serialize type="links" />
+ </map:view>
+ </map:views>
+
+ <!-- =========================== Pipelines ================================= -->
+
<map:pipelines>
<map:pipeline>
<map:match pattern="">
<map:generate src="samples.xml" />
<!-- Make use of servlet services -->
- <map:serialize type="servletService" mime-type="text/html">
+ <map:serialize type="servletService">
<map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
</map:serialize>
</map:match>
@@ -37,7 +58,7 @@
<map:generate src="pages/xscript/getquote1.xsp" type="serverpages" />
<map:transform src="stylesheets/soap-getquote1.xsl" />
<!-- Make use of servlet services -->
- <map:serialize type="servletService" mime-type="text/html">
+ <map:serialize type="servletService">
<map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
</map:serialize>
<!-- I can't see where these params are used in the dynamic-page2html.xsl
@@ -56,7 +77,7 @@
<map:match pattern="xscript/*">
<map:generate src="pages/xscript/{1}.xsp" type="serverpages" />
<!-- Make use of servlet services -->
- <map:serialize type="servletService" mime-type="text/html">
+ <map:serialize type="servletService">
<map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
</map:serialize>
<!-- I can't see where these params are used in the dynamic-page2html.xsl
@@ -77,7 +98,7 @@
<map:match pattern="*">
<map:generate src="pages/{1}.xsp" type="serverpages" />
<!-- Make use of servlet services -->
- <map:serialize type="servletService" mime-type="text/html">
+ <map:serialize type="servletService">
<map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
</map:serialize>
</map:match>