Author: thorsten
Date: Tue Oct 7 05:58:50 2008
New Revision: 702465
URL: http://svn.apache.org/viewvc?rev=702465&view=rev
Log:
FOR-1118 Adding more configuration parameter to the dispatcher conf. Adding the
dispatcher as forrest module property instead of the properties module
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
Modified:
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
URL:
http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap?rev=702465&r1=702464&r2=702465&view=diff
==============================================================================
---
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
(original)
+++
forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
Tue Oct 7 05:58:50 2008
@@ -73,7 +73,7 @@
| The default is set to "false".
+-->
<!-- Until we have migrated all contract to work with plain strings
- we need this being true -->
+ we need this being true -->
<allowXml>true</allowXml>
<!--+
@@ -83,7 +83,7 @@
|
| The default is "cocoon://resolve.contract".
+-->
- <!--<contractUriPrefix>cocoon://resolve.contract</contractUriPrefix>-->
+
<!--<contractUriPrefix>cocoon://resolve.contract.</contractUriPrefix>-->
<!--+
| You can use either limited of full xpath support for the injection
of contract
@@ -93,6 +93,18 @@
| The default is "basic".
+-->
<!--<xpathSupport>enhanced</xpathSupport>-->
+ <!--+
+ | DOWNGRADE COMPATIBLE
+ | When using tags such as <forrest:property name="theme"
value="pelt"/>
+ | and if you set this property to false, you will get the whole tag
in your contract.
+ | If you set it to true we will pass a simple string to the
transformation
+ | in the form of [EMAIL PROTECTED], [EMAIL PROTECTED]
+ |
+ | The default is "true".
+ +-->
+ <!-- Until we have migrated all contract to work with plain strings
+ we need this being true -->
+ <shrink>false</shrink>
</map:transformer>
<!-- Enhanced xpath support of the dispatcher enabled for
formats such as fo which depend on namespaces -->
@@ -102,6 +114,9 @@
we need this being true -->
<allowXml>true</allowXml>
<xpathSupport>enhanced</xpathSupport>
+ <!-- Until we have migrated all contract to work with plain strings
+ we need this being true -->
+ <shrink>false</shrink>
</map:transformer>
<map:transformer name="i18n"
src="org.apache.cocoon.transformation.I18nTransformer">
@@ -210,10 +225,13 @@
<map:parameter name="getRequestExtension" value="html" />
</map:generate>
<map:transform type="dispatcher">
- <map:parameter name="cacheKey" value="{0}" />
- <map:parameter name="validityFile"
value="cocoon:/resolve.structurer.{1}" />
- <map:parameter name="request" value="{1}" />
- <map:parameter name="type" value="html" />
+ <map:parameter name="cacheKey" value="{0}"/>
+ <map:parameter name="validityFile"
+ value="cocoon:/resolve.structurer.{1}"/>
+ <map:parameter name="request" value="{1}"/>
+ <map:parameter name="dispatcher.caching"
+ value="{forrest:dispatcher.caching}"/>
+ <map:parameter name="type" value="html"/>
</map:transform>
<map:transform src="lm://hooks-to-html.xsl"/>
<map:transform
@@ -255,11 +273,13 @@
<map:parameter name="contextPath" value="{request:contextPath}" />
</map:generate>
<map:transform type="dispatcher">
- <map:parameter name="cacheKey" value="{0}" />
- <map:parameter name="validityFile"
value="cocoon:/resolve.structurer.{1}" />
- <map:parameter name="dispatcher.caching"
value="{properties:dispatcher.caching}" />
- <map:parameter name="request" value="{1}" />
- <map:parameter name="type" value="internal{2}" />
+ <map:parameter name="cacheKey" value="{0}"/>
+ <map:parameter name="validityFile"
+ value="cocoon:/resolve.structurer.{1}"/>
+ <map:parameter name="dispatcher.caching"
+ value="{forrest:dispatcher.caching}"/>
+ <map:parameter name="request" value="{1}"/>
+ <map:parameter name="type" value="internal{2}"/>
</map:transform>
<map:serialize />
</map:match>
@@ -270,12 +290,14 @@
<map:parameter name="getRequestExtension" value="css" />
<map:parameter name="contextPath" value="{request:contextPath}" />
</map:generate>
- <map:transform type="dispatcher">
- <map:parameter name="cacheKey" value="{0}" />
- <map:parameter name="validityFile"
value="cocoon:/resolve.structurer.{1}" />
- <map:parameter name="dispatcher.caching"
value="{properties:dispatcher.caching}" />
- <map:parameter name="request" value="{1}" />
- <map:parameter name="type" value="css" />
+ <map:transform type="dispatcherEnhanced">
+ <map:parameter name="cacheKey" value="{0}"/>
+ <map:parameter name="validityFile"
+ value="cocoon:/resolve.structurer.{1}"/>
+ <map:parameter name="dispatcher.caching"
+ value="{forrest:dispatcher.caching}"/>
+ <map:parameter name="request" value="{1}"/>
+ <map:parameter name="type" value="css"/>
</map:transform>
<map:serialize type="text" mime-type="text/css" />
</map:match>
