Return-Path: 
 <cocoon-cvs-return-3443-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 22594 invoked by uid 500); 12 Sep 2001 13:07:56 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 22584 invoked by uid 500); 12 Sep 2001 13:07:56 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 12 Sep 2001 13:03:32 -0000
Message-ID: <20010912130332.30619.qmail@icarus.apache.org>
From: dims@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit: xml-cocoon2/src/org/apache/cocoon Cocoon.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

dims        01/09/12 06:03:32

  Modified:    src/org/apache/cocoon Cocoon.java
  Log:
  Patch to disable HSQLDB by commenting out the hsqldb-server section in cocoon.xconf
  
  Revision  Changes    Path
  1.27      +18 -12    xml-cocoon2/src/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Cocoon.java	2001/09/08 16:20:38	1.26
  +++ Cocoon.java	2001/09/12 13:03:31	1.27
  @@ -58,16 +58,16 @@
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a> (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
  - * @version CVS $Revision: 1.26 $ $Date: 2001/09/08 16:20:38 $
  + * @version CVS $Revision: 1.27 $ $Date: 2001/09/12 13:03:31 $
    */
  -public class Cocoon 
  -        extends AbstractLoggable 
  -        implements ThreadSafe, 
  -                   Component, 
  -                   Initializable, 
  -                   Disposable, 
  -                   Modifiable, 
  -                   Processor, 
  +public class Cocoon
  +        extends AbstractLoggable
  +        implements ThreadSafe,
  +                   Component,
  +                   Initializable,
  +                   Disposable,
  +                   Modifiable,
  +                   Processor,
                      Contextualizable,
                      Composable,
                      LogKitManageable{
  @@ -224,8 +224,14 @@
           // Start the database server
           Server server = null;
           try {
  -            getLogger().debug("Starting database server");
  -            server = (Server) this.componentManager.lookup(Server.ROLE);
  +            // Check if the hsqldb server has been disabled in either cocoon.roles or cocoon.xconf
  +            Configuration children[] = conf.getChildren("hsqldb-server");
  +            if((children != null) && (children.length > 0) && this.componentManager.hasComponent(Server.ROLE)) {
  +                getLogger().debug("Starting database server");
  +                server = (Server) this.componentManager.lookup(Server.ROLE);
  +            } else {
  +                getLogger().debug("Disabled hsqldb server");
  +            }
           } catch (Exception e){
               getLogger().error("Error starting database server",e);
           } finally {
  @@ -450,7 +456,7 @@
               String[] params = request.getParameterValues(p);
               for (int i = 0; i < params.length; i++) {
                   msg.append("["+params[i]+"]");
  -                if (i != params.length-1) 
  +                if (i != params.length-1)
                   msg.append(", ");
               }
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org