You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ad...@apache.org on 2009/03/11 08:02:25 UTC
svn commit: r752394 [1/2] - in /incubator/jsecurity/trunk: ./ samples/spring-hibernate/web/WEB-INF/ samples/spring/webroot/WEB-INF/ samples/web/webroot/WEB-INF/ support/spring/src/org/apache/ki/spring/ support/spring/test/org/ki/spring/ web/src/org/apa...

Author: adc
Date: Wed Mar 11 07:02:21 2009
New Revision: 752394

URL: http://svn.apache.org/viewvc?rev=752394&view=rev
Log:
KI-66 intermediate changes

Added:
    incubator/jsecurity/trunk/web/src/org/apache/
    incubator/jsecurity/trunk/web/src/org/apache/ki/
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/DefaultWebSecurityManager.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/DefaultWebSecurityManager.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/RedirectView.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/RedirectView.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/SavedRequest.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/SavedRequest.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebRememberMeManager.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/WebRememberMeManager.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebSubjectFactory.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/WebSubjectFactory.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/WebUtils.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/AbstractWebAttribute.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/CookieAttribute.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/attr/CookieAttribute.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/RequestParamAttribute.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/attr/RequestParamAttribute.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/WebAttribute.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/attr/WebAttribute.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/IniWebConfiguration.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/WebConfiguration.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/config/WebConfiguration.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/AccessControlFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/PathConfigProcessor.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathConfigProcessor.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/PathMatchingFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AnonymousFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AnonymousFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AuthenticatingFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AuthenticationFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/FormAuthenticationFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/PassThruAuthenticationFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/UserFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/AuthorizationFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/PermissionsAuthorizationFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/RolesAuthorizationFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/AdviceFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/AdviceFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpServletResponse.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletResponse.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpSession.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletRequest.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/OncePerRequestFilter.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/ProxiedFilterChain.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ProxiedFilterChain.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/ServletContextSupport.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ServletContextSupport.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/DefaultWebSessionManager.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/ServletContainerSessionManager.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSession.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSessionManager.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/AuthenticatedTag.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/AuthenticatedTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/GuestTag.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/GuestTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasAnyRolesTag.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasPermissionTag.java   (contents, props changed)
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasPermissionTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasRoleTag.java   (contents, props changed)
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasRoleTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksPermissionTag.java   (contents, props changed)
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksPermissionTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksRoleTag.java   (contents, props changed)
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksRoleTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/NotAuthenticatedTag.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/NotAuthenticatedTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PermissionTag.java   (contents, props changed)
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/PermissionTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PrincipalTag.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/PrincipalTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/RoleTag.java   (contents, props changed)
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/RoleTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/SecureTag.java   (contents, props changed)
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/UserTag.java
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/UserTag.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/jsecurity.tld   (contents, props changed)
      - copied, changed from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/jsecurity.tld
Removed:
    incubator/jsecurity/trunk/web/src/org/ki/web/DefaultWebSecurityManager.java
    incubator/jsecurity/trunk/web/src/org/ki/web/RedirectView.java
    incubator/jsecurity/trunk/web/src/org/ki/web/SavedRequest.java
    incubator/jsecurity/trunk/web/src/org/ki/web/WebRememberMeManager.java
    incubator/jsecurity/trunk/web/src/org/ki/web/WebSubjectFactory.java
    incubator/jsecurity/trunk/web/src/org/ki/web/WebUtils.java
    incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java
    incubator/jsecurity/trunk/web/src/org/ki/web/attr/CookieAttribute.java
    incubator/jsecurity/trunk/web/src/org/ki/web/attr/RequestParamAttribute.java
    incubator/jsecurity/trunk/web/src/org/ki/web/attr/WebAttribute.java
    incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java
    incubator/jsecurity/trunk/web/src/org/ki/web/config/WebConfiguration.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathConfigProcessor.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AnonymousFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/servlet/AdviceFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java
    incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletResponse.java
    incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java
    incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java
    incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ProxiedFilterChain.java
    incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ServletContextSupport.java
    incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java
    incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java
    incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java
    incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/AuthenticatedTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/GuestTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasPermissionTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasRoleTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksPermissionTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksRoleTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/NotAuthenticatedTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/PermissionTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/PrincipalTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/RoleTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/UserTag.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/jsecurity.tld
Modified:
    incubator/jsecurity/trunk/changes.txt
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml
    incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml
    incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml
    incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java
    incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java
    incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java
    incubator/jsecurity/trunk/web/src/org/ki/web/attr/package-info.java
    incubator/jsecurity/trunk/web/test/org/ki/web/DefaultWebSecurityManagerTest.java
    incubator/jsecurity/trunk/web/test/org/ki/web/WebRememberMeManagerTest.java
    incubator/jsecurity/trunk/web/test/org/ki/web/attr/CookieAttributeTest.java
    incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java

Modified: incubator/jsecurity/trunk/changes.txt
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/changes.txt?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/changes.txt (original)
+++ incubator/jsecurity/trunk/changes.txt Wed Mar 11 07:02:21 2009
@@ -2,8 +2,8 @@
 
 * org.ki.spring.SpringWebConfiguration renamed to org.apache.ki.spring.SpringIniWebConfiguration
 * org.apache.ki.util.ThreadContext fixed to correctly work in child/spawned threads from a parent thread (sometimes surfaced in Tomcat environments)
