Skip to content

Commit efa4ab2

Browse files
author
Wenjun Che
committed
ADAP-43: Replaced java logging with slf4j
1 parent e73a38f commit efa4ab2

File tree

3 files changed

+62
-4
lines changed

3 files changed

+62
-4
lines changed

‎pom.xml‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>co.openfin</groupId>
88
<artifactId>openfin-desktop-java-example</artifactId>
9-
<version>5.44.2.0</version>
9+
<version>5.44.2.2</version>
1010
<packaging>jar</packaging>
1111

1212
<name>openfin-desktop-java-example</name>
@@ -38,13 +38,55 @@
3838
<dependency>
3939
<groupId>co.openfin</groupId>
4040
<artifactId>openfin-desktop-java-adapter</artifactId>
41-
<version>5.44.2.0</version>
41+
<version>5.44.2.2</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>tablelayout</groupId>
4545
<artifactId>TableLayout</artifactId>
4646
<version>20050920</version>
4747
</dependency>
48+
<dependency>
49+
<groupId>junit</groupId>
50+
<artifactId>junit</artifactId>
51+
<version>4.11</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.hamcrest</groupId>
55+
<artifactId>hamcrest-core</artifactId>
56+
<version>1.3</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.hamcrest</groupId>
60+
<artifactId>hamcrest-library</artifactId>
61+
<version>1.1</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.mockito</groupId>
65+
<artifactId>mockito-core</artifactId>
66+
<version>1.9.5</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.slf4j</groupId>
70+
<artifactId>slf4j-api</artifactId>
71+
<version>1.7.5</version>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.slf4j</groupId>
75+
<artifactId>slf4j-jdk14</artifactId>
76+
<version>1.6.1</version>
77+
</dependency>
78+
<!-- to use log4j and comment out slf4j-jdk14
79+
<dependency>
80+
<groupId>org.slf4j</groupId>
81+
<artifactId>slf4j-log4j12</artifactId>
82+
<version>1.7.5</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>log4j</groupId>
86+
<artifactId>log4j</artifactId>
87+
<version>1.2.17</version>
88+
</dependency>
89+
-->
4890
</dependencies>
4991

5092
<build>

‎release/log4j.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
3+
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
4+
<appender name="console" class="org.apache.log4j.ConsoleAppender">
5+
<param name="Target" value="System.out"/>
6+
<layout class="org.apache.log4j.PatternLayout">
7+
<param name="ConversionPattern" value="%-5p %c{1} - %m%n"/>
8+
</layout>
9+
</appender>
10+
11+
<root>
12+
<priority value ="debug" />
13+
<appender-ref ref="console" />
14+
</root>
15+
</log4j:configuration>

‎src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
import java.awt.event.WindowListener;
1818
import java.util.ArrayList;
1919
import java.util.HashMap;
20-
import java.util.logging.Logger;
20+
import org.slf4j.Logger;
21+
import org.slf4j.LoggerFactory;
2122

2223
/**
2324
*
@@ -42,7 +43,7 @@
4243
*
4344
*/
4445
public class OpenFinDesktopDemo extends JPanel implements ActionListener, WindowListener {
45-
private final static Logger logger = Logger.getLogger(OpenFinDesktopDemo.class.getName());
46+
private final static Logger logger = LoggerFactory.getLogger(OpenFinDesktopDemo.class.getName());
4647

4748

4849
private static JFrame jFrame;

0 commit comments

Comments
 (0)