unico 2004/03/10 08:26:19
Modified: src/webapp/samples sitemap.xmap
Removed: src/webapp/samples/xsp samples.xml sitemap.xmap
src/webapp/samples/xsp/java logicsheet.xsp simple.xsp
request.xsp cookie.xsp sessionpage.xsp
cacheable.xsp upload.xsp hello.xsp session.xsp
response.xsp resolver.xsp
src/webapp/samples/xsp/logicsheets hello.xsl
src/webapp/samples/myapp/xml page.xml
src/webapp/samples/soap/stylesheets soap-getquote1.xsl
soap-getquote3.xsl
src/webapp/samples/soap/pages/xscript getquote1.xsp test.xsp
getquote3.xsp getquote2.xsp simple.xsp
src/webapp/samples/xsp/stream OrderPage.xml
src/webapp/samples/xsp/javascript simple.xsp response.xsp
request.xsp hello.xsp session.xsp
src/webapp/samples/myapp sitemap.xmap readme.html
src/webapp/samples/soap/pages currency.xsp temperature.xsp
src/webapp/samples/soap samples.xml sitemap.xmap
src/webapp/samples/myapp/xsl style.xsl
src/webapp/samples/xsp/python hello.xsp
src/webapp/samples/common view-source.xsp
src/webapp/samples/myapp/xsp page.xsp
Log:
xsp has become a block
Revision Changes Path
1.20 +6 -24 cocoon-2.2/src/webapp/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/sitemap.xmap,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sitemap.xmap 10 Mar 2004 10:05:07 -0000 1.19
+++ sitemap.xmap 10 Mar 2004 16:26:19 -0000 1.20
@@ -28,13 +28,7 @@
<map:transformers default="xslt"/>
<map:readers default="resource"/>
<map:serializers default="html"/>
- <map:matchers default="wildcard">
- <map:matcher logger="sitemap.matcher.header" name="filename"
src="org.apache.cocoon.matching.modular.CachingRegexpMatcher">
- <input-module name="request-param">
- <parameter>filename</parameter>
- </input-module>
- </map:matcher>
- </map:matchers>
+ <map:matchers default="wildcard"/>
<map:selectors default="browser"/>
</map:components>
@@ -143,9 +137,9 @@
<map:match pattern="clearcache.html">
<map:act type="clear-cache">
<map:generate src="status" type="status"/>
- <map:transform src="context://stylesheets/system/status2html.xslt">
+ <map:transform src="context://stylesheets/system/status2html.xslt">
<map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
+ </map:transform>
<map:serialize/>
</map:act>
</map:match>
@@ -153,9 +147,9 @@
<map:match pattern="clearpersistentstore.html">
<map:act type="clear-persistent-store">
<map:generate src="status" type="status"/>
- <map:transform src="context://stylesheets/system/status2html.xslt">
+ <map:transform src="context://stylesheets/system/status2html.xslt">
<map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
+ </map:transform>
<map:serialize/>
</map:act>
</map:match>
@@ -172,18 +166,6 @@
<map:mount uri-prefix="{1}" src="{1}/" check-reload="yes"/>
</map:match>
- </map:pipeline>
-
- <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:generate src="common/view-source.xsp" type="serverpages"/>
- <map:serialize/>
- </map:match>
- <!-- all other files are just send as text -->
- <map:read mime-type="text/plain" src="../{request-param:filename}"/>
- </map:match>
</map:pipeline>
</map:pipelines>
