From eca99576a0bf41a07684fc653405b9e9d2a09111 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 11 Jul 2016 11:04:58 +1000
Subject: [PATCH] Move net.md_5.bungee.log to its own module.

API subject to change and should not be used externally.
---
 log/nb-configuration.xml                      | 31 ++++++++++++++++
 log/pom.xml                                   | 35 +++++++++++++++++++
 .../net/md_5/bungee/log/BungeeLogger.java     | 11 +++---
 .../net/md_5/bungee/log/ColouredWriter.java   |  1 -
 .../net/md_5/bungee/log/ConciseFormatter.java |  1 +
 .../net/md_5/bungee/log/LogDispatcher.java    |  0
 .../md_5/bungee/log/LoggingOutputStream.java  |  0
 pom.xml                                       |  1 +
 proxy/pom.xml                                 |  8 ++---
 .../main/java/net/md_5/bungee/BungeeCord.java |  2 +-
 10 files changed, 79 insertions(+), 11 deletions(-)
 create mode 100644 log/nb-configuration.xml
 create mode 100644 log/pom.xml
 rename {proxy => log}/src/main/java/net/md_5/bungee/log/BungeeLogger.java (84%)
 rename {proxy => log}/src/main/java/net/md_5/bungee/log/ColouredWriter.java (99%)
 rename {proxy => log}/src/main/java/net/md_5/bungee/log/ConciseFormatter.java (99%)
 rename {proxy => log}/src/main/java/net/md_5/bungee/log/LogDispatcher.java (100%)
 rename {proxy => log}/src/main/java/net/md_5/bungee/log/LoggingOutputStream.java (100%)

diff --git a/log/nb-configuration.xml b/log/nb-configuration.xml
new file mode 100644
index 00000000..7e465924
--- /dev/null
+++ b/log/nb-configuration.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+    This file contains additional configuration written by modules in the NetBeans IDE.
+    The configuration is intended to be shared among all the users of project and
+    therefore it is assumed to be part of version control checkout.
+    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+    -->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+        Properties that influence various parts of the IDE, especially code formatting and the like. 
+        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+        That way multiple projects can share the same settings (useful for formatting rules for example).
+        Any value defined here will override the pom.xml file value but is only applicable to the current project.
+        -->
+        <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>
+        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
+    </properties>
+</project-shared-configuration>
diff --git a/log/pom.xml b/log/pom.xml
new file mode 100644
index 00000000..28b20bd9
--- /dev/null
+++ b/log/pom.xml
@@ -0,0 +1,35 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>net.md-5</groupId>
+        <artifactId>bungeecord-parent</artifactId>
+        <version>1.10-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>net.md-5</groupId>
+    <artifactId>bungeecord-log</artifactId>
+    <version>1.10-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>BungeeCord-Log</name>
+    <description>Simplistic and performant java.util.Logger based logger and console API designed for use with BungeeCord and Minecraft related applications.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+            <version>2.14.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-chat</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java b/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java
similarity index 84%
rename from proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java
rename to log/src/main/java/net/md_5/bungee/log/BungeeLogger.java
index 94e924b6..9598fff3 100644
--- a/proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java
+++ b/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java
@@ -7,7 +7,7 @@ import java.util.logging.Formatter;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import net.md_5.bungee.BungeeCord;
+import jline.console.ConsoleReader;
 
 public class BungeeLogger extends Logger
 {
@@ -20,18 +20,18 @@ public class BungeeLogger extends Logger
                 "CallToPrintStackTrace", "CallToThreadStartDuringObjectConstruction"
             })
     @SuppressFBWarnings("SC_START_IN_CTOR")
-    public BungeeLogger(BungeeCord bungee)
+    public BungeeLogger(String loggerName, String filePattern, ConsoleReader reader)
     {
-        super( "BungeeCord", null );
+        super( loggerName, null );
         setLevel( Level.ALL );
 
         try
         {
-            FileHandler fileHandler = new FileHandler( "proxy.log", 1 << 24, 8, true );
+            FileHandler fileHandler = new FileHandler( filePattern, 1 << 24, 8, true );
             fileHandler.setFormatter( formatter );
             addHandler( fileHandler );
 
-            ColouredWriter consoleHandler = new ColouredWriter( bungee.getConsoleReader() );
+            ColouredWriter consoleHandler = new ColouredWriter( reader );
             consoleHandler.setLevel( Level.INFO );
             consoleHandler.setFormatter( formatter );
             addHandler( consoleHandler );
@@ -40,6 +40,7 @@ public class BungeeLogger extends Logger
             System.err.println( "Could not register logger!" );
             ex.printStackTrace();
         }
+
         dispatcher.start();
     }
 
diff --git a/proxy/src/main/java/net/md_5/bungee/log/ColouredWriter.java b/log/src/main/java/net/md_5/bungee/log/ColouredWriter.java
similarity index 99%
rename from proxy/src/main/java/net/md_5/bungee/log/ColouredWriter.java
rename to log/src/main/java/net/md_5/bungee/log/ColouredWriter.java
index 3a234e62..e7650f70 100644
--- a/proxy/src/main/java/net/md_5/bungee/log/ColouredWriter.java
+++ b/log/src/main/java/net/md_5/bungee/log/ColouredWriter.java
@@ -79,5 +79,4 @@ public class ColouredWriter extends Handler
     public void close() throws SecurityException
     {
     }
-
 }
diff --git a/proxy/src/main/java/net/md_5/bungee/log/ConciseFormatter.java b/log/src/main/java/net/md_5/bungee/log/ConciseFormatter.java
similarity index 99%
rename from proxy/src/main/java/net/md_5/bungee/log/ConciseFormatter.java
rename to log/src/main/java/net/md_5/bungee/log/ConciseFormatter.java
index 015a4716..61fdd281 100644
--- a/proxy/src/main/java/net/md_5/bungee/log/ConciseFormatter.java
+++ b/log/src/main/java/net/md_5/bungee/log/ConciseFormatter.java
@@ -24,6 +24,7 @@ public class ConciseFormatter extends Formatter
         formatted.append( "] " );
         formatted.append( formatMessage( record ) );
         formatted.append( '\n' );
+
         if ( record.getThrown() != null )
         {
             StringWriter writer = new StringWriter();
diff --git a/proxy/src/main/java/net/md_5/bungee/log/LogDispatcher.java b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/log/LogDispatcher.java
rename to log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
diff --git a/proxy/src/main/java/net/md_5/bungee/log/LoggingOutputStream.java b/log/src/main/java/net/md_5/bungee/log/LoggingOutputStream.java
similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/log/LoggingOutputStream.java
rename to log/src/main/java/net/md_5/bungee/log/LoggingOutputStream.java
diff --git a/pom.xml b/pom.xml
index 299f6fa2..5897369a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
         <module>chat</module>
         <module>config</module>
         <module>event</module>
+        <module>log</module>
         <module>module</module>
         <module>protocol</module>
         <module>proxy</module>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 700e3278..55bba906 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -33,14 +33,14 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
-            <version>2.12</version>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-api</artifactId>
+            <artifactId>bungeecord-log</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index ac08d8ee..9825b993 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -206,7 +206,7 @@ public class BungeeCord extends ProxyServer
         consoleReader = new ConsoleReader();
         consoleReader.setExpandEvents( false );
 
-        logger = new BungeeLogger( this );
+        logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader );
         System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
         System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );