[java-opensaml COMMIT] in /trunk: opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessage...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Feb 11 13:02:03 2014
New Revision: 3611

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3611&view=rev
Log:
Use SLF4J as logging abstraction rather than Log4j.

Modified:
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java
    trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java?rev=3611&r1=3610&r2=3611&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java Tue Feb 11 13:02:03 2014
@@ -25,8 +25,8 @@
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
-import org.apache.log4j.Logger;
 import org.opensaml.messaging.context.MessageContext;
+import org.slf4j.LoggerFactory;
 
 
 
@@ -68,7 +68,7 @@
                 try {
                     doPostInvoke(messageContext, e);
                 } catch (Throwable t) {
-                    Logger.getInstance(AbstractMessageHandler.class).warn(getLogPrefix()
+                    LoggerFactory.getLogger(AbstractMessageHandler.class).warn(getLogPrefix()
                             + " Unchecked exception/error thrown by doPostInvoke, "
                             + "superseding a MessageHandlerException ", e);
                     t.addSuppressed(e);
@@ -79,7 +79,7 @@
                 try {
                     doPostInvoke(messageContext);
                 } catch (Throwable t2) {
-                    Logger.getInstance(AbstractMessageHandler.class).warn(getLogPrefix()
+                    LoggerFactory.getLogger(AbstractMessageHandler.class).warn(getLogPrefix()
                             + " Unchecked exception/error thrown by doPostInvoke, "
                             + "superseding an unchecked exception/error ", t);
                     t2.addSuppressed(t);

Modified: trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java?rev=3611&r1=3610&r2=3611&view=diff
==============================================================================
--- trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java (original)
+++ trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java Tue Feb 11 13:02:03 2014
@@ -22,14 +22,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.log4j.Logger;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
+
 import org.opensaml.profile.ProfileException;
 import org.opensaml.profile.context.EventContext;
 import org.opensaml.profile.context.PreviousEventContext;
 import org.opensaml.profile.context.ProfileRequestContext;
-
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import org.slf4j.LoggerFactory;
 
 
 //TODO perf metrics
@@ -132,7 +132,7 @@
                 try {
                     doPostExecute(profileRequestContext, e);
                 } catch (Throwable t) {
-                    Logger.getInstance(AbstractProfileAction.class).warn(getLogPrefix()
+                    LoggerFactory.getLogger(AbstractProfileAction.class).warn(getLogPrefix()
                             + " Unchecked exception/error thrown by doPostInvoke, "
                             + "superseding a MessageHandlerException ", e);
                     t.addSuppressed(e);
@@ -143,7 +143,7 @@
                 try {
                     doPostExecute(profileRequestContext);
                 } catch (Throwable t2) {
-                    Logger.getInstance(AbstractProfileAction.class).warn(getLogPrefix()
+                    LoggerFactory.getLogger(AbstractProfileAction.class).warn(getLogPrefix()
                             + " Unchecked exception/error thrown by doPostInvoke, "
                             + "superseding an unchecked exception/error ", t);
                     t2.addSuppressed(t);