tomdz       2005/12/21 14:28:17

  Modified:    src/java/org/apache/ojb/broker/util/configuration Tag:
                        OJB_1_0_RELEASE Configurator.java Configurable.java
                        Configuration.java ConfigurationException.java
               src/java/org/apache/ojb/broker/util/configuration/impl Tag:
                        OJB_1_0_RELEASE OjbConfigurator.java
                        ConfigurationAbstractImpl.java
                        OjbConfiguration.java
               src/java/org/apache/ojb/broker/util/collections Tag:
                        OJB_1_0_RELEASE RemovalAwareCollection.java
                        ManageableHashSet.java RemovalAwareList.java
                        RemovalAwareSet.java ManageableHashMap.java
                        ManageableArrayList.java ManageableVector.java
                        IRemovalAwareCollection.java
               src/java/org/apache/ojb/broker/util/logging Tag:
                        OJB_1_0_RELEASE LoggerFactoryImpl.java
                        LoggerFactory.java Logger.java Log4jLoggerImpl.java
                        StringBufferLoggerImpl.java
                        LoggerWrapperPrintWriter.java
                        PoorMansLoggerImpl.java LoggingConfiguration.java
                        CommonsLoggerImpl.java
               src/java/org/apache/ojb/broker/util/interceptor Tag:
                        OJB_1_0_RELEASE TracingInterceptor.java
                        InterceptorFactory.java Interceptor.java
               src/java/org/apache/ojb/broker/util/dbhandling Tag:
                        OJB_1_0_RELEASE TorqueDBHandling.java
                        DBHandlingTask.java DBHandling.java
               src/java/org/apache/ojb/broker/util/event Tag:
                        OJB_1_0_RELEASE OjbEvent.java OjbEventListener.java
               src/java/org/apache/ojb/broker/util/factory Tag:
                        OJB_1_0_RELEASE ConfigurableFactory.java
  Log:
  Updated license
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.5.2.1   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/configuration/Attic/Configurator.java
  
  Index: Configurator.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/configuration/Attic/Configurator.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- Configurator.java 4 Apr 2004 23:53:37 -0000       1.5
  +++ Configurator.java 21 Dec 2005 22:28:15 -0000      1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.configuration;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.1   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/configuration/Attic/Configurable.java
  
  Index: Configurable.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/configuration/Attic/Configurable.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- Configurable.java 4 Apr 2004 23:53:37 -0000       1.5
  +++ Configurable.java 21 Dec 2005 22:28:15 -0000      1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.configuration;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.1   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/configuration/Attic/Configuration.java
  
  Index: Configuration.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/configuration/Attic/Configuration.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- Configuration.java        4 Apr 2004 23:53:37 -0000       1.5
  +++ Configuration.java        21 Dec 2005 22:28:15 -0000      1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.configuration;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.1   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/configuration/Attic/ConfigurationException.java
  
  Index: ConfigurationException.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/configuration/Attic/ConfigurationException.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- ConfigurationException.java       4 Apr 2004 23:53:37 -0000       1.5
  +++ ConfigurationException.java       21 Dec 2005 22:28:15 -0000      1.5.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.configuration;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  No                   revision
  No                   revision
  1.7.2.1   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/Attic/OjbConfigurator.java
  
  Index: OjbConfigurator.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/Attic/OjbConfigurator.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- OjbConfigurator.java      4 Apr 2004 23:53:37 -0000       1.7
  +++ OjbConfigurator.java      21 Dec 2005 22:28:15 -0000      1.7.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.configuration.impl;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.15.2.4  +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/Attic/ConfigurationAbstractImpl.java
  
  Index: ConfigurationAbstractImpl.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/Attic/ConfigurationAbstractImpl.java,v
  retrieving revision 1.15.2.3
  retrieving revision 1.15.2.4
  diff -u -r1.15.2.3 -r1.15.2.4
  --- ConfigurationAbstractImpl.java    9 Nov 2005 00:53:45 -0000       1.15.2.3
  +++ ConfigurationAbstractImpl.java    21 Dec 2005 22:28:15 -0000      1.15.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.configuration.impl;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.35.2.6  +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/Attic/OjbConfiguration.java
  
  Index: OjbConfiguration.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/Attic/OjbConfiguration.java,v
  retrieving revision 1.35.2.5
  retrieving revision 1.35.2.6
  diff -u -r1.35.2.5 -r1.35.2.6
  --- OjbConfiguration.java     9 Aug 2005 20:03:22 -0000       1.35.2.5
  +++ OjbConfiguration.java     21 Dec 2005 22:28:15 -0000      1.35.2.6
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.configuration.impl;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  No                   revision
  No                   revision
  1.7.2.3   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/collections/RemovalAwareCollection.java
  
  Index: RemovalAwareCollection.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/collections/RemovalAwareCollection.java,v
  retrieving revision 1.7.2.2
  retrieving revision 1.7.2.3
  diff -u -r1.7.2.2 -r1.7.2.3
  --- RemovalAwareCollection.java       17 Apr 2005 13:29:37 -0000      1.7.2.2
  +++ RemovalAwareCollection.java       21 Dec 2005 22:28:15 -0000      1.7.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.collections;
   
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.7.2.1   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/collections/ManageableHashSet.java
  
  Index: ManageableHashSet.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/collections/ManageableHashSet.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- ManageableHashSet.java    22 May 2004 09:51:25 -0000      1.7
  +++ ManageableHashSet.java    21 Dec 2005 22:28:15 -0000      1.7.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.collections;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.4.2.1   +4 -2      
