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 [9/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/ coc...
Modified: cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -21,105 +21,105 @@
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Componenets =================================== -->
+ <!-- =========================== Componenets =================================== -->
- <map:components>
+ <map:components>
- <!-- =========================== Generators =================================== -->
+ <!-- =========================== Generators =================================== -->
- <map:generators default="file">
- <map:generator name="traversable" logger="sitemap.generator.traversable" src="org.apache.cocoon.generation.TraversableGenerator" />
- </map:generators>
-
- </map:components>
-
- <!-- =========================== 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>
-
- <!-- =========================== 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:serialize />
- </map:match>
-
- <map:match pattern="populate">
- <map:generate src="populate.xml" />
- <map:transform type="cinclude" />
- <map:transform type="write-source" />
- <map:serialize />
- </map:match>
-
- <!-- WildcardURISelector would be just perfect here -->
- <map:match pattern="browse/">
- <map:generate type="traversable" src="jcr://" />
- <map:transform src="dir2samples.xsl" />
- <!-- 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="browse/**/">
- <map:generate type="traversable" src="jcr://{1}/" />
- <map:transform src="dir2samples.xsl" />
- <!-- 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="browse/**">
- <map:generate src="jcr://{1}" />
- <map:transform src="dir2samples.xsl" />
- <!-- 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="repository/">
- <map:generate type="traversable" src="jcr://" />
- <map:serialize type="xml" />
- </map:match>
- <map:match pattern="repository/**/">
- <map:generate type="traversable" src="jcr://{1}/" />
- <map:serialize type="xml" />
- </map:match>
- <map:match pattern="repository/**">
- <map:generate src="jcr://{1}" />
- <map:serialize type="xml" />
- </map:match>
-
- <!-- Mount sitemap from repository -->
- <map:match pattern="mount/**">
- <map:mount uri-prefix="mount" src="jcr://cocoon/sitemap" />
- </map:match>
+ <map:generators default="file">
+ <map:generator name="traversable" logger="sitemap.generator.traversable" src="org.apache.cocoon.generation.TraversableGenerator" />
+ </map:generators>
+
+ </map:components>
+
+ <!-- =========================== 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>
+
+ <!-- =========================== 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:serialize />
+ </map:match>
+
+ <map:match pattern="populate">
+ <map:generate src="populate.xml" />
+ <map:transform type="cinclude" />
+ <map:transform type="write-source" />
+ <map:serialize />
+ </map:match>
+
+ <!-- WildcardURISelector would be just perfect here -->
+ <map:match pattern="browse/">
+ <map:generate type="traversable" src="jcr://" />
+ <map:transform src="dir2samples.xsl" />
+ <!-- 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="browse/**/">
+ <map:generate type="traversable" src="jcr://{1}/" />
+ <map:transform src="dir2samples.xsl" />
+ <!-- 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="browse/**">
+ <map:generate src="jcr://{1}" />
+ <map:transform src="dir2samples.xsl" />
+ <!-- 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="repository/">
+ <map:generate type="traversable" src="jcr://" />
+ <map:serialize type="xml" />
+ </map:match>
+ <map:match pattern="repository/**/">
+ <map:generate type="traversable" src="jcr://{1}/" />
+ <map:serialize type="xml" />
+ </map:match>
+ <map:match pattern="repository/**">
+ <map:generate src="jcr://{1}" />
+ <map:serialize type="xml" />
+ </map:match>
+
+ <!-- Mount sitemap from repository -->
+ <map:match pattern="mount/**">
+ <map:mount uri-prefix="mount" src="jcr://cocoon/sitemap" />
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jcr-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jcr-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jcr-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jcr-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.jcr.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-jcr-sample" context-path="blockcontext:/cocoon-jcr-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.jcr.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-jcr-sample" context-path="blockcontext:/cocoon-jcr-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-jfor/cocoon-jfor-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -20,70 +20,70 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Views =================================== -->
+ <!-- =========================== 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>
-
- <!-- =========================== Pipelines =================================== -->
-
- <map:pipelines>
- <map:pipeline type="caching">
- <map:match pattern="">
- <map:redirect-to uri="welcome" />
- </map:match>
-
- <map:match pattern="welcome">
- <map:generate src="misc/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>
-
- <!-- ========================= jfor ================================ -->
-
- <!-- hello world -->
- <map:match pattern="hello.rtf">
- <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
- <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl" />
- <map:serialize type="fo2rtf" />
- </map:match>
-
- <map:match pattern="*.fo.xml">
- <map:generate src="misc/{1}.fo.xml" />
- <map:serialize type="xml" />
- </map:match>
-
- <map:match pattern="*.rtf">
- <map:generate src="cocoon:/{1}.fo.xml" />
- <map:serialize type="fo2rtf" />
- </map:match>
-
- <map:match pattern="*.css">
- <map:read src="misc/{1}.css" />
- </map:match>
-
- <map:match pattern="**/*.css">
- <map:read src="misc/{2}.css" />
- </map:match>
+ <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>
+
+ <!-- =========================== Pipelines =================================== -->
+
+ <map:pipelines>
+ <map:pipeline type="caching">
+ <map:match pattern="">
+ <map:redirect-to uri="welcome" />
+ </map:match>
+
+ <map:match pattern="welcome">
+ <map:generate src="misc/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>
+
+ <!-- ========================= jfor ================================ -->
+
+ <!-- hello world -->
+ <map:match pattern="hello.rtf">
+ <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
+ <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl" />
+ <map:serialize type="fo2rtf" />
+ </map:match>
+
+ <map:match pattern="*.fo.xml">
+ <map:generate src="misc/{1}.fo.xml" />
+ <map:serialize type="xml" />
+ </map:match>
+
+ <map:match pattern="*.rtf">
+ <map:generate src="cocoon:/{1}.fo.xml" />
+ <map:serialize type="fo2rtf" />
+ </map:match>
+
+ <map:match pattern="*.css">
+ <map:read src="misc/{1}.css" />
+ </map:match>
+
+ <map:match pattern="**/*.css">
+ <map:read src="misc/{2}.css" />
+ </map:match>
- </map:pipeline>
+ </map:pipeline>
- </map:pipelines>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jfor-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jfor-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jfor-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jfor-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,12 +23,12 @@
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.jfor.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-jfor-sample" context-path="blockcontext:/cocoon-jfor-sample/">
- <servlet:connections>
- <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
- <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
- </servlet:connections>
- </servlet:context>
- </bean>
+ <bean id="org.apache.cocoon.jfor.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-jfor-sample" context-path="blockcontext:/cocoon-jfor-sample/">
+ <servlet:connections>
+ <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
+ <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+ </servlet:connections>
+ </servlet:context>
+ </bean>
</beans>
Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/database/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/database/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/database/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/database/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,98 +24,98 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Components =================================== -->
+ <!-- =========================== Components =================================== -->
- <map:components>
+ <map:components>
- <!-- =========================== Matchers =================================== -->
+ <!-- =========================== Matchers =================================== -->
- <map:matchers default="wildcard">
- <map:matcher name="host-matcher" logger="sitemap.matcher.wildcard" src="org.apache.cocoon.matching.modular.CachingWildcardMatcher">
- <input-module name="request" />
- <parameter-name>serverName</parameter-name>
- </map:matcher>
- </map:matchers>
-
- <!-- =========================== Actions =================================== -->
-
- <map:actions>
- <map:action name="cacheevent" src="org.apache.cocoon.acting.CacheEventAction" />
- <map:action name="jmsevent" src="org.apache.cocoon.acting.JMSPublisherAction" logger="sitemap.actions.jms">
- <parameter name="connection" value="local-topics" />
- <parameter name="topic" value="topic1" />
- </map:action>
- </map:actions>
-
- <!-- =========================== Pipes =================================== -->
-
- <map:pipes default="caching">
- <!-- A pipe must be defined configured to use the EventAware cache. -->
- <map:pipe name="event-aware" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline">
- <parameter name="cache-role" value="org.apache.cocoon.caching.Cache/EventAware" />
- </map:pipe>
- </map:pipes>
-
- </map:components>
-
- <!-- =========================== Views =================================== -->
-
- <map:views>
- <map:view name="content" from-label="content">
- <map:serialize type="xml" />
- </map:view>
- </map:views>
-
- <!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
-
- <!-- Our content must occur in a pipeline configured to use our Event Aware cache -->
- <map:pipeline type="event-aware">
- <map:match pattern="eventcache">
- <map:generate type="serverpages" src="{0}.xsp" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
- </map:serialize>
- </map:match>
- </map:pipeline>
-
- <map:pipeline>
-
- <map:match pattern="">
- <map:redirect-to uri="eventcache" />
- </map:match>
-
- <map:match pattern="invalidate">
- <map:match type="host-matcher" pattern="localhost">
- <map:act type="cacheevent">
- <map:parameter name="event" value="{request-param:table}" />
- </map:act>
- <map:read src="invalidated.xml" />
- </map:match>
- <map:read src="access-error.xml" />
- </map:match>
-
- <map:match pattern="jms-invalidate">
- <map:match type="host-matcher" pattern="localhost">
- <map:act type="jmsevent">
- <map:parameter name="message" value="action|{request-param:table}" />
- </map:act>
- <map:read src="invalidated.xml" />
- </map:match>
- <map:read src="access-error.xml" />
- </map:match>
-
- <map:match pattern="*">
- <map:generate type="serverpages" src="{1}.xsp" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
- </map:serialize>
- </map:match>
- </map:pipeline>
+ <map:matchers default="wildcard">
+ <map:matcher name="host-matcher" logger="sitemap.matcher.wildcard" src="org.apache.cocoon.matching.modular.CachingWildcardMatcher">
+ <input-module name="request" />
+ <parameter-name>serverName</parameter-name>
+ </map:matcher>
+ </map:matchers>
+
+ <!-- =========================== Actions =================================== -->
+
+ <map:actions>
+ <map:action name="cacheevent" src="org.apache.cocoon.acting.CacheEventAction" />
+ <map:action name="jmsevent" src="org.apache.cocoon.acting.JMSPublisherAction" logger="sitemap.actions.jms">
+ <parameter name="connection" value="local-topics" />
+ <parameter name="topic" value="topic1" />
+ </map:action>
+ </map:actions>
+
+ <!-- =========================== Pipes =================================== -->
+
+ <map:pipes default="caching">
+ <!-- A pipe must be defined configured to use the EventAware cache. -->
+ <map:pipe name="event-aware" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline">
+ <parameter name="cache-role" value="org.apache.cocoon.caching.Cache/EventAware" />
+ </map:pipe>
+ </map:pipes>
+
+ </map:components>
+
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view name="content" from-label="content">
+ <map:serialize type="xml" />
+ </map:view>
+ </map:views>
+
+ <!-- =========================== Pipelines ================================= -->
+
+ <map:pipelines>
+
+ <!-- Our content must occur in a pipeline configured to use our Event Aware cache -->
+ <map:pipeline type="event-aware">
+ <map:match pattern="eventcache">
+ <map:generate type="serverpages" src="{0}.xsp" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+ </map:serialize>
+ </map:match>
+ </map:pipeline>
+
+ <map:pipeline>
+
+ <map:match pattern="">
+ <map:redirect-to uri="eventcache" />
+ </map:match>
+
+ <map:match pattern="invalidate">
+ <map:match type="host-matcher" pattern="localhost">
+ <map:act type="cacheevent">
+ <map:parameter name="event" value="{request-param:table}" />
+ </map:act>
+ <map:read src="invalidated.xml" />
+ </map:match>
+ <map:read src="access-error.xml" />
+ </map:match>
+
+ <map:match pattern="jms-invalidate">
+ <map:match type="host-matcher" pattern="localhost">
+ <map:act type="jmsevent">
+ <map:parameter name="message" value="action|{request-param:table}" />
+ </map:act>
+ <map:read src="invalidated.xml" />
+ </map:match>
+ <map:read src="access-error.xml" />
+ </map:match>
+
+ <map:match pattern="*">
+ <map:generate type="serverpages" src="{1}.xsp" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+ </map:serialize>
+ </map:match>
+ </map:pipeline>
- </map:pipelines>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -16,17 +16,17 @@
limitations under the License.
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:pipelines>
- <map:pipeline>
+ <map:pipelines>
+ <map:pipeline>
- <!--+
+ <!--+
| Mount everything else by calling the sitemap.xmap file located
| in the requested folder.
+-->
- <map:match pattern="*/**">
- <map:mount src="{1}/" uri-prefix="{1}"/>
- </map:match>
+ <map:match pattern="*/**">
+ <map:mount src="{1}/" uri-prefix="{1}" />
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jms-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.jms.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-jms-sample" context-path="blockcontext:/cocoon-jms-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.jms.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-jms-sample" context-path="blockcontext:/cocoon-jms-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-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -21,92 +21,92 @@
+-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- ========================== Components =============================== -->
+ <!-- ========================== Components =============================== -->
- <map:components>
+ <map:components>
- <!-- ========================== Generators =============================== -->
+ <!-- ========================== Generators =============================== -->
- <map:generators default="file">
- <!--+
- | JSPGenerator is used to get output of a JSP page
- | and parse as XML SAX events.
- +-->
- <map:generator name="jsp" label="content" logger="sitemap.generator.jsp" src="org.apache.cocoon.generation.JSPGenerator" />
- </map:generators>
-
- <!-- ========================== Readers =============================== -->
-
- <map:readers default="resource">
- <!--+
- | JSPReader is used to send output of a JSP page
- | directly into the response stream. Note, that JSP
- | can produce non XML, or even binary, result.
- +-->
- <map:reader name="jsp" logger="sitemap.reader.jsp" src="org.apache.cocoon.reading.JSPReader">
- <!--+
- | The configuration for the JSPReader with its default values:
- <buffer-size>8192</buffer-size>
- <output-encoding>UTF-8</output-encoding>
- +-->
- </map:reader>
- </map:readers>
- </map:components>
-
- <!-- =========================== 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>
-
- <!-- ========================== 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="*.htm">
- <map:read type="jsp" src="{1}.jsp" mime-type="text/html" />
- </map:match>
-
- <!-- Use this to debug your JSPs -->
- <map:match pattern="*.xml">
- <map:generate type="jsp" src="{1}.jsp" />
- <map:serialize type="xml" mime-type="text/xml" />
- </map:match>
-
- <map:match pattern="*.jsp">
- <map:generate type="jsp" src="{1}.jsp" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
- </map:serialize>
- </map:match>
+ <map:generators default="file">
+ <!--+
+ | JSPGenerator is used to get output of a JSP page
+ | and parse as XML SAX events.
+ +-->
+ <map:generator name="jsp" label="content" logger="sitemap.generator.jsp" src="org.apache.cocoon.generation.JSPGenerator" />
+ </map:generators>
+
+ <!-- ========================== Readers =============================== -->
+
+ <map:readers default="resource">
+ <!--+
+ | JSPReader is used to send output of a JSP page
+ | directly into the response stream. Note, that JSP
+ | can produce non XML, or even binary, result.
+ +-->
+ <map:reader name="jsp" logger="sitemap.reader.jsp" src="org.apache.cocoon.reading.JSPReader">
+ <!--+
+ | The configuration for the JSPReader with its default values:
+ <buffer-size>8192</buffer-size>
+ <output-encoding>UTF-8</output-encoding>
+ +-->
+ </map:reader>
+ </map:readers>
+ </map:components>
+
+ <!-- =========================== 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>
+
+ <!-- ========================== 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="*.htm">
+ <map:read type="jsp" src="{1}.jsp" mime-type="text/html" />
+ </map:match>
+
+ <!-- Use this to debug your JSPs -->
+ <map:match pattern="*.xml">
+ <map:generate type="jsp" src="{1}.jsp" />
+ <map:serialize type="xml" mime-type="text/xml" />
+ </map:match>
+
+ <map:match pattern="*.jsp">
+ <map:generate type="jsp" src="{1}.jsp" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+ </map:serialize>
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jsp-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jsp-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jsp-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-jsp-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.jsp.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-jsp-sample" context-path="blockcontext:/cocoon-jsp-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.jsp.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-jsp-sample" context-path="blockcontext:/cocoon-jsp-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-linkrewriter/cocoon-linkrewriter-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-linkrewriter.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-linkrewriter.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-linkrewriter.xconf (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-linkrewriter.xconf Mon May 28 13:17:10 2007
@@ -23,35 +23,27 @@
<components>
<input-modules>
- <!-- For the sitedemo sample -->
- <component-instance
- class="org.apache.cocoon.components.modules.input.XMLFileModule"
- logger="core.modules.xml" name="linkmap">
- <file src="cocoon://samples/linkrewriter/sitedemo/linkmap"/>
- <!-- Shouldn't this be the default? -->
- <reloadable>true</reloadable>
- </component-instance>
- <component-instance
- class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
- logger="core.modules.mapper" name="site">
- <input-module name="linkmap"/>
- <prefix>/site/</prefix>
- <suffix>/@href</suffix>
- </component-instance>
+ <!-- For the sitedemo sample -->
+ <component-instance class="org.apache.cocoon.components.modules.input.XMLFileModule" logger="core.modules.xml" name="linkmap">
+ <file src="cocoon://samples/linkrewriter/sitedemo/linkmap" />
+ <!-- Shouldn't this be the default? -->
+ <reloadable>true</reloadable>
+ </component-instance>
+ <component-instance class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule" logger="core.modules.mapper" name="site">
+ <input-module name="linkmap" />
+ <prefix>/site/</prefix>
+ <suffix>/@href</suffix>
+ </component-instance>
- <!-- For the bookdemo sample -->
- <component-instance
- class="org.apache.cocoon.components.modules.input.XMLFileModule"
- logger="core.modules.xml" name="book-raw">
- <!-- Shouldn't this be the default? -->
- <file src="cocoon://samples/linkrewriter/bookdemo/linkmap"/>
- <reloadable>true</reloadable>
- </component-instance>
- <component-instance
- class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
- logger="core.modules.mapper" name="book">
- <input-module name="book-raw"/>
- </component-instance>
+ <!-- For the bookdemo sample -->
+ <component-instance class="org.apache.cocoon.components.modules.input.XMLFileModule" logger="core.modules.xml" name="book-raw">
+ <!-- Shouldn't this be the default? -->
+ <file src="cocoon://samples/linkrewriter/bookdemo/linkmap" />
+ <reloadable>true</reloadable>
+ </component-instance>
+ <component-instance class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule" logger="core.modules.mapper" name="book">
+ <input-module name="book-raw" />
+ </component-instance>
</input-modules>
</components>
Modified: cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/bookdemo/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/bookdemo/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/bookdemo/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/bookdemo/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,64 +18,63 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-<!-- =========================== Components ================================ -->
+ <!-- =========================== Components ================================ -->
- <map:components>
- <map:transformers default="xslt">
- <map:transformer name="linkrewriter"
- src="org.apache.cocoon.transformation.LinkRewriterTransformer">
- <input-module name="book-raw">
- <file src="cocoon://samples/linkrewriter/bookdemo/linkmap" reloadable="true"/>
- </input-module>
- <input-module name="book">
+ <map:components>
+ <map:transformers default="xslt">
+ <map:transformer name="linkrewriter" src="org.apache.cocoon.transformation.LinkRewriterTransformer">
<input-module name="book-raw">
- <file src="{src}" reloadable="true"/>
+ <file src="cocoon://samples/linkrewriter/bookdemo/linkmap" reloadable="true" />
</input-module>
- <prefix>//*[@label='</prefix>
- <suffix>']/@href</suffix>
- </input-module>
- </map:transformer>
- </map:transformers>
- </map:components>
-
-<!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
- <map:pipeline>
-
- <map:match pattern="">
- <map:redirect-to uri="index.html"/>
- </map:match>
-
- <map:match pattern="*.html">
- <map:generate src="docs/{1}.html"/>
- <map:transform type="linkrewriter" src="cocoon:/linkmap">
- <!--
- <map:parameter name="prefix" value="//*[@label='"/>
- <map:parameter name="suffix" value="']/@href"/>
- -->
- </map:transform>
- <map:serialize/>
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="**/*.html">
- <map:generate src="docs/{1}/{2}.html"/>
- <map:transform type="linkrewriter" src="cocoon:/{1}/linkmap"/>
- <map:serialize/>
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="**linkmap">
- <map:generate src="docs/book.xml"/>
- <map:transform src="../stylesheets/absolutize-linkmap.xsl"/>
- <map:transform src="../stylesheets/relativize-linkmap.xsl">
- <map:parameter name="path" value="{0}"/>
- </map:transform>
- <map:serialize type="xml"/>
- </map:match>
+ <input-module name="book">
+ <input-module name="book-raw">
+ <file src="{src}" reloadable="true" />
+ </input-module>
+ <prefix>//*[@label='</prefix>
+ <suffix>']/@href</suffix>
+ </input-module>
+ </map:transformer>
+ </map:transformers>
+ </map:components>
+
+ <!-- =========================== Pipelines ================================= -->
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="">
+ <map:redirect-to uri="index.html" />
+ </map:match>
+
+ <map:match pattern="*.html">
+ <map:generate src="docs/{1}.html" />
+ <map:transform type="linkrewriter" src="cocoon:/linkmap">
+ <!--
+ <map:parameter name="prefix" value="//*[@label='"/>
+ <map:parameter name="suffix" value="']/@href"/>
+ -->
+ </map:transform>
+ <map:serialize />
+ <map:serialize type="xml" />
+ </map:match>
+
+ <map:match pattern="**/*.html">
+ <map:generate src="docs/{1}/{2}.html" />
+ <map:transform type="linkrewriter" src="cocoon:/{1}/linkmap" />
+ <map:serialize />
+ <map:serialize type="xml" />
+ </map:match>
+
+ <map:match pattern="**linkmap">
+ <map:generate src="docs/book.xml" />
+ <map:transform src="../stylesheets/absolutize-linkmap.xsl" />
+ <map:transform src="../stylesheets/relativize-linkmap.xsl">
+ <map:parameter name="path" value="{0}" />
+ </map:transform>
+ <map:serialize type="xml" />
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitedemo-ns/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitedemo-ns/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitedemo-ns/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitedemo-ns/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,61 +18,60 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-<!-- =========================== Components ================================ -->
+ <!-- =========================== Components ================================ -->
- <map:components>
- <map:transformers default="xslt">
- <map:transformer name="linkrewriter"
- src="org.apache.cocoon.transformation.LinkRewriterTransformer">
- <input-module name="linkmap">
- <file src="{src}" reloadable="true"/>
- </input-module>
- <input-module name="site">
+ <map:components>
+ <map:transformers default="xslt">
+ <map:transformer name="linkrewriter" src="org.apache.cocoon.transformation.LinkRewriterTransformer">
<input-module name="linkmap">
- <file src="{src}" reloadable="true"/>
+ <file src="{src}" reloadable="true" />
</input-module>
- <prefix>/site/</prefix>
- <suffix>/@href</suffix>
- </input-module>
- </map:transformer>
- </map:transformers>
- </map:components>
-
-<!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
- <map:pipeline>
-
- <map:match pattern="">
- <map:redirect-to uri="welcome"/>
- </map:match>
-
- <map:match pattern="**welcome">
- <map:generate src="docs/index.xml"/>
- <!-- Uses {src} and {prefix} var interpolation -->
- <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
- <map:parameter name="prefix" value="/site/"/>
- </map:transform>
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="abs-linkmap">
- <map:generate src="linkmap.xml"/>
- <map:transform src="../stylesheets/absolutize-linkmap.xsl"/>
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="**linkmap">
- <map:generate src="linkmap.xml"/>
- <map:transform src="../stylesheets/absolutize-linkmap.xsl"/>
- <map:transform src="../stylesheets/relativize-linkmap.xsl">
- <map:parameter name="path" value="{0}"/>
- </map:transform>
- <map:serialize type="xml"/>
- </map:match>
+ <input-module name="site">
+ <input-module name="linkmap">
+ <file src="{src}" reloadable="true" />
+ </input-module>
+ <prefix>/site/</prefix>
+ <suffix>/@href</suffix>
+ </input-module>
+ </map:transformer>
+ </map:transformers>
+ </map:components>
+
+ <!-- =========================== Pipelines ================================= -->
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="">
+ <map:redirect-to uri="welcome" />
+ </map:match>
+
+ <map:match pattern="**welcome">
+ <map:generate src="docs/index.xml" />
+ <!-- Uses {src} and {prefix} var interpolation -->
+ <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
+ <map:parameter name="prefix" value="/site/" />
+ </map:transform>
+ <map:serialize type="xml" />
+ </map:match>
+
+ <map:match pattern="abs-linkmap">
+ <map:generate src="linkmap.xml" />
+ <map:transform src="../stylesheets/absolutize-linkmap.xsl" />
+ <map:serialize type="xml" />
+ </map:match>
+
+ <map:match pattern="**linkmap">
+ <map:generate src="linkmap.xml" />
+ <map:transform src="../stylesheets/absolutize-linkmap.xsl" />
+ <map:transform src="../stylesheets/relativize-linkmap.xsl">
+ <map:parameter name="path" value="{0}" />
+ </map:transform>
+ <map:serialize type="xml" />
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitedemo/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitedemo/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitedemo/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitedemo/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,61 +18,60 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-<!-- =========================== Components ================================ -->
+ <!-- =========================== Components ================================ -->
- <map:components>
- <map:transformers default="xslt">
- <map:transformer name="linkrewriter"
- src="org.apache.cocoon.transformation.LinkRewriterTransformer">
- <input-module name="linkmap">
- <file src="{src}" reloadable="true"/>
- </input-module>
- <input-module name="site">
+ <map:components>
+ <map:transformers default="xslt">
+ <map:transformer name="linkrewriter" src="org.apache.cocoon.transformation.LinkRewriterTransformer">
<input-module name="linkmap">
- <file src="{src}" reloadable="true"/>
+ <file src="{src}" reloadable="true" />
</input-module>
- <prefix>/site/</prefix>
- <suffix>/@href</suffix>
- </input-module>
- </map:transformer>
- </map:transformers>
- </map:components>
-
-<!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
- <map:pipeline>
-
- <map:match pattern="">
- <map:redirect-to uri="welcome"/>
- </map:match>
-
- <map:match pattern="**welcome">
- <map:generate src="docs/index.xml"/>
- <!-- Uses {src} and {prefix} var interpolation -->
- <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
- <map:parameter name="prefix" value="/site/"/>
- </map:transform>
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="abs-linkmap">
- <map:generate src="linkmap.xml"/>
- <map:transform src="../stylesheets/absolutize-linkmap.xsl"/>
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="**linkmap">
- <map:generate src="linkmap.xml"/>
- <map:transform src="../stylesheets/absolutize-linkmap.xsl"/>
- <map:transform src="../stylesheets/relativize-linkmap.xsl">
- <map:parameter name="path" value="{0}"/>
- </map:transform>
- <map:serialize type="xml"/>
- </map:match>
+ <input-module name="site">
+ <input-module name="linkmap">
+ <file src="{src}" reloadable="true" />
+ </input-module>
+ <prefix>/site/</prefix>
+ <suffix>/@href</suffix>
+ </input-module>
+ </map:transformer>
+ </map:transformers>
+ </map:components>
+
+ <!-- =========================== Pipelines ================================= -->
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="">
+ <map:redirect-to uri="welcome" />
+ </map:match>
+
+ <map:match pattern="**welcome">
+ <map:generate src="docs/index.xml" />
+ <!-- Uses {src} and {prefix} var interpolation -->
+ <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
+ <map:parameter name="prefix" value="/site/" />
+ </map:transform>
+ <map:serialize type="xml" />
+ </map:match>
+
+ <map:match pattern="abs-linkmap">
+ <map:generate src="linkmap.xml" />
+ <map:transform src="../stylesheets/absolutize-linkmap.xsl" />
+ <map:serialize type="xml" />
+ </map:match>
+
+ <map:match pattern="**linkmap">
+ <map:generate src="linkmap.xml" />
+ <map:transform src="../stylesheets/absolutize-linkmap.xsl" />
+ <map:transform src="../stylesheets/relativize-linkmap.xsl">
+ <map:parameter name="path" value="{0}" />
+ </map:transform>
+ <map:serialize type="xml" />
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,47 +18,47 @@
<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: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:pipeline>
-
- <!-- pipeline mounting linkrewriter samples sitemaps -->
- <map:pipeline>
- <!-- mount everything else -->
- <map:match pattern="*/**">
- <map:mount src="{1}/" uri-prefix="{1}" />
- </map:match>
- </map:pipeline>
- </map:pipelines>
+ <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: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:pipeline>
+
+ <!-- pipeline mounting linkrewriter samples sitemaps -->
+ <map:pipeline>
+ <!-- mount everything else -->
+ <map:match pattern="*/**">
+ <map:mount src="{1}/" uri-prefix="{1}" />
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/META-INF/cocoon/spring/cocoon-linkrewriter-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/META-INF/cocoon/spring/cocoon-linkrewriter-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/META-INF/cocoon/spring/cocoon-linkrewriter-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-sample/src/main/resources/META-INF/cocoon/spring/cocoon-linkrewriter-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.linkrewriter.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-linkrewriter-sample" context-path="blockcontext:/cocoon-linkrewriter-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.linkrewriter.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-linkrewriter-sample" context-path="blockcontext:/cocoon-linkrewriter-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-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,115 +18,115 @@
<!-- CVS $Id$ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <!-- =========================== Components ================================ -->
+ <!-- =========================== Components ================================ -->
- <map:components>
+ <map:components>
- <!-- =========================== Generators ================================ -->
+ <!-- =========================== Generators ================================ -->
- <map:generators default="file">
- <map:generator name="search" logger="sitemap.generator.search" label="content" src="org.apache.cocoon.generation.SearchGenerator" />
- </map:generators>
- <map:transformers default="xslt">
- <map:transformer name="index" logger="sitemap.transformer.luceneindextransformer" src="org.apache.cocoon.transformation.LuceneIndexTransformer" />
- </map:transformers>
-
- <!-- =========================== Actions ================================ -->
-
- <map:actions>
- <!-- FIXME: Has this action moved somewhere else?
- <map:action name="lang-select" src="org.apache.cocoon.acting.LangSelect"/>
- -->
- </map:actions>
- </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>
-
-
- <!-- =========================== Flowscripts ================================ -->
-
- <map:flow language="javascript">
- <map:script src="flow.js" />
- </map:flow>
-
- <!-- =========================== Pipelines ================================= -->
-
- <map:pipelines>
- <map:pipeline>
-
- <map:match pattern="">
- <map:redirect-to uri="welcome" />
- </map:match>
-
- <!-- mount query bean pipelines
- <map:match pattern="query/**">
- <map:mount src="query/sitemap.xmap" uri-prefix="query"/>
- </map:match>
- -->
-
- <map:match pattern="images/*.gif">
- <map:read src="images/{1}.gif" mime-type="image/gif">
- <map:parameter name="expires" value="60000" />
- </map:read>
- </map:match>
-
- <map:match pattern="findIt">
- <map:generate type="search" />
- <map:transform type="log" />
- <map:transform src="stylesheets/search2html.xsl" />
- <map:transform type="servletLinkRewriter" />
- <map:serialize />
- </map:match>
-
- <map:match pattern="findIt2">
- <map:generate type="search">
- <map:parameter name="index" value="index2" />
- </map:generate>
- <map:transform type="log" />
- <map:transform src="stylesheets/search-index2html.xsl" />
- <map:transform type="servletLinkRewriter" />
- <map:serialize />
- </map:match>
-
- <map:match pattern="welcome">
- <map:generate src="welcome-index.xml" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
- </map:serialize>
- </map:match>
-
- <map:match pattern="create">
- <map:call function="create" />
- </map:match>
-
- <map:match pattern="create-index.jx">
- <map:generate type="jx" src="create-index.jx" />
- <!-- Make use of servlet services -->
- <map:serialize type="servletService">
- <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
- </map:serialize>
- </map:match>
+ <map:generators default="file">
+ <map:generator name="search" logger="sitemap.generator.search" label="content" src="org.apache.cocoon.generation.SearchGenerator" />
+ </map:generators>
+ <map:transformers default="xslt">
+ <map:transformer name="index" logger="sitemap.transformer.luceneindextransformer" src="org.apache.cocoon.transformation.LuceneIndexTransformer" />
+ </map:transformers>
+
+ <!-- =========================== Actions ================================ -->
+
+ <map:actions>
+ <!-- FIXME: Has this action moved somewhere else?
+ <map:action name="lang-select" src="org.apache.cocoon.acting.LangSelect"/>
+ -->
+ </map:actions>
+ </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>
+
+
+ <!-- =========================== Flowscripts ================================ -->
+
+ <map:flow language="javascript">
+ <map:script src="flow.js" />
+ </map:flow>
+
+ <!-- =========================== Pipelines ================================= -->
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="">
+ <map:redirect-to uri="welcome" />
+ </map:match>
+
+ <!-- mount query bean pipelines
+ <map:match pattern="query/**">
+ <map:mount src="query/sitemap.xmap" uri-prefix="query"/>
+ </map:match>
+ -->
+
+ <map:match pattern="images/*.gif">
+ <map:read src="images/{1}.gif" mime-type="image/gif">
+ <map:parameter name="expires" value="60000" />
+ </map:read>
+ </map:match>
+
+ <map:match pattern="findIt">
+ <map:generate type="search" />
+ <map:transform type="log" />
+ <map:transform src="stylesheets/search2html.xsl" />
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize />
+ </map:match>
+
+ <map:match pattern="findIt2">
+ <map:generate type="search">
+ <map:parameter name="index" value="index2" />
+ </map:generate>
+ <map:transform type="log" />
+ <map:transform src="stylesheets/search-index2html.xsl" />
+ <map:transform type="servletLinkRewriter" />
+ <map:serialize />
+ </map:match>
+
+ <map:match pattern="welcome">
+ <map:generate src="welcome-index.xml" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+ </map:serialize>
+ </map:match>
+
+ <map:match pattern="create">
+ <map:call function="create" />
+ </map:match>
+
+ <map:match pattern="create-index.jx">
+ <map:generate type="jx" src="create-index.jx" />
+ <!-- Make use of servlet services -->
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html" />
+ </map:serialize>
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/src/main/resources/META-INF/cocoon/spring/cocoon-lucene-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.lucene.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-lucene-sample" context-path="blockcontext:/cocoon-lucene-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.lucene.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-lucene-sample" context-path="blockcontext:/cocoon-lucene-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-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-mail.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-mail.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-mail.xconf (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-mail.xconf Mon May 28 13:17:10 2007
@@ -21,17 +21,17 @@
| SVN $Id$
+-->
<components>
+ <!--+
+ | Component for simplified mail sending.
+ +-->
+ <component role="org.apache.cocoon.mail.MailSender"
+ class="org.apache.cocoon.mail.MailMessageSender"
+ logger="core.mail.MailSender">
<!--+
- | Component for simplified mail sending.
- +-->
- <component role="org.apache.cocoon.mail.MailSender"
- class="org.apache.cocoon.mail.MailMessageSender"
- logger="core.mail.MailSender">
- <!--+
- | SMTP host name, user name, and password.
+ | SMTP host name, user name, and password.
<smtp-host>127.0.0.1</smtp-host>
<smtp-user>john</smtp-user>
<smtp-password>john</smtp-password>
- +-->
- </component>
+ +-->
+ </component>
</components>
Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/conf/sendmail_xsl.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/conf/sendmail_xsl.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/conf/sendmail_xsl.xconf (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/conf/sendmail_xsl.xconf Mon May 28 13:17:10 2007
@@ -19,14 +19,14 @@
<xconf xpath="/cocoon/markup-languages/xsp-language[@name='xsp']/target-language[@name='java']"
unless="builtin-logicsheet/parameter[@name='prefix' and @value='sendmail']">
- <!--+
- | The sendmail logicsheet is an XSP logicsheet that allows sending
- | simple emails as well as multipart mime emails
- +-->
- <builtin-logicsheet>
- <parameter name="prefix" value="sendmail"/>
- <parameter name="uri" value="http://apache.org/cocoon/sendmail/1.0"/>
- <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/sendmail.xsl"/>
- </builtin-logicsheet>
+ <!--+
+ | The sendmail logicsheet is an XSP logicsheet that allows sending
+ | simple emails as well as multipart mime emails
+ +-->
+ <builtin-logicsheet>
+ <parameter name="prefix" value="sendmail" />
+ <parameter name="uri" value="http://apache.org/cocoon/sendmail/1.0" />
+ <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/sendmail.xsl" />
+ </builtin-logicsheet>
</xconf>