diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java index 613a989..16814e5 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/AssertionCasRealmDelegate.java @@ -10,8 +10,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.authentication.AttributePrincipal; import org.jasig.cas.client.util.CommonUtils; @@ -30,9 +28,6 @@ import org.jasig.cas.client.util.CommonUtils; public class AssertionCasRealmDelegate implements CasRealm { /** Default role attribute name */ public static final String DEFAULT_ROLE_NAME = "role"; - - /** Log instance */ - private final Log log = LogFactory.getLog(getClass()); /** Name of the role attribute in the principal's attributes */ private String roleAttributeName = DEFAULT_ROLE_NAME; diff --git a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java index ca3e843..6d0ab35 100644 --- a/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java +++ b/cas-client-integration-tomcat-common/src/main/java/org/jasig/cas/client/tomcat/PropertiesCasRealmDelegate.java @@ -17,6 +17,8 @@ import java.util.Properties; import java.util.Set; import java.util.HashSet; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jasig.cas.client.util.CommonUtils; /** @@ -35,6 +37,9 @@ import org.jasig.cas.client.util.CommonUtils; * */ public class PropertiesCasRealmDelegate implements CasRealm { + /** Log instance */ + private final Log log = LogFactory.getLog(getClass()); + /** Path to backing properties file */ private String propertiesFilePath; @@ -57,7 +62,8 @@ public class PropertiesCasRealmDelegate implements CasRealm { file = new File(System.getProperty("catalina.base"), propertiesFilePath); } CommonUtils.assertTrue(file.exists(), "File not found " + file); - CommonUtils.assertTrue(file.canRead(), "Cannot read " + file); + CommonUtils.assertTrue(file.canRead(), "Cannot read " + file); + log.debug("Loading users/roles from " + file); final Properties properties = new Properties(); try { properties.load(new BufferedInputStream(new FileInputStream(file))); diff --git a/cas-client-integration-tomcat-v6/pom.xml b/cas-client-integration-tomcat-v6/pom.xml new file mode 100644 index 0000000..960961a --- /dev/null +++ b/cas-client-integration-tomcat-v6/pom.xml @@ -0,0 +1,42 @@ + + + + cas-client + org.jasig.cas.client + 3.1.12-SNAPSHOT + + 4.0.0 + + org.jasig.cas.client + cas-client-integration-tomcat-v6 + jar + JA-SIG CAS Client for Java - Tomcat 6.x Integration + + + + org.jasig.cas.client + cas-client-integration-tomcat-common + ${project.version} + jar + compile + + + org.apache.tomcat + catalina + 6.0.29 + jar + compile + + + + org.jasig.cas.client + cas-client-core + ${project.version} + jar + compile + + + + diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractAuthenticator.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractAuthenticator.java index f26523b..d94d9ff 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractAuthenticator.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractAuthenticator.java @@ -5,7 +5,6 @@ */ package org.jasig.cas.client.tomcat.v7; -import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleListener; @@ -56,6 +55,7 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements protected void startInternal() throws LifecycleException { super.startInternal(); + this.log.debug("Starting..."); final Realm realm = this.context.getRealm(); if (!(realm instanceof CasRealm)) { throw new LifecycleException("Expected CasRealm but got " + realm.getInfo()); @@ -139,7 +139,8 @@ public abstract class AbstractAuthenticator extends AuthenticatorBase implements /** {@inheritDoc} */ public void lifecycleEvent(final LifecycleEvent event) { - if (Lifecycle.AFTER_START_EVENT.equals(event.getType())) { + if (AFTER_START_EVENT.equals(event.getType())) { + this.log.debug("Processing lifecycle event " + AFTER_START_EVENT); this.delegate.setTicketValidator(getTicketValidator()); this.delegate.setArtifactParameterName(getArtifactParameterName()); this.delegate.setServiceParameterName(getServiceParameterName()); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractLogoutValveBase.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractLogoutValve.java similarity index 96% rename from cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractLogoutValveBase.java rename to cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractLogoutValve.java index 6eb30b9..3a6c7f0 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractLogoutValveBase.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/AbstractLogoutValve.java @@ -24,7 +24,7 @@ import java.io.IOException; * @version $Revision$ $Date$ * @since 3.1.12 */ -public abstract class AbstractLogoutValveBase extends ValveBase { +public abstract class AbstractLogoutValve extends ValveBase { protected final Log log = LogFactory.getLog(getClass()); diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegExpBasedLogoutValue.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegExpBasedLogoutValve.java similarity index 95% rename from cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegExpBasedLogoutValue.java rename to cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegExpBasedLogoutValve.java index 06c15b9..27fba48 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegExpBasedLogoutValue.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/RegExpBasedLogoutValve.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; * @version $Revision$ $Date$ * @since 3.1.12 */ -public final class RegExpBasedLogoutValue extends AbstractLogoutValveBase { +public final class RegExpBasedLogoutValve extends AbstractLogoutValve { private String regexpUri; diff --git a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/UrlBasedLogoutValve.java b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/UrlBasedLogoutValve.java index 42af52e..2108345 100644 --- a/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/UrlBasedLogoutValve.java +++ b/cas-client-integration-tomcat-v7/src/main/java/org/jasig/cas/client/tomcat/v7/UrlBasedLogoutValve.java @@ -16,7 +16,7 @@ import org.jasig.cas.client.util.CommonUtils; * @version $Revision$ $Date$ * @since 3.1.12 */ -public final class UrlBasedLogoutValve extends AbstractLogoutValveBase { +public final class UrlBasedLogoutValve extends AbstractLogoutValve { private String logoutUri; diff --git a/pom.xml b/pom.xml index e16d992..a33c9d6 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,7 @@ cas-client-support-distributed-ehcache cas-client-support-distributed-memcached cas-client-integration-tomcat-common + cas-client-integration-tomcat-v6 cas-client-integration-tomcat-v7