-* org.ki.web.servlet.FilterChainWrapper renamed to org.ki.web.servlet.ProxiedFilterChain to maintain parallel naming conventions with ProxiedSession.
-* org.ki.web.attr.CookieAttribute#onRetrieveValue would return deleted cookies (maxAge of 0) on Tomcat.  It now only returns a value if the cookie is non null and maxAge != 0 (-1 or positive only).
+* org.ki.web.servlet.FilterChainWrapper renamed to org.apache.ki.web.servlet.ProxiedFilterChain to maintain parallel naming conventions with ProxiedSession.
+* org.apache.ki.web.attr.CookieAttribute#onRetrieveValue would return deleted cookies (maxAge of 0) on Tomcat.  It now only returns a value if the cookie is non null and maxAge != 0 (-1 or positive only).
 * Added *AnnotationHandler implementations and refactored the AuthorizingAnnotationMethodInterceptor implementations
   to delegate to internal AnnotationHandler instances for performing authorization checks based on annotations.  This was
   done to ensure Annotations could be processed independently of where they are declared (method, class, etc).

Modified: incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml Wed Mar 11 07:02:21 2009
@@ -87,7 +87,7 @@
 
     <!-- JSecurity's main business-tier object for web-enabled applications
          (use org.kifaultSecurityManager instead when there is no web environment)-->
-    <bean id="securityManager" class="org.ki.web.DefaultWebSecurityManager">
+    <bean id="securityManager" class="org.apache.ki.web.DefaultWebSecurityManager">
         <!-- Single realm app (realm configured next, below).  If you have multiple realms, use the 'realms'
       property instead. -->
         <property name="realm" ref="sampleRealm"/>

Modified: incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml Wed Mar 11 07:02:21 2009
@@ -76,7 +76,7 @@
 
                 [filters]
                 # Override the authentication filter to pass thru so we can handle login logic in our controller
-                authc = org.ki.web.filter.authc.PassThruAuthenticationFilter
+                authc = org.apache.ki.web.filter.authc.PassThruAuthenticationFilter
                 jsecurity.loginUrl = /s/login
                 jsecurity.unauthorizedUrl = /unauthorized.jsp
                 authc.successUrl = /s/home

Modified: incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml Wed Mar 11 07:02:21 2009
@@ -40,7 +40,7 @@
          ========================================================= -->
     <!-- JSecurity's main business-tier object for web-enabled applications
          (use org.kifaultSecurityManager instead when there is no web environment)-->
-    <bean id="securityManager" class="org.ki.web.DefaultWebSecurityManager">
+    <bean id="securityManager" class="org.apache.ki.web.DefaultWebSecurityManager">
         <!-- Single realm app.  If you have multiple realms, use the 'realms' property instead. -->
         <property name="realm" ref="jdbcRealm"/>
         <property name="sessionMode" value="jsecurity"/>

Modified: incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml (original)
+++ incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml Wed Mar 11 07:02:21 2009
@@ -24,7 +24,7 @@
 
     <filter>
         <filter-name>JSecurityFilter</filter-name>
-        <filter-class>org.ki.web.servlet.JSecurityFilter</filter-class>
+        <filter-class>org.apache.ki.web.servlet.JSecurityFilter</filter-class>
         <init-param>
             <param-name>config</param-name>
             <param-value>

Modified: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java Wed Mar 11 07:02:21 2009
@@ -22,7 +22,6 @@
 import java.util.Map;
 import javax.servlet.ServletContext;
 
-import org.ki.web.config.IniWebConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -34,13 +33,14 @@
 import org.apache.ki.mgt.RealmSecurityManager;
 import org.apache.ki.mgt.SecurityManager;
 import org.apache.ki.realm.Realm;