db-ojb/src/java/org/apache/ojb/broker/util/collections/RemovalAwareList.java
  
  Index: RemovalAwareList.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/collections/RemovalAwareList.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- RemovalAwareList.java     30 Apr 2004 20:14:24 -0000      1.4
  +++ RemovalAwareList.java     21 Dec 2005 22:28:15 -0000      1.4.2.1
  @@ -1,5 +1,6 @@
   package org.apache.ojb.broker.util.collections;
  -/* Copyright 2004-2004 The Apache Software Foundation
  +
  +/* Copyright 2004-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -13,6 +14,7 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
   import org.apache.ojb.broker.PersistenceBroker;
   import org.apache.ojb.broker.PersistenceBrokerException;
   
  
  
  
  1.1.2.2   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/collections/RemovalAwareSet.java
  
  Index: RemovalAwareSet.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/collections/RemovalAwareSet.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- RemovalAwareSet.java      11 Apr 2005 16:21:01 -0000      1.1.2.1
  +++ RemovalAwareSet.java      21 Dec 2005 22:28:15 -0000      1.1.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.collections;
   
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.6.2.2   +1 -1      
db-ojb/src/java/org/apache/ojb/broker/util/collections/ManageableHashMap.java
  
  Index: ManageableHashMap.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/collections/ManageableHashMap.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- ManageableHashMap.java    29 Sep 2005 17:21:20 -0000      1.6.2.1
  +++ ManageableHashMap.java    21 Dec 2005 22:28:15 -0000      1.6.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.collections;
   
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.7.2.1   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/collections/ManageableArrayList.java
  
  Index: ManageableArrayList.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/collections/ManageableArrayList.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- ManageableArrayList.java  22 May 2004 09:51:25 -0000      1.7
  +++ ManageableArrayList.java  21 Dec 2005 22:28:15 -0000      1.7.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.collections;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.7.2.1   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/collections/ManageableVector.java
  
  Index: ManageableVector.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/collections/ManageableVector.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- ManageableVector.java     22 May 2004 09:51:25 -0000      1.7
  +++ ManageableVector.java     21 Dec 2005 22:28:15 -0000      1.7.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.collections;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.1.2.1   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/collections/Attic/IRemovalAwareCollection.java
  
  Index: IRemovalAwareCollection.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/collections/Attic/IRemovalAwareCollection.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- IRemovalAwareCollection.java      30 Apr 2004 20:14:24 -0000      1.1
  +++ IRemovalAwareCollection.java      21 Dec 2005 22:28:15 -0000      1.1.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.collections;
   
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  No                   revision
  No                   revision
  1.18.2.6  +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/logging/LoggerFactoryImpl.java
  
  Index: LoggerFactoryImpl.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/LoggerFactoryImpl.java,v
  retrieving revision 1.18.2.5
  retrieving revision 1.18.2.6
  diff -u -r1.18.2.5 -r1.18.2.6
  --- LoggerFactoryImpl.java    7 Dec 2005 15:19:04 -0000       1.18.2.5
  +++ LoggerFactoryImpl.java    21 Dec 2005 22:28:16 -0000      1.18.2.6
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.logging;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.7.2.1   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/logging/LoggerFactory.java
  
  Index: LoggerFactory.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/LoggerFactory.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- LoggerFactory.java        4 Apr 2004 23:53:38 -0000       1.7
  +++ LoggerFactory.java        21 Dec 2005 22:28:16 -0000      1.7.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.logging;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.9.2.1   +1 -1      
db-ojb/src/java/org/apache/ojb/broker/util/logging/Logger.java
  
  Index: Logger.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/Logger.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- Logger.java       1 Jun 2004 21:42:21 -0000       1.9
  +++ Logger.java       21 Dec 2005 22:28:16 -0000      1.9.2.1
  @@ -1 +1 @@
  -package org.apache.ojb.broker.util.logging;

/* Copyright 2002-2004 The Apache Software Foundation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

import org.apache.ojb.broker.util.configuration.Configurable;
import org.apache.ojb.broker.util.configuration.Configuration;
import org.apache.ojb.broker.util.configuration.ConfigurationException;

import java.io.Serializable;


/**
 * this interface defines the behaviour of a logging mechanism.
 * This API corresponds clos
 ely to the LOG4J Category Api.
 * By using this interface OJB remains free from Logger-Implementation
 * specific code.
 */
