cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: cocoon-2.1 status.xml
Date Thu, 15 May 2003 14:19:08 GMT
vgritsenko    2003/05/15 07:19:07

  Modified:    .        changes.xml
               src/webapp sitemap.xmap
               .        status.xml
  Log:
  Document different doctypes for xhtml1 serializer
  Add xhtml11 serializer (fixes bug 16003)
  
  Revision  Changes    Path
  1.11      +5 -1      cocoon-2.0/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/changes.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- changes.xml	7 May 2003 21:20:03 -0000	1.10
  +++ changes.xml	15 May 2003 14:19:04 -0000	1.11
  @@ -42,6 +42,10 @@
    </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="VG" type="add" fixes-bug="16003">
  +   Added XHTML 1.1 DTD to the entity catalog. Added XHTML 1.1 serializer into the sitemap.
  +   Explained different XHTML 1.0 serializer options.
  +  </action>
     <action dev="CZ" type="fix" fixes-bug="14564">
      Fixing NPE in JspEngineImpl.
     </action>
  
  
  
  1.3       +23 -0     cocoon-2.0/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/sitemap.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sitemap.xmap	1 May 2003 18:51:14 -0000	1.2
  +++ sitemap.xmap	15 May 2003 14:19:05 -0000	1.3
  @@ -195,10 +195,33 @@
      <map:serializer name="xhtml" mime-type="text/html"         logger="sitemap.serializer.xhtml"
                      src="org.apache.cocoon.serialization.XMLSerializer"
                      pool-max="64" pool-min="2" pool-grow="2">
  +     <!--
  +       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 simulteneously, 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>
      </map:serializer>
  +
  +   <map:serializer name="xhtml11" mime-type="text/html"       logger="sitemap.serializer.xhtml"
  +                   src="org.apache.cocoon.serialization.XMLSerializer"
  +                   pool-max="64" pool-min="2" pool-grow="2">
  +     <doctype-public>-//W3C//DTD XHTML 1.1//EN</doctype-public>
  +     <doctype-system>http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</doctype-system>
  +     <encoding>UTF-8</encoding>
  +   </map:serializer>   
   
      <map:serializer name="text"   mime-type="text/plain"        logger="sitemap.serializer.text"
                      src="org.apache.cocoon.serialization.TextSerializer"/>
  
  
  
  1.32      +4 -0      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- status.xml	15 May 2003 10:09:40 -0000	1.31
  +++ status.xml	15 May 2003 14:19:07 -0000	1.32
  @@ -180,6 +180,10 @@
     <changes>
   
    <release version="@version@" date="@date@">
  +  <action dev="VG" type="add" fixes-bug="16003">
  +   Added XHTML 1.1 DTD to the entity catalog. Added XHTML 1.1 serializer into the sitemap.
  +   Explained different XHTML 1.0 serializer options.
  +  </action>
     <action dev="SMS" type="update" fixes-bug="18466" due-to="Yury Mikhienko" due-to-email="yuryx@mobicomk.donpac.ru">
      Enable the LDAPTransformer to obtain attribute values from LDAP using various encoding
      schemes for stored values.
  
  
  

Mime
View raw message