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/28 22:17:18 UTC
svn commit: r542312 [14/14] - in /cocoon/trunk/blocks:
cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/
cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/
cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ co...
Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/sitemap.xmap Mon May 28 13:17:10 2007
@@ -17,74 +17,74 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-<map:components>
- <map:include-properties dir="properties"/>
- <map:generators default="file">
- <map:generator name="traverse" src="org.apache.cocoon.generation.TraversableGenerator"/>
- </map:generators>
-</map:components>
-
-<map:pipelines>
- <map:pipeline>
-
- <map:match pattern="repo/">
- <map:generate type="traverse" src="{global:staging}repo/">
- <map:parameter name="exclude" value="[\w]*.meta"/>
- </map:generate>
- <map:transform src="{global:staging}styles/dir2html.xsl"/>
- <map:serialize type="html"/>
- </map:match>
-
- <map:match pattern="repo/**/">
- <map:generate type="traverse" src="{global:staging}repo/{1}/">
- <map:parameter name="exclude" value="[\w]*.meta"/>
- </map:generate>
- <map:transform src="{global:staging}styles/dir2html.xsl"/>
- <map:serialize type="html"/>
- </map:match>
+ <map:components>
+ <map:include-properties dir="properties" />
+ <map:generators default="file">
+ <map:generator name="traverse" src="org.apache.cocoon.generation.TraversableGenerator" />
+ </map:generators>
+ </map:components>
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="repo/">
+ <map:generate type="traverse" src="{global:staging}repo/">
+ <map:parameter name="exclude" value="[\w]*.meta" />
+ </map:generate>
+ <map:transform src="{global:staging}styles/dir2html.xsl" />
+ <map:serialize type="html" />
+ </map:match>
+
+ <map:match pattern="repo/**/">
+ <map:generate type="traverse" src="{global:staging}repo/{1}/">
+ <map:parameter name="exclude" value="[\w]*.meta" />
+ </map:generate>
+ <map:transform src="{global:staging}styles/dir2html.xsl" />
+ <map:serialize type="html" />
+ </map:match>
- <map:match pattern="**/new">
- <map:generate src="{global:staging}new.xml"/>
+ <map:match pattern="**/new">
+ <map:generate src="{global:staging}new.xml" />
<map:transform src="{global:staging}styles/new2html.xsl">
- <map:parameter name="file" value="{1}/new"/>
- <map:parameter name="requestURI" value="{request:requestURI}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+ <map:parameter name="file" value="{1}/new" />
+ <map:parameter name="requestURI" value="{request:requestURI}" />
+ <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
</map:transform>
- <map:serialize type="html"/>
- </map:match>
+ <map:serialize type="html" />
+ </map:match>
- <map:match pattern="repo/**">
+ <map:match pattern="repo/**">
<map:aggregate element="page">
- <map:part src="cocoon:/page/{1}"/>
- <map:part src="cocoon:/metapage/{1}"/>
+ <map:part src="cocoon:/page/{1}" />
+ <map:part src="cocoon:/metapage/{1}" />
</map:aggregate>
<map:transform src="{global:staging}styles/file2html.xsl">
- <map:parameter name="file" value="repo/{1}"/>
- <map:parameter name="requestURI" value="{request:requestURI}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+ <map:parameter name="file" value="repo/{1}" />
+ <map:parameter name="requestURI" value="{request:requestURI}" />
+ <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
</map:transform>
- <map:serialize type="html"/>
- </map:match>
- <map:match pattern="page/**">
- <map:generate src="{global:staging}repo/{1}"/>
- <map:serialize type="xml"/>
- </map:match>
- <map:match pattern="metapage/**">
- <map:generate src="{global:staging}repo/{1}.meta"/>
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="write/**">
- <map:generate type="request"/>
- <map:transform src="{global:staging}styles/request2doc.xsl"/>
+ <map:serialize type="html" />
+ </map:match>
+ <map:match pattern="page/**">
+ <map:generate src="{global:staging}repo/{1}" />
+ <map:serialize type="xml" />
+ </map:match>
+ <map:match pattern="metapage/**">
+ <map:generate src="{global:staging}repo/{1}.meta" />
+ <map:serialize type="xml" />
+ </map:match>
+
+ <map:match pattern="write/**">
+ <map:generate type="request" />
+ <map:transform src="{global:staging}styles/request2doc.xsl" />
<map:transform src="{global:staging}styles/doc2write.xsl">
- <map:parameter name="file" value="{global:staging}{1}"/>
+ <map:parameter name="file" value="{global:staging}{1}" />
</map:transform>
- <map:transform type="write-source"/>
- <map:serialize type="xml"/>
- </map:match>
+ <map:transform type="write-source" />
+ <map:serialize type="xml" />
+ </map:match>
- </map:pipeline>
-</map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/META-INF/cocoon/spring/cocoon-webdav-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/META-INF/cocoon/spring/cocoon-webdav-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/META-INF/cocoon/spring/cocoon-webdav-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/META-INF/cocoon/spring/cocoon-webdav-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
- <bean id="org.apache.cocoon.webdavs.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-webdav-sample" context-path="blockcontext:/cocoon-webdav-sample/">
- <servlet:connections>
- <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
- </servlet:connections>
- </servlet:context>
- </bean>
+ <bean id="org.apache.cocoon.webdavs.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-webdav-sample" context-path="blockcontext:/cocoon-webdav-sample/">
+ <servlet:connections>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
</beans>
Modified: cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-xmldb-sitemap.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-xmldb-sitemap.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-xmldb-sitemap.xconf (original)
+++ cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-xmldb-sitemap.xconf Mon May 28 13:17:10 2007
@@ -21,11 +21,11 @@
+-->
<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<map:transformers>
- <map:transformer logger="sitemap.transformer.xmldb" name="xmldb" src="org.apache.cocoon.transformation.XMLDBTransformer">
+ <map:transformer logger="sitemap.transformer.xmldb" name="xmldb" src="org.apache.cocoon.transformation.XMLDBTransformer">
<!-- Driver class (optional). Uncomment if you want XMLDBTransformer
- to create and register XML:DB database. Keep commented out if
- database created somewhere else (for example, by XML:DB source factory)
- <driver>org.apache.xindice.client.xmldb.embed.DatabaseImpl</driver>
+ to create and register XML:DB database. Keep commented out if
+ database created somewhere else (for example, by XML:DB source factory)
+ <driver>org.apache.xindice.client.xmldb.embed.DatabaseImpl</driver>
-->
<base>xmldb:xindice-embed:///db</base>
</map:transformer>
Modified: cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/main/resources/WEB-INF/xindice.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/main/resources/WEB-INF/xindice.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/main/resources/WEB-INF/xindice.xml (original)
+++ cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/src/main/resources/WEB-INF/xindice.xml Mon May 28 13:17:10 2007
@@ -28,66 +28,65 @@
-->
<xindice>
+ <!--
+ - Defines the database instance. Xindice server in servlet mode currently
+ - supports only one database instance. Attributes:
+ - dbroot:
+ - Identifies location of the database. Relative paths will be
+ - resolved depending on mode of operation.
+ - name:
+ - Name of the database instance.
+ - use-metadata:
+ - When set to 'on', enables external metadata facilities
+ - for this database instance.
+ -->
+ <root-collection dbroot="./db/" name="db" use-metadata="on">
+
<!--
- - Defines the database instance. Xindice server in servlet mode currently
- - supports only one database instance. Attributes:
- - dbroot:
- - Identifies location of the database. Relative paths will be
- - resolved depending on mode of operation.
- - name:
- - Name of the database instance.
- - use-metadata:
- - When set to 'on', enables external metadata facilities
- - for this database instance.
+ - Query Engine Configuration.
+ -->
+ <queryengine>
+ <!--
+ - XPath query engine. Has single configuration parameter.
+ - autoindex:
+ - If true, for every XPath query, XPath query engine will create
+ - all the indexes it can use to evaluate the query.
-->
- <root-collection dbroot="./db/" name="db" use-metadata="on">
-
- <!--
- - Query Engine Configuration.
- -->
- <queryengine>
- <!--
- - XPath query engine. Has single configuration parameter.
- - autoindex:
- - If true, for every XPath query, XPath query engine will create
- - all the indexes it can use to evaluate the query.
- -->
- <resolver class="org.apache.xindice.core.query.XPathQueryResolver"
- autoindex="false"/>
+ <resolver class="org.apache.xindice.core.query.XPathQueryResolver" autoindex="false" />
- <!--
- - XUpdate engine. Has no configuration parameters.
- -->
- <resolver class="org.apache.xindice.core.xupdate.XUpdateQueryResolver"/>
- </queryengine>
- </root-collection>
+ <!--
+ - XUpdate engine. Has no configuration parameters.
+ -->
+ <resolver class="org.apache.xindice.core.xupdate.XUpdateQueryResolver" />
+ </queryengine>
+ </root-collection>
- <!--
- - Xindice supports multiple DB instances. Uncomment entry below to have
- - second database instance, named 'db2'.
- -
+ <!--
+ - Xindice supports multiple DB instances. Uncomment entry below to have
+ - second database instance, named 'db2'.
+ -
<root-collection dbroot="./db2/" name="db2" use-metadata="off">
- <queryengine>
- <resolver class="org.apache.xindice.core.query.XPathQueryResolver"
- autoindex="false"/>
- <resolver class="org.apache.xindice.core.xupdate.XUpdateQueryResolver"/>
- </queryengine>
+ <queryengine>
+ <resolver class="org.apache.xindice.core.query.XPathQueryResolver"
+ autoindex="false"/>
+ <resolver class="org.apache.xindice.core.xupdate.XUpdateQueryResolver"/>
+ </queryengine>
</root-collection>
- -->
+ -->
- <!--
- - XML-RPC configuration for the Xindice server. Specifies name of the parser
- - to be used by XML-RPC. Apache XML-RPC knows following parsers:
- - xerces org.apache.xerces.parsers.SAXParser
- - xp com.jclark.xml.sax.Driver
- - ibm1 com.ibm.xml.parser.SAXDriver
- - ibm2 com.ibm.xml.parsers.SAXParser
- - aelfred com.microstar.xml.SAXDriver
- - oracle1 oracle.xml.parser.XMLParser
- - oracle2 oracle.xml.parser.v2.SAXParser
- - openxml org.openxml.parser.XMLSAXParser
- -->
- <xml-rpc>
- <driver name="xerces"/>
- </xml-rpc>
+ <!--
+ - XML-RPC configuration for the Xindice server. Specifies name of the parser
+ - to be used by XML-RPC. Apache XML-RPC knows following parsers:
+ - xerces org.apache.xerces.parsers.SAXParser
+ - xp com.jclark.xml.sax.Driver
+ - ibm1 com.ibm.xml.parser.SAXDriver
+ - ibm2 com.ibm.xml.parsers.SAXParser
+ - aelfred com.microstar.xml.SAXDriver
+ - oracle1 oracle.xml.parser.XMLParser
+ - oracle2 oracle.xml.parser.v2.SAXParser
+ - openxml org.openxml.parser.XMLSAXParser
+ -->
+ <xml-rpc>
+ <driver name="xerces" />
+ </xml-rpc>
</xindice>
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=542312&r1=542311&r2=542312
==============================================================================
--- 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 Mon May 28 13:17:10 2007
@@ -23,88 +23,88 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Views =================================== -->
+ <!-- =========================== Views =================================== -->
- <map:views>
- <map:view name="content" from-label="content">
- <map:serialize type="xml" />
- </map:view>
-
- <map:view from-label="content" name="pretty-content">
- <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:redirect-to uri="welcome" />
- </map:match>
-
- <map:match pattern="welcome">
- <map:generate src="samples.xml" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="xwelcome">
- <map:generate src="xmldb:xindice-embed:///db/cocoon/xsamples.xml" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="xmount/**">
- <map:mount uri-prefix="xmount" src="xmldb:xindice-embed:///db/cocoon/sitemap" />
- </map:match>
-
- <map:match pattern="populate">
- <map:generate src="populate.xml" />
- <map:transform type="cinclude" />
- <map:transform type="xmldb" />
- <map:serialize />
- </map:match>
-
- <map:match pattern="browse/**">
- <map:match type="request-parameter" pattern="xpath">
- <map:generate src="xmldb:xindice-embed:///db/{../1}#{1}" />
- <map:transform src="xmldb2samples.xsl" />
- <map:transform type="servletLinkRewriter" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
- </map:serialize>
- </map:match>
-
- <map:generate src="xmldb:xindice-embed:///db/{1}" />
- <map:transform src="xmldb2samples.xsl" />
- <map:transform type="servletLinkRewriter" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="db/**">
- <map:match type="request-parameter" pattern="xpath">
- <map:generate src="xmldb:xindice-embed:///db/{../1}#{1}" />
- <map:serialize type="xml" />
- </map:match>
- <map:generate src="xmldb:xindice-embed:///db/{1}" />
- <map:serialize type="xml" />
- </map:match>
- </map:pipeline>
+ <map:views>
+ <map:view name="content" from-label="content">
+ <map:serialize type="xml" />
+ </map:view>
+
+ <map:view from-label="content" name="pretty-content">
+ <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:redirect-to uri="welcome" />
+ </map:match>
+
+ <map:match pattern="welcome">
+ <map:generate src="samples.xml" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ </map:serialize>
+ </map:match>
+
+ <map:match pattern="xwelcome">
+ <map:generate src="xmldb:xindice-embed:///db/cocoon/xsamples.xml" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ </map:serialize>
+ </map:match>
+
+ <map:match pattern="xmount/**">
+ <map:mount uri-prefix="xmount" src="xmldb:xindice-embed:///db/cocoon/sitemap" />
+ </map:match>
+
+ <map:match pattern="populate">
+ <map:generate src="populate.xml" />
+ <map:transform type="cinclude" />
+ <map:transform type="xmldb" />
+ <map:serialize />
+ </map:match>
+
+ <map:match pattern="browse/**">
+ <map:match type="request-parameter" pattern="xpath">
+ <map:generate src="xmldb:xindice-embed:///db/{../1}#{1}" />
+ <map:transform src="xmldb2samples.xsl" />
+ <map:transform type="servletLinkRewriter" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ </map:serialize>
+ </map:match>
+
+ <map:generate src="xmldb:xindice-embed:///db/{1}" />
+ <map:transform src="xmldb2samples.xsl" />
+ <map:transform type="servletLinkRewriter" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ </map:serialize>
+ </map:match>
+
+ <map:match pattern="db/**">
+ <map:match type="request-parameter" pattern="xpath">
+ <map:generate src="xmldb:xindice-embed:///db/{../1}#{1}" />
+ <map:serialize type="xml" />
+ </map:match>
+ <map:generate src="xmldb:xindice-embed:///db/{1}" />
+ <map:serialize type="xml" />
+ </map:match>
+ </map:pipeline>
- </map:pipelines>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xmldb-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xmldb-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xmldb-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xmldb-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
- <bean id="org.apache.cocoon.xmldb.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-xmldb-sample" context-path="blockcontext:/cocoon-xmldb-sample/">
- <servlet:connections>
- <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
- </servlet:connections>
- </servlet:context>
- </bean>
+ <bean id="org.apache.cocoon.xmldb.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-xmldb-sample" context-path="blockcontext:/cocoon-xmldb-sample/">
+ <servlet:connections>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
</beans>
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=542312&r1=542311&r2=542312
==============================================================================
--- 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 Mon May 28 13:17:10 2007
@@ -18,137 +18,137 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Componenets ================================= -->
+ <!-- =========================== Componenets ================================= -->
- <map:components>
+ <map:components>
- <!-- =========================== Matchers ================================= -->
+ <!-- =========================== 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">
- <parameter>filename</parameter>
- </input-module>
- </map:matcher>
- </map:matchers>
-
- </map:components>
-
- <!-- =========================== 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">
- <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="java/*.zip">
- <map:generate src="java/{1}.xsp" type="serverpages" label="content" />
- <map:serialize type="zip" />
- </map:match>
-
- <map:match pattern="java/*">
- <map:generate src="java/{1}.xsp" type="serverpages" />
- <!-- Make use of servlet services -->
- <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
- <map:transform src="servlet:style-default:/blocks/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="xsp/{1}.xsp"/>
- <map:parameter name="remove" value="{0}"/>
- </map:transform>
- <map:transform type="servletLinkRewriter" />
- <map:serialize/>
- -->
- </map:match>
-
- <map:match pattern="js/*">
- <map:generate src="javascript/{1}.xsp" type="serverpages">
- <map:parameter name="programming-language" value="js" />
- </map:generate>
- <!-- Make use of servlet services -->
- <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
- <map:transform src="servlet:style-default:/blocks/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="xsp-js/{1}.xsp"/>
- <map:parameter name="remove" value="{0}"/>
- </map:transform>
- <map:transform type="servletLinkRewriter" />
- <map:serialize/>
- -->
- </map:match>
-
- <map:match pattern="python/*">
- <map:generate src="python/{1}.xsp" type="serverpages">
- <map:parameter name="programming-language" value="python" />
- </map:generate>
- <!-- Make use of servlet services -->
- <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
- <map:transform src="servlet:style-default:/blocks/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="xsp-js/{1}.xsp"/>
- <map:parameter name="remove" value="{0}"/>
- </map:transform>
- <map:transform type="servletLinkRewriter" />
- <map:serialize/>
- -->
- </map:match>
-
- <map:match pattern="soap/**">
- <map:mount uri-prefix="soap" src="soap/" />
- </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="util/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: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:components>
+
+ <!-- =========================== 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">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ </map:serialize>
+ </map:match>
+
+ <map:match pattern="java/*.zip">
+ <map:generate src="java/{1}.xsp" type="serverpages" label="content" />
+ <map:serialize type="zip" />
+ </map:match>
+
+ <map:match pattern="java/*">
+ <map:generate src="java/{1}.xsp" type="serverpages" />
+ <!-- Make use of servlet services -->
+ <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
+ <map:transform src="servlet:style-default:/blocks/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="xsp/{1}.xsp"/>
+ <map:parameter name="remove" value="{0}"/>
+ </map:transform>
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize/>
+ -->
+ </map:match>
+
+ <map:match pattern="js/*">
+ <map:generate src="javascript/{1}.xsp" type="serverpages">
+ <map:parameter name="programming-language" value="js" />
+ </map:generate>
+ <!-- Make use of servlet services -->
+ <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
+ <map:transform src="servlet:style-default:/blocks/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="xsp-js/{1}.xsp"/>
+ <map:parameter name="remove" value="{0}"/>
+ </map:transform>
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize/>
+ -->
+ </map:match>
+
+ <map:match pattern="python/*">
+ <map:generate src="python/{1}.xsp" type="serverpages">
+ <map:parameter name="programming-language" value="python" />
+ </map:generate>
+ <!-- Make use of servlet services -->
+ <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
+ <map:transform src="servlet:style-default:/blocks/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="xsp-js/{1}.xsp"/>
+ <map:parameter name="remove" value="{0}"/>
+ </map:transform>
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize/>
+ -->
+ </map:match>
+
+ <map:match pattern="soap/**">
+ <map:mount uri-prefix="soap" src="soap/" />
+ </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="util/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>
+ </map:pipelines>
</map:sitemap>
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=542312&r1=542311&r2=542312
==============================================================================
--- 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 Mon May 28 13:17:10 2007
@@ -20,89 +20,89 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Views =================================== -->
+ <!-- =========================== 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">
- <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
- </map:serialize>
- </map:match>
-
- <!-- ======================== XScript Samples ========================= -->
-
- <map:match pattern="xscript/getquote1">
- <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">
- <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
- <map:transform src="servlet:style-default:/blocks/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="pages/{0}.xsp"/>
- <map:parameter name="remove" value="{0}"/>
- </map:transform>
- <map:transform type="servletLinkRewriter" />
- <map:serialize/>
- -->
- </map:match>
-
- <map:match pattern="xscript/*">
- <map:generate src="pages/xscript/{1}.xsp" type="serverpages" />
- <!-- Make use of servlet services -->
- <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
- <map:transform src="servlet:style-default:/blocks/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="pages/{0}.xsp"/>
- <map:parameter name="remove" value="{0}"/>
- </map:transform>
- <map:transform type="servletLinkRewriter" />
- <map:serialize/>
- -->
- </map:match>
-
- <!-- ======================== XScript Samples ========================= -->
-
- <map:match pattern="*">
- <map:generate src="pages/{1}.xsp" type="serverpages" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
- </map:serialize>
- </map:match>
+ <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">
+ <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+ </map:serialize>
+ </map:match>
+
+ <!-- ======================== XScript Samples ========================= -->
+
+ <map:match pattern="xscript/getquote1">
+ <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">
+ <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
+ <map:transform src="servlet:style-default:/blocks/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="pages/{0}.xsp"/>
+ <map:parameter name="remove" value="{0}"/>
+ </map:transform>
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize/>
+ -->
+ </map:match>
+
+ <map:match pattern="xscript/*">
+ <map:generate src="pages/xscript/{1}.xsp" type="serverpages" />
+ <!-- Make use of servlet services -->
+ <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
+ <map:transform src="servlet:style-default:/blocks/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="pages/{0}.xsp"/>
+ <map:parameter name="remove" value="{0}"/>
+ </map:transform>
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize/>
+ -->
+ </map:match>
+
+ <!-- ======================== XScript Samples ========================= -->
+
+ <map:match pattern="*">
+ <map:generate src="pages/{1}.xsp" type="serverpages" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+ </map:serialize>
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xsp-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xsp-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xsp-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xsp-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
- <bean id="org.apache.cocoon.xsp.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-xsp-sample" context-path="blockcontext:/cocoon-xsp-sample/">
- <servlet:connections>
- <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
- </servlet:connections>
- </servlet:context>
- </bean>
+ <bean id="org.apache.cocoon.xsp.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-xsp-sample" context-path="blockcontext:/cocoon-xsp-sample/">
+ <servlet:connections>
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
</beans>