+import org.apache.ki.web.config.IniWebConfiguration;
 
 
 /**
  * <p>JSecurity configuration that relies on Spring to define and initialize the JSecurity SecurityManager
  * instance (and all of its dependencies) and makes it available to the JSecurityFilter by performing a Spring bean
  * lookup.  The URL/filter definitions are still .ini based and loaded according to the behavior of the parent class
- * {@link org.ki.web.config.IniWebConfiguration}</p>
+ * {@link org.apache.ki.web.config.IniWebConfiguration}</p>
  * <p/>
  * That is, this class is offers a hybrid means of configuring JSecurity in Spring apps deployed in a web container:
  * Spring XML config for the SecurityManager and its dependencies (realms, etc), and .ini format for configuring
@@ -56,7 +56,7 @@
  * throw an exception that says you have to set the init-param to specify the bean name.</li>
  * <li>if no beans of type {@link SecurityManager}, look for any beans of type {@link Realm}.
  * If some are found, create a default security manager by calling
- * {@link org.ki.web.config.IniWebConfiguration#createSecurityManager(java.util.Map) super.createSecurityManager(Map)}
+ * {@link org.apache.ki.web.config.IniWebConfiguration#createSecurityManager(java.util.Map) super.createSecurityManager(Map)}
  * and set the Realms on that SecurityManager instance.</li>
  * <li>If none of the above, throw an exception that explains the options.</li>
  * <ol>

Modified: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java Wed Mar 11 07:02:21 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.ki.spring;
 
-import org.ki.web.servlet.JSecurityFilter;
+import org.apache.ki.web.servlet.JSecurityFilter;
 
 /**
  * Extension of JSecurityFilter that uses {@link SpringIniWebConfiguration} to configure JSecurity in a Spring web

Modified: incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java (original)
+++ incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java Wed Mar 11 07:02:21 2009
@@ -25,7 +25,7 @@
 
 import static org.easymock.EasyMock.*;
 import org.junit.Test;
-import org.ki.web.servlet.JSecurityFilter;
+import org.apache.ki.web.servlet.JSecurityFilter;
 import org.springframework.web.context.WebApplicationContext;
 
 import org.apache.ki.mgt.SecurityManager;

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/DefaultWebSecurityManager.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/DefaultWebSecurityManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/DefaultWebSecurityManager.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/DefaultWebSecurityManager.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/DefaultWebSecurityManager.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/DefaultWebSecurityManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/DefaultWebSecurityManager.java Wed Mar 11 07:02:21 2009
@@ -16,24 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web;
+package org.apache.ki.web;
+
+import java.util.Collection;
+import javax.servlet.ServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.ki.realm.Realm;
 
 import org.apache.ki.mgt.DefaultSecurityManager;
+import org.apache.ki.realm.Realm;
 import org.apache.ki.session.mgt.SessionManager;
 import org.apache.ki.subject.PrincipalCollection;
 import org.apache.ki.util.LifecycleUtils;
-
-import org.ki.web.session.DefaultWebSessionManager;
-import org.ki.web.session.ServletContainerSessionManager;
-import org.ki.web.session.WebSessionManager;
-import org.ki.web.servlet.JSecurityHttpServletRequest;
-
-import javax.servlet.ServletRequest;
-import java.util.Collection;
+import org.apache.ki.web.servlet.KiHttpServletRequest;
+import org.apache.ki.web.session.DefaultWebSessionManager;
+import org.apache.ki.web.session.ServletContainerSessionManager;
+import org.apache.ki.web.session.WebSessionManager;
 
 
 /**
@@ -187,7 +186,7 @@
     protected void removeRequestIdentity() {
         ServletRequest request = WebUtils.getServletRequest();
         if ( request != null ) {
-            request.setAttribute(JSecurityHttpServletRequest.IDENTITY_REMOVED_KEY, Boolean.TRUE);
+            request.setAttribute(KiHttpServletRequest.IDENTITY_REMOVED_KEY, Boolean.TRUE);
         }
     }
 }

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/RedirectView.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/RedirectView.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/RedirectView.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/RedirectView.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/RedirectView.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/RedirectView.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/RedirectView.java Wed Mar 11 07:02:21 2009
@@ -16,18 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web;
+package org.apache.ki.web;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ki.util.JavaEnvironment;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.util.JavaEnvironment;
 
 /**
  * <p>View that redirects to an absolute, context relative, or current request

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/SavedRequest.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/SavedRequest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/SavedRequest.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/SavedRequest.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/SavedRequest.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/SavedRequest.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/SavedRequest.java Wed Mar 11 07:02:21 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web;
+package org.apache.ki.web;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * Maintains request data for a request that was redirected, so that after authentication

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebRememberMeManager.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/WebRememberMeManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebRememberMeManager.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebRememberMeManager.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/WebRememberMeManager.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/WebRememberMeManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebRememberMeManager.java Wed Mar 11 07:02:21 2009
@@ -16,26 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web;
+package org.apache.ki.web;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.apache.ki.codec.Base64;
 import org.apache.ki.mgt.AbstractRememberMeManager;
-
-import org.ki.web.attr.CookieAttribute;
-import org.ki.web.attr.WebAttribute;
-import org.ki.web.servlet.JSecurityHttpServletRequest;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import org.apache.ki.web.attr.CookieAttribute;
+import org.apache.ki.web.attr.WebAttribute;
+import org.apache.ki.web.servlet.KiHttpServletRequest;
 
 
 /**
  * Remembers a Subject's identity by using a {@link WebAttribute WebAttribute} instance to retain
  * the identity value between web requests.
  *
- * <p>This class's default <code>WebAttribute</code> instance is a {@link CookieAttribute CookieAttribute}, storing
+ * <p>This class's default <code>WebAttribute</code> instance is a {@link org.apache.ki.web.attr.CookieAttribute CookieAttribute}, storing
  * the Subject's {@link org.apache.ki.subject.Subject#getPrincipals principals} in a <code>Cookie</code>.  Note that
  * because this class subclasses the <code>AbstractRememberMeManager</code> which already provides serialization and
  * encryption logic, this class utilizes both for added security before setting the cookie value.</p>
@@ -209,7 +209,7 @@
     protected boolean isIdentityRemoved() {
         ServletRequest request = WebUtils.getServletRequest();
         if ( request != null ) {
-            Boolean removed = (Boolean)request.getAttribute(JSecurityHttpServletRequest.IDENTITY_REMOVED_KEY);
+            Boolean removed = (Boolean)request.getAttribute(KiHttpServletRequest.IDENTITY_REMOVED_KEY);
             return removed != null && removed;
         }
         return false;

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebSubjectFactory.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/WebSubjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebSubjectFactory.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebSubjectFactory.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/WebSubjectFactory.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/WebSubjectFactory.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebSubjectFactory.java Wed Mar 11 07:02:21 2009
@@ -16,20 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web;
+package org.apache.ki.web;
 
-import org.apache.ki.mgt.*;
+import java.net.InetAddress;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.ki.mgt.DefaultSubjectFactory;
 import org.apache.ki.mgt.SecurityManager;
 import org.apache.ki.mgt.SessionSubjectBinder;
 import org.apache.ki.session.Session;
 import org.apache.ki.subject.PrincipalCollection;
-
 import org.apache.ki.subject.Subject;
-import org.ki.web.session.WebSessionManager;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import java.net.InetAddress;
+import org.apache.ki.web.session.WebSessionManager;
 
 
 /**

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/WebUtils.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/WebUtils.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/WebUtils.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.java Wed Mar 11 07:02:21 2009
@@ -16,27 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web;
+package org.apache.ki.web;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ki.SecurityUtils;
-import org.apache.ki.session.Session;
-import org.apache.ki.subject.Subject;
-import org.apache.ki.util.ThreadContext;
-
-import org.apache.ki.util.StringUtils;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.util.Map;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.StringUtils;
+import org.apache.ki.util.ThreadContext;
 
 /**
  * Simple utility class for operations used across multiple class hierarchies in the web framework code.

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/AbstractWebAttribute.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/AbstractWebAttribute.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/AbstractWebAttribute.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/AbstractWebAttribute.java Wed Mar 11 07:02:21 2009
@@ -16,17 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.attr;
+package org.apache.ki.web.attr;
+
+import java.beans.PropertyEditor;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.apache.ki.KiException;
 import org.apache.ki.util.ClassUtils;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import java.beans.PropertyEditor;
-
 /**
  * Convenient superclass for implementations of the {@link WebAttribute} interface.  This class encapsulates
  * converting values from a String form to Object form and vice versa through the use of a <tt>PropertyEditor</tt>

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/CookieAttribute.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/attr/CookieAttribute.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/CookieAttribute.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/CookieAttribute.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/attr/CookieAttribute.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/attr/CookieAttribute.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/CookieAttribute.java Wed Mar 11 07:02:21 2009
@@ -16,19 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.attr;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ki.util.StringUtils;
-import static org.ki.web.WebUtils.toHttp;
+package org.apache.ki.web.attr;
 
+import java.beans.PropertyEditor;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.beans.PropertyEditor;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.util.StringUtils;
+import static org.apache.ki.web.WebUtils.toHttp;
 
 /**
  * A <tt>CookieAttribute</tt> stores an object as a {@link Cookie} for access on later requests.

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/RequestParamAttribute.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/attr/RequestParamAttribute.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/RequestParamAttribute.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/RequestParamAttribute.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/attr/RequestParamAttribute.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/attr/RequestParamAttribute.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/RequestParamAttribute.java Wed Mar 11 07:02:21 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.attr;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+package org.apache.ki.web.attr;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * @author Les Hazlewood
  * @since 0.2

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/WebAttribute.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/attr/WebAttribute.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/WebAttribute.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/WebAttribute.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/attr/WebAttribute.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/attr/WebAttribute.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/WebAttribute.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.attr;
+package org.apache.ki.web.attr;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/IniWebConfiguration.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/IniWebConfiguration.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/IniWebConfiguration.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/IniWebConfiguration.java Wed Mar 11 07:02:21 2009
@@ -16,33 +16,42 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.config;
+package org.apache.ki.web.config;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.apache.ki.config.ConfigurationException;
 import org.apache.ki.config.IniConfiguration;
 import org.apache.ki.config.ReflectionBuilder;
 import org.apache.ki.mgt.RealmSecurityManager;
 import org.apache.ki.util.AntPathMatcher;
 import org.apache.ki.util.PatternMatcher;
-
 import static org.apache.ki.util.StringUtils.split;
-
-import org.ki.web.DefaultWebSecurityManager;
-import org.ki.web.WebUtils;
-import org.ki.web.filter.PathConfigProcessor;
-import org.ki.web.filter.authc.AnonymousFilter;
-import org.ki.web.filter.authc.BasicHttpAuthenticationFilter;
-import org.ki.web.filter.authc.FormAuthenticationFilter;
-import org.ki.web.filter.authc.UserFilter;
-import org.ki.web.filter.authz.PermissionsAuthorizationFilter;
-import org.ki.web.filter.authz.RolesAuthorizationFilter;
-import org.ki.web.servlet.AdviceFilter;
-import org.ki.web.servlet.ProxiedFilterChain;
-
-import javax.servlet.*;
-import java.util.*;
+import org.apache.ki.web.DefaultWebSecurityManager;
+import org.apache.ki.web.WebUtils;
+import org.apache.ki.web.filter.PathConfigProcessor;
+import org.apache.ki.web.filter.authc.AnonymousFilter;
+import org.apache.ki.web.filter.authc.BasicHttpAuthenticationFilter;
+import org.apache.ki.web.filter.authc.FormAuthenticationFilter;
+import org.apache.ki.web.filter.authc.UserFilter;
+import org.apache.ki.web.filter.authz.PermissionsAuthorizationFilter;
+import org.apache.ki.web.filter.authz.RolesAuthorizationFilter;
+import org.apache.ki.web.servlet.AdviceFilter;
+import org.apache.ki.web.servlet.ProxiedFilterChain;
 
 
 /**
@@ -168,7 +177,7 @@
      * calls this method.
      * <p/>
      * The default implementation merely returns
-     * <code>new {@link org.ki.web.servlet.ProxiedFilterChain FilterChainWrapper(filters, originalChain)}</code>,
+     * <code>new {@link org.apache.ki.web.servlet.ProxiedFilterChain FilterChainWrapper(filters, originalChain)}</code>,
      * and can be overridden by subclasses for custom creation.
      *
      * @param filters       the configured filter chain for the incoming request application path
@@ -200,7 +209,7 @@
 
     /**
      * Merely returns
-     * <code>WebUtils.{@link WebUtils#getPathWithinApplication(javax.servlet.http.HttpServletRequest) getPathWithinApplication(request)}</code>
+     * <code>WebUtils.{@link org.apache.ki.web.WebUtils#getPathWithinApplication(javax.servlet.http.HttpServletRequest) getPathWithinApplication(request)}</code>
      * and can be overridden by subclasses for custom request-to-application-path resolution behavior.
      *
      * @param request the incoming <code>ServletRequest</code>
@@ -215,7 +224,7 @@
      * the JSecurity environment for the web application.
      * <p/>
      * The default implementation simply returns
-     * <code>new {@link org.ki.web.DefaultWebSecurityManager DefaultWebSecurityManager()};</code>
+     * <code>new {@link org.apache.ki.web.DefaultWebSecurityManager DefaultWebSecurityManager()};</code>
      *
      * @return a new, uninitialized <code>SecurityManager</code> instance that will be used to build up
      *         the JSecurity environment for the web application.

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/WebConfiguration.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/config/WebConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/WebConfiguration.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/WebConfiguration.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/config/WebConfiguration.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/config/WebConfiguration.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/WebConfiguration.java Wed Mar 11 07:02:21 2009
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.config;
-
-import org.apache.ki.config.Configuration;
+package org.apache.ki.web.config;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import org.apache.ki.config.Configuration;
+
 /**
  * A <code>WebConfiguration</code> configures JSecurity components in a web-enabled application.
  * <p/>

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/AccessControlFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/AccessControlFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/AccessControlFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/AccessControlFilter.java Wed Mar 11 07:02:21 2009
@@ -16,16 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter;
-
-import org.apache.ki.SecurityUtils;
-import org.apache.ki.subject.Subject;
-
-import org.ki.web.WebUtils;
+package org.apache.ki.web.filter;
 
+import java.io.IOException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import java.io.IOException;
+
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.web.WebUtils;
 
 /**
  * Superclass for any filter that controls access to a resource and may redirect the user to the login page

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/PathConfigProcessor.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathConfigProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/PathConfigProcessor.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/PathConfigProcessor.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathConfigProcessor.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathConfigProcessor.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/PathConfigProcessor.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter;
+package org.apache.ki.web.filter;
 
 import javax.servlet.Filter;
 

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/PathMatchingFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/PathMatchingFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/PathMatchingFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/PathMatchingFilter.java Wed Mar 11 07:02:21 2009
@@ -16,21 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter;
+package org.apache.ki.web.filter;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.servlet.Filter;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.apache.ki.util.AntPathMatcher;
 import org.apache.ki.util.PatternMatcher;
 import static org.apache.ki.util.StringUtils.split;
-import org.ki.web.WebUtils;
-import org.ki.web.servlet.AdviceFilter;
-
-import javax.servlet.Filter;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import org.apache.ki.web.WebUtils;
+import org.apache.ki.web.servlet.AdviceFilter;
 
 /**
  * <p>Base class for Filters that will process only specified paths and allow all others to pass through.</p>

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AnonymousFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AnonymousFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AnonymousFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AnonymousFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AnonymousFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AnonymousFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AnonymousFilter.java Wed Mar 11 07:02:21 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter.authc;
-
-import org.ki.web.filter.PathMatchingFilter;
+package org.apache.ki.web.filter.authc;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import org.apache.ki.web.filter.PathMatchingFilter;
+
 /**
  * Filter that allows access to a path immeidately without performing security checks of any kind.
  * <p/>

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AuthenticatingFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AuthenticatingFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AuthenticatingFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AuthenticatingFilter.java Wed Mar 11 07:02:21 2009
@@ -16,18 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter.authc;
+package org.apache.ki.web.filter.authc;
+
+import java.net.InetAddress;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
 import org.apache.ki.authc.AuthenticationException;
 import org.apache.ki.authc.AuthenticationToken;
 import org.apache.ki.authc.UsernamePasswordToken;
-
 import org.apache.ki.subject.Subject;
-import org.ki.web.WebUtils;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import java.net.InetAddress;
+import org.apache.ki.web.WebUtils;
 
 /**
  * An <code>AuthenticationFilter</code> that is capable of automatically performing an authentication attempt
@@ -85,7 +84,7 @@
      * during construction of an <code>AuthenticationToken</code>.
      * <p/>
      * The default implementation merely returns
-     * {@link WebUtils#getInetAddress(javax.servlet.ServletRequest) WebUtils.getInetAddress(request)}.
+     * {@link org.apache.ki.web.WebUtils#getInetAddress(javax.servlet.ServletRequest) WebUtils.getInetAddress(request)}.
      *
      * @param request the incoming ServletRequest
      * @return the <code>InetAddress</code> to associate with the login attempt.

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AuthenticationFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AuthenticationFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AuthenticationFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AuthenticationFilter.java Wed Mar 11 07:02:21 2009
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter.authc;
-
-import org.apache.ki.subject.Subject;
-import org.ki.web.SavedRequest;
-import org.ki.web.WebUtils;
-import org.ki.web.filter.AccessControlFilter;
+package org.apache.ki.web.filter.authc;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import org.apache.ki.subject.Subject;
+import org.apache.ki.web.SavedRequest;
+import org.apache.ki.web.WebUtils;
+import org.apache.ki.web.filter.AccessControlFilter;
+
 /**
  * <p>Base class for all Filters that require the current user to be authenticated. This class encapsulates the
  * logic of checking whether a user is already authenticated in the system. If the user is not authenticated, we use

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java Wed Mar 11 07:02:21 2009
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter.authc;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ki.authc.AuthenticationToken;
-import org.apache.ki.codec.Base64;
-
-import org.ki.web.WebUtils;
+package org.apache.ki.web.filter.authc;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.codec.Base64;
+import org.apache.ki.web.WebUtils;
+
 
 /**
  * Requires the requesting user to be {@link org.apache.ki.subject.Subject#isAuthenticated() authenticated} for the

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/FormAuthenticationFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/FormAuthenticationFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/FormAuthenticationFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/FormAuthenticationFilter.java Wed Mar 11 07:02:21 2009
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter.authc;
+package org.apache.ki.web.filter.authc;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.apache.ki.authc.AuthenticationException;
 import org.apache.ki.authc.AuthenticationToken;
 import org.apache.ki.authc.UsernamePasswordToken;
 import org.apache.ki.subject.Subject;
-
-import org.ki.web.WebUtils;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.ki.web.WebUtils;
 
 
 /**
@@ -51,12 +51,12 @@
  * (e.g. no account, incorrect password, etc).
  *
  * <p>If you would prefer to handle the authentication validation and login in your own code, consider using the
- * {@link org.ki.web.filter.authc.PassThruAuthenticationFilter} instead, which allows requests to the
+ * {@link PassThruAuthenticationFilter} instead, which allows requests to the
  * {@link #loginUrl} to pass through to your application's code directly.
  *
  * @author Les Hazlewood
  * @author Jeremy Haile
- * @see org.ki.web.filter.authc.PassThruAuthenticationFilter
+ * @see PassThruAuthenticationFilter
  * @since 0.9
  */
 public class FormAuthenticationFilter extends AuthenticatingFilter {

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/PassThruAuthenticationFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/PassThruAuthenticationFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/PassThruAuthenticationFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/PassThruAuthenticationFilter.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter.authc;
+package org.apache.ki.web.filter.authc;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/UserFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/UserFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/UserFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/UserFilter.java Wed Mar 11 07:02:21 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter.authc;
-
-import org.apache.ki.subject.Subject;
-import org.ki.web.filter.AccessControlFilter;
+package org.apache.ki.web.filter.authc;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import org.apache.ki.subject.Subject;
+import org.apache.ki.web.filter.AccessControlFilter;
+
 /**
  * Filter that allows access to resources if the accessor is a known user, which is defined as
  * having a known principal.  This means that any user who is authenticated or remembered via a

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/AuthorizationFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/AuthorizationFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/AuthorizationFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/AuthorizationFilter.java Wed Mar 11 07:02:21 2009
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter.authz;
-
-import org.apache.ki.subject.Subject;
-import org.apache.ki.util.StringUtils;
-import org.ki.web.WebUtils;
-import org.ki.web.filter.AccessControlFilter;
+package org.apache.ki.web.filter.authz;
 
+import java.io.IOException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.StringUtils;
+import org.apache.ki.web.WebUtils;
+import org.apache.ki.web.filter.AccessControlFilter;
 
 /**
  * Superclass for authorization-related filters.  For unauthorized requests, this filter redirects to the

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/PermissionsAuthorizationFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/PermissionsAuthorizationFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/PermissionsAuthorizationFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/PermissionsAuthorizationFilter.java Wed Mar 11 07:02:21 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter.authz;
-
-import org.apache.ki.subject.Subject;
+package org.apache.ki.web.filter.authz;
 
+import java.io.IOException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import java.io.IOException;
+
+import org.apache.ki.subject.Subject;
 
 /**
  * Filter that allows access if the current user has the permissions specified by the mapped value, or denies access

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/RolesAuthorizationFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/RolesAuthorizationFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/RolesAuthorizationFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/RolesAuthorizationFilter.java Wed Mar 11 07:02:21 2009
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.filter.authz;
+package org.apache.ki.web.filter.authz;
 
-import org.apache.ki.subject.Subject;
-import org.apache.ki.util.CollectionUtils;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import java.io.IOException;
 import java.util.Set;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.CollectionUtils;
 
 
 /**

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/AdviceFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/AdviceFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/AdviceFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/AdviceFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/servlet/AdviceFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/AdviceFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/AdviceFilter.java Wed Mar 11 07:02:21 2009
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.servlet;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+package org.apache.ki.web.servlet;
 
+import java.io.IOException;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A Servlet Filter that enables AOP-style advice for a SerlvetRequest via

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityFilter.java Wed Mar 11 07:02:21 2009
@@ -16,31 +16,34 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.servlet;
+package org.apache.ki.web.servlet;
+
+import java.beans.PropertyDescriptor;
+import java.io.IOException;
+import java.net.InetAddress;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+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.apache.ki.config.Configuration;
 import org.apache.ki.config.ConfigurationException;
 import org.apache.ki.mgt.SecurityManager;
 import org.apache.ki.util.ClassUtils;
 import org.apache.ki.util.LifecycleUtils;
-import org.apache.ki.util.ThreadContext;
-
 import static org.apache.ki.util.StringUtils.clean;
-
-import org.ki.web.DefaultWebSecurityManager;
-import org.ki.web.WebUtils;
-import org.ki.web.config.IniWebConfiguration;
-import org.ki.web.config.WebConfiguration;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.beans.PropertyDescriptor;
-import java.io.IOException;
-import java.net.InetAddress;
+import org.apache.ki.util.ThreadContext;
+import org.apache.ki.web.DefaultWebSecurityManager;
+import org.apache.ki.web.WebUtils;
+import org.apache.ki.web.config.IniWebConfiguration;
+import org.apache.ki.web.config.WebConfiguration;
 
 
 /**
@@ -70,8 +73,8 @@
  * # (and client-agnostic) session management.  You can enable this by uncommenting the following line
  * # and changing 'http' to 'jsecurity'
  * #
- * #securityManager = {@link org.ki.web.DefaultWebSecurityManager org.jsecurity.web.DefaultWebSecurityManager}
- * #securityManager.{@link org.ki.web.DefaultWebSecurityManager#setSessionMode(String) sessionMode} = http
+ * #securityManager = {@link org.apache.ki.web.DefaultWebSecurityManager org.jsecurity.web.DefaultWebSecurityManager}
+ * #securityManager.{@link org.apache.ki.web.DefaultWebSecurityManager#setSessionMode(String) sessionMode} = http
  * <p/>
  * [filters]
  * # This section defines the 'pool' of all Filters available to the url path definitions in the [urls] section below.
@@ -85,36 +88,36 @@
  * # affect the user experience.
  * #
  * # Form-based Authentication filter:
- * #<a name="authc"></a>authc = {@link org.ki.web.filter.authc.FormAuthenticationFilter}
- * #authc.{@link org.ki.web.filter.authc.FormAuthenticationFilter#setLoginUrl(String) loginUrl} = /login.jsp
- * #authc.{@link org.ki.web.filter.authc.FormAuthenticationFilter#setUsernameParam(String) usernameParam} = username
- * #authc.{@link org.ki.web.filter.authc.FormAuthenticationFilter#setPasswordParam(String) passwordParam} = password
- * #authc.{@link org.ki.web.filter.authc.FormAuthenticationFilter#setRememberMeParam(String) rememberMeParam} = rememberMe
- * #authc.{@link org.ki.web.filter.authc.FormAuthenticationFilter#setSuccessUrl(String) successUrl}  = /login.jsp
- * #authc.{@link org.ki.web.filter.authc.FormAuthenticationFilter#setFailureKeyAttribute(String) failureKeyAttribute} = {@link org.ki.web.filter.authc.FormAuthenticationFilter#DEFAULT_ERROR_KEY_ATTRIBUTE_NAME}
+ * #<a name="authc"></a>authc = {@link org.apache.ki.web.filter.authc.FormAuthenticationFilter}
+ * #authc.{@link org.apache.ki.web.filter.authc.FormAuthenticationFilter#setLoginUrl(String) loginUrl} = /login.jsp
+ * #authc.{@link org.apache.ki.web.filter.authc.FormAuthenticationFilter#setUsernameParam(String) usernameParam} = username
+ * #authc.{@link org.apache.ki.web.filter.authc.FormAuthenticationFilter#setPasswordParam(String) passwordParam} = password
+ * #authc.{@link org.apache.ki.web.filter.authc.FormAuthenticationFilter#setRememberMeParam(String) rememberMeParam} = rememberMe
+ * #authc.{@link org.apache.ki.web.filter.authc.FormAuthenticationFilter#setSuccessUrl(String) successUrl}  = /login.jsp
+ * #authc.{@link org.apache.ki.web.filter.authc.FormAuthenticationFilter#setFailureKeyAttribute(String) failureKeyAttribute} = {@link org.apache.ki.web.filter.authc.FormAuthenticationFilter#DEFAULT_ERROR_KEY_ATTRIBUTE_NAME}
  * #
  * # Http BASIC Authentication filter:
- * #<a name="authcBasic"></a>authcBasic = {@link org.ki.web.filter.authc.BasicHttpAuthenticationFilter}
- * #authcBasic.{@link org.ki.web.filter.authc.BasicHttpAuthenticationFilter#setApplicationName(String) applicationName} = application
+ * #<a name="authcBasic"></a>authcBasic = {@link org.apache.ki.web.filter.authc.BasicHttpAuthenticationFilter}
+ * #authcBasic.{@link org.apache.ki.web.filter.authc.BasicHttpAuthenticationFilter#setApplicationName(String) applicationName} = application
  * #
  * # Roles filter: requires the requesting user to have one or more roles for the request to continue.
  * # If they do not have the specified roles, they are redirected to the specified URL.
- * #<a name="roles"></a>roles = {@link org.ki.web.filter.authz.RolesAuthorizationFilter}
- * #roles.{@link org.ki.web.filter.authz.RolesAuthorizationFilter#setUnauthorizedUrl(String) unauthorizedUrl} =
+ * #<a name="roles"></a>roles = {@link org.apache.ki.web.filter.authz.RolesAuthorizationFilter}
+ * #roles.{@link org.apache.ki.web.filter.authz.RolesAuthorizationFilter#setUnauthorizedUrl(String) unauthorizedUrl} =
  * # (note the above url is null by default, which will cause an HTTP 403 (Access Denied) response instead
  * # of redirecting to a page.  If you want to show a 'nice page' instead, you should specify that url.
  * #
  * # Permissions filter: requires the requesting user to have one or more permissions for the request to
  * # continue, and if they do not, redirects them to the specified URL.
- * #<a name="perms"></a>perms = {@link org.ki.web.filter.authz.PermissionsAuthorizationFilter}
- * #perms.{@link org.ki.web.filter.authz.PermissionsAuthorizationFilter#setUnauthorizedUrl(String) unauthorizedUrl} =
+ * #<a name="perms"></a>perms = {@link org.apache.ki.web.filter.authz.PermissionsAuthorizationFilter}
+ * #perms.{@link org.apache.ki.web.filter.authz.PermissionsAuthorizationFilter#setUnauthorizedUrl(String) unauthorizedUrl} =
  * # (note the above url is null by default, which will cause an HTTP 403 (Access Denied) response instead
  * # of redirecting to a page.  If you want to show a 'nice page' instead, you should specify that url.  Many
  * # applications like to use the same url specified in roles.unauthorizedUrl above.
  * #
  * #
  * # Define your own filters here.  To properly handle url path matching (see the [urls] section below), your
- * # filter should extend the {@link org.ki.web.filter.PathMatchingFilter PathMatchingFilter} abstract class.
+ * # filter should extend the {@link org.apache.ki.web.filter.PathMatchingFilter PathMatchingFilter} abstract class.
  * <p/>
  * [urls]
  * # This section defines url path mappings.  Each mapping entry must be on a single line and conform to the
@@ -351,11 +354,11 @@
     }
 
     /**
-     * Wraps the original HttpServletRequest in a {@link JSecurityHttpServletRequest}
+     * Wraps the original HttpServletRequest in a {@link KiHttpServletRequest}
      * @since 1.0
      */
     protected ServletRequest wrapServletRequest(HttpServletRequest orig) {
-        return new JSecurityHttpServletRequest(orig, getServletContext(), isHttpSessions());
+        return new KiHttpServletRequest(orig, getServletContext(), isHttpSessions());
     }
 
     /** @since 1.0 */
@@ -370,7 +373,7 @@
     }
 
     /** @since 1.0 */
