|
|
@ -219,9 +219,9 @@ public class FrameworkLogger { |
|
|
|
try { |
|
|
|
try { |
|
|
|
// log4j v2 available?
|
|
|
|
// log4j v2 available?
|
|
|
|
log4jLoggerClass = Class.forName( |
|
|
|
log4jLoggerClass = Class.forName( |
|
|
|
"org.apache.logging.log4j.Logger"); |
|
|
|
"com.fr.third.apache.logging.log4j.Logger"); |
|
|
|
log4jManagerClass = Class.forName( |
|
|
|
log4jManagerClass = Class.forName( |
|
|
|
"org.apache.logging.log4j.LogManager"); |
|
|
|
"com.fr.third.apache.logging.log4j.LogManager"); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
|
|
|
|
|
|
|
|
// The class will only load successfully if Log4j v2 thinks it is
|
|
|
|
// The class will only load successfully if Log4j v2 thinks it is
|
|
|
@ -232,11 +232,11 @@ public class FrameworkLogger { |
|
|
|
// Attempt to configure log4j v2
|
|
|
|
// Attempt to configure log4j v2
|
|
|
|
if (log4jLoggerClass != null) { |
|
|
|
if (log4jLoggerClass != null) { |
|
|
|
try { |
|
|
|
try { |
|
|
|
populateJdkToLog4jLevels("org.apache.logging.log4j.Level"); |
|
|
|
populateJdkToLog4jLevels("com.fr.third.apache.logging.log4j.Level"); |
|
|
|
|
|
|
|
|
|
|
|
log4jLogMethod = log4jLoggerClass.getMethod("log", |
|
|
|
log4jLogMethod = log4jLoggerClass.getMethod("log", |
|
|
|
new Class[] { |
|
|
|
new Class[] { |
|
|
|
Class.forName("org.apache.logging.log4j.Level"), |
|
|
|
Class.forName("com.fr.third.apache.logging.log4j.Level"), |
|
|
|
Object.class, Throwable.class |
|
|
|
Object.class, Throwable.class |
|
|
|
}); |
|
|
|
}); |
|
|
|
log4jGetLogger = log4jManagerClass.getMethod("getLogger", |
|
|
|
log4jGetLogger = log4jManagerClass.getMethod("getLogger", |
|
|
@ -272,7 +272,7 @@ public class FrameworkLogger { |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
try { |
|
|
|
// log4j v1 available?
|
|
|
|
// log4j v1 available?
|
|
|
|
log4jLoggerClass = Class.forName("org.apache.log4j.Logger"); |
|
|
|
log4jLoggerClass = Class.forName("com.fr.third.apache.log4j.Logger"); |
|
|
|
log4jManagerClass = log4jLoggerClass; |
|
|
|
log4jManagerClass = log4jLoggerClass; |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
|
|
|
|
|
|
|
@ -284,11 +284,11 @@ public class FrameworkLogger { |
|
|
|
// Attempt to configure log4j v1
|
|
|
|
// Attempt to configure log4j v1
|
|
|
|
if (log4jLoggerClass != null) { |
|
|
|
if (log4jLoggerClass != null) { |
|
|
|
try { |
|
|
|
try { |
|
|
|
populateJdkToLog4jLevels("org.apache.log4j.Level"); |
|
|
|
populateJdkToLog4jLevels("com.fr.third.apache.log4j.Level"); |
|
|
|
|
|
|
|
|
|
|
|
log4jLogMethod = log4jLoggerClass.getMethod("log", |
|
|
|
log4jLogMethod = log4jLoggerClass.getMethod("log", |
|
|
|
new Class[] { |
|
|
|
new Class[] { |
|
|
|
String.class, Class.forName("org.apache.log4j.Priority"), |
|
|
|
String.class, Class.forName("com.fr.third.apache.log4j.Priority"), |
|
|
|
Object.class, Throwable.class |
|
|
|
Object.class, Throwable.class |
|
|
|
}); |
|
|
|
}); |
|
|
|
log4jGetLogger = log4jManagerClass.getMethod("getLogger", |
|
|
|
log4jGetLogger = log4jManagerClass.getMethod("getLogger", |
|
|
@ -350,7 +350,7 @@ public class FrameworkLogger { |
|
|
|
|
|
|
|
|
|
|
|
lm.readConfiguration(istream); |
|
|
|
lm.readConfiguration(istream); |
|
|
|
|
|
|
|
|
|
|
|
Logger cmdlineLogger = Logger.getLogger("org.hsqldb.cmdline"); |
|
|
|
Logger cmdlineLogger = Logger.getLogger("com.fr.third.org.hsqldb.cmdline"); |
|
|
|
|
|
|
|
|
|
|
|
cmdlineLogger.addHandler(consoleHandler); |
|
|
|
cmdlineLogger.addHandler(consoleHandler); |
|
|
|
cmdlineLogger.setUseParentHandlers(false); |
|
|
|
cmdlineLogger.setUseParentHandlers(false); |
|
|
|