diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml
index 849bceb..8a13a67 100644
--- a/cas-client-core/pom.xml
+++ b/cas-client-core/pom.xml
@@ -77,13 +77,6 @@
test
-
- org.slf4j
- jcl-over-slf4j
- ${slf4j.version}
- test
-
-
log4j
log4j
diff --git a/cas-client-integration-atlassian/pom.xml b/cas-client-integration-atlassian/pom.xml
index 17f64d3..e1390e9 100644
--- a/cas-client-integration-atlassian/pom.xml
+++ b/cas-client-integration-atlassian/pom.xml
@@ -520,6 +520,10 @@
bouncycastle
bcprov-jdk14
+
+ commons-logging
+ commons-logging
+
diff --git a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Confluence35CasAuthenticator.java b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Confluence35CasAuthenticator.java
index d1f4dcb..61815ed 100644
--- a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Confluence35CasAuthenticator.java
+++ b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Confluence35CasAuthenticator.java
@@ -24,10 +24,10 @@ import com.atlassian.confluence.event.events.security.LoginFailedEvent;
import com.atlassian.confluence.user.ConfluenceAuthenticator;
import com.atlassian.seraph.auth.AuthenticatorException;
import com.atlassian.seraph.auth.LoginReason;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jasig.cas.client.util.AbstractCasFilter;
import org.jasig.cas.client.validation.Assertion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -49,14 +49,12 @@ import java.security.Principal;
public final class Confluence35CasAuthenticator extends ConfluenceAuthenticator {
private static final long serialVersionUID = -6097438206488390678L;
- private static final Log LOG = LogFactory.getLog(Confluence35CasAuthenticator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Confluence35CasAuthenticator.class);
public Principal getUser(final HttpServletRequest request, final HttpServletResponse response) {
Principal existingUser = getUserFromSession(request);
if (existingUser != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Session found; user already logged in.");
- }
+ LOGGER.debug("Session found; user already logged in.");
LoginReason.OK.stampRequestResponse(request, response);
return existingUser;
}
@@ -76,13 +74,9 @@ public final class Confluence35CasAuthenticator extends ConfluenceAuthenticator
// Firing this event is necessary to ensure the user's personal information is initialised correctly.
getEventPublisher().publish(new LoginEvent(this, username, request.getSession().getId(), remoteHost, remoteIP));
LoginReason.OK.stampRequestResponse(request, response);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Logging in [" + username + "] from CAS.");
- }
+ LOGGER.debug("Logging in [{}] from CAS.", username);
} else {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Failed logging [" + username + "] from CAS.");
- }
+ LOGGER.debug("Failed logging [{}] from CAS.", username);
getElevatedSecurityGuard().onFailedLoginAttempt(request, username);
getEventPublisher().publish(new LoginFailedEvent(this, username, request.getSession().getId(), remoteHost, remoteIP));
}
@@ -97,8 +91,8 @@ public final class Confluence35CasAuthenticator extends ConfluenceAuthenticator
final Principal principal = (Principal) session.getAttribute(LOGGED_IN_KEY);
- if (LOG.isDebugEnabled() && principal != null) {
- LOG.debug("Logging out [" + principal.getName() + "] from CAS.");
+ if (principal != null) {
+ LOGGER.debug("Logging out [{}] from CAS.", principal.getName());
}
removePrincipalFromSessionContext(request);
diff --git a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/ConfluenceCasAuthenticator.java b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/ConfluenceCasAuthenticator.java
index 3f88bea..30ef63e 100644
--- a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/ConfluenceCasAuthenticator.java
+++ b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/ConfluenceCasAuthenticator.java
@@ -21,10 +21,10 @@ package org.jasig.cas.client.integration.atlassian;
import com.atlassian.confluence.user.ConfluenceAuthenticator;
import com.atlassian.seraph.auth.AuthenticatorException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jasig.cas.client.util.AbstractCasFilter;
import org.jasig.cas.client.validation.Assertion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -45,16 +45,14 @@ public final class ConfluenceCasAuthenticator extends ConfluenceAuthenticator {
/** ConfluenceCasAuthenticator.java */
private static final long serialVersionUID = -6097438206488390677L;
- private static final Log LOG = LogFactory.getLog(ConfluenceCasAuthenticator.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConfluenceCasAuthenticator.class);
public Principal getUser(final HttpServletRequest request, final HttpServletResponse response) {
final HttpSession session = request.getSession();
// user already exists
if (session.getAttribute(LOGGED_IN_KEY) != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Session found; user already logged in.");
- }
+ LOGGER.debug("Session found; user already logged in.");
return (Principal) session.getAttribute(LOGGED_IN_KEY);
}
@@ -63,9 +61,7 @@ public final class ConfluenceCasAuthenticator extends ConfluenceAuthenticator {
if (assertion != null) {
final Principal p = getUser(assertion.getPrincipal().getName());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Logging in [" + p.getName() + "] from CAS.");
- }
+ LOGGER.debug("Logging in [{}] from CAS.", p.getName());
session.setAttribute(LOGGED_IN_KEY, p);
session.setAttribute(LOGGED_OUT_KEY, null);
@@ -80,9 +76,7 @@ public final class ConfluenceCasAuthenticator extends ConfluenceAuthenticator {
final Principal principal = (Principal) session.getAttribute(LOGGED_IN_KEY);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Logging out [" + principal.getName() + "] from CAS.");
- }
+ LOGGER.debug("Logging out [{}] from CAS.", principal.getName());
session.setAttribute(LOGGED_OUT_KEY, principal);
session.setAttribute(LOGGED_IN_KEY, null);
diff --git a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Jira44CasAuthenticator.java b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Jira44CasAuthenticator.java
index 3ba8991..65b44a9 100644
--- a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Jira44CasAuthenticator.java
+++ b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/Jira44CasAuthenticator.java
@@ -22,8 +22,6 @@ package org.jasig.cas.client.integration.atlassian;
import com.atlassian.jira.security.login.JiraSeraphAuthenticator;
import com.atlassian.seraph.auth.AuthenticatorException;
import com.atlassian.seraph.auth.LoginReason;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jasig.cas.client.util.AbstractCasFilter;
import org.jasig.cas.client.validation.Assertion;
import org.slf4j.Logger;
diff --git a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/JiraCasAuthenticator.java b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/JiraCasAuthenticator.java
index 9cd1976..5f3c519 100644
--- a/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/JiraCasAuthenticator.java
+++ b/cas-client-integration-atlassian/src/main/java/org/jasig/cas/client/integration/atlassian/JiraCasAuthenticator.java
@@ -22,10 +22,7 @@ package org.jasig.cas.client.integration.atlassian;
import com.atlassian.seraph.auth.DefaultAuthenticator;
import com.atlassian.seraph.auth.AuthenticatorException;
import com.opensymphony.user.EntityNotFoundException;
-import com.opensymphony.user.User;
import com.opensymphony.user.UserManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jasig.cas.client.util.AbstractCasFilter;
import org.jasig.cas.client.validation.Assertion;
import org.slf4j.Logger;
diff --git a/pom.xml b/pom.xml
index bdd2bad..9472fbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,7 +166,6 @@ NwXMoqnmqmUUnosrspqmmmmmmUUnosrspqmmmmmmUUA1jJ
commons-logging
- cglib:cglib
@@ -180,23 +179,35 @@ NwXMoqnmqmUUnosrspqmmmmmmUUnosrspqmmmmmmUUA1jJ
- junit
- junit
- 4.8.2
- test
+ junit
+ junit
+ 4.8.2
+ test
- org.slf4j
- slf4j-api
- ${slf4j.version}
- compile
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+ compile
- javax.servlet
- servlet-api
- 2.4
- provided
+ javax.servlet
+ servlet-api
+ 2.4
+ provided
+
+ org.slf4j
+ jcl-over-slf4j
+ ${slf4j.version}
+ test
+
+
+ org.slf4j
+ slf4j-simple
+ ${slf4j.version}
+ test
+