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:14:42 UTC
svn commit: r539143 - in /cocoon/trunk/blocks:
cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/
cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/
cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/
Author: felixk
Date: Thu May 17 15:14:42 2007
New Revision: 539143
URL: http://svn.apache.org/viewvc?view=rev&rev=539143
Log:
remove mime-type because it's fixed now
Modified:
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539143&r1=539142&r2=539143
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 15:14:42 2007
@@ -16,8 +16,13 @@
limitations under the License.
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
<!-- =========================== Components ================================ -->
+
<map:components>
+
+ <!-- =========================== Transformers ================================ -->
+
<map:transformers default="xslt">
<!-- include the transformer like this:
-->
@@ -36,7 +41,7 @@
<map:view from-label="content" name="pretty-content">
<!-- 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:view>
@@ -56,6 +61,7 @@
</map:views>
<!-- =========================== Pipelines ================================= -->
+
<map:pipelines>
<map:pipeline>
<map:match pattern="">
@@ -65,7 +71,7 @@
<map:match pattern="samples">
<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>
Modified: cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539143&r1=539142&r2=539143
==============================================================================
--- cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 15:14:42 2007
@@ -31,7 +31,7 @@
</map:view>
<map:view from-label="content" name="pretty-content">
- <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:view>
@@ -52,7 +52,7 @@
<map:match pattern="welcome">
<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>
@@ -60,7 +60,7 @@
<map:match pattern="xwelcome">
<map:generate src="xmldb:xindice-embed:///db/cocoon/xsamples.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>
@@ -82,7 +82,7 @@
<map:transform src="xmldb2samples.xsl" />
<map:transform type="servletLinkRewriter" />
<!-- 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>
@@ -91,7 +91,7 @@
<map:transform src="xmldb2samples.xsl" />
<map:transform type="servletLinkRewriter" />
<!-- 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>
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539143&r1=539142&r2=539143
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 15:14:42 2007
@@ -17,7 +17,13 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <!-- =========================== Componenets ================================= -->
+
<map:components>
+
+ <!-- =========================== Matchers ================================= -->
+
<map:matchers default="wildcard">
<map:matcher logger="sitemap.matcher.header" name="filename" src="org.apache.cocoon.matching.modular.CachingRegexpMatcher">
<input-module name="request-param">
@@ -25,6 +31,7 @@
</input-module>
</map:matcher>
</map:matchers>
+
</map:components>
<!-- =========================== Views =================================== -->
@@ -36,7 +43,7 @@
<map:view from-label="content" name="pretty-content">
<!-- 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:view>
@@ -54,7 +61,7 @@
<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>
@@ -67,7 +74,7 @@
<map:match pattern="java/*">
<map:generate src="java/{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
@@ -88,7 +95,7 @@
<map:parameter name="programming-language" value="js" />
</map:generate>
<!-- 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
@@ -109,7 +116,7 @@
<map:parameter name="programming-language" value="python" />
</map:generate>
<!-- 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