From eee992f02343cefc4e3572dedaf9b74a244f7974 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 15 Aug 2017 10:59:29 -0600
Subject: [PATCH] moved logging.props; always in src root now
---
src/gov/usgs/earthquake/nshmp/internal/Logging.java | 8 --------
{lib => src}/logging.properties | 0
2 files changed, 8 deletions(-)
rename {lib => src}/logging.properties (100%)
diff --git a/src/gov/usgs/earthquake/nshmp/internal/Logging.java b/src/gov/usgs/earthquake/nshmp/internal/Logging.java
index 8a70eb942..05440d2ba 100644
--- a/src/gov/usgs/earthquake/nshmp/internal/Logging.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/Logging.java
@@ -6,7 +6,6 @@ import static java.util.logging.Level.SEVERE;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.logging.Formatter;
@@ -28,14 +27,7 @@ public class Logging {
*/
public static void init() {
try {
- /*
- * When running from a jar, logging.properties will have been moved to the
- * root of the source directory, otherwise it can be found in lib.
- */
InputStream is = Logging.class.getResourceAsStream("/logging.properties");
- if (is == null) {
- is = new FileInputStream("lib/logging.properties");
- }
LogManager.getLogManager().readConfiguration(is);
} catch (IOException ioe) {
ioe.printStackTrace();
diff --git a/lib/logging.properties b/src/logging.properties
similarity index 100%
rename from lib/logging.properties
rename to src/logging.properties
--
GitLab