You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by st...@locus.apache.org on 2000/05/12 14:40:29 UTC

cvs commit: xml-cocoon/src/org/apache/cocoon Cocoon.java Engine.java

stefano     00/05/12 05:40:29

  Modified:    src/org/apache/cocoon Cocoon.java Engine.java
  Log:
  made browsers accessible by all producers
  
  Revision  Changes    Path
  1.16      +4 -4      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Cocoon.java	2000/05/10 15:02:06	1.15
  +++ Cocoon.java	2000/05/12 12:40:29	1.16
  @@ -1,4 +1,4 @@
  -/*-- $Id: Cocoon.java,v 1.15 2000/05/10 15:02:06 stefano Exp $ -- 
  +/*-- $Id: Cocoon.java,v 1.16 2000/05/12 12:40:29 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.15 $ $Date: 2000/05/10 15:02:06 $
  + * @version $Revision: 1.16 $ $Date: 2000/05/12 12:40:29 $
    */
   
   public class Cocoon extends HttpServlet implements Defaults {
  @@ -115,9 +115,9 @@
   
           try {
               // Create the configuration object
  -            // if we are using a servlet container that is 2.1 or higher then we
  +            // if we are using a servlet container that is 2.2 or higher then we
               // can use container based resources instead of files
  -            if ((containerMajorVersion >= 2) && (containerMinorVersion > 0)) {
  +            if ((containerMajorVersion >= 2) && (containerMinorVersion >= 2)) {
                  try {
                      URL resource = config.getServletContext().getResource(confsName);
                      InputStream confsStream = resource.openConnection().getInputStream();
  
  
  
  1.28      +3 -2      xml-cocoon/src/org/apache/cocoon/Engine.java
  
  Index: Engine.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Engine.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Engine.java	2000/05/07 16:04:27	1.27
  +++ Engine.java	2000/05/12 12:40:29	1.28
  @@ -1,4 +1,4 @@
  -/*-- $Id: Engine.java,v 1.27 2000/05/07 16:04:27 stefano Exp $ --
  +/*-- $Id: Engine.java,v 1.28 2000/05/12 12:40:29 stefano Exp $ --
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -73,7 +73,7 @@
    * This class implements the engine that does all the document processing.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.27 $ $Date: 2000/05/07 16:04:27 $
  + * @version $Revision: 1.28 $ $Date: 2000/05/12 12:40:29 $
    */
   
   public class Engine implements Defaults {
  @@ -177,6 +177,7 @@
           browsers = (Browsers) manager.create(
               "org.apache.cocoon.Browsers",
               configurations.getConfigurations(BROWSERS_PROP));
  +        manager.setRole("browsers", browsers);
       }
   
       /**