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

[vgritsenko]

vgritsenko    02/01/18 12:13:41

  Modified:    src/java/org/apache/cocoon Cocoon.java
  Log:
  Remove forced initialization of HSQL; it is initialized by manager
  
  Revision  Changes    Path
  1.4       +1 -24     xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Cocoon.java       7 Jan 2002 12:36:46 -0000       1.3
  +++ Cocoon.java       18 Jan 2002 20:13:40 -0000      1.4
  @@ -72,7 +72,6 @@
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.components.hsqldb.Server;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.generator.ProgramGenerator;
   import org.apache.cocoon.components.parser.Parser;
  @@ -104,7 +103,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a> (Apache 
Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2002/01/07 12:36:46 $
  + * @version CVS $Revision: 1.4 $ $Date: 2002/01/18 20:13:40 $
    */
   public class Cocoon
           extends AbstractLoggable
  @@ -285,28 +284,6 @@
               }
               this.componentManager.release(processor);
           }
  -
  -        // Start the database server
  -        Server server = null;
  -        try {
  -            // 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)) {
  -                if (getLogger().isDebugEnabled()) {
  -                    getLogger().debug("Starting database server");
  -                }
  -                server = (Server) this.componentManager.lookup(Server.ROLE);
  -            } else {
  -                if (getLogger().isDebugEnabled()) {
  -                    getLogger().debug("Disabled hsqldb server");
  -                }
  -            }
  -        } catch (Exception e){
  -            getLogger().error("Error starting database server",e);
  -        } finally {
  -            this.componentManager.release(server);
  -        }
  -
       }
   
       /** Dump System Properties */
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]