svn commit: r941271 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon: properties/dispatcher.properties spring/dispatcher-context.xml

Author: thorsten
Date: Wed May  5 12:49:10 2010
New Revision: 941271

URL: http://svn.apache.org/viewvc?rev=941271&view=rev
Log:
Using spring configuration to easier override the configuration

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties?rev=941271&r1=941270&r2=941271&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/properties/dispatcher.properties Wed May  5 12:49:10 2010
@@ -20,4 +20,9 @@ dispatcher.fallback.theme=common
 dispatcher.fallback.theme-ext=.structurer.xml
 dispatcher.caching=on
 dispatcher.contract.ext=.contract.xml
-dispatcher.panel.ext=.panel.xml
\ No newline at end of file
+dispatcher.panel.ext=.panel.xml
+
+dispatcher.allowXmlProperties=false
+dispatcher.contractUriSufix=
+dispatcher.contractUriPrefix=cocoon://resolve.contract.
+dispatcher.shrink=true

Modified: forrest/trunk/whiteboard/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/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml?rev=941271&r1=941270&r2=941271&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml Wed May  5 12:49:10 2010
@@ -64,10 +64,10 @@
   </bean>
   <bean id="config" scope="prototype"
   class="org.apache.forrest.dispatcher.config.WritableDispatcherBean">
-    <property name="allowXmlProperties" value="true" />
-    <property name="shrink" value="false" />
-    <property name="contractUriSufix" value="" />
-    <property name="contractUriPrefix" value="cocoon://resolve.contract." />
+    <property name="allowXmlProperties" value="${dispatcher.allowXmlProperties}" />
+    <property name="shrink" value="${dispatcher.shrink}" />
+    <property name="contractUriSufix" value="${dispatcher.contractUriSufix}" />
+    <property name="contractUriPrefix" value="${dispatcher.contractUriPrefix}" />
     <property name="staxHelper" ref="staxHelper" />
     <property name="entityResolver" 
       ref="org.xml.sax.EntityResolver" />