-    protected ServletResponse wrapServletResponse(HttpServletResponse orig, JSecurityHttpServletRequest request) {
+    protected ServletResponse wrapServletResponse(HttpServletResponse orig, KiHttpServletRequest request) {
         return new JSecurityHttpServletResponse(orig, getServletContext(), request);
     }
 
@@ -378,11 +381,11 @@
     protected ServletResponse prepareServletResponse(ServletRequest request, ServletResponse response,
                                                      FilterChain chain) {
         ServletResponse toUse = response;
-        if (isHttpSessions() && (request instanceof JSecurityHttpServletRequest) &&
+        if (isHttpSessions() && (request instanceof KiHttpServletRequest) &&
             (response instanceof HttpServletResponse)) {
             //the JSecurityHttpServletResponse exists to support URL rewriting for session ids.  This is only needed if
             //using JSecurity sessions (i.e. not simple HttpSession based sessions):
-            toUse = wrapServletResponse((HttpServletResponse) response, (JSecurityHttpServletRequest) request);
+            toUse = wrapServletResponse((HttpServletResponse) response, (KiHttpServletRequest) request);
         }
         return toUse;
     }

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpServletResponse.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletResponse.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpServletResponse.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpServletResponse.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletResponse.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletResponse.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpServletResponse.java Wed Mar 11 07:02:21 2009
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.servlet;
+package org.apache.ki.web.servlet;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
 
 /**
  * HttpServletResponse implementation to support URL Encoding of JSecurity Session IDs.
@@ -52,9 +52,9 @@
 
     private ServletContext context = null;
     //the associated request
-    private JSecurityHttpServletRequest request = null;
+    private KiHttpServletRequest request = null;
 
-    public JSecurityHttpServletResponse(HttpServletResponse wrapped, ServletContext context, JSecurityHttpServletRequest request) {
+    public JSecurityHttpServletResponse(HttpServletResponse wrapped, ServletContext context, KiHttpServletRequest request) {
         super(wrapped);
         this.context = context;
         this.request = request;
@@ -68,11 +68,11 @@
         this.context = context;
     }
 
-    public JSecurityHttpServletRequest getRequest() {
+    public KiHttpServletRequest getRequest() {
         return request;
     }
 
-    public void setRequest(JSecurityHttpServletRequest request) {
+    public void setRequest(KiHttpServletRequest request) {
         this.request = request;
     }
 

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpSession.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpSession.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpSession.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpSession.java Wed Mar 11 07:02:21 2009
@@ -16,15 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.servlet;
+package org.apache.ki.web.servlet;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+import javax.servlet.http.HttpSessionContext;
 
 import org.apache.ki.session.InvalidSessionException;
 import org.apache.ki.session.Session;
-import org.ki.web.session.WebSession;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.*;
-import java.util.*;
+import org.apache.ki.web.session.WebSession;
 
 
 /**
@@ -233,7 +242,7 @@
     }
 
     public boolean isNew() {
-        Boolean value = (Boolean) currentRequest.getAttribute(JSecurityHttpServletRequest.REFERENCED_SESSION_IS_NEW);
+        Boolean value = (Boolean) currentRequest.getAttribute(KiHttpServletRequest.REFERENCED_SESSION_IS_NEW);
         return value != null && value.equals(Boolean.TRUE);
     }
 }

Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletRequest.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletRequest.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletRequest.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletRequest.java Wed Mar 11 07:02:21 2009
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.web.servlet;
-
-import org.apache.ki.SecurityUtils;
-import org.apache.ki.session.Session;
-import org.apache.ki.subject.Subject;
+package org.apache.ki.web.servlet;
 
+import java.security.Principal;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpSession;
-import java.security.Principal;
+
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.Subject;
 
 
 /**
@@ -36,32 +36,32 @@
  * @since 0.2
  */
 @SuppressWarnings({"deprecated", "deprecation"})
-public class JSecurityHttpServletRequest extends HttpServletRequestWrapper {
+public class KiHttpServletRequest extends HttpServletRequestWrapper {
 
     //TODO - complete JavaDoc
 
     //The following 7 constants support the JSecurity's implementation of the Servlet Specification
     public static final String COOKIE_SESSION_ID_SOURCE = "cookie";
     public static final String URL_SESSION_ID_SOURCE = "url";
-    public static final String REFERENCED_SESSION_ID = JSecurityHttpServletRequest.class.getName() + "_REQUESTED_SESSION_ID";
-    public static final String REFERENCED_SESSION_ID_IS_VALID = JSecurityHttpServletRequest.class.getName() + "_REQUESTED_SESSION_ID_VALID";
-    public static final String REFERENCED_SESSION_IS_NEW = JSecurityHttpServletRequest.class.getName() + "_REFERENCED_SESSION_IS_NEW";
-    public static final String REFERENCED_SESSION_ID_SOURCE = JSecurityHttpServletRequest.class.getName() + "REFERENCED_SESSION_ID_SOURCE";
+    public static final String REFERENCED_SESSION_ID = KiHttpServletRequest.class.getName() + "_REQUESTED_SESSION_ID";
+    public static final String REFERENCED_SESSION_ID_IS_VALID = KiHttpServletRequest.class.getName() + "_REQUESTED_SESSION_ID_VALID";
+    public static final String REFERENCED_SESSION_IS_NEW = KiHttpServletRequest.class.getName() + "_REFERENCED_SESSION_IS_NEW";
+    public static final String REFERENCED_SESSION_ID_SOURCE = KiHttpServletRequest.class.getName() + "REFERENCED_SESSION_ID_SOURCE";
     public static final String SESSION_ID_NAME = JSecurityHttpSession.DEFAULT_SESSION_ID_NAME;
     /**
      * Key that may be used to alert that the request's  referenced JSecurity Session has expired prior to
      * request processing.
      */
-    public static final String EXPIRED_SESSION_KEY = JSecurityHttpServletRequest.class.getName() + "_EXPIRED_SESSION_KEY";
+    public static final String EXPIRED_SESSION_KEY = KiHttpServletRequest.class.getName() + "_EXPIRED_SESSION_KEY";
 
-    public static final String IDENTITY_REMOVED_KEY = JSecurityHttpServletRequest.class.getName() + "_IDENTITY_REMOVED_KEY";
+    public static final String IDENTITY_REMOVED_KEY = KiHttpServletRequest.class.getName() + "_IDENTITY_REMOVED_KEY";
 
     protected ServletContext servletContext = null;
 
     protected HttpSession session = null;
     protected boolean httpSessions = true;
 
-    public JSecurityHttpServletRequest(HttpServletRequest wrapped, ServletContext servletContext,
+    public KiHttpServletRequest(HttpServletRequest wrapped, ServletContext servletContext,
                                        boolean httpSessions) {
         super(wrapped);
         this.servletContext = servletContext;