Author: thorsten
Date: Wed Oct 15 05:38:40 2008
New Revision: 704892
URL: http://svn.apache.org/viewvc?rev=704892&view=rev
Log:
Cleaning cocoon-block implementation from legacy code.
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/locationmap.xml
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/locationmap.xml?rev=704892&r1=704891&r2=704892&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/locationmap.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/locationmap.xml
Wed Oct 15 05:38:40 2008
@@ -35,12 +35,6 @@
</components>
<locator>
- <!-- DEMO -->
-
- <match pattern="demo">
- <location src="{lm:dispatcher.home}locationmap.xml"/>
- </match>
-
<!-- Base location of the dispatcher-->
<match pattern="dispatcher.home">
<location src="blockcontext:/dispatcher/"/>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap?rev=704892&r1=704891&r2=704892&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap
Wed Oct 15 05:38:40 2008
@@ -20,22 +20,6 @@
xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:pipelines>
- <map:pipeline id="usage">
- <map:match pattern="">
- <map:generate src="demo/welcome.xml"/>
- <map:transform src="demo/welcome.xslt"/>
- <map:serialize type="xhtml"/>
- </map:match>
-
- <map:match pattern="test">
- <map:generate src="{lm:demo}"/>
- <map:transform src="resource/stylesheets/testing.xsl">
- <map:parameter value="xxx-{lm:hooks-to-html.xsl}" name="test"/>
- </map:transform>
- <map:serialize type="xml"/>
- </map:match>
-
- </map:pipeline>
<map:pipeline id="lm">
<map:match pattern="locationmap.xml">
@@ -58,8 +42,8 @@
value="lm://resolve.structurer.{1}"/>
<map:parameter name="request" value="{1}"/>
<map:parameter name="type" value="html"/>
- <map:parameter name="hooksTransformer"
value="lm://hooks-to-html.xsl"/>
</map:transform>
+ <map:transform src="lm://hooks-to-html.xsl"/>
<map:transform src="lm://namespace-stripped"/>
<map:transform src="lm://strip-dispatcher-remains-html.xsl"/>
<map:serialize type="xhtml"/>
@@ -77,8 +61,8 @@
value="lm://resolve.structurer.{1}"/>
<map:parameter name="request" value="{1}"/>
<map:parameter name="type" value="fo"/>
- <map:parameter name="hooksTransformer" value="lm://hooks-to-fo.xsl"/>
</map:transform>
+ <map:transform src="lm://hooks-to-fo.xsl"/>
<map:transform src="lm://strip-dispatcher-remains-fo.xsl"/>
<map:serialize type="xml"/>
</map:match>
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml?rev=704892&r1=704891&r2=704892&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
Wed Oct 15 05:38:40 2008
@@ -23,4 +23,9 @@
class="org.apache.forrest.dispatcher.transformation.DispatcherTransformer">
<property name="manager"
ref="org.apache.avalon.framework.service.ServiceManager"/>
</bean>
+ <bean id="dispatcherEnhanced" scope="prototype"
+ name="org.apache.cocoon.transformation.Transformer/dispatcherEnhanced"
+ class="org.apache.forrest.dispatcher.transformation.DispatcherTransformer">
+ <property name="manager"
ref="org.apache.avalon.framework.service.ServiceManager"/>
+ </bean>
</beans>