public interface Logger extends Serializable, Configurable
{
        static final long serialVersionUID = 1177329037874407180L;    /*
     * OJB loglevel constants. they corespond directly to LOG4J LogLevels.
     */
    public final static int DEBUG = 1;
    public final static int INFO = 2;
    public final static int WARN = 3;
    public final static int ERROR = 4;
    public final static int FATAL = 5;


    /**
     * generate a message for loglevel DEBUG
     * @param pObject the message Object
     */
    public void debug(Object pObject);

    /**
     * generate a message for loglevel INFO
     * @param pObject the message Object
     */
    public void info(Object pObject);

    /**
     * generate a message for loglevel WARN
     * @param pObject the message Object
     */
    public void warn(Object pObject);

    /**
     * generate a message for 
 loglevel ERROR
     * @param pObject the message Object
     */
    public void error(Object pObject);

    /**
     * generate a message for loglevel FATAL
     * @param pObject the message Object
     */
    public void fatal(Object pObject);

    public void debug(Object message, Throwable obj);
    public void info(Object message, Throwable obj);
    public void warn(Object message, Throwable obj);
    public void error(Object message, Throwable obj);
    public void fatal(Object message, Throwable obj);

    public boolean isEnabledFor(int priority);
    public boolean isDebugEnabled();

