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/10 21:18:00 UTC
svn commit: r752240 [7/7] - in /incubator/jsecurity/trunk: ./ core/
core/src/org/apache/ core/src/org/jsecurity/ core/src/org/ki/
core/src/org/ki/aop/ core/src/org/ki/authc/
core/src/org/ki/authc/credential/ core/src/org/ki/authc/pam/
core/src/org/ki/a...
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java Tue Mar 10 20:17:48 2009
@@ -16,28 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.config;
+package org.ki.web.config;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jsecurity.config.ConfigurationException;
-import org.jsecurity.config.IniConfiguration;
-import org.jsecurity.config.ReflectionBuilder;
-import org.jsecurity.mgt.RealmSecurityManager;
-import org.jsecurity.util.AntPathMatcher;
-import org.jsecurity.util.PatternMatcher;
-import static org.jsecurity.util.StringUtils.split;
-import org.jsecurity.web.DefaultWebSecurityManager;
-import org.jsecurity.web.WebUtils;
-import org.jsecurity.web.filter.PathConfigProcessor;
-import org.jsecurity.web.filter.authc.AnonymousFilter;
-import org.jsecurity.web.filter.authc.BasicHttpAuthenticationFilter;
-import org.jsecurity.web.filter.authc.FormAuthenticationFilter;
-import org.jsecurity.web.filter.authc.UserFilter;
-import org.jsecurity.web.filter.authz.PermissionsAuthorizationFilter;
-import org.jsecurity.web.filter.authz.RolesAuthorizationFilter;
-import org.jsecurity.web.servlet.AdviceFilter;
-import org.jsecurity.web.servlet.ProxiedFilterChain;
+import org.ki.config.ConfigurationException;
+import org.ki.config.IniConfiguration;
+import org.ki.config.ReflectionBuilder;
+import org.ki.mgt.RealmSecurityManager;
+import org.ki.util.AntPathMatcher;
+import org.ki.util.PatternMatcher;
+import static org.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.*;
@@ -71,7 +71,7 @@
/**
* Returns the <code>PatternMatcher</code> used when determining if an incoming request's path
* matches a configured filter chain path in the <code>[urls]</code> section. Unless overridden, the
- * default implementation is an {@link org.jsecurity.util.AntPathMatcher AntPathMatcher}.
+ * default implementation is an {@link org.ki.util.AntPathMatcher AntPathMatcher}.
*
* @return the <code>PatternMatcher</code> used when determining if an incoming request's path
* matches a configured filter chain path in the <code>[urls]</code> section.
@@ -84,7 +84,7 @@
/**
* Sets the <code>PatternMatcher</code> used when determining if an incoming request's path
* matches a configured filter chain path in the <code>[urls]</code> section. Unless overridden, the
- * default implementation is an {@link org.jsecurity.util.AntPathMatcher AntPathMatcher}.
+ * default implementation is an {@link org.ki.util.AntPathMatcher AntPathMatcher}.
*
* @param pathMatcher the <code>PatternMatcher</code> used when determining if an incoming request's path
* matches a configured filter chain path in the <code>[urls]</code> section.
@@ -165,7 +165,7 @@
* calls this method.
* <p/>
* The default implementation merely returns
- * <code>new {@link org.jsecurity.web.servlet.ProxiedFilterChain FilterChainWrapper(filters, originalChain)}</code>,
+ * <code>new {@link org.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
@@ -182,7 +182,7 @@
* <code>false</code> otherwise.
* <p/>
* Simply delegates to
- * <b><code>{@link #getPathMatcher() getPathMatcher()}.{@link org.jsecurity.util.PatternMatcher#matches(String, String) matches(pattern,path)}</code></b>,
+ * <b><code>{@link #getPathMatcher() getPathMatcher()}.{@link org.ki.util.PatternMatcher#matches(String, String) matches(pattern,path)}</code></b>,
* but can be overridden by subclasses for custom matching behavior.
*
* @param pattern the pattern to match against
@@ -212,7 +212,7 @@
* the JSecurity environment for the web application.
* <p/>
* The default implementation simply returns
- * <code>new {@link org.jsecurity.web.DefaultWebSecurityManager DefaultWebSecurityManager()};</code>
+ * <code>new {@link org.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.
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/config/WebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/config/WebConfiguration.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/config/WebConfiguration.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/config/WebConfiguration.java Tue Mar 10 20:17:48 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.config;
+package org.ki.web.config;
-import org.jsecurity.config.Configuration;
+import org.ki.config.Configuration;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/config/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/config/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/config/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/config/package-info.java Tue Mar 10 20:17:48 2009
@@ -19,4 +19,4 @@
/**
* Web-specific implementation extensions to the <code>org.jsecurity.config</code> components.
*/
-package org.jsecurity.web.config;
\ No newline at end of file
+package org.ki.web.config;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java Tue Mar 10 20:17:48 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter;
+package org.ki.web.filter;
-import org.jsecurity.SecurityUtils;
-import org.jsecurity.subject.Subject;
-import org.jsecurity.web.WebUtils;
+import org.ki.SecurityUtils;
+import org.ki.subject.Subject;
+import org.ki.web.WebUtils;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -89,7 +89,7 @@
* Convenience method that acquires the Subject associated with the request.
* <p/>
* The default implementation simply returns
- * {@link org.jsecurity.SecurityUtils#getSubject() SecurityUtils.getSubject()}.
+ * {@link org.ki.SecurityUtils#getSubject() SecurityUtils.getSubject()}.
*
* @param request the incoming <code>ServletRequest</code>
* @param response the outgoing <code>ServletResponse</code>
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathConfigProcessor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathConfigProcessor.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathConfigProcessor.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathConfigProcessor.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter;
+package org.ki.web.filter;
import javax.servlet.Filter;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java Tue Mar 10 20:17:48 2009
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter;
+package org.ki.web.filter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jsecurity.util.AntPathMatcher;
-import org.jsecurity.util.PatternMatcher;
-import static org.jsecurity.util.StringUtils.split;
-import org.jsecurity.web.WebUtils;
-import org.jsecurity.web.servlet.AdviceFilter;
+import org.ki.util.AntPathMatcher;
+import org.ki.util.PatternMatcher;
+import static org.ki.util.StringUtils.split;
+import org.ki.web.WebUtils;
+import org.ki.web.servlet.AdviceFilter;
import javax.servlet.Filter;
import javax.servlet.ServletRequest;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AnonymousFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AnonymousFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AnonymousFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AnonymousFilter.java Tue Mar 10 20:17:48 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter.authc;
+package org.ki.web.filter.authc;
-import org.jsecurity.web.filter.PathMatchingFilter;
+import org.ki.web.filter.PathMatchingFilter;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java Tue Mar 10 20:17:48 2009
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter.authc;
+package org.ki.web.filter.authc;
-import org.jsecurity.authc.AuthenticationException;
-import org.jsecurity.authc.AuthenticationToken;
-import org.jsecurity.authc.UsernamePasswordToken;
-import org.jsecurity.subject.Subject;
-import org.jsecurity.web.WebUtils;
+import org.ki.authc.AuthenticationException;
+import org.ki.authc.AuthenticationToken;
+import org.ki.authc.UsernamePasswordToken;
+import org.ki.subject.Subject;
+import org.ki.web.WebUtils;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java Tue Mar 10 20:17:48 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter.authc;
+package org.ki.web.filter.authc;
-import org.jsecurity.subject.Subject;
-import org.jsecurity.web.SavedRequest;
-import org.jsecurity.web.WebUtils;
-import org.jsecurity.web.filter.AccessControlFilter;
+import org.ki.subject.Subject;
+import org.ki.web.SavedRequest;
+import org.ki.web.WebUtils;
+import org.ki.web.filter.AccessControlFilter;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -65,7 +65,7 @@
* <p/>
* The default implementation {@link #getSubject(javax.servlet.ServletRequest, javax.servlet.ServletResponse) acquires}
* the currently executing Subject and then returns
- * {@link org.jsecurity.subject.Subject#isAuthenticated() subject.isAuthenticated()};
+ * {@link org.ki.subject.Subject#isAuthenticated() subject.isAuthenticated()};
*
* @return true if the subject is authenticated; false if the subject is unauthenticated
*/
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java Tue Mar 10 20:17:48 2009
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter.authc;
+package org.ki.web.filter.authc;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jsecurity.authc.AuthenticationToken;
-import org.jsecurity.codec.Base64;
-import org.jsecurity.web.WebUtils;
+import org.ki.authc.AuthenticationToken;
+import org.ki.codec.Base64;
+import org.ki.web.WebUtils;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -30,7 +30,7 @@
import javax.servlet.http.HttpServletResponse;
/**
- * Requires the requesting user to be {@link org.jsecurity.subject.Subject#isAuthenticated() authenticated} for the
+ * Requires the requesting user to be {@link org.ki.subject.Subject#isAuthenticated() authenticated} for the
* request to continue, and if they're not, forces the user to login via the HTTP Basic protocol-specific challenge.
* Upon successful login, they're allowed to continue on to the requested resource/url.
*
@@ -53,7 +53,7 @@
*
* <p>The {@link #onAccessDenied(javax.servlet.ServletRequest, javax.servlet.ServletResponse)} method will
* only be called if the subject making the request is not
- * {@link org.jsecurity.subject.Subject#isAuthenticated() authenticated} </p>
+ * {@link org.ki.subject.Subject#isAuthenticated() authenticated} </p>
*
* @author Allan Ditzel
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java Tue Mar 10 20:17:48 2009
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter.authc;
+package org.ki.web.filter.authc;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jsecurity.authc.AuthenticationException;
-import org.jsecurity.authc.AuthenticationToken;
-import org.jsecurity.authc.UsernamePasswordToken;
-import org.jsecurity.subject.Subject;
-import org.jsecurity.web.WebUtils;
+import org.ki.authc.AuthenticationException;
+import org.ki.authc.AuthenticationToken;
+import org.ki.authc.UsernamePasswordToken;
+import org.ki.subject.Subject;
+import org.ki.web.WebUtils;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -37,7 +37,7 @@
* <p>This filter constructs a {@link UsernamePasswordToken UsernamePasswordToken} with the values found in
* {@link #setUsernameParam(String) username}, {@link #setPasswordParam(String) password},
* and {@link #setRememberMeParam(String) rememberMe} request parameters. It then calls
- * {@link org.jsecurity.subject.Subject#login(org.jsecurity.authc.AuthenticationToken) Subject.login(usernamePasswordToken)},
+ * {@link org.ki.subject.Subject#login(org.ki.authc.AuthenticationToken) Subject.login(usernamePasswordToken)},
* effectively automatically performing a login attempt. Note that the login attempt will only occur when the
* {@link #isLoginSubmission(javax.servlet.ServletRequest, javax.servlet.ServletResponse) isLoginSubmission(request,response)}
* is <code>true</code>, which by default occurs when the request is for the {@link #setLoginUrl(String) loginUrl} and
@@ -49,12 +49,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.jsecurity.web.filter.authc.PassThruAuthenticationFilter} instead, which allows requests to the
+ * {@link org.ki.web.filter.authc.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.jsecurity.web.filter.authc.PassThruAuthenticationFilter
+ * @see org.ki.web.filter.authc.PassThruAuthenticationFilter
* @since 0.9
*/
public class FormAuthenticationFilter extends AuthenticatingFilter {
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter.authc;
+package org.ki.web.filter.authc;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -30,12 +30,12 @@
* on a login submission (by default an HTTP POST to the login URL), the <code>FormAuthenticationFilter</code> filter
* attempts to automatically authenticate the user by passing the <code>username</code> and <code>password</code>
* request parameter values to
- * {@link org.jsecurity.subject.Subject#login(org.jsecurity.authc.AuthenticationToken) Subject.login(usernamePasswordToken)}
+ * {@link org.ki.subject.Subject#login(org.ki.authc.AuthenticationToken) Subject.login(usernamePasswordToken)}
* directly.
* <p/>
* Conversely, this controller always passes all requests to the {@link #setLoginUrl loginUrl} through, both GETs and
* POSTs. This is useful in cases where the developer wants to write their own login behavior, which should include a
- * call to {@link org.jsecurity.subject.Subject#login(org.jsecurity.authc.AuthenticationToken) Subject.login(AuthenticationToken)}
+ * call to {@link org.ki.subject.Subject#login(org.ki.authc.AuthenticationToken) Subject.login(AuthenticationToken)}
* at some point. For example, if the developer has their own custom MVC login controller or validator,
* this <code>PassThruAuthenticationFilter</code> may be appropriate.
*
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java Tue Mar 10 20:17:48 2009
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter.authc;
+package org.ki.web.filter.authc;
-import org.jsecurity.subject.Subject;
-import org.jsecurity.web.filter.AccessControlFilter;
+import org.ki.subject.Subject;
+import org.ki.web.filter.AccessControlFilter;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/package-info.java Tue Mar 10 20:17:48 2009
@@ -20,4 +20,4 @@
* Servlet {@link javax.servlet.Filter Filter} implementations specific to controlling access based on a
* subject's authentication status, or those that can execute authentications (log-ins) directly.
*/
-package org.jsecurity.web.filter.authc;
\ No newline at end of file
+package org.ki.web.filter.authc;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java Tue Mar 10 20:17:48 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter.authz;
+package org.ki.web.filter.authz;
-import org.jsecurity.subject.Subject;
-import org.jsecurity.util.StringUtils;
-import org.jsecurity.web.WebUtils;
-import org.jsecurity.web.filter.AccessControlFilter;
+import org.ki.subject.Subject;
+import org.ki.util.StringUtils;
+import org.ki.web.WebUtils;
+import org.ki.web.filter.AccessControlFilter;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java Tue Mar 10 20:17:48 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter.authz;
+package org.ki.web.filter.authz;
-import org.jsecurity.subject.Subject;
+import org.ki.subject.Subject;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java Tue Mar 10 20:17:48 2009
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.filter.authz;
+package org.ki.web.filter.authz;
-import org.jsecurity.subject.Subject;
-import org.jsecurity.util.CollectionUtils;
+import org.ki.subject.Subject;
+import org.ki.util.CollectionUtils;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/package-info.java Tue Mar 10 20:17:48 2009
@@ -20,4 +20,4 @@
* Servlet {@link javax.servlet.Filter Filter} implementations that perform authorization (access control)
* checks based on the Subject's abilities (for example, role or permission checks).
*/
-package org.jsecurity.web.filter.authz;
\ No newline at end of file
+package org.ki.web.filter.authz;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/package-info.java Tue Mar 10 20:17:48 2009
@@ -20,4 +20,4 @@
* Base package supporting all Servlet {@link javax.servlet.Filter Filter} implementations used to control
* access to web pages and URL resources.
*/
-package org.jsecurity.web.filter;
\ No newline at end of file
+package org.ki.web.filter;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/package-info.java Tue Mar 10 20:17:48 2009
@@ -19,4 +19,4 @@
/**
* Framework support for any web-enabled application.
*/
-package org.jsecurity.web;
\ No newline at end of file
+package org.ki.web;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/AdviceFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/AdviceFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/AdviceFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/AdviceFilter.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.servlet;
+package org.ki.web.servlet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java Tue Mar 10 20:17:48 2009
@@ -16,22 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.servlet;
+package org.ki.web.servlet;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jsecurity.config.Configuration;
-import org.jsecurity.config.ConfigurationException;
-import org.jsecurity.mgt.SecurityManager;
-import org.jsecurity.util.ClassUtils;
-import org.jsecurity.util.LifecycleUtils;
-import static org.jsecurity.util.StringUtils.clean;
-import org.jsecurity.util.ThreadContext;
-import org.jsecurity.web.DefaultWebSecurityManager;
-import org.jsecurity.web.WebUtils;
-import org.jsecurity.web.config.IniWebConfiguration;
-import org.jsecurity.web.config.WebConfiguration;
+import org.ki.config.Configuration;
+import org.ki.config.ConfigurationException;
+import org.ki.mgt.SecurityManager;
+import org.ki.util.ClassUtils;
+import org.ki.util.LifecycleUtils;
+import static org.ki.util.StringUtils.clean;
+import org.ki.util.ThreadContext;
+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;
@@ -67,8 +67,8 @@
* # (and client-agnostic) session management. You can enable this by uncommenting the following line
* # and changing 'http' to 'jsecurity'
* #
- * #securityManager = {@link org.jsecurity.web.DefaultWebSecurityManager org.jsecurity.web.DefaultWebSecurityManager}
- * #securityManager.{@link org.jsecurity.web.DefaultWebSecurityManager#setSessionMode(String) sessionMode} = http
+ * #securityManager = {@link org.ki.web.DefaultWebSecurityManager org.jsecurity.web.DefaultWebSecurityManager}
+ * #securityManager.{@link org.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.
@@ -82,36 +82,36 @@
* # affect the user experience.
* #
* # Form-based Authentication filter:
- * #<a name="authc"></a>authc = {@link org.jsecurity.web.filter.authc.FormAuthenticationFilter}
- * #authc.{@link org.jsecurity.web.filter.authc.FormAuthenticationFilter#setLoginUrl(String) loginUrl} = /login.jsp
- * #authc.{@link org.jsecurity.web.filter.authc.FormAuthenticationFilter#setUsernameParam(String) usernameParam} = username
- * #authc.{@link org.jsecurity.web.filter.authc.FormAuthenticationFilter#setPasswordParam(String) passwordParam} = password
- * #authc.{@link org.jsecurity.web.filter.authc.FormAuthenticationFilter#setRememberMeParam(String) rememberMeParam} = rememberMe
- * #authc.{@link org.jsecurity.web.filter.authc.FormAuthenticationFilter#setSuccessUrl(String) successUrl} = /login.jsp
- * #authc.{@link org.jsecurity.web.filter.authc.FormAuthenticationFilter#setFailureKeyAttribute(String) failureKeyAttribute} = {@link org.jsecurity.web.filter.authc.FormAuthenticationFilter#DEFAULT_ERROR_KEY_ATTRIBUTE_NAME}
+ * #<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}
* #
* # Http BASIC Authentication filter:
- * #<a name="authcBasic"></a>authcBasic = {@link org.jsecurity.web.filter.authc.BasicHttpAuthenticationFilter}
- * #authcBasic.{@link org.jsecurity.web.filter.authc.BasicHttpAuthenticationFilter#setApplicationName(String) applicationName} = application
+ * #<a name="authcBasic"></a>authcBasic = {@link org.ki.web.filter.authc.BasicHttpAuthenticationFilter}
+ * #authcBasic.{@link org.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.jsecurity.web.filter.authz.RolesAuthorizationFilter}
- * #roles.{@link org.jsecurity.web.filter.authz.RolesAuthorizationFilter#setUnauthorizedUrl(String) unauthorizedUrl} =
+ * #<a name="roles"></a>roles = {@link org.ki.web.filter.authz.RolesAuthorizationFilter}
+ * #roles.{@link org.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.jsecurity.web.filter.authz.PermissionsAuthorizationFilter}
- * #perms.{@link org.jsecurity.web.filter.authz.PermissionsAuthorizationFilter#setUnauthorizedUrl(String) unauthorizedUrl} =
+ * #<a name="perms"></a>perms = {@link org.ki.web.filter.authz.PermissionsAuthorizationFilter}
+ * #perms.{@link org.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.jsecurity.web.filter.PathMatchingFilter PathMatchingFilter} abstract class.
+ * # filter should extend the {@link org.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
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java Tue Mar 10 20:17:48 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.servlet;
+package org.ki.web.servlet;
-import org.jsecurity.SecurityUtils;
-import org.jsecurity.session.Session;
-import org.jsecurity.subject.Subject;
+import org.ki.SecurityUtils;
+import org.ki.session.Session;
+import org.ki.subject.Subject;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletResponse.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletResponse.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletResponse.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletResponse.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.servlet;
+package org.ki.web.servlet;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java Tue Mar 10 20:17:48 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.servlet;
+package org.ki.web.servlet;
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.Session;
-import org.jsecurity.web.session.WebSession;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.Session;
+import org.ki.web.session.WebSession;
import javax.servlet.ServletContext;
import javax.servlet.http.*;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java Tue Mar 10 20:17:48 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.servlet;
+package org.ki.web.servlet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jsecurity.util.Nameable;
+import org.ki.util.Nameable;
import javax.servlet.*;
import java.io.IOException;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ProxiedFilterChain.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ProxiedFilterChain.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ProxiedFilterChain.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ProxiedFilterChain.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.servlet;
+package org.ki.web.servlet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ServletContextSupport.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ServletContextSupport.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ServletContextSupport.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ServletContextSupport.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.servlet;
+package org.ki.web.servlet;
import javax.servlet.ServletContext;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/package-info.java Tue Mar 10 20:17:48 2009
@@ -20,4 +20,4 @@
* Support implementations that depend heavily on the <tt>javax.servlet.*</tt> API and are meant to be
* directly used in web.xml (Servlet Filters, Servlet Context Listeners, Servlets, etc)
*/
-package org.jsecurity.web.servlet;
\ No newline at end of file
+package org.ki.web.servlet;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java Tue Mar 10 20:17:48 2009
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.session;
+package org.ki.web.session;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jsecurity.authz.AuthorizationException;
-import org.jsecurity.authz.HostUnauthorizedException;
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.Session;
-import org.jsecurity.session.mgt.DefaultSessionManager;
-import org.jsecurity.web.WebUtils;
-import org.jsecurity.web.attr.CookieAttribute;
-import org.jsecurity.web.attr.RequestParamAttribute;
-import org.jsecurity.web.attr.WebAttribute;
-import org.jsecurity.web.servlet.JSecurityHttpServletRequest;
-import org.jsecurity.web.servlet.JSecurityHttpSession;
+import org.ki.authz.AuthorizationException;
+import org.ki.authz.HostUnauthorizedException;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.Session;
+import org.ki.session.mgt.DefaultSessionManager;
+import org.ki.web.WebUtils;
+import org.ki.web.attr.CookieAttribute;
+import org.ki.web.attr.RequestParamAttribute;
+import org.ki.web.attr.WebAttribute;
+import org.ki.web.servlet.JSecurityHttpServletRequest;
+import org.ki.web.servlet.JSecurityHttpSession;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -247,9 +247,9 @@
* @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.jsecurity.session.InvalidSessionException
+ * @throws org.ki.session.InvalidSessionException
* if the associated Session has expired prior to invoking this method.
- * @throws org.jsecurity.authz.AuthorizationException
+ * @throws org.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)
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java Tue Mar 10 20:17:48 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.session;
+package org.ki.web.session;
-import org.jsecurity.authz.AuthorizationException;
-import org.jsecurity.authz.HostUnauthorizedException;
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.Session;
-import org.jsecurity.session.mgt.AbstractSessionManager;
-import org.jsecurity.web.WebUtils;
+import org.ki.authz.AuthorizationException;
+import org.ki.authz.HostUnauthorizedException;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.Session;
+import org.ki.session.mgt.AbstractSessionManager;
+import org.ki.web.WebUtils;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java Tue Mar 10 20:17:48 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.session;
+package org.ki.web.session;
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.Session;
-import org.jsecurity.web.servlet.JSecurityHttpSession;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.Session;
+import org.ki.web.servlet.JSecurityHttpSession;
import javax.servlet.http.HttpSession;
import java.io.Serializable;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java Tue Mar 10 20:17:48 2009
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.session;
+package org.ki.web.session;
-import org.jsecurity.session.Session;
-import org.jsecurity.session.mgt.SessionManager;
+import org.ki.session.Session;
+import org.ki.session.mgt.SessionManager;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/session/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/session/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/session/package-info.java Tue Mar 10 20:17:48 2009
@@ -19,4 +19,4 @@
/**
* Components supporting Session management in web-enabled applications.
*/
-package org.jsecurity.web.session;
\ No newline at end of file
+package org.ki.web.session;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/AuthenticatedTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/AuthenticatedTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/AuthenticatedTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/AuthenticatedTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/GuestTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/GuestTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/GuestTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/GuestTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java Tue Mar 10 20:17:48 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
-import org.jsecurity.subject.Subject;
+import org.ki.subject.Subject;
/**
* Displays body content if the current user has any of the roles specified.
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasPermissionTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasPermissionTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasPermissionTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasPermissionTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
/**
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasRoleTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasRoleTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasRoleTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasRoleTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
/**
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksPermissionTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksPermissionTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksPermissionTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksPermissionTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
/**
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksRoleTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksRoleTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksRoleTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksRoleTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
/**
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/NotAuthenticatedTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/NotAuthenticatedTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/NotAuthenticatedTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/NotAuthenticatedTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/PermissionTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/PermissionTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/PermissionTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/PermissionTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/PrincipalTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/PrincipalTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/PrincipalTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/PrincipalTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/RoleTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/RoleTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/RoleTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/RoleTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java Tue Mar 10 20:17:48 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jsecurity.SecurityUtils;
-import org.jsecurity.subject.Subject;
+import org.ki.SecurityUtils;
+import org.ki.subject.Subject;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/UserTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/UserTag.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/UserTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/UserTag.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.tags;
+package org.ki.web.tags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/jsecurity.tld
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/jsecurity.tld?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/jsecurity.tld (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/jsecurity.tld Tue Mar 10 20:17:48 2009
@@ -34,7 +34,7 @@
<tag>
<name>hasPermission</name>
- <tag-class>org.jsecurity.web.tags.HasPermissionTag</tag-class>
+ <tag-class>org.ki.web.tags.HasPermissionTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current Subject (user)
'has' (implies) the specified permission (i.e the user has the specified ability).
@@ -48,7 +48,7 @@
<tag>
<name>lacksPermission</name>
- <tag-class>org.jsecurity.web.tags.LacksPermissionTag</tag-class>
+ <tag-class>org.ki.web.tags.LacksPermissionTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current Subject (user) does
NOT have (not imply) the specified permission (i.e. the user lacks the specified ability)
@@ -62,7 +62,7 @@
<tag>
<name>hasRole</name>
- <tag-class>org.jsecurity.web.tags.HasRoleTag</tag-class>
+ <tag-class>org.ki.web.tags.HasRoleTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current user has the specified role.</description>
<attribute>
@@ -75,7 +75,7 @@
<tag>
<name>hasAnyRoles</name>
- <tag-class>org.jsecurity.web.tags.HasAnyRolesTag</tag-class>
+ <tag-class>org.ki.web.tags.HasAnyRolesTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current user has one of the specified roles from a
comma-separated list of role names.
@@ -89,7 +89,7 @@
<tag>
<name>lacksRole</name>
- <tag-class>org.jsecurity.web.tags.LacksRoleTag</tag-class>
+ <tag-class>org.ki.web.tags.LacksRoleTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current user does NOT have the specified role
(i.e. they explicitly lack the specified role)
@@ -103,7 +103,7 @@
<tag>
<name>authenticated</name>
- <tag-class>org.jsecurity.web.tags.AuthenticatedTag</tag-class>
+ <tag-class>org.ki.web.tags.AuthenticatedTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current user has successfully authenticated
_during their current session_. It is more restrictive than the 'user' tag.
@@ -113,7 +113,7 @@
<tag>
<name>notAuthenticated</name>
- <tag-class>org.jsecurity.web.tags.NotAuthenticatedTag</tag-class>
+ <tag-class>org.ki.web.tags.NotAuthenticatedTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current user has NOT succesfully authenticated
_during their current session_. It is logically opposite to the 'authenticated' tag.
@@ -122,7 +122,7 @@
<tag>
<name>user</name>
- <tag-class>org.jsecurity.web.tags.UserTag</tag-class>
+ <tag-class>org.ki.web.tags.UserTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current Subject has a known identity, either
from a previous login or from 'RememberMe' services. Note that this is semantically different
@@ -133,7 +133,7 @@
<tag>
<name>guest</name>
- <tag-class>org.jsecurity.web.tags.GuestTag</tag-class>
+ <tag-class>org.ki.web.tags.GuestTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current Subject IS NOT known to the system, either
because they have not logged in or they have no corresponding 'RememberMe' identity. It is logically
@@ -143,7 +143,7 @@
<tag>
<name>principal</name>
- <tag-class>org.jsecurity.web.tags.PrincipalTag</tag-class>
+ <tag-class>org.ki.web.tags.PrincipalTag</tag-class>
<body-content>JSP</body-content>
<description>Displays the user's principal or a property of the user's principal.</description>
<attribute>
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/package-info.java Tue Mar 10 20:17:48 2009
@@ -22,4 +22,4 @@
* JSecurity JSP Tags can be used to evalute or not evaluate (show or not show) parts of a JSP page based on the
* current user's authentication status and/or authorization (access control) abilities.
*/
-package org.jsecurity.web.tags;
\ No newline at end of file
+package org.ki.web.tags;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/web/test/org/ki/web/DefaultWebSecurityManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/test/org/ki/web/DefaultWebSecurityManagerTest.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/test/org/ki/web/DefaultWebSecurityManagerTest.java (original)
+++ incubator/jsecurity/trunk/web/test/org/ki/web/DefaultWebSecurityManagerTest.java Tue Mar 10 20:17:48 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web;
+package org.ki.web;
-import org.jsecurity.util.ThreadContext;
+import org.ki.util.ThreadContext;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: incubator/jsecurity/trunk/web/test/org/ki/web/WebRememberMeManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/test/org/ki/web/WebRememberMeManagerTest.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/test/org/ki/web/WebRememberMeManagerTest.java (original)
+++ incubator/jsecurity/trunk/web/test/org/ki/web/WebRememberMeManagerTest.java Tue Mar 10 20:17:48 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web;
+package org.ki.web;
import static org.easymock.EasyMock.*;
-import org.jsecurity.authc.AuthenticationInfo;
-import org.jsecurity.authc.SimpleAuthenticationInfo;
-import org.jsecurity.authc.UsernamePasswordToken;
-import org.jsecurity.subject.PrincipalCollection;
-import org.jsecurity.subject.SimplePrincipalCollection;
+import org.ki.authc.AuthenticationInfo;
+import org.ki.authc.SimpleAuthenticationInfo;
+import org.ki.authc.UsernamePasswordToken;
+import org.ki.subject.PrincipalCollection;
+import org.ki.subject.SimplePrincipalCollection;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
Modified: incubator/jsecurity/trunk/web/test/org/ki/web/attr/CookieAttributeTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/test/org/ki/web/attr/CookieAttributeTest.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/test/org/ki/web/attr/CookieAttributeTest.java (original)
+++ incubator/jsecurity/trunk/web/test/org/ki/web/attr/CookieAttributeTest.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.attr;
+package org.ki.web.attr;
import junit.framework.TestCase;
import static org.easymock.EasyMock.*;
Modified: incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java (original)
+++ incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.web.servlet;
+package org.ki.web.servlet;
import static org.easymock.EasyMock.*;
import org.junit.Test;