forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r375669 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher: internal.xmap themes.xmap
Date Tue, 07 Feb 2006 19:34:11 GMT
Author: thorsten
Date: Tue Feb  7 11:34:09 2006
New Revision: 375669

URL: http://svn.apache.org/viewcvs?rev=375669&view=rev
Log:
Removing component declaration where possible and using the core sitemap defaults. Further
trying to move all new components (that are used in more then one sitemap) used by the dispatcher
into the internal.xmap FOR-798

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap?rev=375669&r1=375668&r2=375669&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
Tue Feb  7 11:34:09 2006
@@ -31,16 +31,7 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
-    <map:selectors>
-      <map:selector logger="sitemap.selector.exists" name="exists" 
-        src="org.apache.forrest.sourceexists.SourceExistsSelector" />
-      <map:selector logger="sitemap.selector.config" name="config" 
-        src="org.apache.cocoon.selection.SimpleSelector" />
-    </map:selectors>
     <map:generators default="file">
-      <map:generator name="traverse" 
-        src="org.apache.cocoon.generation.TraversableGenerator" 
-        logger="sitemap.generator.traverse" label="content" pool-max="16" />
       <map:generator label="content" logger="sitemap.generator.xpathdirectory" 
         name="xpathdirectory" 
         src="org.apache.cocoon.generation.XPathDirectoryGenerator"/>
@@ -49,19 +40,28 @@
       <map:generator name="jx" logger="sitemap.generator.jx" 
         src="org.apache.cocoon.generation.JXTemplateGenerator" 
         label="content,data" pool-max="16" />
+        <map:generator name="text" 
+        src="org.apache.cocoon.generation.TextGenerator">
+        <parameter name="localizable" value="true" />
+      </map:generator>
     </map:generators>
     <map:transformers default="xslt">
       <map:transformer logger="sitemap.transformer.jx" name="jx" pool-max="16" 
         src="org.apache.cocoon.transformation.JXTemplateTransformer" />
       <map:transformer logger="sitemap.transformer.jpath" name="jpath" 
         src="org.apache.cocoon.transformation.JPathTransformer" />
-      <map:transformer name="cinclude" 
-        src="org.apache.cocoon.transformation.CIncludeTransformer" />
-      <map:transformer name="xinclude" 
-        src="org.apache.cocoon.transformation.XIncludeTransformer" />
       <map:transformer name="dispatcher" 
         src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer" 
         />
+        <map:transformer name="i18n" 
+        src="org.apache.cocoon.transformation.I18nTransformer">
+        <catalogues default="contracts">
+          <catalogue id="other" name="OtherMessages" location="messages" />
+          <catalogue id="contracts" name="ContractsMessages" 
+            location="messages" />
+        </catalogues>
+        <cache-at-startup>true</cache-at-startup>
+      </map:transformer>
     </map:transformers>
     <map:serializers default="xml">
       <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" 
@@ -72,9 +72,12 @@
           </doctype-system>
         <encoding>UTF-8</encoding>
       </map:serializer>
-      <map:serializer name="text" 
-        src="org.apache.cocoon.serialization.TextSerializer" 
-        mime-type="text/plain" logger="sitemap.serializer.text" />
+      <map:serializer mime-type="image/png" name="svg2png" 
+        src="org.apache.cocoon.serialization.SVGSerializer">
+        <!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
+        <!-- <parameter name="gamma" type="float" value="0.48"/> -->
+        <parameter name="gamma" type="float" value="0" />
+      </map:serializer>
     </map:serializers>
     <map:actions>
       <map:action name="locale" src="org.apache.cocoon.acting.LocaleAction" />

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap?rev=375669&r1=375668&r2=375669&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
Tue Feb  7 11:34:09 2006
@@ -17,51 +17,9 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
-    <map:selectors>
-      <map:selector logger="sitemap.selector.exists" name="exists" 
-        src="org.apache.forrest.sourceexists.SourceExistsSelector" />
-    </map:selectors>
-    <map:generators default="file">
-      <map:generator name="html" 
-        src="org.apache.cocoon.generation.HTMLGenerator">
-        <jtidy-config>jtidy.properties</jtidy-config>
-      </map:generator>
-      <map:generator name="text" 
-        src="org.apache.cocoon.generation.TextGenerator">
-        <parameter name="localizable" value="true" />
-      </map:generator>
-      <map:generator name="directory" 
-        src="org.apache.cocoon.generation.DirectoryGenerator" />
-      <!--<map:generator name="structurerXsl"
-        src="org.apache.forrest.structurer.generation.StructurerXSLGenerator" />
-      -->
-    </map:generators>
-    <map:transformers default="xslt">
-      <map:transformer name="cinclude" 
-        src="org.apache.cocoon.transformation.CIncludeTransformer" />
-      <map:transformer name="dispatcher" 
-        src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer" 
-        />
-      <map:transformer name="i18n" 
-        src="org.apache.cocoon.transformation.I18nTransformer">
-        <catalogues default="contracts">
-          <catalogue id="other" name="OtherMessages" location="messages" />
-          <catalogue id="contracts" name="ContractsMessages" 
-            location="messages" />
-        </catalogues>
-        <cache-at-startup>true</cache-at-startup>
-      </map:transformer>
-    </map:transformers>
+    <map:generators default="file"/>
+    <map:transformers default="xslt"/>
     <map:serializers default="xml">
-      <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" 
-        name="xhtml" pool-grow="2" pool-max="64" pool-min="2" 
-        src="org.apache.cocoon.serialization.XMLSerializer">
-        <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>
-        <indent>yes</indent>
-      </map:serializer>
       <map:serializer name="txt" 
         src="org.apache.cocoon.serialization.TextSerializer" 
         mime-type="text/plain" logger="sitemap.serializer.text" />



Mime
View raw message