diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/logging')
17 files changed, 27 insertions, 20 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/logging/CLISmartHandler.java b/src/de/lmu/ifi/dbs/elki/logging/CLISmartHandler.java index c425e5fb..4aa6f89b 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/CLISmartHandler.java +++ b/src/de/lmu/ifi/dbs/elki/logging/CLISmartHandler.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/ELKILogRecord.java b/src/de/lmu/ifi/dbs/elki/logging/ELKILogRecord.java index 211b788b..98a25b01 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/ELKILogRecord.java +++ b/src/de/lmu/ifi/dbs/elki/logging/ELKILogRecord.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/Logging.java b/src/de/lmu/ifi/dbs/elki/logging/Logging.java index a2d43bbc..ea412905 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/Logging.java +++ b/src/de/lmu/ifi/dbs/elki/logging/Logging.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java b/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java index 2d191f7c..e6a61bef 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java +++ b/src/de/lmu/ifi/dbs/elki/logging/LoggingConfiguration.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team @@ -48,7 +48,7 @@ public final class LoggingConfiguration { /** * Configuration file name */ - private static final String CLIConffile = "logging-cli.properties"; + private static final String LOGGING_PROPERTIES_FILE = "logging.properties"; /** * Top level ELKI package (for setting 'verbose') @@ -63,7 +63,7 @@ public final class LoggingConfiguration { /** * Static instance of the configuration */ - protected static LoggingConfiguration config = new LoggingConfiguration(confbase, CLIConffile); + protected static LoggingConfiguration config = new LoggingConfiguration(confbase, LOGGING_PROPERTIES_FILE); /** * Configure Java Logging API: {@link java.util.logging.LogManager} @@ -95,8 +95,15 @@ public final class LoggingConfiguration { if(pkg == null) { pkg = ""; } - // Load logging configuration from resources. - String cfgfile = pkg.replace('.', File.separatorChar) + File.separatorChar + name; + // Load logging configuration from current directory + String cfgfile = name; + if(new File(name).exists()) { + cfgfile = name; + } + else { + // Fall back to full path / resources. + cfgfile = pkg.replace('.', File.separatorChar) + File.separatorChar + name; + } try { InputStream cfgdata = FileUtil.openSystemFile(cfgfile); logManager.readConfiguration(cfgdata); diff --git a/src/de/lmu/ifi/dbs/elki/logging/LoggingUtil.java b/src/de/lmu/ifi/dbs/elki/logging/LoggingUtil.java index a9413eab..808a648c 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/LoggingUtil.java +++ b/src/de/lmu/ifi/dbs/elki/logging/LoggingUtil.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/MessageFormatter.java b/src/de/lmu/ifi/dbs/elki/logging/MessageFormatter.java index 5ea5c489..9c1f6046 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/MessageFormatter.java +++ b/src/de/lmu/ifi/dbs/elki/logging/MessageFormatter.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/OutputStreamLogger.java b/src/de/lmu/ifi/dbs/elki/logging/OutputStreamLogger.java index 6d8a23f5..7bd09da0 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/OutputStreamLogger.java +++ b/src/de/lmu/ifi/dbs/elki/logging/OutputStreamLogger.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/logging-cli.properties b/src/de/lmu/ifi/dbs/elki/logging/logging.properties index 538da540..538da540 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/logging-cli.properties +++ b/src/de/lmu/ifi/dbs/elki/logging/logging.properties diff --git a/src/de/lmu/ifi/dbs/elki/logging/package-info.java b/src/de/lmu/ifi/dbs/elki/logging/package-info.java index d7a3321e..cb6f3377 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/package-info.java +++ b/src/de/lmu/ifi/dbs/elki/logging/package-info.java @@ -56,7 +56,7 @@ if (verbose) { This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures -Copyright (C) 2011 +Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/AbstractProgress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/AbstractProgress.java index 2fb6764e..070dbdb9 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/AbstractProgress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/AbstractProgress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/FiniteProgress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/FiniteProgress.java index 4319255f..6d70b560 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/FiniteProgress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/FiniteProgress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/IndefiniteProgress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/IndefiniteProgress.java index 404a990a..9a13947c 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/IndefiniteProgress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/IndefiniteProgress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/Progress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/Progress.java index 092ec49c..972f0c58 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/Progress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/Progress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressLogRecord.java b/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressLogRecord.java index 8f54f75e..64e8214e 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressLogRecord.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressLogRecord.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressTracker.java b/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressTracker.java index b7c125c9..d39e3107 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressTracker.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/ProgressTracker.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/StepProgress.java b/src/de/lmu/ifi/dbs/elki/logging/progress/StepProgress.java index b5eee462..df6e3b13 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/StepProgress.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/StepProgress.java @@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.logging.progress; This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures - Copyright (C) 2011 + Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team diff --git a/src/de/lmu/ifi/dbs/elki/logging/progress/package-info.java b/src/de/lmu/ifi/dbs/elki/logging/progress/package-info.java index bad21ca9..8b25c703 100644 --- a/src/de/lmu/ifi/dbs/elki/logging/progress/package-info.java +++ b/src/de/lmu/ifi/dbs/elki/logging/progress/package-info.java @@ -5,7 +5,7 @@ This file is part of ELKI: Environment for Developing KDD-Applications Supported by Index-Structures -Copyright (C) 2011 +Copyright (C) 2012 Ludwig-Maximilians-Universität München Lehr- und Forschungseinheit für Datenbanksysteme ELKI Development Team |