    /**
     * returns the name of the logger isntance
     */
    public String getName();

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : DEBUG
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thro
 wn while accessing the arguments. 
     */
    public void safeDebug(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : DEBUG
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeDebug(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : INFO
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeInfo(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any e
 xception thrown by obj.toString() implementations.
     * Log level used : INFO
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeInfo(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : WARN
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeWarn(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : WARN
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *          
    that are thrown while accessing the arguments. 
     */
    public void safeWarn(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : ERROR
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeError(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : ERROR
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeError(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This metho
 d can be used to prevent any exception thrown by obj.toString() 
implementations.
     * Log level used : FATAL
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeFatal(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : FATAL
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeFatal(String message, Object obj, Throwable t);

    /**
     * Configure this logging. Note that the config object will be an instance
     * of [EMAIL PROTECTED] LoggingConfiguration}.
     * 
     * @param config The [EMAIL PROTECTED] LoggingConfiguration} object
     * @throws ConfigurationException
     */
   
  void configure(Configuration config) throws ConfigurationException;
}
  +package org.apache.ojb.broker.util.logging;

/* Copyright 2002-2005 The Apache Software Foundation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

import org.apache.ojb.broker.util.configuration.Configurable;
import org.apache.ojb.broker.util.configuration.Configuration;
import org.apache.ojb.broker.util.configuration.ConfigurationException;

import java.io.Serializable;


/**
 * this interface defines the behaviour of a logging mechanism.
 * This API corresponds clos
 ely to the LOG4J Category Api.
 * By using this interface OJB remains free from Logger-Implementation
 * specific code.
 */
public interface Logger extends Serializable, Configurable
{
        static final long serialVersionUID = 1177329037874407180L;    /*
     * OJB loglevel constants. they corespond directly to LOG4J LogLevels.
     */
    public final static int DEBUG = 1;
    public final static int INFO = 2;
    public final static int WARN = 3;
    public final static int ERROR = 4;
    public final static int FATAL = 5;


    /**
     * generate a message for loglevel DEBUG
     * @param pObject the message Object
     */
    public void debug(Object pObject);

    /**
     * generate a message for loglevel INFO
     * @param pObject the message Object
     */
    public void info(Object pObject);

    /**
     * generate a message for loglevel WARN
     * @param pObject the message Object
     */
    public void warn(Object pObject);

    /**
     * generate a message for 
 loglevel ERROR
     * @param pObject the message Object
     */
    public void error(Object pObject);

    /**
     * generate a message for loglevel FATAL
     * @param pObject the message Object
     */
    public void fatal(Object pObject);

    public void debug(Object message, Throwable obj);
    public void info(Object message, Throwable obj);
    public void warn(Object message, Throwable obj);
    public void error(Object message, Throwable obj);
    public void fatal(Object message, Throwable obj);

    public boolean isEnabledFor(int priority);
    public boolean isDebugEnabled();

    /**
     * returns the name of the logger isntance
     */
    public String getName();

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : DEBUG
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thro
 wn while accessing the arguments. 
     */
    public void safeDebug(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : DEBUG
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeDebug(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : INFO
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeInfo(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any e
 xception thrown by obj.toString() implementations.
     * Log level used : INFO
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeInfo(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : WARN
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeWarn(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : WARN
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *          
    that are thrown while accessing the arguments. 
     */
    public void safeWarn(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : ERROR
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeError(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : ERROR
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeError(String message, Object obj, Throwable t);

    /**
     * Exception safe log method.
     * This metho
 d can be used to prevent any exception thrown by obj.toString() 
implementations.
     * Log level used : FATAL
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeFatal(String message, Object obj);

    /**
     * Exception safe log method.
     * This method can be used to prevent any exception thrown by 
obj.toString() implementations.
     * Log level used : FATAL
     * @deprecated The normal logging methods should always be safe with regard 
to exceptions
     *             that are thrown while accessing the arguments. 
     */
    public void safeFatal(String message, Object obj, Throwable t);

    /**
     * Configure this logging. Note that the config object will be an instance
     * of [EMAIL PROTECTED] LoggingConfiguration}.
     * 
     * @param config The [EMAIL PROTECTED] LoggingConfiguration} object
     * @throws ConfigurationException
     */
   
  void configure(Configuration config) throws ConfigurationException;
}
  
  
  
  1.16.2.4  +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/logging/Log4jLoggerImpl.java
  
  Index: Log4jLoggerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/Log4jLoggerImpl.java,v
  retrieving revision 1.16.2.3
  retrieving revision 1.16.2.4
  diff -u -r1.16.2.3 -r1.16.2.4
  --- Log4jLoggerImpl.java      21 Nov 2005 20:16:47 -0000      1.16.2.3
  +++ Log4jLoggerImpl.java      21 Dec 2005 22:28:16 -0000      1.16.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.logging;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.1.2.2   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/logging/StringBufferLoggerImpl.java
  
  Index: StringBufferLoggerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/StringBufferLoggerImpl.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- StringBufferLoggerImpl.java       17 Nov 2005 01:34:19 -0000      1.1.2.1
  +++ StringBufferLoggerImpl.java       21 Dec 2005 22:28:16 -0000      1.1.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.logging;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.1.2.3   +16 -1     
db-ojb/src/java/org/apache/ojb/broker/util/logging/LoggerWrapperPrintWriter.java
  
  Index: LoggerWrapperPrintWriter.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/LoggerWrapperPrintWriter.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- LoggerWrapperPrintWriter.java     7 Jun 2005 17:27:05 -0000       1.1.2.2
  +++ LoggerWrapperPrintWriter.java     21 Dec 2005 22:28:16 -0000      1.1.2.3
  @@ -1,5 +1,20 @@
   package org.apache.ojb.broker.util.logging;
   
  +/* Copyright 2002-2005 The Apache Software Foundation
  + *
  + * Licensed under the Apache License, Version 2.0 (the "License");
  + * you may not use this file except in compliance with the License.
  + * You may obtain a copy of the License at
  + *
  + *     http://www.apache.org/licenses/LICENSE-2.0
  + *
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an "AS IS" BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + */
  +
   import java.io.PrintWriter;
   
   import org.apache.commons.lang.BooleanUtils;
  
  
  
  1.11.2.3  +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/logging/PoorMansLoggerImpl.java
  
  Index: PoorMansLoggerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/PoorMansLoggerImpl.java,v
  retrieving revision 1.11.2.2
  retrieving revision 1.11.2.3
  diff -u -r1.11.2.2 -r1.11.2.3
  --- PoorMansLoggerImpl.java   17 Nov 2005 01:34:19 -0000      1.11.2.2
  +++ PoorMansLoggerImpl.java   21 Dec 2005 22:28:16 -0000      1.11.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.logging;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.8.2.4   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/logging/LoggingConfiguration.java
  
  Index: LoggingConfiguration.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/LoggingConfiguration.java,v
  retrieving revision 1.8.2.3
  retrieving revision 1.8.2.4
  diff -u -r1.8.2.3 -r1.8.2.4
  --- LoggingConfiguration.java 9 Nov 2005 01:02:37 -0000       1.8.2.3
  +++ LoggingConfiguration.java 21 Dec 2005 22:28:16 -0000      1.8.2.4
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.logging;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.4.2.3   +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/logging/CommonsLoggerImpl.java
  
  Index: CommonsLoggerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/CommonsLoggerImpl.java,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- CommonsLoggerImpl.java    21 Nov 2005 20:16:47 -0000      1.4.2.2
  +++ CommonsLoggerImpl.java    21 Dec 2005 22:28:16 -0000      1.4.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.logging;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  No                   revision
  No                   revision
  1.11.2.1  +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/interceptor/TracingInterceptor.java
  
  Index: TracingInterceptor.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/interceptor/TracingInterceptor.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- TracingInterceptor.java   4 Apr 2004 23:53:37 -0000       1.11
  +++ TracingInterceptor.java   21 Dec 2005 22:28:16 -0000      1.11.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.interceptor;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.10.2.3  +2 -2      
db-ojb/src/java/org/apache/ojb/broker/util/interceptor/Attic/InterceptorFactory.java
  
  Index: InterceptorFactory.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/interceptor/Attic/InterceptorFactory.java,v
  retrieving revision 1.10.2.2
  retrieving revision 1.10.2.3
  diff -u -r1.10.2.2 -r1.10.2.3
  --- InterceptorFactory.java   9 Nov 2005 00:54:49 -0000       1.10.2.2
  +++ InterceptorFactory.java   21 Dec 2005 22:28:16 -0000      1.10.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.interceptor;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.4.2.1   +3 -1      
db-ojb/src/java/org/apache/ojb/broker/util/interceptor/Interceptor.java
  
  Index: Interceptor.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/interceptor/Interceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- Interceptor.java  4 Apr 2004 23:53:37 -0000       1.4
  +++ Interceptor.java  21 Dec 2005 22:28:16 -0000      1.4.2.1
  @@ -1,5 +1,6 @@
   package org.apache.ojb.broker.util.interceptor;
  -/* Copyright 2002-2004 The Apache Software Foundation
  +
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -13,6 +14,7 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
   import java.lang.reflect.Method;
   
   //#ifdef JDK13
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +1 -1      
db-ojb/src/java/org/apache/ojb/broker/util/dbhandling/Attic/TorqueDBHandling.java
  
  Index: TorqueDBHandling.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/dbhandling/Attic/TorqueDBHandling.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- TorqueDBHandling.java     17 Jun 2004 19:50:19 -0000      1.1
  +++ TorqueDBHandling.java     21 Dec 2005 22:28:17 -0000      1.1.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.dbhandling;
   
  -/* Copyright 2004-2004 The Apache Software Foundation
  +/* Copyright 2004-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.1.2.2   +1 -1      
db-ojb/src/java/org/apache/ojb/broker/util/dbhandling/Attic/DBHandlingTask.java
  
  Index: DBHandlingTask.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/dbhandling/Attic/DBHandlingTask.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- DBHandlingTask.java       11 Mar 2005 11:27:50 -0000      1.1.2.1
  +++ DBHandlingTask.java       21 Dec 2005 22:28:17 -0000      1.1.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.dbhandling;
   
  -/* Copyright 2004-2004 The Apache Software Foundation
  +/* Copyright 2004-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.1.2.1   +1 -1      
db-ojb/src/java/org/apache/ojb/broker/util/dbhandling/Attic/DBHandling.java
  
  Index: DBHandling.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/dbhandling/Attic/DBHandling.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- DBHandling.java   17 Jun 2004 19:50:19 -0000      1.1
  +++ DBHandling.java   21 Dec 2005 22:28:17 -0000      1.1.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.dbhandling;
   
  -/* Copyright 2004-2004 The Apache Software Foundation
  +/* Copyright 2004-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +4 -3      
db-ojb/src/java/org/apache/ojb/broker/util/event/OjbEvent.java
  
  Index: OjbEvent.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/event/OjbEvent.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- OjbEvent.java     4 Apr 2004 23:53:37 -0000       1.3
  +++ OjbEvent.java     21 Dec 2005 22:28:17 -0000      1.3.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.util.event;
   
  -import java.util.EventObject;
  -
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import java.util.EventObject;
  +
   public class OjbEvent extends EventObject
   {
       public OjbEvent(Object source)
  
  
  
  1.3.2.1   +4 -3      
db-ojb/src/java/org/apache/ojb/broker/util/event/OjbEventListener.java
  
  Index: OjbEventListener.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/event/OjbEventListener.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- OjbEventListener.java     4 Apr 2004 23:53:37 -0000       1.3
  +++ OjbEventListener.java     21 Dec 2005 22:28:17 -0000      1.3.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.util.event;
   
  -import java.util.EventListener;
  -
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import java.util.EventListener;
  +
   public interface OjbEventListener extends EventListener
   {
   
  
  
  
  No                   revision
  No                   revision
  1.15.2.1  +1 -1      
db-ojb/src/java/org/apache/ojb/broker/util/factory/Attic/ConfigurableFactory.java
  
  Index: ConfigurableFactory.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/factory/Attic/ConfigurableFactory.java,v
  retrieving revision 1.15
  retrieving revision 1.15.2.1
  diff -u -r1.15 -r1.15.2.1
  --- ConfigurableFactory.java  3 May 2004 23:05:56 -0000       1.15
  +++ ConfigurableFactory.java  21 Dec 2005 22:28:17 -0000      1.15.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.factory;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to