forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@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
Date Tue, 29 Jul 2003 09:45:20 GMT
cheche      2003/07/29 02:45:20

  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:
  Moving <map:components> from mount xmaps to sitemap.xmap
  
  Revision  Changes    Path
  1.7       +1 -11     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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- aggregate.xmap	21 Jul 2003 00:56:11 -0000	1.6
  +++ aggregate.xmap	29 Jul 2003 09:45:19 -0000	1.7
  @@ -19,16 +19,6 @@
   ==================================================== -->
   
   <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.7       +1 -11     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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- dtd.xmap	5 Jul 2003 13:01:02 -0000	1.6
  +++ dtd.xmap	29 Jul 2003 09:45:19 -0000	1.7
  @@ -12,16 +12,6 @@
   ==================================================== -->
   
   <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.15      +2 -6      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- faq.xmap	5 Jul 2003 13:01:02 -0000	1.14
  +++ faq.xmap	29 Jul 2003 09:45:19 -0000	1.15
  @@ -18,11 +18,6 @@
   
   <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">
  @@ -41,6 +36,7 @@
       </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.23      +2 -4      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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- forrest.xmap	21 Jul 2003 00:56:20 -0000	1.22
  +++ forrest.xmap	29 Jul 2003 09:45:19 -0000	1.23
  @@ -19,11 +19,11 @@
   
   <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:generator name="html" src="org.apache.cocoon.generation.HTMLGenerator" />
         <map:generator name="text2xml" src="org.apache.cocoon.generation.TextGenerator"
/>
       </map:generators>
  -    <map:serializers default="html"/>
       <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">
  @@ -34,8 +34,6 @@
   
   
   
  -    <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="document-v10">
  
  
  
  1.6       +1 -9      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- issues.xmap	5 Jul 2003 13:01:02 -0000	1.5
  +++ issues.xmap	29 Jul 2003 09:45:19 -0000	1.6
  @@ -12,14 +12,6 @@
   ==================================================== -->
   
   <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.15      +1 -9      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- linkmap.xmap	13 Jul 2003 12:45:24 -0000	1.14
  +++ linkmap.xmap	29 Jul 2003 09:45:19 -0000	1.15
  @@ -15,14 +15,6 @@
   
   
   <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.7       +1 -12     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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- menu.xmap	13 Jul 2003 12:45:24 -0000	1.6
  +++ menu.xmap	29 Jul 2003 09:45:19 -0000	1.7
  @@ -15,17 +15,6 @@
   ==================================================== -->
   
   <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.6       +1 -11     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- profiler.xmap	5 Jul 2003 13:03:52 -0000	1.5
  +++ profiler.xmap	29 Jul 2003 09:45:19 -0000	1.6
  @@ -14,16 +14,6 @@
   
   
   <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.8       +1 -12     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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- raw.xmap	5 Jul 2003 13:01:02 -0000	1.7
  +++ raw.xmap	29 Jul 2003 09:45:19 -0000	1.8
  @@ -15,17 +15,6 @@
   ==================================================== -->
   
   <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.3       +2 -10     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- resources.xmap	16 Jul 2003 23:43:24 -0000	1.2
  +++ resources.xmap	29 Jul 2003 09:45:19 -0000	1.3
  @@ -12,19 +12,11 @@
   ==================================================== -->
   
   <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.7       +2 -11     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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- revisions.xmap	5 Jul 2003 13:01:02 -0000	1.6
  +++ revisions.xmap	29 Jul 2003 09:45:19 -0000	1.7
  @@ -22,16 +22,7 @@
   ==================================================== -->
   
   <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.113     +32 -6     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.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- sitemap.xmap	21 Jul 2003 09:40:57 -0000	1.112
  +++ sitemap.xmap	29 Jul 2003 09:45:19 -0000	1.113
  @@ -11,11 +11,12 @@
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
     <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" />
  +      <map:generator name="file"      src="org.apache.cocoon.generation.FileGenerator"
/>
  +      <map:generator name="html"      src="org.apache.cocoon.generation.HTMLGenerator"
/>
         <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">
  @@ -48,6 +49,7 @@
         </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>
  @@ -58,6 +60,16 @@
         </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">
  @@ -80,6 +92,18 @@
         <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"/>
  @@ -92,7 +116,9 @@
       </map:matchers>
   
       <map:selectors>
  -      <map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.cocoon.selection.ResourceExistsSelector"
/>
  +      <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:selectors>
   
       <map:pipes default="caching">
  
  
  
  1.6       +1 -15     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- status.xmap	5 Jul 2003 13:01:02 -0000	1.5
  +++ status.xmap	29 Jul 2003 09:45:19 -0000	1.6
  @@ -15,20 +15,6 @@
   ==================================================== -->
   
   <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>
  
  
  

Mime
View raw message