You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2009/03/27 20:20:11 UTC
svn commit: r759309 [2/2] - in /incubator/jsecurity/trunk: ./ core/
core/src/main/java/org/apache/ki/authc/
core/src/main/java/org/apache/ki/authc/credential/
core/src/main/java/org/apache/ki/authc/pam/
core/src/main/java/org/apache/ki/config/ core/src...
Modified: incubator/jsecurity/trunk/samples/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/pom.xml?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/pom.xml (original)
+++ incubator/jsecurity/trunk/samples/web/pom.xml Fri Mar 27 19:20:08 2009
@@ -49,6 +49,10 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: incubator/jsecurity/trunk/support/ehcache/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/pom.xml?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/pom.xml (original)
+++ incubator/jsecurity/trunk/support/ehcache/pom.xml Fri Mar 27 19:20:08 2009
@@ -40,6 +40,11 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java Fri Mar 27 19:20:08 2009
@@ -25,8 +25,8 @@
import net.sf.ehcache.Element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.cache.Cache;
import org.apache.ki.cache.CacheException;
@@ -42,7 +42,7 @@
public class EhCache implements Cache {
/** Private internal log instance. */
- private static final Log log = LogFactory.getLog(EhCache.class);
+ private static final Logger log = LoggerFactory.getLogger(EhCache.class);
/**
* The wrapped Ehcache instance.
Modified: incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java Fri Mar 27 19:20:08 2009
@@ -21,8 +21,8 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.cache.Cache;
import org.apache.ki.cache.CacheException;
@@ -71,7 +71,7 @@
/**
* This class's private log instance.
*/
- private static final Log log = LogFactory.getLog(EhCacheManager.class);
+ private static final Logger log = LoggerFactory.getLogger(EhCacheManager.class);
/**
* The EhCache cache manager used by this implementation to create caches.
Modified: incubator/jsecurity/trunk/support/quartz/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/quartz/pom.xml?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/quartz/pom.xml (original)
+++ incubator/jsecurity/trunk/support/quartz/pom.xml Fri Mar 27 19:20:08 2009
@@ -40,6 +40,11 @@
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
</dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/jsecurity/trunk/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java (original)
+++ incubator/jsecurity/trunk/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java Fri Mar 27 19:20:08 2009
@@ -23,8 +23,8 @@
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.session.mgt.ValidatingSessionManager;
@@ -49,7 +49,7 @@
/*--------------------------------------------
| I N S T A N C E V A R I A B L E S |
============================================*/
- private static final Log log = LogFactory.getLog(QuartzSessionValidationJob.class);
+ private static final Logger log = LoggerFactory.getLogger(QuartzSessionValidationJob.class);
/*--------------------------------------------
| C O N S T R U C T O R S |
Modified: incubator/jsecurity/trunk/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java (original)
+++ incubator/jsecurity/trunk/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java Fri Mar 27 19:20:08 2009
@@ -24,8 +24,8 @@
import org.quartz.SimpleTrigger;
import org.quartz.impl.StdSchedulerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.session.mgt.DefaultSessionManager;
import org.apache.ki.session.mgt.SessionValidationScheduler;
@@ -62,7 +62,7 @@
/*--------------------------------------------
| I N S T A N C E V A R I A B L E S |
============================================*/
- private static final Log log = LogFactory.getLog(QuartzSessionValidationScheduler.class);
+ private static final Logger log = LoggerFactory.getLogger(QuartzSessionValidationScheduler.class);
/**
* The configured Quartz scheduler to use to schedule the Quartz job. If no scheduler is
Modified: incubator/jsecurity/trunk/support/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/pom.xml?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/pom.xml (original)
+++ incubator/jsecurity/trunk/support/spring/pom.xml Fri Mar 27 19:20:08 2009
@@ -49,6 +49,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java Fri Mar 27 19:20:08 2009
@@ -22,8 +22,8 @@
import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.util.Destroyable;
import org.apache.ki.util.Initializable;
@@ -48,7 +48,7 @@
/**
* Private internal class log instance.
*/
- private static final Log log = LogFactory.getLog(LifecycleBeanPostProcessor.class);
+ private static final Logger log = LoggerFactory.getLogger(LifecycleBeanPostProcessor.class);
/**
* Calls the <tt>init()</tt> methods on the bean if it implements {@link org.apache.ki.util.Initializable}
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java Fri Mar 27 19:20:08 2009
@@ -26,8 +26,8 @@
import org.springframework.context.ApplicationContextException;
import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.KiException;
import org.apache.ki.mgt.RealmSecurityManager;
@@ -73,7 +73,7 @@
public static final String SECURITY_MANAGER_BEAN_NAME_PARAM_NAME = "securityManagerBeanName";
public static final String DEFAULT_SECURITY_MANAGER_BEAN_ID = "securityManager";
- private static final Log log = LogFactory.getLog(SpringIniWebConfiguration.class);
+ private static final Logger log = LoggerFactory.getLogger(SpringIniWebConfiguration.class);
protected String securityManagerBeanName;
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java Fri Mar 27 19:20:08 2009
@@ -24,8 +24,8 @@
import org.springframework.remoting.support.DefaultRemoteInvocationExecutor;
import org.springframework.remoting.support.RemoteInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.mgt.SecurityManager;
import org.apache.ki.util.ThreadContext;
@@ -52,7 +52,7 @@
/*--------------------------------------------
| I N S T A N C E V A R I A B L E S |
============================================*/
- private static final Log log = LogFactory.getLog(SecureRemoteInvocationExecutor.class);
+ private static final Logger log = LoggerFactory.getLogger(SecureRemoteInvocationExecutor.class);
/**
* The SecurityManager used to retrieve realms that should be associated with the
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java Fri Mar 27 19:20:08 2009
@@ -25,8 +25,8 @@
import org.springframework.remoting.support.RemoteInvocation;
import org.springframework.remoting.support.RemoteInvocationFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.SecurityUtils;
import org.apache.ki.session.Session;
@@ -47,7 +47,7 @@
*/
public class SecureRemoteInvocationFactory extends DefaultRemoteInvocationFactory {
- private static final Log log = LogFactory.getLog(SecureRemoteInvocationFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(SecureRemoteInvocationFactory.class);
public static final String SESSION_ID_KEY = Session.class.getName() + "_ID_KEY";
Modified: incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java Fri Mar 27 19:20:08 2009
@@ -23,8 +23,8 @@
import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
import org.springframework.beans.factory.InitializingBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.authz.annotation.RequiresAuthentication;
import org.apache.ki.authz.annotation.RequiresGuest;
@@ -42,7 +42,7 @@
public class AuthorizationAttributeSourceAdvisor extends StaticMethodMatcherPointcutAdvisor
implements InitializingBean {
- private static final Log log = LogFactory.getLog(AuthorizationAttributeSourceAdvisor.class);
+ private static final Logger log = LoggerFactory.getLogger(AuthorizationAttributeSourceAdvisor.class);
protected SecurityManager securityManager = null;
Modified: incubator/jsecurity/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/pom.xml?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/pom.xml (original)
+++ incubator/jsecurity/trunk/web/pom.xml Fri Mar 27 19:20:08 2009
@@ -48,6 +48,12 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/DefaultWebSecurityManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/DefaultWebSecurityManager.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/DefaultWebSecurityManager.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/DefaultWebSecurityManager.java Fri Mar 27 19:20:08 2009
@@ -21,8 +21,8 @@
import java.util.Collection;
import javax.servlet.ServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.mgt.DefaultSecurityManager;
import org.apache.ki.realm.Realm;
@@ -46,7 +46,7 @@
//TODO - complete JavaDoc
- private static final Log log = LogFactory.getLog(DefaultWebSecurityManager.class);
+ private static final Logger log = LoggerFactory.getLogger(DefaultWebSecurityManager.class);
public static final String HTTP_SESSION_MODE = "http";
public static final String KI_SESSION_MODE = "ki";
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/RedirectView.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/RedirectView.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/RedirectView.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/RedirectView.java Fri Mar 27 19:20:08 2009
@@ -25,8 +25,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.util.JavaEnvironment;
@@ -78,7 +78,7 @@
*/
public static final String DEFAULT_ENCODING_SCHEME = "UTF-8";
- private static final Log log = LogFactory.getLog(RedirectView.class);
+ private static final Logger log = LoggerFactory.getLogger(RedirectView.class);
private String url;
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebRememberMeManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebRememberMeManager.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebRememberMeManager.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebRememberMeManager.java Fri Mar 27 19:20:08 2009
@@ -21,8 +21,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.codec.Base64;
import org.apache.ki.mgt.AbstractRememberMeManager;
@@ -61,7 +61,7 @@
//TODO - complete JavaDoc
- private static transient final Log log = LogFactory.getLog(WebRememberMeManager.class);
+ private static transient final Logger log = LoggerFactory.getLogger(WebRememberMeManager.class);
/**
* The default name of the underlying rememberMe cookie which is <code>rememberMe</code>.
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebSubjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebSubjectFactory.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebSubjectFactory.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebSubjectFactory.java Fri Mar 27 19:20:08 2009
@@ -49,7 +49,7 @@
super(securityManager);
}
- public WebSubjectFactory(org.apache.ki.mgt.SecurityManager securityManager, WebSessionManager webSessionManager) {
+ public WebSubjectFactory(SecurityManager securityManager, WebSessionManager webSessionManager) {
super(securityManager);
setWebSessionManager(webSessionManager);
}
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebUtils.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebUtils.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebUtils.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebUtils.java Fri Mar 27 19:20:08 2009
@@ -29,8 +29,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.SecurityUtils;
import org.apache.ki.session.Session;
@@ -54,7 +54,7 @@
//TODO - complete JavaDoc
- private static final Log log = LogFactory.getLog(WebUtils.class);
+ private static final Logger log = LoggerFactory.getLogger(WebUtils.class);
/**
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/AbstractWebAttribute.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/AbstractWebAttribute.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/AbstractWebAttribute.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/AbstractWebAttribute.java Fri Mar 27 19:20:08 2009
@@ -22,8 +22,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.KiException;
import org.apache.ki.util.ClassUtils;
@@ -46,7 +46,7 @@
public static final String DEFAULT_NAME = "name";
- private static final Log log = LogFactory.getLog(AbstractWebAttribute.class);
+ private static final Logger log = LoggerFactory.getLogger(AbstractWebAttribute.class);
protected String name = DEFAULT_NAME;
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/CookieAttribute.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/CookieAttribute.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/CookieAttribute.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/CookieAttribute.java Fri Mar 27 19:20:08 2009
@@ -25,8 +25,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.util.StringUtils;
import static org.apache.ki.web.WebUtils.toHttp;
@@ -45,7 +45,7 @@
/**
* Private internal log instance.
*/
- private static final Log log = LogFactory.getLog(CookieAttribute.class);
+ private static final Logger log = LoggerFactory.getLogger(CookieAttribute.class);
/**
* The number of seconds in one year (= 60 * 60 * 24 * 365).
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/RequestParamAttribute.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/RequestParamAttribute.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/RequestParamAttribute.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/RequestParamAttribute.java Fri Mar 27 19:20:08 2009
@@ -21,8 +21,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Les Hazlewood
@@ -32,7 +32,7 @@
//TODO - complete JavaDoc
- private static final Log log = LogFactory.getLog(RequestParamAttribute.class);
+ private static final Logger log = LoggerFactory.getLogger(RequestParamAttribute.class);
public RequestParamAttribute() {
setMutable(false);
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/IniWebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/IniWebConfiguration.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/IniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/IniWebConfiguration.java Fri Mar 27 19:20:08 2009
@@ -31,8 +31,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.config.ConfigurationException;
import org.apache.ki.config.IniConfiguration;
@@ -65,7 +65,7 @@
//TODO - complete JavaDoc
- private static final transient Log log = LogFactory.getLog(IniWebConfiguration.class);
+ private static final transient Logger log = LoggerFactory.getLogger(IniWebConfiguration.class);
public static final String FILTERS = "filters";
public static final String URLS = "urls";
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/PathMatchingFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/PathMatchingFilter.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/PathMatchingFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/PathMatchingFilter.java Fri Mar 27 19:20:08 2009
@@ -24,8 +24,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.util.AntPathMatcher;
import org.apache.ki.util.PatternMatcher;
@@ -45,7 +45,7 @@
/**
* Log available to this class only
*/
- private static final Log log = LogFactory.getLog(PathMatchingFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(PathMatchingFilter.class);
/**
* PatternMatcher used in determining which paths to react to for a given request.
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java Fri Mar 27 19:20:08 2009
@@ -23,8 +23,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.authc.AuthenticationToken;
import org.apache.ki.codec.Base64;
@@ -68,7 +68,7 @@
/**
* This class's private logger.
*/
- private static final Log log = LogFactory.getLog(BasicHttpAuthenticationFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(BasicHttpAuthenticationFilter.class);
/**
* HTTP Authorization header, equal to <code>Authorization</code>
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/FormAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/FormAuthenticationFilter.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/FormAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/FormAuthenticationFilter.java Fri Mar 27 19:20:08 2009
@@ -22,8 +22,8 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.authc.AuthenticationException;
import org.apache.ki.authc.AuthenticationToken;
@@ -69,7 +69,7 @@
public static final String DEFAULT_PASSWORD_PARAM = "password";
public static final String DEFAULT_REMEMBER_ME_PARAM = "rememberMe";
- private static final Log log = LogFactory.getLog(FormAuthenticationFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(FormAuthenticationFilter.class);
private String usernameParam = DEFAULT_USERNAME_PARAM;
private String passwordParam = DEFAULT_PASSWORD_PARAM;
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/AdviceFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/AdviceFilter.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/AdviceFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/AdviceFilter.java Fri Mar 27 19:20:08 2009
@@ -24,8 +24,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Servlet Filter that enables AOP-style advice for a SerlvetRequest via
@@ -40,7 +40,7 @@
public abstract class AdviceFilter extends OncePerRequestFilter {
/** The static logger available to this class only */
- private static final Log log = LogFactory.getLog(AdviceFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(AdviceFilter.class);
/**
* Returns <code>true</code> if the filter chain should be allowed to continue, <code>false</code> otherwise.
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java Fri Mar 27 19:20:08 2009
@@ -30,8 +30,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.config.Configuration;
import org.apache.ki.config.ConfigurationException;
@@ -191,7 +191,7 @@
public static final String CONFIG_INIT_PARAM_NAME = "config";
public static final String CONFIG_URL_INIT_PARAM_NAME = "configUrl";
- private static final Log log = LogFactory.getLog(KiFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(KiFilter.class);
protected String config;
protected String configUrl;
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/OncePerRequestFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/OncePerRequestFilter.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/OncePerRequestFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/OncePerRequestFilter.java Fri Mar 27 19:20:08 2009
@@ -26,8 +26,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.util.Nameable;
@@ -51,7 +51,7 @@
public abstract class OncePerRequestFilter extends ServletContextSupport implements Filter, Nameable {
/** Private internal log instance. */
- private static final Log log = LogFactory.getLog(OncePerRequestFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(OncePerRequestFilter.class);
/**
* Suffix that gets appended to the filter name for the "already filtered" request attribute.
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/ProxiedFilterChain.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/ProxiedFilterChain.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/ProxiedFilterChain.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/ProxiedFilterChain.java Fri Mar 27 19:20:08 2009
@@ -26,8 +26,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Les Hazlewood
@@ -37,7 +37,7 @@
//TODO - complete JavaDoc
- private static final Log log = LogFactory.getLog(ProxiedFilterChain.class);
+ private static final Logger log = LoggerFactory.getLogger(ProxiedFilterChain.class);
private FilterChain orig;
private List<Filter> filters;
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/DefaultWebSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/DefaultWebSessionManager.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/DefaultWebSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/DefaultWebSessionManager.java Fri Mar 27 19:20:08 2009
@@ -18,14 +18,6 @@
*/
package org.apache.ki.web.session;
-import java.io.Serializable;
-import java.net.InetAddress;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.ki.authz.AuthorizationException;
import org.apache.ki.authz.HostUnauthorizedException;
import org.apache.ki.session.InvalidSessionException;
@@ -37,6 +29,13 @@
import org.apache.ki.web.attr.WebAttribute;
import org.apache.ki.web.servlet.KiHttpServletRequest;
import org.apache.ki.web.servlet.KiHttpSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.io.Serializable;
+import java.net.InetAddress;
/**
@@ -49,7 +48,7 @@
//TODO - complete JavaDoc
- private static final Log log = LogFactory.getLog(DefaultWebSessionManager.class);
+ private static final Logger log = LoggerFactory.getLogger(DefaultWebSessionManager.class);
/**
* Property specifying if, after a session object is acquired from the request, if that session should be
@@ -195,13 +194,22 @@
}
//ensure that the id has been set in the idStore, or if it already has, that it is not different than the
//'real' session value:
- Serializable existingId = retrieveSessionId(request, response);
+ Serializable existingId = getReferencedSessionId(request, response);
if (existingId == null || !currentId.equals(existingId)) {
getSessionIdCookieAttribute().storeValue(currentId, request, response);
}
}
- protected Serializable retrieveSessionId(ServletRequest request, ServletResponse response) {
+ private void markSessionIdValid(Serializable sessionId, ServletRequest request) {
+ request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, Boolean.TRUE);
+ }
+
+ private void removeSessionIdCookie(ServletRequest request, ServletResponse response) {
+ getSessionIdCookieAttribute().removeValue(request, response);
+ }
+
+
+ protected Serializable getReferencedSessionId(ServletRequest request, ServletResponse response) {
WebAttribute<Serializable> cookieSessionIdAttribute = getSessionIdCookieAttribute();
Serializable id = cookieSessionIdAttribute.retrieveValue(request, response);
if (id != null) {
@@ -214,32 +222,43 @@
KiHttpServletRequest.URL_SESSION_ID_SOURCE);
}
}
+ if ( id != null ) {
+ request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID, id);
+ }
return id;
}
- public Serializable start(InetAddress hostAddress) throws HostUnauthorizedException, IllegalArgumentException {
+ /**
+ * Stores the Session's ID, usually as a Cookie, to associate with future requests.
+ *
+ * @param session the session that was just {@link #createSession created}.
+ */
+ @Override
+ protected void onStart(Session session) {
ServletRequest request = WebUtils.getRequiredServletRequest();
ServletResponse response = WebUtils.getRequiredServletResponse();
- return start(request, response, hostAddress);
+ onStart(session, request, response);
}
- protected Serializable start(ServletRequest request, ServletResponse response, InetAddress inetAddress) {
- Serializable sessionId = super.start(inetAddress);
+ protected void onStart(Session session, ServletRequest request, ServletResponse response) {
+ Serializable sessionId = session.getId();
storeSessionId(sessionId, request, response);
+ onSessionStart(request);
+ }
+
+ protected void onSessionStart(ServletRequest request) {
request.removeAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID_SOURCE);
request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_IS_NEW, Boolean.TRUE);
- return sessionId;
}
@Override
protected Session retrieveSession(Serializable sessionId) throws InvalidSessionException, AuthorizationException {
- if (sessionId != null) {
- return super.retrieveSession(sessionId);
- } else {
+ if (sessionId == null) {
ServletRequest request = WebUtils.getRequiredServletRequest();
ServletResponse response = WebUtils.getRequiredServletResponse();
return getSession(request, response);
}
+ return retrieveSessionFromDataSource(sessionId);
}
/**
@@ -249,52 +268,38 @@
* @param request incoming servlet request
* @param response outgoing servlet response
* @return the Session associated with the incoming request or <tt>null</tt> if one does not exist.
- * @throws org.apache.ki.session.InvalidSessionException
- * if the associated Session has expired prior to invoking this method.
* @throws org.apache.ki.authz.AuthorizationException
* if the caller is not authorized to access the session associated with the request.
*/
- public final Session getSession(ServletRequest request, ServletResponse response)
+ public Session getSession(ServletRequest request, ServletResponse response)
throws InvalidSessionException, AuthorizationException {
- Session session;
- try {
- session = doGetSession(request, response);
- } catch (InvalidSessionException ise) {
- if (log.isTraceEnabled()) {
- log.trace("Request Session with id [" + ise.getSessionId() + "] is invalid, message: [" +
- ise.getMessage() + "]. Removing any associated session cookie...");
- }
- getSessionIdCookieAttribute().removeValue(request, response);
-
- //give subclass a chance to do something additional if necessary. Otherwise returning null is just fine:
- session = handleInvalidSession(request, response, ise);
- }
-
- return session;
- }
-
- protected Session doGetSession(ServletRequest request, ServletResponse response) {
-
Session session = null;
- Serializable sessionId = retrieveSessionId(request, response);
+ Serializable sessionId = getReferencedSessionId(request, response);
if (sessionId != null) {
request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID, sessionId);
- session = super.retrieveSession(sessionId);
+ try {
+ session = retrieveSessionFromDataSource(sessionId);
+ markSessionIdValid(sessionId, request);
+ } catch (InvalidSessionException ise) {
+ if (log.isTraceEnabled()) {
+ log.trace("Request Session with id [" + ise.getSessionId() + "] is invalid, message: [" +
+ ise.getMessage() + "]. Removing any associated session cookie...");
+ }
+ removeSessionIdCookie(request, response);
+ //give subclass a chance to do something additional if necessary. Otherwise returning null is just fine:
+ session = handleInvalidSession(request, response, ise);
+ }
if (isValidateRequestOrigin()) {
if (log.isDebugEnabled()) {
log.debug("Validating request origin against session origin");
}
validateSessionOrigin(request, session);
}
- if (session != null) {
- request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, Boolean.TRUE);
- }
} else {
if (log.isTraceEnabled()) {
- log.trace("No Ki session id associated with the given " +
- "HttpServletRequest. A Session will not be returned.");
+ log.trace("A valid Ki session id was not associated with the current request.");
}
}
@@ -314,6 +319,7 @@
super.onStop(session);
ServletRequest request = WebUtils.getRequiredServletRequest();
ServletResponse response = WebUtils.getRequiredServletResponse();
+ removeSessionIdCookie(request,response);
getSessionIdCookieAttribute().removeValue(request, response);
}
}
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/AuthenticatedTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/AuthenticatedTag.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/AuthenticatedTag.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/AuthenticatedTag.java Fri Mar 27 19:20:08 2009
@@ -21,8 +21,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -44,7 +44,7 @@
//TODO - complete JavaDoc
- private static final Log log = LogFactory.getLog(AuthenticatedTag.class);
+ private static final Logger log = LoggerFactory.getLogger(AuthenticatedTag.class);
public int onDoStartTag() throws JspException {
if (getSubject() != null && getSubject().isAuthenticated()) {
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/GuestTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/GuestTag.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/GuestTag.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/GuestTag.java Fri Mar 27 19:20:08 2009
@@ -21,8 +21,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -39,7 +39,7 @@
//TODO - complete JavaDoc
- private static final Log log = LogFactory.getLog(GuestTag.class);
+ private static final Logger log = LoggerFactory.getLogger(GuestTag.class);
public int onDoStartTag() throws JspException {
if (getSubject() == null || getSubject().getPrincipal() == null) {
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/NotAuthenticatedTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/NotAuthenticatedTag.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/NotAuthenticatedTag.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/NotAuthenticatedTag.java Fri Mar 27 19:20:08 2009
@@ -21,8 +21,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -38,7 +38,7 @@
//TODO - complete JavaDoc
- private static final Log log = LogFactory.getLog(NotAuthenticatedTag.class);
+ private static final Logger log = LoggerFactory.getLogger(NotAuthenticatedTag.class);
public int onDoStartTag() throws JspException {
if (getSubject() == null || !getSubject().isAuthenticated()) {
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/PrincipalTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/PrincipalTag.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/PrincipalTag.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/PrincipalTag.java Fri Mar 27 19:20:08 2009
@@ -25,8 +25,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspTagException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>Tag used to print out the String value of a user's default principal,
@@ -54,7 +54,7 @@
/*--------------------------------------------
| I N S T A N C E V A R I A B L E S |
============================================*/
- private static final Log log = LogFactory.getLog(PrincipalTag.class);
+ private static final Logger log = LoggerFactory.getLogger(PrincipalTag.class);
/**
* The type of principal to be retrieved, or null if the default principal should be used.
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/SecureTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/SecureTag.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/SecureTag.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/SecureTag.java Fri Mar 27 19:20:08 2009
@@ -21,8 +21,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.ki.SecurityUtils;
import org.apache.ki.subject.Subject;
@@ -35,7 +35,7 @@
//TODO - complete JavaDoc
- private static final Log log = LogFactory.getLog(SecureTag.class);
+ private static final Logger log = LoggerFactory.getLogger(SecureTag.class);
public SecureTag() {
}
Modified: incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/UserTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/UserTag.java?rev=759309&r1=759308&r2=759309&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/UserTag.java (original)
+++ incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/UserTag.java Fri Mar 27 19:20:08 2009
@@ -20,8 +20,8 @@
import javax.servlet.jsp.JspException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -43,7 +43,7 @@
//TODO - complete JavaDoc
- private static final Log log = LogFactory.getLog(UserTag.class);
+ private static final Logger log = LoggerFactory.getLogger(UserTag.class);
public int onDoStartTag() throws JspException {
if (getSubject() != null && getSubject().getPrincipal() != null) {