cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon Cocoon.java cocoon.properties Frontend.java
Date Tue, 04 Apr 2000 11:10:11 GMT
stefano     00/04/04 04:10:11

  Modified:    src/org/apache/cocoon Cocoon.java cocoon.properties
                        Frontend.java
  Log:
  cosmetic cleanups + new cocoon properties for enhanced formatters
  
  Revision  Changes    Path
  1.13      +3 -3      xml-cocoon/src/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Cocoon.java	2000/02/13 18:29:16	1.12
  +++ Cocoon.java	2000/04/04 11:10:10	1.13
  @@ -1,4 +1,4 @@
  -/*-- $Id: Cocoon.java,v 1.12 2000/02/13 18:29:16 stefano Exp $ -- 
  +/*-- $Id: Cocoon.java,v 1.13 2000/04/04 11:10:10 stefano Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -64,7 +64,7 @@
    * separate different knowledge contexts in different processing layers.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.12 $ $Date: 2000/02/13 18:29:16 $
  + * @version $Revision: 1.13 $ $Date: 2000/04/04 11:10:10 $
    */
   
   public class Cocoon extends HttpServlet implements Defaults {
  @@ -102,7 +102,7 @@
               exception = null;
               message = "<p>The servlet initialization argument <i>\"" + INIT_ARG
+ "\"</i> was not found. " +
                   "Please, make sure Cocoon is able to find its configurations or it won't
be able to execute correctly.</p>" +
  -                "<p>A template for such configurations may be found in the file \"/bin/cocoon.properties\"
in the distribution.</p>";
  +                "<p>A template for such configurations may be found in the file \"/conf/cocoon.properties\"
in the distribution.</p>";
               return;
           }
   
  
  
  
  1.22      +53 -16    xml-cocoon/src/org/apache/cocoon/cocoon.properties
  
  Index: cocoon.properties
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/cocoon.properties,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- cocoon.properties	2000/03/31 11:25:38	1.21
  +++ cocoon.properties	2000/04/04 11:10:11	1.22
  @@ -102,6 +102,8 @@
   processor.type.sql = org.apache.cocoon.processor.sql.SQLProcessor
   
   # LDAP Processor
  +# NOTE: you need to have the SUN JDNI API (jndi.jar) in your classpath
  +# in order for this processor to work. Check the FAQ for more information.
   #processor.type.ldap = org.apache.cocoon.processor.ldap.LdapProcessor
   
   ##########################################
  @@ -159,27 +161,62 @@
   # XML Formatters                         #
   ##########################################
   
  -# These are used when the <?cocoon-format type="xxx/yyy"?> PI is present
  -# The syntax for this is
  -#   formatter.type.xxx/yyy = full.class.name
  -
  -formatter.type.text/xml    = org.apache.cocoon.formatter.XMLFormatter
  -formatter.type.text/wml    = org.apache.cocoon.formatter.WMLFormatter
  -formatter.type.text/html   = org.apache.cocoon.formatter.HTMLFormatter
  -formatter.type.text/plain  = org.apache.cocoon.formatter.TextFormatter
  -formatter.type.text/xslfo  = org.apache.cocoon.formatter.FO2PDFFormatter
  -formatter.type.model/vrml  = org.apache.cocoon.formatter.VRMLFormatter
  -
   # This is used when no <?cocoon?> PI is present to indicate
   # which MIME type to associate to the document.
   # NOTE: this type must present in the above map.
   formatter.default = text/html
   
  -# Specifies the text stream format. (meaningful for text formatters only)
  -# Supported styles are
  -#   - normal
  -#   - compact
  -formatter.style = normal
  +# These are used when the <?cocoon-format type="xxx/yyy"?> PI is present
  +# The syntax for this is
  +#   formatter.type.xxx/yyy = full.class.name
  +
  +# Full configurable formatters
  +###############################
  +
  +formatter.type.text/html        = org.apache.cocoon.formatter.HTMLFormatter
  +formatter.type.text/html/loose  = org.apache.cocoon.formatter.HTMLFormatter
  +formatter.type.text/xml         = org.apache.cocoon.formatter.XMLFormatter
  +formatter.type.text/wml         = org.apache.cocoon.formatter.XMLFormatter
  +formatter.type.text/plain       = org.apache.cocoon.formatter.TextFormatter
  +formatter.type.model/vrml       = org.apache.cocoon.formatter.TextFormatter
  +formatter.type.text/xslfo       = org.apache.cocoon.formatter.FO2PDFFormatter
  +
  +# You can modify the formatter's behavior by adding the following configurations
  +# for each formatter you want to specifize. Note that even if two formatters
  +# share the same class, they are will be seen as different entities, accessed
  +# only by their types.
  +#
  +#   formatter.[type].MIME-type      = [formatter MIME type]
  +#   formatter.[type].encoding       = [encoding type]
  +#   formatter.[type].doctype-public = [public identifier]
  +#   formatter.[type].doctype-system = [system identifier]
  +#   formatter.[type].preserve-space = [whether to preserve space or not]
  +#   formatter.[type].line-width     = [page width, wrapping column]
  +#   formatter.[type].indent         = [numbers of spaces for tag indenting]
  +
  +# HTML 4.0 (strict)
  +formatter.text/html.doctype-public = -//W3C//DTD HTML 4.0//EN
  +formatter.text/html.doctype-system = http://www.w3.org/TR/REC-html40/strict.dtd
  +
  +# WML 1.1
  +formatter.text/wml.doctype-public = -//WAPFORUM//DTD WML 1.1//EN
  +formatter.text/wml.doctype-system = http://www.wapforum.org/DTD/wml_1.1.xml
  +formatter.text/wml.MIME-type = text/vnd.wap.wml
  +
  +# VRML 97
  +formatter.model/vrml.MIME-type = model/vrml
  +
  +# PDF
  +formatter.text/xslfo.MIME-type = application/pdf
  +
  +# HTML 4.0 (trasitional)
  +formatter.text/html/loose.doctype-public = -//W3C//DTD HTML 4.0 Transitional//EN
  +formatter.text/html/loose.doctype-system = http://www.w3.org/TR/REC-html40/loose.dtd
  +formatter.text/html/loose.preserve-space = true
  +formatter.text/html/loose.encoding = UTF-8
  +formatter.text/html/loose.indent = 1
  +formatter.text/html/loose.line-width = 120
  +formatter.text/html/loose.MIME-type = text/html
   
   
   
  
  
  
  1.8       +3 -3      xml-cocoon/src/org/apache/cocoon/Frontend.java
  
  Index: Frontend.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Frontend.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Frontend.java	2000/02/13 18:29:16	1.7
  +++ Frontend.java	2000/04/04 11:10:11	1.8
  @@ -1,4 +1,4 @@
  -/*-- $Id: Frontend.java,v 1.7 2000/02/13 18:29:16 stefano Exp $ -- 
  +/*-- $Id: Frontend.java,v 1.8 2000/04/04 11:10:11 stefano Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -64,7 +64,7 @@
    * smart publishing behavior. (ECS may be used instead).
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.7 $ $Date: 2000/02/13 18:29:16 $
  + * @version $Revision: 1.8 $ $Date: 2000/04/04 11:10:11 $
    */
   
   public class Frontend implements Defaults {
  @@ -101,7 +101,7 @@
       }
   
       public static void header(PrintWriter out) {
  -        header(out, 60);
  +        header(out, 90);
       }
   
       public static void header(PrintWriter out, int width) {
  
  
  

Mime
View raw message