You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2003/03/06 15:41:46 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/util/logging LoggerFactoryImpl.java
arminw 2003/03/06 06:41:46
Modified: src/java/org/apache/ojb/broker/metadata/fieldaccess
PersistentFieldFactory.java
src/java/org/apache/ojb/broker/util/logging
LoggerFactoryImpl.java
Log:
use OjbConfigurator instead PBF
to obtain OjbConfiguration
Revision Changes Path
1.4 +40 -39 db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldFactory.java
Index: PersistentFieldFactory.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PersistentFieldFactory.java 20 Dec 2002 01:53:31 -0000 1.3
+++ PersistentFieldFactory.java 6 Mar 2003 14:41:46 -0000 1.4
@@ -54,12 +54,12 @@
* <http://www.apache.org/>.
*/
-import java.lang.reflect.Constructor;
-
-import org.apache.ojb.broker.PersistenceBrokerFactory;
import org.apache.ojb.broker.metadata.MetadataException;
import org.apache.ojb.broker.singlevm.PersistenceBrokerConfiguration;
import org.apache.ojb.broker.util.configuration.ConfigurationException;
+import org.apache.ojb.broker.util.configuration.impl.OjbConfigurator;
+
+import java.lang.reflect.Constructor;
/**
* @author <a href="mailto:thma@apache.org">Thomas Mahler<a>
@@ -69,8 +69,9 @@
public class PersistentFieldFactory
{
private static Class persistentFieldClass = null;
- private static boolean usesAccessorsAndMutators = false;
- private static boolean usesAccessorsAndMutatorsCheck = false;
+ private static boolean usesAccessorsAndMutators = false;
+ private static boolean usesAccessorsAndMutatorsCheck = false;
+
/**
* @throws MetadataException if an erros occours when creating the PersistenteField
*/
@@ -86,56 +87,56 @@
}
}
- Class[] types = { Class.class, String.class };
+ Class[] types = {Class.class, String.class};
Constructor c = persistentFieldClass.getConstructor(types);
Object[] args =
- { attributeType, attributeName };
+ {attributeType, attributeName};
Object instance = c.newInstance(args);
return (PersistentField) instance;
}
- catch(Exception ex)
+ catch (Exception ex)
{
- throw new MetadataException("Error creating PersistentField: "+ attributeType.getName() + ", " + attributeName,ex);
+ throw new MetadataException("Error creating PersistentField: " + attributeType.getName() + ", " + attributeName, ex);
}
}
- public static boolean usesAccessorsAndMutators()
- {
- boolean retval = false;
- if (usesAccessorsAndMutatorsCheck)
- retval = usesAccessorsAndMutators;
- else
- {
- Class clazz = getPersistentFieldClass();
- PersistentField field = null;
- try
- {
- field = (PersistentField) clazz.newInstance();
- usesAccessorsAndMutators = field.usesAccessorsAndMutators();
- retval = usesAccessorsAndMutators;
- usesAccessorsAndMutatorsCheck = true;
- }
- catch (InstantiationException e)
- {
- System.out.println("InstantiationException in usesAccessorsAndMutators " + e.getMessage());
- }
- catch (IllegalAccessException e)
- {
- System.out.println("IllegalAccessException error in usesAccessorsAndMutators " + e.getMessage());
- }
- }
- return retval;
- }
+ public static boolean usesAccessorsAndMutators()
+ {
+ boolean retval = false;
+ if (usesAccessorsAndMutatorsCheck)
+ retval = usesAccessorsAndMutators;
+ else
+ {
+ Class clazz = getPersistentFieldClass();
+ PersistentField field = null;
+ try
+ {
+ field = (PersistentField) clazz.newInstance();
+ usesAccessorsAndMutators = field.usesAccessorsAndMutators();
+ retval = usesAccessorsAndMutators;
+ usesAccessorsAndMutatorsCheck = true;
+ }
+ catch (InstantiationException e)
+ {
+ System.out.println("InstantiationException in usesAccessorsAndMutators " + e.getMessage());
+ }
+ catch (IllegalAccessException e)
+ {
+ System.out.println("IllegalAccessException error in usesAccessorsAndMutators " + e.getMessage());
+ }
+ }
+ return retval;
+ }
private static Class getPersistentFieldClass()
{
try
{
PersistenceBrokerConfiguration config =
- (PersistenceBrokerConfiguration) PersistenceBrokerFactory.getConfigurator().getConfigurationFor(
- null);
+ (PersistenceBrokerConfiguration) OjbConfigurator.getInstance().getConfigurationFor(
+ null);
Class clazz = config.getPersistentFieldClass();
return clazz;
1.11 +30 -38 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LoggerFactoryImpl.java 15 Feb 2003 10:46:32 -0000 1.10
+++ LoggerFactoryImpl.java 6 Mar 2003 14:41:46 -0000 1.11
@@ -55,18 +55,17 @@
*/
//OJB
-import org.apache.ojb.broker.PersistenceBrokerFactory;
-import org.apache.ojb.broker.util.configuration.Configurator;
-//LOG4j
import org.apache.log4j.LogManager;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.ojb.broker.util.ClassHelper;
+import org.apache.ojb.broker.util.configuration.Configurator;
+import org.apache.ojb.broker.util.configuration.impl.OjbConfigurator;
-//JDK
+import java.net.URL;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
-import java.util.Enumeration;
-import java.net.URL;
/**
* The factory class <code>LoggerFactory</code> can be used
@@ -108,7 +107,6 @@
}
-
/**
* returns a minimal logger that needs no configuration
* and can thus be safely used during OJB boot phase
@@ -121,14 +119,13 @@
{
bootLogger = new PoorMansLoggerImpl("BOOT");
// allow user to set boot log level via system property
- String level = System.getProperty("OJB.bootLogLevel","WARN");
+ String level = System.getProperty("OJB.bootLogLevel", "WARN");
((PoorMansLoggerImpl) bootLogger).setLevel(level);
}
return bootLogger;
}
-
/**
* returns the default logger. This Logger can
* be used when it is not appropriate to use a
@@ -137,7 +134,7 @@
*/
public Logger getDefaultLogger()
{
- if(defaultLogger == null)
+ if (defaultLogger == null)
{
defaultLogger = getLogger("DEFAULT");
}
@@ -145,7 +142,6 @@
}
-
/**
* returns a Logger. The Logger is named
* after the full qualified name of input parameter clazz
@@ -158,7 +154,6 @@
}
-
/**
* returns a Logger.
* @param loggerName the name of the Logger
@@ -169,7 +164,7 @@
//lookup in the cache first
if (cache.containsKey(loggerName))
{
- getBootLogger().debug("Returning cached version of Logger["+ loggerName + "]");
+ getBootLogger().debug("Returning cached version of Logger[" + loggerName + "]");
return (Logger) cache.get(loggerName);
}
getBootLogger().debug("Logger[" + loggerName + "] not cached");
@@ -179,48 +174,47 @@
try
{
// obtain configurator
- Configurator configurator = PersistenceBrokerFactory.getConfigurator();
+ Configurator configurator = OjbConfigurator.getInstance();
// get the configuration
LoggingConfiguration lc = (LoggingConfiguration) configurator.getConfigurationFor(null);
loggerClass = lc.getLoggerClass();
- getBootLogger().debug("Using logger class : "+loggerClass+" for:"+loggerName);
- Class[] aType = {String.class};
- Object[] aArgs = {loggerName};
- java.lang.reflect.Constructor constructor = loggerClass.getConstructor( aType ) ;
- logger = (Logger) constructor.newInstance( aArgs );
+ getBootLogger().debug("Using logger class : " + loggerClass + " for:" + loggerName);
+ logger = (Logger) ClassHelper.newInstance(loggerClass, String.class, loggerName);
// configure the logger
- if(logger instanceof Log4jLoggerImpl)
+ if (logger instanceof Log4jLoggerImpl)
{
- if(!isLog4JConfigured())
+ getBootLogger().debug("Initializing Log4j logger instance " + loggerName);
+ if (!isLog4JConfigured())
{
initializeLog4JSubSystem(lc.getLoggerConfigFile());
}
}
- else if(logger instanceof PoorMansLoggerImpl)
+ else if (logger instanceof PoorMansLoggerImpl)
{
- getBootLogger().debug("Initializing PoorMans logger instance " + loggerName);
+ getBootLogger().debug("Initializing PoorMans logger instance " + loggerName);
logger.configure(lc);
}
- else if(logger instanceof CommonsLoggerImpl)
+ else if (logger instanceof CommonsLoggerImpl)
{
- getBootLogger().debug("Initializing Commons logger instance " + loggerName);
+ getBootLogger().debug("Initializing Commons logger instance " + loggerName);
+
logger.configure(lc);
}
else
{
- // try to initialize a custom logger
+ // try to initialize a custom logger
try
{
- getBootLogger().debug("Initializing Custom logger instance " + loggerName);
+ getBootLogger().debug("Initializing Custom logger instance " + loggerName);
logger.configure(lc);
}
catch (Exception x)
{
- throw new IllegalArgumentException("Don't know how to initialize : "+logger);
- }
+ throw new IllegalArgumentException("Don't know how to initialize : " + logger);
+ }
}
//cache it so we can get it faster the next time
@@ -229,35 +223,34 @@
catch (Throwable t)
{
logger = getBootLogger();
- logger.error("["+this.getClass().getName()+"] Could not set logger for class " + loggerClass, t);
+ logger.error("[" + this.getClass().getName() + "] Could not set logger for class " + loggerClass, t);
}
return logger;
}
-
/**
* Helper method to check if log4j is already configured
*/
synchronized boolean isLog4JConfigured()
{
- if(log4jConfigured)
+ if (log4jConfigured)
return true;
Enumeration enum = org.apache.log4j.Logger.getRootLogger().getAllAppenders();
- if ( !(enum instanceof org.apache.log4j.helpers.NullEnumeration) )
+ if (!(enum instanceof org.apache.log4j.helpers.NullEnumeration))
{
log4jConfigured = true;
return true;
}
else
{
- Enumeration cats = LogManager.getCurrentLoggers();
- while ( cats.hasMoreElements() )
+ Enumeration cats = LogManager.getCurrentLoggers();
+ while (cats.hasMoreElements())
{
org.apache.log4j.Logger c = (org.apache.log4j.Logger) cats.nextElement();
- if ( !(c.getAllAppenders() instanceof org.apache.log4j.helpers.NullEnumeration) )
+ if (!(c.getAllAppenders() instanceof org.apache.log4j.helpers.NullEnumeration))
{
log4jConfigured = true;
return true;
@@ -266,7 +259,6 @@
}
return false;
}
-
/**