From bca830c8ee8cc574bd3f05e0599c56d05ba011e2 Mon Sep 17 00:00:00 2001
From: Luke Parker <lparker@amdocs.com>
Date: Tue, 19 Jun 2018 23:35:33 +1000
Subject: Change MDC datetime formatter to Zulu time

Change-Id: I0e771e0ec10d1972290c44e8e0740309ac83bc52
Signed-off-by: Luke Parker <lparker@amdocs.com>
Issue-ID: LOG-115
---
 .../ref/slf4j/demo/SLF4JRefApplication.java        |  6 ++--
 .../src/main/resources/logback.xml                 | 35 ----------------------
 .../org/onap/logging/ref/slf4j/CallGraphTest.java  |  2 +-
 .../ref/slf4j/demo/SLF4JRefApplicationTest.java    |  6 ++--
 .../src/test/resources/logback.xml                 | 35 ++++++++++++++++++++++
 5 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 reference/logging-slf4j-demo/src/main/resources/logback.xml
 create mode 100644 reference/logging-slf4j-demo/src/test/resources/logback.xml

(limited to 'reference/logging-slf4j-demo/src')

diff --git a/reference/logging-slf4j-demo/src/main/java/org/onap/logging/ref/slf4j/demo/SLF4JRefApplication.java b/reference/logging-slf4j-demo/src/main/java/org/onap/logging/ref/slf4j/demo/SLF4JRefApplication.java
index 146f66b..ff2fa2f 100644
--- a/reference/logging-slf4j-demo/src/main/java/org/onap/logging/ref/slf4j/demo/SLF4JRefApplication.java
+++ b/reference/logging-slf4j-demo/src/main/java/org/onap/logging/ref/slf4j/demo/SLF4JRefApplication.java
@@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class SLF4JRefApplication {
 
     /** System property override, read by embedded Logback configuration. */
-    public static final String SLF4J_OUTPUT_DIRECTORY = "SLF4J_OUTPUT_DIRECTORY";
+    public static final String TESTNG_SLF4J_OUTPUT_DIRECTORY = "TESTNG_SLF4J_OUTPUT_DIRECTORY";
 
     /**
      * Launch from CLI.
@@ -48,7 +48,7 @@ public class SLF4JRefApplication {
      * overridden by tests, but not in services.)
      */
     static void initOutputDirectory() {
-        System.getProperties().setProperty(SLF4J_OUTPUT_DIRECTORY,
-                System.getProperty(SLF4J_OUTPUT_DIRECTORY, "."));
+        System.getProperties().setProperty(TESTNG_SLF4J_OUTPUT_DIRECTORY,
+                System.getProperty(TESTNG_SLF4J_OUTPUT_DIRECTORY, "."));
     }
 }
\ No newline at end of file
diff --git a/reference/logging-slf4j-demo/src/main/resources/logback.xml b/reference/logging-slf4j-demo/src/main/resources/logback.xml
deleted file mode 100644
index 554d712..0000000
--- a/reference/logging-slf4j-demo/src/main/resources/logback.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<configuration>
-
-    <property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
-    <property name="p_lvl" value="%level"/>
-    <property name="p_log" value="%logger"/>
-    <property name="p_mdc" value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}"/>
-    <property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/>
-    <property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/>
-    <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
-    <property name="p_thr" value="%thread"/>
-    <property name="pattern" value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n"/>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${SLF4J_OUTPUT_DIRECTORY}/output.log</file>
-        <encoder>
-            <pattern>${pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <logger level="debug" name="org.onap.logging.ref.slf4j" additivity="false">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </logger>
-
-    <root level="error">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-</configuration>
diff --git a/reference/logging-slf4j-demo/src/test/java/org/onap/logging/ref/slf4j/CallGraphTest.java b/reference/logging-slf4j-demo/src/test/java/org/onap/logging/ref/slf4j/CallGraphTest.java
index 3d123e0..cc52cf3 100644
--- a/reference/logging-slf4j-demo/src/test/java/org/onap/logging/ref/slf4j/CallGraphTest.java
+++ b/reference/logging-slf4j-demo/src/test/java/org/onap/logging/ref/slf4j/CallGraphTest.java
@@ -58,7 +58,7 @@ public class CallGraphTest {
     public static void setUp() throws Exception {
         AbstractComponentTest.setInProcess();
         sDir = Files.createTempDirectory(CallGraphTest.class.getName()).toFile();
-        System.getProperties().setProperty("SLF4J_OUTPUT_DIRECTORY", sDir.getAbsolutePath());
+        System.getProperties().setProperty("TESTNG_SLF4J_OUTPUT_DIRECTORY", sDir.getAbsolutePath());
         LoggerFactory.getLogger(CallGraphTest.class).info("Starting.");
     }
 
diff --git a/reference/logging-slf4j-demo/src/test/java/org/onap/logging/ref/slf4j/demo/SLF4JRefApplicationTest.java b/reference/logging-slf4j-demo/src/test/java/org/onap/logging/ref/slf4j/demo/SLF4JRefApplicationTest.java
index a01cbe8..43f8746 100644
--- a/reference/logging-slf4j-demo/src/test/java/org/onap/logging/ref/slf4j/demo/SLF4JRefApplicationTest.java
+++ b/reference/logging-slf4j-demo/src/test/java/org/onap/logging/ref/slf4j/demo/SLF4JRefApplicationTest.java
@@ -34,14 +34,14 @@ public class SLF4JRefApplicationTest {
 
     @Test
     public void testProperty() {
-        assertThat(SLF4JRefApplication.SLF4J_OUTPUT_DIRECTORY,
-                is("SLF4J_OUTPUT_DIRECTORY"));
+        assertThat(SLF4JRefApplication.TESTNG_SLF4J_OUTPUT_DIRECTORY,
+                is("TESTNG_SLF4J_OUTPUT_DIRECTORY"));
     }
 
     @Test
     public void testInitOutputDirectory() throws Exception {
         SLF4JRefApplication.initOutputDirectory();
-        assertThat(System.getProperty(SLF4JRefApplication.SLF4J_OUTPUT_DIRECTORY),
+        assertThat(System.getProperty(SLF4JRefApplication.TESTNG_SLF4J_OUTPUT_DIRECTORY),
                 notNullValue());
     }
 }
diff --git a/reference/logging-slf4j-demo/src/test/resources/logback.xml b/reference/logging-slf4j-demo/src/test/resources/logback.xml
new file mode 100644
index 0000000..ba86e54
--- /dev/null
+++ b/reference/logging-slf4j-demo/src/test/resources/logback.xml
@@ -0,0 +1,35 @@
+<configuration>
+
+    <property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
+    <property name="p_lvl" value="%level"/>
+    <property name="p_log" value="%logger"/>
+    <property name="p_mdc" value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}"/>
+    <property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+    <property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+    <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+    <property name="p_thr" value="%thread"/>
+    <property name="pattern" value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n"/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>${TESTNG_SLF4J_OUTPUT_DIRECTORY}/output.log</file>
+        <encoder>
+            <pattern>${pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <logger level="debug" name="org.onap.logging.ref.slf4j" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
+    </logger>
+
+    <root level="error">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>
-- 
cgit 1.2.3-korg