forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r708183 - /forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
Date Mon, 27 Oct 2008 14:01:58 GMT
Author: thorsten
Date: Mon Oct 27 07:01:58 2008
New Revision: 708183

URL: http://svn.apache.org/viewvc?rev=708183&view=rev
Log:
Using spring configuration over old school avalon and re-adding serializer config to the avalon
config

Modified:
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
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/avalon/dispatcher-sitemapcomponents.xconf?rev=708183&r1=708182&r2=708183&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
Mon Oct 27 07:01:58 2008
@@ -18,64 +18,6 @@
 
 <map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:transformers default="xslt">
-    <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>-->
-        <!--+
-        | 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 key=@name, value=@value
-        |  
-        | 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 -->
-      <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>
-        <!-- 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">
       <catalogues default="contracts">
@@ -87,4 +29,32 @@
       <cache-at-startup>true</cache-at-startup>
     </map:transformer>
   </map:transformers>
+  <map:serializers default="xhtml">
+    <map:serializer logger="sitemap.serializer.xhtml"
+      mime-type="text/html; charset=UTF-8" name="xhtml" ppool-max="64"
+      src="org.apache.cocoon.serialization.XMLSerializer">
+      <!--+
+      | You can choose from Strict, Transitional, or Frameset XHTML.
+      | For Strict XHTML set doctype to:
+      |   <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
+      |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
+      | For Transitional XHTML set doctype to:
+      |   <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
+      |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
+      | For Frameset XHTML set doctype to:
+      |   <doctype-public>-//W3C//DTD XHTML 1.0 Frameset//EN</doctype-public>
+      |   <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd</doctype-system>
+      |
+      | Default XHTML doctype in Cocoon is XHTML Strict. If you want to use more than one
+      | XHTML DTD simultaneously, you can define several XHTML serializers.
+      +-->
+      <!--doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
+      <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
+      <encoding>UTF-8</encoding-->
+      <omit-xml-declaration>yes</omit-xml-declaration>
+      <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
+      <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
+      <encoding>UTF-8</encoding>
+    </map:serializer>
+  </map:serializers>
 </map:components>
\ No newline at end of file



Mime
View raw message