issue #2 upgrade to log4j2.13.3 and removing commons logging

Author: schnelle

build.gradle

@@ -9,10 +9,9 @@ repositories {
 
 dependencies {
     compile group: 'directory-network', name: 'mina', version: '0.8.0'
-    compile group: 'commons-logging', name: 'commons-logging', version: '1.2'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.2'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.2'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.11.2'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.3'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.3'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.13.3'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
@@ -65,11 +64,11 @@ uploadArchives {
             }
 
             pom.project {
-                name 'JVoiceXML'
+                name 'org.mrcp4j'
                 groupId = JVOICEXML_GROUP
                 packaging 'jar'
                 description 'MRCP4J provides a Java API that encapsulates the MRCPv2 protocol and can be used to implement MRCP clients and/or servers.'
-                url 'https://github.com/JVoiceXML/JVoiceXML'
+                url 'https://github.com/JVoiceXML/mrcp4j'
 
                 scm {
                     connection 'scm:[email protected]:JVoiceXML/mrcp4j.git'

gradle.properties

@@ -1,4 +1,6 @@
 version=0.3-SNAPSHOT
+JVOICEXML_GROUP = org.jvoicexml
+group = org.jvoicexml
 
 # Sonatype credentials
 JVOICEXML_OSSRH_USERNAME=MUST-BE-SUPPLIED-VALUE

src/main/java/org/mrcp4j/client/MrcpChannel.java

@@ -27,8 +27,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.mrcp4j.MrcpMethodName;
 import org.mrcp4j.message.MrcpEvent;
 import org.mrcp4j.message.MrcpMessage;
@@ -50,8 +50,7 @@
  * @author Niels Godfredsen {@literal <}<a href="mailto:[email protected]">[email protected]</a>{@literal >}
  */
 public class MrcpChannel implements MrcpMessageHandler {
-
-    private static Log _log = LogFactory.getLog(MrcpChannel.class);
+    private static Logger _log = LogManager.getLogger(MrcpChannel.class);
 
     private MrcpResponse _response = new MrcpResponse();
     private Object _responseLock = new Object();

src/main/java/org/mrcp4j/client/MrcpMessageDecoder.java

@@ -22,17 +22,16 @@
  */
 package org.mrcp4j.client;
 
-import org.mrcp4j.message.MrcpMessage;
-import org.mrcp4j.message.header.IllegalValueException;
-import org.mrcp4j.message.header.MrcpHeader;
-import org.mrcp4j.message.header.MrcpHeaderName;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.text.ParseException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.mrcp4j.message.MrcpMessage;
+import org.mrcp4j.message.header.IllegalValueException;
+import org.mrcp4j.message.header.MrcpHeader;
+import org.mrcp4j.message.header.MrcpHeaderName;
 
 /**
  * Decodes messages received in MRCPv2 format into {@link org.mrcp4j.message.MrcpMessage} instances.
@@ -41,7 +40,7 @@
  */
 public class MrcpMessageDecoder {
 
-    private static Log _log = LogFactory.getLog(MrcpMessageDecoder.class);
+	private static Logger _log = LogManager.getLogger(MrcpMessageDecoder.class);
 
     private MrcpResponseDecoder _responseDecoder = new MrcpResponseDecoder();
     private MrcpEventDecoder _eventDecoder = new MrcpEventDecoder();

src/main/java/org/mrcp4j/client/MrcpSocket.java

@@ -22,11 +22,6 @@
  */
 package org.mrcp4j.client;
 
-import org.mrcp4j.message.MrcpMessage;
-import org.mrcp4j.message.header.ChannelIdentifier;
-import org.mrcp4j.message.header.IllegalValueException;
-import org.mrcp4j.message.request.MrcpRequest;
-
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -40,8 +35,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.mrcp4j.message.MrcpMessage;
+import org.mrcp4j.message.header.ChannelIdentifier;
+import org.mrcp4j.message.header.IllegalValueException;
+import org.mrcp4j.message.request.MrcpRequest;
 
 /**
  * Provides an endpoint for communication between the MRCPv2 client and the MRCPv2 server (for internal library use only).
@@ -55,7 +54,7 @@
  */
 public class MrcpSocket {
 
-    private static Log _log = LogFactory.getLog(MrcpSocket.class);
+	private static Logger _log = LogManager.getLogger(MrcpSocket.class);
 
     private MrcpRequestEncoder _requestEncoder = new MrcpRequestEncoder();
     Map<ChannelIdentifier , MrcpMessageHandler> _handlers = Collections.synchronizedMap(new HashMap<ChannelIdentifier , MrcpMessageHandler>());

src/main/java/org/mrcp4j/server/MrcpRequestDecoder.java

@@ -22,21 +22,20 @@
  */
 package org.mrcp4j.server;
 
-import org.mrcp4j.message.header.IllegalValueException;
-import org.mrcp4j.message.header.MrcpHeader;
-import org.mrcp4j.message.header.MrcpHeaderName;
-import org.mrcp4j.message.request.MrcpRequest;
-import org.mrcp4j.message.request.MrcpRequestFactory;
-
 import java.text.ParseException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.protocol.ProtocolDecoder;
 import org.apache.mina.protocol.ProtocolDecoderOutput;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.ProtocolViolationException;
+import org.mrcp4j.message.header.IllegalValueException;
+import org.mrcp4j.message.header.MrcpHeader;
+import org.mrcp4j.message.header.MrcpHeaderName;
+import org.mrcp4j.message.request.MrcpRequest;
+import org.mrcp4j.message.request.MrcpRequestFactory;
 
 /**
  * Decodes request messages received in MRCPv2 format into {@link org.mrcp4j.message.request.MrcpRequest} instances.
@@ -45,7 +44,7 @@
  */
 public class MrcpRequestDecoder implements ProtocolDecoder {
 
-    private static Log _log = LogFactory.getLog(MrcpRequestDecoder.class);
+	private static Logger _log = LogManager.getLogger(MrcpRequestDecoder.class);
 
     private StringBuilder decodeBuf = new StringBuilder();
 

src/main/java/org/mrcp4j/server/MrcpRequestProcessorImpl.java

@@ -22,6 +22,16 @@
  */
 package org.mrcp4j.server;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.mrcp4j.MrcpEventName;
 import org.mrcp4j.MrcpRequestState;
 import org.mrcp4j.message.MrcpEvent;
@@ -32,24 +42,13 @@
 import org.mrcp4j.message.request.MrcpRequest;
 import org.mrcp4j.util.ObjectWrapper;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  *
  * @author Niels Godfredsen {@literal <}<a href="mailto:[email protected]">[email protected]</a>{@literal >}
  */
 public class MrcpRequestProcessorImpl implements MrcpRequestProcessor {
 
-    private static Log _log = LogFactory.getLog(MrcpRequestProcessorImpl.class);
+	private static Logger _log = LogManager.getLogger(MrcpRequestProcessorImpl.class);
 
     private Map<String, MrcpRequestHandler> _requestHandlers =
         Collections.synchronizedMap(new HashMap<String, MrcpRequestHandler>());

src/main/java/org/mrcp4j/server/MrcpServerSocket.java

@@ -22,6 +22,17 @@
  */
 package org.mrcp4j.server;
 
+import java.io.IOException;
+import java.util.concurrent.TimeoutException;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.mina.common.TransportType;
+import org.apache.mina.io.IoAcceptor;
+import org.apache.mina.protocol.ProtocolCodecFactory;
+import org.apache.mina.registry.Service;
+import org.apache.mina.registry.ServiceRegistry;
+import org.apache.mina.registry.SimpleServiceRegistry;
 import org.mrcp4j.MrcpEventName;
 import org.mrcp4j.MrcpRequestState;
 import org.mrcp4j.MrcpResourceType;
@@ -41,26 +52,13 @@
 import org.mrcp4j.server.provider.SpeechSynthRequestHandler;
 import org.mrcp4j.server.provider.VoiceEnrollmentRequestHandler;
 
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.mina.common.TransportType;
-import org.apache.mina.io.IoAcceptor;
-import org.apache.mina.protocol.ProtocolCodecFactory;
-import org.apache.mina.registry.Service;
-import org.apache.mina.registry.ServiceRegistry;
-import org.apache.mina.registry.SimpleServiceRegistry;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  *
  * @author Niels Godfredsen {@literal <}<a href="mailto:[email protected]">[email protected]</a>{@literal >}
  */
 public class MrcpServerSocket {
 
-    private static Log _log = LogFactory.getLog(MrcpServerSocket.class);
+	private static Logger _log = LogManager.getLogger(MrcpServerSocket.class);
 
     private static ProtocolCodecFactory CODEC_FACTORY = new MrcpCodecFactory();
 

src/main/java/org/mrcp4j/server/mina/IoTextLoggingFilter.java

@@ -22,8 +22,8 @@
  */
 package org.mrcp4j.server.mina;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.io.IoFilter;
@@ -40,7 +40,7 @@ public class IoTextLoggingFilter implements IoFilter {
      */
     public static final String SESSION_LOG_NAME = "org.mrcp4j.server.SESSION";
 
-    private static Log _log = LogFactory.getLog(SESSION_LOG_NAME);
+    private static Logger _log = LogManager.getLogger(SESSION_LOG_NAME);
 
     /* (non-Javadoc)
      * @see org.apache.mina.io.IoFilter#sessionOpened(org.apache.mina.io.IoFilter.NextFilter,