svn commit: r154507 - cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java

[cziegeler]

Author: cziegeler
Date: Sun Feb 20 04:24:52 2005
New Revision: 154507

URL: http://svn.apache.org/viewcvs?view=rev&rev=154507
Log:
Remove debug msgs and change some property names

Modified:
    cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java
    
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java

Modified: 
cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java?view=diff&r1=154506&r2=154507
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java 
(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java 
Sun Feb 20 04:24:52 2005
@@ -70,14 +70,14 @@
      * try setting this parameter to "true".
      */
     protected boolean initClassloader = INIT_CLASSLOADER;
-    public static final String KEY_INIT_CLASSLOADER = "init.classloader";
+    public static final String KEY_INIT_CLASSLOADER = "classloader.init";
 
     /**
      * This parameter allows to set system properties
      */
     protected Map forceProperties = new HashMap();
     /** FIXME - implement the support for this key: */
-    public static final String KEY_FORCE_PROPERTIES = "force.properties";
+    public static final String KEY_FORCE_PROPERTIES = "system.properties";
     
     /**
      * This parameter points to the main configuration file for Cocoon.
@@ -98,7 +98,7 @@
      * configuration used by the environment.
      */
     protected String accessLogger;
-    public static final String KEY_LOGGING_ACCESS_LOGGER = 
"logging.logger.access";
+    public static final String KEY_LOGGING_ACCESS_LOGGER = 
"logging.logger.access.category";
 
     /**
      * This parameter indicates the category id of the logger from the LogKit
@@ -108,7 +108,7 @@
      * logger="..." attribute in the component configuration file.
      */
     protected String cocoonLogger;
-    public static final String KEY_LOGGING_COCOON_LOGGER = 
"logging.logger.cocoon";
+    public static final String KEY_LOGGING_COCOON_LOGGER = 
"logging.logger.cocoon.category";
 
     /**
      * This parameter indicates the log level to use throughout startup of the
@@ -117,7 +117,7 @@
      * not readable/available this log level is of importance.
      */
     protected String bootstrapLogLevel;
-    public static final String KEY_LOGGING_BOOTSTRAP_LOGLEVEL = 
"logging.bootstrap.level";
+    public static final String KEY_LOGGING_BOOTSTRAP_LOGLEVEL = 
"logging.bootstrap.loglevel";
 
     /**
      * This parameter switches the logging system from LogKit to Log4J for 
Cocoon.
@@ -155,7 +155,7 @@
      */
     protected List loadClasses = new ArrayList();
     /** FIXME: Implement support for this: */
-    public static final String KEY_LOAD_CLASSES = "load.classes";
+    public static final String KEY_LOAD_CLASSES = "classloader.load.classes";
 
     /**
      * Causes all files in multipart requests to be processed.

Modified: 
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java?view=diff&r1=154506&r2=154507
==============================================================================
--- 
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java
 (original)
+++ 
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/PoolableComponentHandler.java
 Sun Feb 20 04:24:52 2005
@@ -61,7 +61,6 @@
         this.guessWorkInterfaces( factory.getCreatedClass(), workInterfaces );
 
         this.interfaces = (Class[]) workInterfaces.toArray( new 
Class[workInterfaces.size()] );
-        System.out.println("New poolable handler for " + 
factory.getCreatedClass());
     }
     
     /* (non-Javadoc)
@@ -157,9 +156,6 @@
         public void invoke() {
             try {
                 final Object o = this.componentHolder.get();
-                if ( o == null ) {
-                    System.out.println(this.hashCode() + "/" + 
Thread.currentThread() + " : Releasing null for " + 
this.handler.factory.getCreatedClass());
-                }
                 this.handler.putIntoPool(o);
             } catch (Exception ignore) {
                 // we ignore this