Moving to slf4j

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@27834 356b4b1a-1d2b-0410-8bf1-ffa24008f01e

gazelle-proxy-netty/pom.xml

@@ -53,10 +53,6 @@
 			<version>1.2</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>apache-log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

gazelle-proxy-netty/src/main/java/net/ihe/gazelle/proxy/netty/basictls/AlwaysTrustManager.java

@@ -5,11 +5,12 @@ import java.security.cert.X509Certificate;
 
 import javax.net.ssl.X509TrustManager;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AlwaysTrustManager implements X509TrustManager {
 
-	private static Logger log = Logger.getLogger(AlwaysTrustManager.class);
+	static final Logger log = LoggerFactory.getLogger(AlwaysTrustManager.class);
 
 	public X509Certificate[] getAcceptedIssuers() {
 		return new X509Certificate[0];

gazelle-proxy-netty/src/main/java/net/ihe/gazelle/proxy/netty/channel/ProxyHandler.java

@@ -3,7 +3,6 @@ package net.ihe.gazelle.proxy.netty.channel;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
-import org.apache.log4j.Logger;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
@@ -11,6 +10,8 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The Class ProxyHandler.<br />
@@ -18,7 +19,7 @@ import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
  */
 public abstract class ProxyHandler extends SimpleChannelUpstreamHandler {
 
-	private static Logger log = Logger.getLogger(ProxyHandler.class);
+	static final Logger log = LoggerFactory.getLogger(ProxyHandler.class);
 
 	protected Channel proxiedChannel;
 	protected Channel providerChannel;

gazelle-proxy-netty/src/main/java/net/ihe/gazelle/proxy/netty/channel/ProxyLogger.java

@@ -2,17 +2,18 @@ package net.ihe.gazelle.proxy.netty.channel;
 
 import net.ihe.gazelle.proxy.netty.Proxy;
 
-import org.apache.log4j.Logger;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class ProxyLogger<REQU, RESP> extends SimpleChannelUpstreamHandler {
 
 	protected Proxy<REQU, RESP> proxy;
 	protected ProxyHandler matchingHandler;
 
-	private static Logger log = Logger.getLogger(ProxyLogger.class);
+	static final Logger log = LoggerFactory.getLogger(ProxyLogger.class);
 
 	public ProxyLogger(Proxy<REQU, RESP> proxy, ProxyHandler matchingHandler) {
 		super();

gazelle-proxy-netty/src/main/java/net/ihe/gazelle/proxy/netty/protocols/dicom/DicomDecoder.java

@@ -6,7 +6,6 @@ import jp.digitalsensation.ihej.transactionmonitor.dicom.messageexchange.Associa
 import jp.digitalsensation.ihej.transactionmonitor.dicom.messageexchange.DimseMessage;
 import jp.digitalsensation.ihej.transactionmonitor.dicom.messageexchange.DimseMessageParser;
 
-import org.apache.log4j.Logger;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ChannelStateEvent;
@@ -14,10 +13,12 @@ import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DicomDecoder extends SimpleChannelUpstreamHandler {
 
-	private static Logger log = Logger.getLogger(DicomDecoder.class);
+	static final Logger log = LoggerFactory.getLogger(DicomDecoder.class);
 	private DimseMessageParser dimseMessageParser;
 
 	// private PipedOutputStream pos;
@@ -63,7 +64,7 @@ public class DicomDecoder extends SimpleChannelUpstreamHandler {
 			// Channels.fireMessageReceived(ctx, dicomMessage);
 			// }
 		} catch (Exception ex) {
-			log.error(ex, ex);
+			log.error("", ex);
 		}
 	}
 

gazelle-proxy-netty/src/main/java/net/ihe/gazelle/proxy/netty/protocols/hl7/HL7FrameDecoder.java

@@ -2,16 +2,17 @@ package net.ihe.gazelle.proxy.netty.protocols.hl7;
 
 import java.io.ByteArrayOutputStream;
 
-import org.apache.log4j.Logger;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.frame.FrameDecoder;
 import org.jboss.netty.util.CharsetUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HL7FrameDecoder extends FrameDecoder {
 
-	private static Logger log = Logger.getLogger(HL7FrameDecoder.class);
+	static final Logger log = LoggerFactory.getLogger(HL7FrameDecoder.class);
 
 	// character indicating the start of an HL7 message
 	private static final char START_MESSAGE = '\u000b';

gazelle-proxy-netty/src/main/java/org/dcm4che2/net/ProxyAssociation.java

@@ -5,17 +5,18 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.dcm4che2.data.DicomObject;
 import org.dcm4che2.net.pdu.AAbort;
 import org.dcm4che2.net.pdu.AAssociateAC;
 import org.dcm4che2.net.pdu.AAssociateRJ;
 import org.dcm4che2.net.pdu.AAssociateRQ;
 import org.dcm4che2.net.pdu.AAssociateRQAC;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ProxyAssociation implements Runnable {
 
-	private static Logger log = Logger.getLogger(ProxyAssociation.class);
+	static final Logger log = LoggerFactory.getLogger(ProxyAssociation.class);
 
 	private AAssociateRQAC associateAC;
 	private String storageFolder;
@@ -103,7 +104,7 @@ public class ProxyAssociation implements Runnable {
 		} catch (IOException e) {
 			// normal!
 		} catch (Throwable e) {
-			log.error(e, e);
+			log.error("", e);
 		}
 	}
 }

gazelle-proxy-war/src/main/webapp/WEB-INF/web.xml

@@ -102,7 +102,7 @@
 		<filter-class>org.jasig.cas.client.authentication.AuthenticationFilter</filter-class>
 		<init-param>
 			<param-name>casServerLoginUrl</param-name>
-			<param-value>https://gazelle.ihe.net</param-value>
+			<param-value>http://bento:18080/cas</param-value>
 		</init-param>
 		<init-param>
 			<param-name>service</param-name>
@@ -114,7 +114,7 @@
 		<filter-class>org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter</filter-class>
 		<init-param>
 			<param-name>casServerUrlPrefix</param-name>
-			<param-value>https://gazelle.ihe.net</param-value>
+			<param-value>http://bento:18080/cas</param-value>
 		</init-param>
 		<init-param>
 			<param-name>service</param-name>