Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: forrest-dev@xml.apache.org
Date: 7 Aug 2003 02:51:33 -0000
Message-ID: <20030807025133.85356.qmail@minotaur.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/conf aggregate.xmap dtd.xmap
 faq.xmap forrest.xmap issues.xmap linkmap.xmap menu.xmap profiler.xmap
 raw.xmap resources.xmap revisions.xmap sitemap.xmap status.xmap

jefft       2003/08/06 19:51:33

  Modified:    src/resources/conf aggregate.xmap dtd.xmap faq.xmap
                        forrest.xmap issues.xmap linkmap.xmap menu.xmap
                        profiler.xmap raw.xmap resources.xmap
                        revisions.xmap sitemap.xmap status.xmap
  Log:
  Redefine components in subsitemaps, where they are used.  Putting them in the
  main sitemap makes upgrading almost impossible, as sitemap.xmap is frequently
  overridden, which locks in place an old set of components.
  
  Revision  Changes    Path
  1.8       +10 -0     xml-forrest/src/resources/conf/aggregate.xmap
  
  Index: aggregate.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/aggregate.xmap,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- aggregate.xmap	29 Jul 2003 09:45:19 -0000	1.7
  +++ aggregate.xmap	7 Aug 2003 02:51:33 -0000	1.8
  @@ -19,6 +19,16 @@
   ==================================================== -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  <map:components>
  +    <map:generators default="file"/>
  +    <map:serializers default="html"/>
  +    <map:transformers default="xslt">
  +      <map:transformer name="cinclude" src="org.apache.cocoon.transformation.CIncludeTransformer"/>
  +    </map:transformers>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +    <map:selectors default="browser"/>
  +  </map:components>
   
     <map:pipelines>
       <map:pipeline>
  
  
  
  1.8       +10 -0     xml-forrest/src/resources/conf/dtd.xmap
  
  Index: dtd.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/dtd.xmap,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- dtd.xmap	29 Jul 2003 09:45:19 -0000	1.7
  +++ dtd.xmap	7 Aug 2003 02:51:33 -0000	1.8
  @@ -12,6 +12,16 @@
   ==================================================== -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  <map:components>
  +    <map:generators default="file">
  +      <map:generator name="nekodtd" src="org.apache.cocoon.generation.XNIConfigurableFileGenerator" />
  +    </map:generators>
  +    <map:serializers default="html"/>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +    <map:selectors default="browser"/>
  +  </map:components>
   
     <map:resources>
     </map:resources>
  
  
  
  1.17      +6 -2      xml-forrest/src/resources/conf/faq.xmap
  
  Index: faq.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/faq.xmap,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- faq.xmap	1 Aug 2003 11:42:13 -0000	1.16
  +++ faq.xmap	7 Aug 2003 02:51:33 -0000	1.17
  @@ -18,6 +18,11 @@
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
     <map:components>
  +    <map:generators default="file"/>
  +    <map:serializers default="html"/>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
       <map:actions>
         <map:action logger="sitemap.action.sourcetype" name="sourcetype" src="org.apache.cocoon.acting.sourcetype.SourceTypeAction">
           <sourcetype name="faq-v10">
  @@ -36,7 +41,6 @@
       </map:actions>
   
       <map:selectors default="browser">
  -    <!-- FIXME JJP: This should not be here. It should be define on sitemap -->
         <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector" />
       </map:selectors>
     </map:components>
  
  
  
  1.26      +8 -2      xml-forrest/src/resources/conf/forrest.xmap
  
  Index: forrest.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/forrest.xmap,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- forrest.xmap	30 Jul 2003 16:35:46 -0000	1.25
  +++ forrest.xmap	7 Aug 2003 02:51:33 -0000	1.26
  @@ -20,12 +20,18 @@
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
     <map:components>
     <!-- FIXME (JJP): This should not be here. Should be define on sitemap -->
  -    <map:generators default="file">
  +  <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="text2xml" src="org.apache.cocoon.generation.TextGenerator" />
       </map:generators>
  +    <map:serializers default="html"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +
       <map:transformers default="xslt">
         <map:transformer name="lexer" src="org.apache.cocoon.transformation.LexicalTransformer" logger="sitemap.transformer.lexer"/>
         <map:transformer name="parser" src="org.apache.cocoon.transformation.ParserTransformer" logger="sitemap.transformer.parser">
  
  
  
  1.7       +8 -0      xml-forrest/src/resources/conf/issues.xmap
  
  Index: issues.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/issues.xmap,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- issues.xmap	29 Jul 2003 09:45:19 -0000	1.6
  +++ issues.xmap	7 Aug 2003 02:51:33 -0000	1.7
  @@ -12,6 +12,14 @@
   ==================================================== -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  <map:components>
  +    <map:generators default="file"/>
  +    <map:serializers default="html"/>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +    <map:selectors default="browser"/>
  +  </map:components>
   
     <map:resources>
     </map:resources>
  
  
  
  1.16      +8 -0      xml-forrest/src/resources/conf/linkmap.xmap
  
  Index: linkmap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/linkmap.xmap,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- linkmap.xmap	29 Jul 2003 09:45:19 -0000	1.15
  +++ linkmap.xmap	7 Aug 2003 02:51:33 -0000	1.16
  @@ -15,6 +15,14 @@
   
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  <map:components>
  +    <map:generators default="file"/>
  +    <map:serializers default="html"/>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +    <map:selectors default="browser"/>
  +  </map:components>
   
     <map:pipelines>
       <map:pipeline>
  
  
  
  1.8       +11 -0     xml-forrest/src/resources/conf/menu.xmap
  
  Index: menu.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/menu.xmap,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- menu.xmap	29 Jul 2003 09:45:19 -0000	1.7
  +++ menu.xmap	7 Aug 2003 02:51:33 -0000	1.8
  @@ -15,6 +15,17 @@
   ==================================================== -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  <map:components>
  +    <map:generators default="file"/>
  +    <map:serializers default="html"/>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +    <map:selectors default="browser">
  +      <map:selector logger="sitemap.selector.config" name="config" src="org.apache.cocoon.selection.SimpleSelector" />
  +    </map:selectors>
  +
  +  </map:components>
   
     <map:pipelines>
   
  
  
  
  1.7       +10 -0     xml-forrest/src/resources/conf/profiler.xmap
  
  Index: profiler.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/profiler.xmap,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- profiler.xmap	29 Jul 2003 09:45:19 -0000	1.6
  +++ profiler.xmap	7 Aug 2003 02:51:33 -0000	1.7
  @@ -14,6 +14,16 @@
   
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  <map:components>
  +    <map:generators default="file">
  +      <map:generator name="profiler" src="org.apache.cocoon.generation.ProfilerGenerator"/>
  +    </map:generators>
  +    <map:serializers default="html"/>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +    <map:selectors default="browser"/>
  +  </map:components>
   
     <map:resources>
     </map:resources>
  
  
  
  1.9       +11 -0     xml-forrest/src/resources/conf/raw.xmap
  
  Index: raw.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/raw.xmap,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- raw.xmap	29 Jul 2003 09:45:19 -0000	1.8
  +++ raw.xmap	7 Aug 2003 02:51:33 -0000	1.9
  @@ -15,6 +15,17 @@
   ==================================================== -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  <map:components>
  +    <map:generators default="file">
  +      <map:generator name="html" src="org.apache.cocoon.generation.HTMLGenerator" />
  +    </map:generators>
  +    <map:serializers default="html"/>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +    <map:actions/>
  +    <map:selectors default="parameter"/>
  +  </map:components>
   
     <map:resources>
     </map:resources>
  
  
  
  1.4       +9 -1      xml-forrest/src/resources/conf/resources.xmap
  
  Index: resources.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/resources.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- resources.xmap	29 Jul 2003 09:45:19 -0000	1.3
  +++ resources.xmap	7 Aug 2003 02:51:33 -0000	1.4
  @@ -12,11 +12,19 @@
   ==================================================== -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  -  <!-- FIXME (JJP): This should not be defined here. -->
     <map:components>
  +    <map:generators default="file"/>
       <map:serializers default="html">
  +      <map:serializer name="svg2jpeg" mime-type="image/jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
  +        <parameter name="quality" type="float" value="1.0"/>
  +      </map:serializer>
         <map:serializer mime-type="image/png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer"/>
       </map:serializers>
  + 
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +    <map:selectors default="browser"/>
     </map:components>
   
     <map:resources>
  
  
  
  1.9       +11 -2     xml-forrest/src/resources/conf/revisions.xmap
  
  Index: revisions.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/revisions.xmap,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- revisions.xmap	1 Aug 2003 11:42:13 -0000	1.8
  +++ revisions.xmap	7 Aug 2003 02:51:33 -0000	1.9
  @@ -22,7 +22,16 @@
   ==================================================== -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  -  
  +  <map:components>
  +    <map:generators default="file">
  +      <map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator" />
  +    </map:generators>
  +    <map:serializers default="html"/>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +    <map:selectors default="browser"/>
  +  </map:components>
     <map:resources>
     </map:resources>
   
  
  
  
  1.116     +4 -30     xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- sitemap.xmap	30 Jul 2003 16:35:46 -0000	1.115
  +++ sitemap.xmap	7 Aug 2003 02:51:33 -0000	1.116
  @@ -12,13 +12,12 @@
     <map:components>
       <map:generators default="file">
         <map:generator name="file"      src="org.apache.cocoon.generation.FileGenerator" />
  +      <!--
         <map:generator name="html"      src="org.apache.cocoon.generation.HTMLGenerator">
           <jtidy-config>jtidy.properties</jtidy-config>
         </map:generator>
         <map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator" />
  -      <map:generator name="text2xml"  src="org.apache.cocoon.generation.TextGenerator" />
  -      <map:generator name="profiler"  src="org.apache.cocoon.generation.ProfilerGenerator" />
  -      <map:generator name="nekodtd"   src="org.apache.cocoon.generation.XNIConfigurableFileGenerator" />
  +      -->
       </map:generators>
   
       <map:transformers default="xslt">
  @@ -51,7 +50,6 @@
         </map:transformer>
   
         <map:transformer name="xpath" logger="sitemap.transformer.xpath" src="org.apache.cocoon.transformation.XPathTransformer" />
  -
         <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer" logger="sitemap.transformer.xslt" pool-max="32" pool-min="8" pool-grow="2">
           <use-request-parameters>false</use-request-parameters>
           <use-browser-capabilities-db>false</use-browser-capabilities-db>
  @@ -62,16 +60,6 @@
         </map:transformer>
   
         <map:transformer name="xinclude" src="org.apache.cocoon.transformation.XIncludeTransformer" logger="sitemap.transformer.xinclude" pool-grow="2" pool-max="16" pool-min="2" />
  -
  -      <map:transformer name="lexer" src="org.apache.cocoon.transformation.LexicalTransformer" logger="sitemap.transformer.lexer"/>
  -
  -      <map:transformer name="parser" src="org.apache.cocoon.transformation.ParserTransformer" logger="sitemap.transformer.parser">
  -         <parameter name="flatten" value="true"/>
  -         <parameter name="ignoring" value="true"/>
  -      </map:transformer>
  -
  -      <map:transformer name="cinclude" src="org.apache.cocoon.transformation.CIncludeTransformer"/>
  -
       </map:transformers>
   
       <map:readers default="resource">
  @@ -97,18 +85,6 @@
         <map:serializer name="links" src="org.apache.cocoon.serialization.LinkSerializer">
           <encoding>ISO-8859-1</encoding>
         </map:serializer>
  -      <map:serializer name="svg2jpeg" mime-type="image/jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
  -         <parameter name="quality" type="float" value="1.0"/>
  -      </map:serializer>
  -
  -      <map:serializer name="svg2png" mime-type="image/png" src="org.apache.cocoon.serialization.SVGSerializer" />
  -
  -      <map:serializer name="rss091" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer">
  -         <doctype-public>-//Netscape Communications//DTD RSS 0.91//EN</doctype-public>
  -         <doctype-system>http://my.netscape.com/publish/formats/rss-0.91.dtd</doctype-system>
  -         <encoding>ISO-8859-1</encoding>
  -      </map:serializer>
  -
        <!--
         <map:serializer mime-type="application/x-shockwave-flash" name="swf" src="org.apache.cocoon.serialization.SWFSerializer"/>
         <map:serializer mime-type="application/msword" name="fo2rtf" src="org.apache.cocoon.serialization.RTFSerializer"/>
  @@ -121,9 +97,7 @@
       </map:matchers>
   
       <map:selectors>
  -      <map:selector name="exists" logger="sitemap.selector.exists" src="org.apache.cocoon.selection.ResourceExistsSelector" />
  -      <map:selector name="config" logger="sitemap.selector.config" src="org.apache.cocoon.selection.SimpleSelector" />
  -      <map:selector name="parameter" logger="sitemap.selector.parameter" src="org.apache.cocoon.selection.ParameterSelector" />
  +      <map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.cocoon.selection.ResourceExistsSelector" />
       </map:selectors>
   
       <map:pipes default="caching">
  
  
  
  1.8       +15 -1     xml-forrest/src/resources/conf/status.xmap
  
  Index: status.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/status.xmap,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- status.xmap	1 Aug 2003 11:42:13 -0000	1.7
  +++ status.xmap	7 Aug 2003 02:51:33 -0000	1.8
  @@ -15,6 +15,20 @@
   ==================================================== -->
   
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  +  <map:components>
  +    <map:generators default="file"/>
  +    <map:serializers default="html">
  +      <map:serializer name="rss091" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer">
  +        <doctype-public>-//Netscape Communications//DTD RSS 0.91//EN</doctype-public>
  +        <doctype-system>http://my.netscape.com/publish/formats/rss-0.91.dtd</doctype-system>
  +        <encoding>ISO-8859-1</encoding>
  +      </map:serializer>
  +    </map:serializers>
  +    <map:transformers default="xslt"/>
  +    <map:readers default="resource"/>
  +    <map:matchers default="wildcard"/>
  +    <map:selectors default="browser"/>
  +  </map:components>
   
     <map:resources>
     </map:resources>