Return-Path: 
 <forrest-cvs-return-1138-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 56513 invoked by uid 500); 30 Jul 2003 16:35:45 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 56492 invoked from network); 30 Jul 2003 16:35:45 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 30 Jul 2003 16:35:45 -0000
Received: (qmail 92482 invoked by uid 1464); 30 Jul 2003 16:35:46 -0000
Date: 30 Jul 2003 16:35:46 -0000
Message-ID: <20030730163546.92481.qmail@minotaur.apache.org>
From: nicolaken@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/schema/relaxng sitemap-v06.rng
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

nicolaken    2003/07/30 09:35:46

  Modified:    .        build.xml status.xml
               src/resources/forrest-shbat forrest.build.xml
               src/resources/conf forrest.xmap sitemap.xmap
               src/resources/schema/relaxng sitemap-v06.rng
  Added:       src/resources/conf jtidy.properties
  Log:
        <action dev="NKB" type="fix" context="sitemap">
          ihtml now works again. Had to add a jtidy configuration that prevented it to output
          tidies html to the pipeline, thus making the stylesheet unusable. Also had to fix
          the sitemap schema.
        </action>
  
  Revision  Changes    Path
  1.68      +1 -0      xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- build.xml	10 Jul 2003 11:47:51 -0000	1.67
  +++ build.xml	30 Jul 2003 16:35:46 -0000	1.68
  @@ -283,6 +283,7 @@
           <include name="*.xmap"/>
           <include name="skinconf.xml"/>
           <include name="jettyconf.xml"/>
  +        <include name="jtidy.properties"/>
         </fileset>
       </copy>
   
  
  
  
  1.185     +6 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.184
  retrieving revision 1.185
  diff -u -r1.184 -r1.185
  --- status.xml	30 Jul 2003 08:37:54 -0000	1.184
  +++ status.xml	30 Jul 2003 16:35:46 -0000	1.185
  @@ -25,6 +25,11 @@
   
     <changes>
       <release version="0.5-dev" date="unreleased">
  +      <action dev="NKB" type="fix" context="sitemap">
  +        ihtml now works again. Had to add a jtidy configuration that prevented it to output
  +        tidies html to the pipeline, thus making the stylesheet unusable. Also had to fix
  +        the sitemap schema.
  +      </action>    
         <action dev="JJP" type="fix" context="core">
           Cleanup maps:components definitions on sub-maps.
   	Remove indent attr from the xsl:output as it is define on serializer.
  @@ -1111,6 +1116,7 @@
     </issues>
   
   </status>
  +
   
   
   
  
  
  
  1.81      +2 -1      xml-forrest/src/resources/forrest-shbat/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.build.xml,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- forrest.build.xml	29 Jul 2003 11:21:50 -0000	1.80
  +++ forrest.build.xml	30 Jul 2003 16:35:46 -0000	1.81
  @@ -406,6 +406,7 @@
       <copy toDir="${project.ctxt-dir}" filtering="true" overwrite="true" failonerror="false">
         <fileset dir="${project.sitemap-dir}">
           <include name="*.xmap"/>
  +        <include name="jtidy.properties"/>
         </fileset>
       </copy>
      </target>
  
  
  
  1.25      +4 -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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- forrest.xmap	30 Jul 2003 08:37:54 -0000	1.24
  +++ forrest.xmap	30 Jul 2003 16:35:46 -0000	1.25
  @@ -21,7 +21,9 @@
     <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="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:transformers default="xslt">
  
  
  
  1.115     +4 -2      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.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- sitemap.xmap	30 Jul 2003 08:37:54 -0000	1.114
  +++ sitemap.xmap	30 Jul 2003 16:35:46 -0000	1.115
  @@ -12,7 +12,9 @@
     <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="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" />
  
  
  
  1.1                  xml-forrest/src/resources/conf/jtidy.properties
  
  Index: jtidy.properties
  ===================================================================
  indent=yes
  indent-spaces=8
  wrap=72
  markup=no
  output-xml=no
  input-xml=no
  show-warnings=yes
  numeric-entities=yes
  quote-marks=yes
  quote-nbsp=yes
  quote-ampersand=no
  break-before-br=yes
  uppercase-tags=no
  uppercase-attributes=no
  char-encoding=latin1
  
  
  
  1.8       +16 -0     xml-forrest/src/resources/schema/relaxng/sitemap-v06.rng
  
  Index: sitemap-v06.rng
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/relaxng/sitemap-v06.rng,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sitemap-v06.rng	23 Jun 2003 11:05:14 -0000	1.7
  +++ sitemap-v06.rng	30 Jul 2003 16:35:46 -0000	1.8
  @@ -35,6 +35,7 @@
     David Crossley <crossley@indexgeo.com.au>
     Colin Paul Adams <colin@colina.demon.co.uk>
     Bruno Dumon <bruno@outerthought.org>
  +  Nicola Ken Barozzi NKB<nicolaken@apache.org>
   
   FIXME:
   - map:act is used in various contexts, so it has a loose definition
  @@ -73,6 +74,7 @@
                 implement their own actions this content cannot be foreseen. (BD)
   20030212 V0.6 Add TagTransformer contents (VG)
   20030219 V0.6 Add new i18nTransformer contents <catalogues> (DC)
  +20030730 V0.6 Added new htmlGenerator contents <catalogues> (NKB)
   
   ====================================================================
   -->
  @@ -272,6 +274,11 @@
       </zeroOrMore>
     </define>
   
  +<!-- CPA: contents confirmed by inspection of HtmlGenerator.java -->
  +  <define name="htmlGenerator.contents">
  +    <optional><ref name="jtidy-config"/></optional>
  +  </define>
  +
   <!-- CPA: contents confirmed by inspection of TraxTransformer.java -->
     <define name="traxTransformer.contents">
       <optional><ref name="use-request-parameters"/></optional>
  @@ -481,6 +488,9 @@
     <define name="map.generator">
       <element name="map:generator">
         <ref name="map.generator.attlist"/>
  +      <interleave>
  +        <ref name="htmlGenerator.contents"/>
  +      </interleave>
         <empty/>
       </element>
     </define>
  @@ -489,6 +499,12 @@
       <ref name="name.attr"/>
       <ref name="src.attr"/>
       <ref name="component.attr"/>
  +  </define>
  +
  +  <define name="jtidy-config">
  +    <element name="jtidy-config">
  +      <text/>
  +    </element>
     </define>
   
   <!-- Transformers ====================================== -->