forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r701119 - in /forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher: default.plugin.properties.xml internal.xmap
Date Thu, 02 Oct 2008 13:21:11 GMT
Author: thorsten
Date: Thu Oct  2 06:21:11 2008
New Revision: 701119

URL: http://svn.apache.org/viewvc?rev=701119&view=rev
Log:
FOR-1118
Renaming extensions for contracts and structurer. Implementing the transformer in the plugin.


HEADSUP the transformer still does not work correctly. Need to look into that tommorrow

Modified:
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
    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/default.plugin.properties.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml?rev=701119&r1=701118&r2=701119&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
Thu Oct  2 06:21:11 2008
@@ -18,9 +18,9 @@
 <properties>
   <property name="dispatcher.theme" value="pelt"/>
   <property name="dispatcher.fallback.theme" value="common"/>
-  <property name="dispatcher.theme-ext" value=".fv"/>
-  <property name="dispatcher.fallback.theme-ext" value=".fv"/>
-  <property name="dispatcher.contract-ext" value=".ft"/>
+  <property name="dispatcher.theme-ext" value=".structurer.xml"/>
+  <property name="dispatcher.fallback.theme-ext" value=".structurer.xml"/>
+  <property name="dispatcher.contract-ext" value=".contract.xml"/>
   <property name="dispatcher.panel-ext" value=".panel.xml"/>
   <property name="dispatcher.themer" value="org.apache.forrest.themes.core"/>
   <property name="dispatcher.home" value="org.apache.forrest.plugin.internal.dispatcher"/>

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=701119&r1=701118&r2=701119&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
Thu Oct  2 06:21:11 2008
@@ -60,9 +60,49 @@
         src="org.apache.cocoon.template.JXTemplateTransformer" />
       <map:transformer logger="sitemap.transformer.jpath" name="jpath" 
         src="org.apache.cocoon.transformation.JPathTransformer" />
-      <map:transformer name="dispatcher" 
-        src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer" 
-        />
+      <map:transformer name="dispatcher"
+        src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer">
+        <!--+
+        |  If you want to use inline xml for contract properties be aware that setting 
+        | this properties to true will have negative influence on performance since 
+        | this feature needs to use DOM parsing!
+        |
+        | We strongly recommend to rewrite your contracts and structurer to use simple 
+        | string for the properties.
+        |   
+        | The default is set to "false".
+        +-->
+        <!-- Until we have migrated all contract to work with plain strings
+          we need this being true -->
+        <allowXml>true</allowXml>
+        
+        <!--+
+        |  If you want to change the uri prefix of the contracts. 
+        | This may be interesting if you work with a contract repository rather then
+        | with the ones from the themer plugin. 
+        |  
+        | The default is "cocoon://resolve.contract".
+        +-->
+        <!--<contractUriPrefix>cocoon://resolve.contract</contractUriPrefix>-->
+        
+        <!--+
+        |  You can use either limited of full xpath support for the injection of contract

+        | result data. We currently provide the basic support with a plain StAX implementation
+        | and the enhanced support with AXIOM.
+        |  
+        | The default is "basic".
+        +-->
+        <!--<xpathSupport>enhanced</xpathSupport>-->
+      </map:transformer>
+      <!-- Enhanced xpath support of the dispatcher enabled for
+        formats such as fo which depend on namespaces -->
+      <map:transformer name="dispatcherEnhanced"
+        src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer">
+        <!-- Until we have migrated all contract to work with plain strings
+          we need this being true -->
+        <allowXml>true</allowXml>
+        <xpathSupport>enhanced</xpathSupport>
+      </map:transformer>
       <map:transformer name="i18n" 
         src="org.apache.cocoon.transformation.I18nTransformer">
         <catalogues default="contracts">
@@ -174,9 +214,8 @@
           <map:parameter name="validityFile" value="cocoon:/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://transform.xml.xml-namespace-stripped" 
           />
@@ -196,13 +235,13 @@
           <map:parameter name="getRequestExtension" value="fo" />
           <map:parameter name="contextPath" value="{request:contextPath}" />
         </map:generate>
-        <map:transform type="dispatcher">
+        <map:transform type="dispatcherEnhanced">
           <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="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" 
           />



Mime
View raw message