cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gree...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon Cocoon.java
Date Wed, 13 Dec 2000 03:38:40 GMT
greenrd     00/12/12 19:38:40

  Modified:    .        changes.xml
               src/org/apache/cocoon Cocoon.java
  Log:
  added ability to override cocoon.properties configs in zone.properties
  
  Revision  Changes    Path
  1.165     +5 -1      xml-cocoon/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/changes.xml,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- changes.xml	2000/12/12 16:07:59	1.164
  +++ changes.xml	2000/12/13 03:38:39	1.165
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes   
  -  $Id: changes.xml,v 1.164 2000/12/12 16:07:59 greenrd Exp $ 
  +  $Id: changes.xml,v 1.165 2000/12/13 03:38:39 greenrd Exp $ 
   -->
   
   <changes title="History of Changes">
  @@ -18,6 +18,10 @@
     </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="RDG" type="add" due-to="Nicolas Lichtmaier"
  +   due-to-email="nick@technisys.com.ar">
  +   You can now override options in cocoon.properties, in web.xml or zone.properties.
  +  </action>
     <action dev="RDG" type="fix" due-to="Berin Loritsch" 
      due-to-email="bloritsch@infoplanning.com">
      Workaround for Websphere classloader: URL handler bug
  
  
  
  1.19      +10 -2     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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Cocoon.java	2000/12/12 16:08:02	1.18
  +++ Cocoon.java	2000/12/13 03:38:39	1.19
  @@ -1,4 +1,4 @@
  -/*-- $Id: Cocoon.java,v 1.18 2000/12/12 16:08:02 greenrd Exp $ -- 
  +/*-- $Id: Cocoon.java,v 1.19 2000/12/13 03:38:39 greenrd 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.18 $ $Date: 2000/12/12 16:08:02 $
  + * @version $Revision: 1.19 $ $Date: 2000/12/13 03:38:39 $
    */
   
   public class Cocoon extends HttpServlet implements Defaults {
  @@ -145,6 +145,14 @@
               statusURL = (String) confs.get(STATUS_URL, STATUS_URL_DEFAULT);
               errorsInternally = ((String) confs.get(ERROR_INTERNALLY, "false")).toLowerCase().equals("true");
   
  +            // Override configuration settings with the "zone" values
  +            // This is most useful for pre-Servlet-2.2 engines such as JServ
  +            Enumeration e = config.getInitParameterNames ();
  +            while (e.hasMoreElements ()) {
  +                String name = (String) e.nextElement ();
  +                confs.put (name, config.getInitParameter (name));
  +            }
  +                                                                                      
                     
               // create the engine
               engine = Engine.getInstance(confs, this.getServletConfig().getServletContext());
           } catch (Exception e) {
  
  
  

Mime
View raw message