shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r752240 [4/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...
Date Tue, 10 Mar 2009 20:18:00 GMT
Modified: incubator/jsecurity/trunk/core/src/org/ki/mgt/SessionsSecurityManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/mgt/SessionsSecurityManager.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/SessionsSecurityManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/mgt/SessionsSecurityManager.java Tue Mar 10 20:17:48 2009
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.mgt;
+package org.ki.mgt;
 
-import org.jsecurity.authz.HostUnauthorizedException;
-import org.jsecurity.cache.CacheManagerAware;
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.Session;
-import org.jsecurity.session.SessionListener;
-import org.jsecurity.session.SessionListenerRegistrar;
-import org.jsecurity.session.mgt.AbstractSessionManager;
-import org.jsecurity.session.mgt.AbstractValidatingSessionManager;
-import org.jsecurity.session.mgt.DefaultSessionManager;
-import org.jsecurity.session.mgt.SessionManager;
-import org.jsecurity.util.LifecycleUtils;
+import org.ki.authz.HostUnauthorizedException;
+import org.ki.cache.CacheManagerAware;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.Session;
+import org.ki.session.SessionListener;
+import org.ki.session.SessionListenerRegistrar;
+import org.ki.session.mgt.AbstractSessionManager;
+import org.ki.session.mgt.AbstractValidatingSessionManager;
+import org.ki.session.mgt.DefaultSessionManager;
+import org.ki.session.mgt.SessionManager;
+import org.ki.util.LifecycleUtils;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -37,7 +37,7 @@
 
 /**
  * JSecurity support of a {@link SecurityManager} class hierarchy that delegates all
- * {@link org.jsecurity.session.Session session} operations to a wrapped {@link SessionManager SessionManager}
+ * {@link org.ki.session.Session session} operations to a wrapped {@link SessionManager SessionManager}
  * instance.  That is, this class implements the methods in the
  * {@link SessionManager SessionManager} interface, but in reality, those methods are merely passthrough calls to
  * the underlying 'real' {@code SessionManager} instance.
@@ -95,7 +95,7 @@
      * Returns this security manager's internal delegate {@link SessionManager SessionManager}.
      *
      * @return this security manager's internal delegate {@link SessionManager SessionManager}.
-     * @see #setSessionManager(org.jsecurity.session.mgt.SessionManager) setSessionManager
+     * @see #setSessionManager(org.ki.session.mgt.SessionManager) setSessionManager
      */
     public SessionManager getSessionManager() {
         return this.sessionManager;
@@ -156,7 +156,7 @@
                     "The current SessionManager is of type [" + this.sessionManager.getClass().getName() + "].  " +
                     "This might occur for example if you're trying to set the validation interval or auto session " +
                     "creation in a servlet container-backed session environment ('http' session mode).  If that is " +
-                    "the case however, that property is only useful when using 'jsecurity' session mode and using " +
+                    "the case however, that property is only useful when using 'ki' session mode and using " +
                     "JSecurity enterprise sessions which do not rely on a servlet container.";
             throw new IllegalStateException(msg);
         }
@@ -165,13 +165,13 @@
     /**
      * Passthrough configuration property to the underlying {@link AbstractSessionManager AbstractSessionManager}
      * instance.  Please read the
-     * {@link org.jsecurity.session.mgt.AbstractSessionManager#getGlobalSessionTimeout() AbstractSessionManager.getGlobalSessionTimeout()}
+     * {@link org.ki.session.mgt.AbstractSessionManager#getGlobalSessionTimeout() AbstractSessionManager.getGlobalSessionTimeout()}
      * for more.
      *
      * @return the time in milliseconds that any {@link Session Session} may remain idle before expiring.
      * @throws IllegalStateException if the underlying {@code SessionManager} instance is not a subclass of
      *                               {@link AbstractSessionManager AbstractSessionManager}.
-     * @see org.jsecurity.session.mgt.AbstractSessionManager#getGlobalSessionTimeout()
+     * @see org.ki.session.mgt.AbstractSessionManager#getGlobalSessionTimeout()
      */
     public long getGlobalSessionTimeout() {
         assertSessionManager(AbstractSessionManager.class);
@@ -181,13 +181,13 @@
     /**
      * Passthrough configuration property to the underlying {@link AbstractSessionManager AbstractSessionManager}
      * instance.  Please read the
-     * {@link org.jsecurity.session.mgt.AbstractSessionManager#setGlobalSessionTimeout(long) AbstractSessionManager.setGlobalSessionTimeout(long)}
+     * {@link org.ki.session.mgt.AbstractSessionManager#setGlobalSessionTimeout(long) AbstractSessionManager.setGlobalSessionTimeout(long)}
      * for more.
      *
      * @param globalSessionTimeout the time in milliseconds that any {@link Session Session} may remain idle before expiring.
      * @throws IllegalStateException if the underlying {@code SessionManager} instance is not a subclass of
      *                               {@link AbstractSessionManager AbstractSessionManager}.
-     * @see org.jsecurity.session.mgt.AbstractSessionManager#setGlobalSessionTimeout(long)
+     * @see org.ki.session.mgt.AbstractSessionManager#setGlobalSessionTimeout(long)
      */
     public void setGlobalSessionTimeout(long globalSessionTimeout) {
         assertSessionManager(AbstractSessionManager.class);
@@ -201,13 +201,13 @@
      * accustomed based on years of servlet container behavior.
      * <p/>
      * When true (the default), the wrapped {@link AbstractValidatingSessionManager} implementation throws an
-     * {@link org.jsecurity.session.ReplacedSessionException ReplacedSessionException} to the caller whenever a new
+     * {@link org.ki.session.ReplacedSessionException ReplacedSessionException} to the caller whenever a new
      * session is created so the caller can receive the new session ID and react accordingly for future
      * {@link SessionManager SessionManager} method invocations.
      *
      * @param autoCreate if the wrapped {@link AbstractValidatingSessionManager} should automatically create a new
      *                   session when an invalid session is referenced
-     * @see org.jsecurity.session.mgt.AbstractValidatingSessionManager#setAutoCreateAfterInvalidation(boolean)
+     * @see org.ki.session.mgt.AbstractValidatingSessionManager#setAutoCreateAfterInvalidation(boolean)
      */
     public void setAutoCreateSessionAfterInvalidation(boolean autoCreate) {
         assertSessionManager(AbstractValidatingSessionManager.class);
@@ -222,13 +222,13 @@
      * developer convenience and to match what most people are accustomed based on years of servlet container behavior.
      * <p/>
      * When true (the default), the wrapped {@link AbstractValidatingSessionManager AbstractValidatingSessionManager}
-     * implementation throws an {@link org.jsecurity.session.ReplacedSessionException ReplacedSessionException} to
+     * implementation throws an {@link org.ki.session.ReplacedSessionException ReplacedSessionException} to
      * the caller whenever a new session is created so the caller can receive the new session ID and react accordingly
      * for future {@link SessionManager SessionManager} method invocations.
      *
      * @return <code>true</code> if this session manager should automatically create a new session when an invalid
      *         session is referenced, <code>false</code> otherwise.
-     * @see org.jsecurity.session.mgt.AbstractValidatingSessionManager#isAutoCreateAfterInvalidation()
+     * @see org.ki.session.mgt.AbstractValidatingSessionManager#isAutoCreateAfterInvalidation()
      */
     public boolean isAutoCreateSessionAfterInvalidation() {
         assertSessionManager(AbstractValidatingSessionManager.class);
@@ -237,7 +237,7 @@
 
     /**
      * Ensures the internal SessionManager instance is an <code>instanceof</code>
-     * {@link org.jsecurity.session.SessionListenerRegistrar SessionListenerRegistrar} to ensure that any
+     * {@link org.ki.session.SessionListenerRegistrar SessionListenerRegistrar} to ensure that any
      * listeners attempting to be registered can actually do so with the internal delegate instance.
      *
      * @throws IllegalStateException if the internal delegate SessionManager instance does not implement the

Modified: incubator/jsecurity/trunk/core/src/org/ki/mgt/SubjectBinder.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/mgt/SubjectBinder.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/SubjectBinder.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/mgt/SubjectBinder.java Tue Mar 10 20:17:48 2009
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.mgt;
+package org.ki.mgt;
 
-import org.jsecurity.subject.Subject;
+import org.ki.subject.Subject;
 
 /**
  * TODO - Class JavaDoc

Modified: incubator/jsecurity/trunk/core/src/org/ki/mgt/SubjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/mgt/SubjectFactory.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/SubjectFactory.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/mgt/SubjectFactory.java Tue Mar 10 20:17:48 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.mgt;
+package org.ki.mgt;
 
-import org.jsecurity.authc.AuthenticationInfo;
-import org.jsecurity.authc.AuthenticationToken;
-import org.jsecurity.session.Session;
-import org.jsecurity.subject.PrincipalCollection;
-import org.jsecurity.subject.Subject;
+import org.ki.authc.AuthenticationInfo;
+import org.ki.authc.AuthenticationToken;
+import org.ki.session.Session;
+import org.ki.subject.PrincipalCollection;
+import org.ki.subject.Subject;
 
 import java.net.InetAddress;
 

Modified: incubator/jsecurity/trunk/core/src/org/ki/mgt/ThreadContextSubjectBinder.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/mgt/ThreadContextSubjectBinder.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/ThreadContextSubjectBinder.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/mgt/ThreadContextSubjectBinder.java Tue Mar 10 20:17:48 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.mgt;
+package org.ki.mgt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.subject.Subject;
-import org.jsecurity.util.ThreadContext;
+import org.ki.subject.Subject;
+import org.ki.util.ThreadContext;
 
 /**
  * Associates a {@link Subject Subject} instance to the currently executing thread via the {
@@ -29,7 +29,7 @@
  * @author Les Hazlewood
  * @link ThreadContext ThreadContext} to ensure that the <code>Subject</code> is accessible to any caller during
  * thread execution.
- * @see org.jsecurity.SecurityUtils#getSubject SecurityUtils.getSubject()
+ * @see org.ki.SecurityUtils#getSubject SecurityUtils.getSubject()
  * @since 1.0
  */
 public class ThreadContextSubjectBinder implements SubjectBinder {

Modified: incubator/jsecurity/trunk/core/src/org/ki/mgt/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/mgt/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/mgt/package-info.java Tue Mar 10 20:17:48 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Provides the master {@link org.jsecurity.mgt.SecurityManager SecurityManager} interface and a default implementation
+ * Provides the master {@link org.ki.mgt.SecurityManager SecurityManager} interface and a default implementation
  * hierarchy for managing all aspects of JSecurity's functionality in an application.
  */
-package org.jsecurity.mgt;
\ No newline at end of file
+package org.ki.mgt;
\ No newline at end of file

Modified: incubator/jsecurity/trunk/core/src/org/ki/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/package-info.java Tue Mar 10 20:17:48 2009
@@ -18,7 +18,7 @@
  */
 /**
  * This package primarily exists as a root classpath distinction, but it does contain two core classes widely used
- * by applications, {@link org.jsecurity.SecurityUtils SecurityUtils} and
- * {@link org.jsecurity.JSecurityException JSecurityException}.
+ * by applications, {@link org.ki.SecurityUtils SecurityUtils} and
+ * {@link org.ki.JSecurityException JSecurityException}.
  */
-package org.jsecurity;
\ No newline at end of file
+package org.ki;
\ No newline at end of file

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/AuthenticatingRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/AuthenticatingRealm.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/AuthenticatingRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/AuthenticatingRealm.java Tue Mar 10 20:17:48 2009
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm;
+package org.ki.realm;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.authc.*;
-import org.jsecurity.authc.credential.AllowAllCredentialsMatcher;
-import org.jsecurity.authc.credential.CredentialsMatcher;
-import org.jsecurity.authc.credential.SimpleCredentialsMatcher;
-import org.jsecurity.cache.CacheManager;
-import org.jsecurity.subject.PrincipalCollection;
+import org.ki.authc.*;
+import org.ki.authc.credential.AllowAllCredentialsMatcher;
+import org.ki.authc.credential.CredentialsMatcher;
+import org.ki.authc.credential.SimpleCredentialsMatcher;
+import org.ki.cache.CacheManager;
+import org.ki.subject.PrincipalCollection;
 
 /**
  * A top-level abstract implementation of the <tt>Realm</tt> interface that only implements authentication support
@@ -62,7 +62,7 @@
 
     /**
      * The class that this realm supports for authentication tokens.  This is used by the
-     * default implementation of the {@link Realm#supports(org.jsecurity.authc.AuthenticationToken)} method to
+     * default implementation of the {@link Realm#supports(org.ki.authc.AuthenticationToken)} method to
      * determine whether or not the given authentication token is supported by this realm.
      */
     private Class<? extends AuthenticationToken> authenticationTokenClass = UsernamePasswordToken.class;
@@ -94,7 +94,7 @@
      * credentials with those stored in the system.
      *
      * <p>Unless overridden by the {@link #setCredentialsMatcher setCredentialsMatcher} method, the default
-     * value is a {@link org.jsecurity.authc.credential.SimpleCredentialsMatcher SimpleCredentialsMatcher} instance.
+     * value is a {@link org.ki.authc.credential.SimpleCredentialsMatcher SimpleCredentialsMatcher} instance.
      *
      * @return the <code>CredentialsMatcher</code> used during an authentication attempt to verify submitted
      *         credentials with those stored in the system.
@@ -109,7 +109,7 @@
      * support any number of schemes, including plain text comparisons, hashing comparisons, and others.
      *
      * <p>Unless overridden by this method, the default value is a
-     * {@link org.jsecurity.authc.credential.SimpleCredentialsMatcher} instance.
+     * {@link org.ki.authc.credential.SimpleCredentialsMatcher} instance.
      *
      * @param credentialsMatcher the matcher to use.
      */
@@ -207,7 +207,7 @@
      * @param token the authentication token containing the user's principal and credentials.
      * @return an {@link AuthenticationInfo} object containing account data resulting from the
      *         authentication ONLY if the lookup is successful (i.e. account exists and is valid, etc.)
-     * @throws org.jsecurity.authc.AuthenticationException
+     * @throws org.ki.authc.AuthenticationException
      *          if there is an error acquiring data or performing
      *          realm-specific authentication logic for the specified <tt>token</tt>
      */
@@ -225,7 +225,7 @@
      * argument could contain principals returned by many realms.  Therefore the subclass implementation would need
      * to know how to extract the principal(s) relevant to only itself and ignore other realms' principals.  This is
      * usually done by calling {@link PrincipalCollection#fromRealm(String) principals.fromRealm(name)},
-     * using the realm's own {@link org.jsecurity.realm.Realm#getName() name}.
+     * using the realm's own {@link org.ki.realm.Realm#getName() name}.
      *
      * @param principals the application-specific Subject/user identifier that is logging out.
      */

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/AuthorizingRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/AuthorizingRealm.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/AuthorizingRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/AuthorizingRealm.java Tue Mar 10 20:17:48 2009
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm;
+package org.ki.realm;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.authc.credential.CredentialsMatcher;
-import org.jsecurity.authz.*;
-import org.jsecurity.authz.permission.PermissionResolver;
-import org.jsecurity.authz.permission.PermissionResolverAware;
-import org.jsecurity.authz.permission.WildcardPermissionResolver;
-import org.jsecurity.cache.Cache;
-import org.jsecurity.cache.CacheManager;
-import org.jsecurity.subject.PrincipalCollection;
-import org.jsecurity.util.Initializable;
+import org.ki.authc.credential.CredentialsMatcher;
+import org.ki.authz.*;
+import org.ki.authz.permission.PermissionResolver;
+import org.ki.authz.permission.PermissionResolverAware;
+import org.ki.authz.permission.WildcardPermissionResolver;
+import org.ki.cache.Cache;
+import org.ki.cache.CacheManager;
+import org.ki.subject.PrincipalCollection;
+import org.ki.util.Initializable;
 
 import java.util.*;
 
@@ -38,7 +38,7 @@
  *
  * <p>This implementation will perform all role and permission checks automatically (and subclasses do not have to
  * write this logic) as long as the
- * {@link #getAuthorizationInfo(org.jsecurity.subject.PrincipalCollection)} method returns an
+ * {@link #getAuthorizationInfo(org.ki.subject.PrincipalCollection)} method returns an
  * {@link AuthorizationInfo}.  Please see that method's JavaDoc for an in-depth explanation.
  *
  * <p>If you find that you do not want to utilize the {@link AuthorizationInfo AuthorizationInfo} construct,
@@ -146,7 +146,7 @@
      * If a <tt>cacheManager</tt> has been set, it will be used to create an authorization
      * <tt>cache</tt>, and this newly created cache which will be used as specified in #1.</li>
      * <li>If neither the {@link #setAuthorizationCache (org.jsecurity.cache.Cache) cache}
-     * or {@link #setCacheManager(org.jsecurity.cache.CacheManager) cacheManager}
+     * or {@link #setCacheManager(org.ki.cache.CacheManager) cacheManager}
      * properties are set, caching will be disabled and authorization lookups will be delegated to
      * subclass implementations for each authorization check.</li>
      * </ol>
@@ -209,11 +209,11 @@
      *
      * <p>This implementation obtains the actual <code>AuthorizationInfo</code> object from the subclass's
      * implementation of
-     * {@link #doGetAuthorizationInfo(org.jsecurity.subject.PrincipalCollection) doGetAuthorizationInfo}, and then
+     * {@link #doGetAuthorizationInfo(org.ki.subject.PrincipalCollection) doGetAuthorizationInfo}, and then
      * caches it for efficient reuse if caching is enabled (see below).
      *
      * <p>Invocations of this method should be thought of as completely orthogonal to acquiring
-     * {@link #getAuthenticationInfo(org.jsecurity.authc.AuthenticationToken) authenticationInfo}, since either could
+     * {@link #getAuthenticationInfo(org.ki.authc.AuthenticationToken) authenticationInfo}, since either could
      * occur in any order.
      *
      * <p>For example, in &quot;Remember Me&quot; scenarios, the user identity is remembered (and
@@ -237,7 +237,7 @@
      * <p><b>Please note:</b>  If caching is enabled and if any authorization data for an account is changed at
      * runtime, such as adding or removing roles and/or permissions, the subclass imlementation should clear the
      * cached AuthorizationInfo for that account via the
-     * {@link #clearCachedAuthorizationInfo(org.jsecurity.subject.PrincipalCollection) clearCachedAuthorizationInfo}
+     * {@link #clearCachedAuthorizationInfo(org.ki.subject.PrincipalCollection) clearCachedAuthorizationInfo}
      * method.  This ensures that the next call to <code>getAuthorizationInfo(PrincipalCollection)</code> will
      * acquire the account's fresh authorization data, where it will then be cached for efficient reuse.  This
      * ensures that stale authorization data will not be reused.
@@ -305,7 +305,7 @@
      * subsequent authorization operations don't used the (old) cached value if account data changes.
      * <p/>
      * After this method is called, the next authorization check for that same account will result in a call to
-     * {@link #getAuthorizationInfo(org.jsecurity.subject.PrincipalCollection) getAuthorizationInfo}, and the
+     * {@link #getAuthorizationInfo(org.ki.subject.PrincipalCollection) getAuthorizationInfo}, and the
      * resulting return value will be cached before being returned so it can be reused for later authorization checks.
      *
      * @param principals the principals of the account for which to clear the cached AuthorizationInfo.

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/CachingRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/CachingRealm.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/CachingRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/CachingRealm.java Tue Mar 10 20:17:48 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm;
+package org.ki.realm;
 
-import org.jsecurity.cache.CacheManager;
-import org.jsecurity.cache.CacheManagerAware;
+import org.ki.cache.CacheManager;
+import org.ki.cache.CacheManagerAware;
 
 /**
  * <p>A very basic abstract extension point for the {@link Realm} interface that provides logging and caching support.

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/Realm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/Realm.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/Realm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/Realm.java Tue Mar 10 20:17:48 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm;
+package org.ki.realm;
 
-import org.jsecurity.authc.AuthenticationException;
-import org.jsecurity.authc.AuthenticationInfo;
-import org.jsecurity.authc.AuthenticationToken;
-import org.jsecurity.authz.Authorizer;
+import org.ki.authc.AuthenticationException;
+import org.ki.authc.AuthenticationInfo;
+import org.ki.authc.AuthenticationToken;
+import org.ki.authz.Authorizer;
 
 /**
  * A <tt>Realm</tt> is a security component that can access application-specific security entities
@@ -38,7 +38,7 @@
  * <a href="http://en.wikipedia.org/wiki/Pluggable_Authentication_Modules">PAM</a> configuration.  This allows a Realm to
  * perform <i>both</i> authentication and authorization duties for a single datasource, which caters to the large
  * majority of applications.  If for some reason you don't want your Realm implementation to perform authentication
- * duties, you should override the {@link #supports(org.jsecurity.authc.AuthenticationToken)} method to always
+ * duties, you should override the {@link #supports(org.ki.authc.AuthenticationToken)} method to always
  * return <tt>false</tt>.
  *
  * <p>Because every application is different, security data such as users and roles can be
@@ -60,7 +60,7 @@
  * @see CachingRealm CachingRealm
  * @see AuthenticatingRealm AuthenticatingRealm
  * @see AuthorizingRealm AuthorizingRealm
- * @see org.jsecurity.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator
+ * @see org.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator
  * @since 0.1
  */
 public interface Realm extends Authorizer {
@@ -75,7 +75,7 @@
 
     /**
      * Returns <tt>true</tt> if this realm wishes to authenticate the Subject represented by the given
-     * {@link org.jsecurity.authc.AuthenticationToken AuthenticationToken} instance, <tt>false</tt> otherwise.
+     * {@link org.ki.authc.AuthenticationToken AuthenticationToken} instance, <tt>false</tt> otherwise.
      *
      * <p>If this method returns <tt>false</tt>, it will not be called to authenticate the Subject represented by
      * the token - more specifically, a <tt>false</tt> return value means this Realm instance's
@@ -99,7 +99,7 @@
      * @param token the application-specific representation of an account principal and credentials.
      * @return the authentication information for the account associated with the specified <tt>token</tt>,
      *         or <tt>null</tt> if no account could be found.
-     * @throws org.jsecurity.authc.AuthenticationException
+     * @throws org.ki.authc.AuthenticationException
      *          if there is an error obtaining or constructing an AuthenticationInfo object based on the
      *          specified <tt>token</tt> or implementation-specifc login behavior fails.
      */

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/RealmFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/RealmFactory.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/RealmFactory.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/RealmFactory.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm;
+package org.ki.realm;
 
 import java.util.Collection;
 
@@ -30,7 +30,7 @@
  * already-created <tt>Realm</tt>s.
  *
  * <p>The <code>Realm</code> instances returned will used to construct the application's
- * {@link org.jsecurity.mgt.SecurityManager SecurityManager} instance.
+ * {@link org.ki.mgt.SecurityManager SecurityManager} instance.
  *
  * @since 0.9
  */
@@ -40,7 +40,7 @@
      * Returns a collection of {@link Realm Realm} instances that will be used to construct
      * the application's SecurityManager instance.
      *
-     * <p>The order of the collection is important.  The {@link org.jsecurity.mgt.SecurityManager SecurityManager}
+     * <p>The order of the collection is important.  The {@link org.ki.mgt.SecurityManager SecurityManager}
      * implementation will consult the Realms during authentication (log-in) and authorization (access control)
      * operations in the collection's <b>iteration order</b>.  That is, the resulting collection's
      * {@link java.util.Iterator Iterator} determines the order in which Realms are used.

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/SimpleAccountRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/SimpleAccountRealm.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/SimpleAccountRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/SimpleAccountRealm.java Tue Mar 10 20:17:48 2009
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm;
+package org.ki.realm;
 
-import org.jsecurity.authc.*;
-import org.jsecurity.authz.AuthorizationInfo;
-import org.jsecurity.authz.SimpleAuthorizingAccount;
-import org.jsecurity.authz.SimpleRole;
-import org.jsecurity.cache.Cache;
-import org.jsecurity.subject.PrincipalCollection;
-import org.jsecurity.util.CollectionUtils;
+import org.ki.authc.*;
+import org.ki.authz.AuthorizationInfo;
+import org.ki.authz.SimpleAuthorizingAccount;
+import org.ki.authz.SimpleRole;
+import org.ki.cache.Cache;
+import org.ki.subject.PrincipalCollection;
+import org.ki.util.CollectionUtils;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,7 +32,7 @@
 import java.util.Set;
 
 /**
- * <p>A simple implementation of the {@link org.jsecurity.realm.Realm Realm} interface that
+ * <p>A simple implementation of the {@link org.ki.realm.Realm Realm} interface that
  * uses a set of configured user accounts and roles to support authentication and authorization.  Each account entry
  * specifies the username, password, and roles for a user.  Roles can also be mapped
  * to permissions and associated with users.</p>

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/activedirectory/ActiveDirectoryRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/activedirectory/ActiveDirectoryRealm.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/activedirectory/ActiveDirectoryRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/activedirectory/ActiveDirectoryRealm.java Tue Mar 10 20:17:48 2009
@@ -16,21 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm.activedirectory;
+package org.ki.realm.activedirectory;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.authc.AuthenticationInfo;
-import org.jsecurity.authc.AuthenticationToken;
-import org.jsecurity.authc.SimpleAuthenticationInfo;
-import org.jsecurity.authc.UsernamePasswordToken;
-import org.jsecurity.authz.AuthorizationInfo;
-import org.jsecurity.authz.SimpleAuthorizationInfo;
-import org.jsecurity.realm.Realm;
-import org.jsecurity.realm.ldap.AbstractLdapRealm;
-import org.jsecurity.realm.ldap.LdapContextFactory;
-import org.jsecurity.realm.ldap.LdapUtils;
-import org.jsecurity.subject.PrincipalCollection;
+import org.ki.authc.AuthenticationInfo;
+import org.ki.authc.AuthenticationToken;
+import org.ki.authc.SimpleAuthenticationInfo;
+import org.ki.authc.UsernamePasswordToken;
+import org.ki.authz.AuthorizationInfo;
+import org.ki.authz.SimpleAuthorizationInfo;
+import org.ki.realm.Realm;
+import org.ki.realm.ldap.AbstractLdapRealm;
+import org.ki.realm.ldap.LdapContextFactory;
+import org.ki.realm.ldap.LdapUtils;
+import org.ki.subject.PrincipalCollection;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/activedirectory/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/activedirectory/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/activedirectory/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/activedirectory/package-info.java Tue Mar 10 20:17:48 2009
@@ -19,4 +19,4 @@
 /**
  * Realms that acquire security data from a Microsoft Active Directory.
  */
-package org.jsecurity.realm.activedirectory;
\ No newline at end of file
+package org.ki.realm.activedirectory;
\ No newline at end of file

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/jdbc/JdbcRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/jdbc/JdbcRealm.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/jdbc/JdbcRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/jdbc/JdbcRealm.java Tue Mar 10 20:17:48 2009
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm.jdbc;
+package org.ki.realm.jdbc;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.authc.*;
-import org.jsecurity.authz.AuthorizationException;
-import org.jsecurity.authz.AuthorizationInfo;
-import org.jsecurity.authz.SimpleAuthorizationInfo;
-import org.jsecurity.realm.AuthorizingRealm;
-import org.jsecurity.subject.PrincipalCollection;
-import org.jsecurity.util.JdbcUtils;
+import org.ki.authc.*;
+import org.ki.authz.AuthorizationException;
+import org.ki.authz.AuthorizationInfo;
+import org.ki.authz.SimpleAuthorizationInfo;
+import org.ki.realm.AuthorizingRealm;
+import org.ki.subject.PrincipalCollection;
+import org.ki.util.JdbcUtils;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -47,12 +47,12 @@
  * <p>
  * If the default implementation
  * of authentication and authorization cannot handle your schema, this class can be subclassed and the
- * appropriate methods overridden. (usually {@link #doGetAuthenticationInfo(org.jsecurity.authc.AuthenticationToken)},
+ * appropriate methods overridden. (usually {@link #doGetAuthenticationInfo(org.ki.authc.AuthenticationToken)},
  * {@link #getRoleNamesForUser(java.sql.Connection,String)}, and/or {@link #getPermissions(java.sql.Connection,String,java.util.Collection)}
  * </p>
  *
  * <p>
- * This realm supports caching by extending from {@link org.jsecurity.realm.AuthorizingRealm}.
+ * This realm supports caching by extending from {@link org.ki.realm.AuthorizingRealm}.
  * </p>
  *
  * @author Jeremy Haile
@@ -116,7 +116,7 @@
      * Overrides the default query used to retrieve a user's password during authentication.  When using the default
      * implementation, this query must take the user's username as a single parameter and return a single result
      * with the user's password as the first column.  If you require a solution that does not match this query
-     * structure, you can override {@link #doGetAuthenticationInfo(org.jsecurity.authc.AuthenticationToken)} or
+     * structure, you can override {@link #doGetAuthenticationInfo(org.ki.authc.AuthenticationToken)} or
      * just {@link #getPasswordForUser(java.sql.Connection,String)}
      *
      * @param authenticationQuery the query to use for authentication.
@@ -254,7 +254,7 @@
      * This implementation of the interface expects the principals collection to return a String username keyed off of
      * this realm's {@link #getName() name}
      *
-     * @see AuthorizingRealm#getAuthorizationInfo(org.jsecurity.subject.PrincipalCollection)
+     * @see AuthorizingRealm#getAuthorizationInfo(org.ki.subject.PrincipalCollection)
      */
     @Override
     protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/jdbc/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/jdbc/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/jdbc/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/jdbc/package-info.java Tue Mar 10 20:17:48 2009
@@ -20,4 +20,4 @@
  * Realms that acquire security data from an RDBMS (Relational Database Management System) using the 
  * JDBC API.
  */
-package org.jsecurity.realm.jdbc;
\ No newline at end of file
+package org.ki.realm.jdbc;
\ No newline at end of file

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/jndi/JndiRealmFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/jndi/JndiRealmFactory.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/jndi/JndiRealmFactory.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/jndi/JndiRealmFactory.java Tue Mar 10 20:17:48 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm.jndi;
+package org.ki.realm.jndi;
 
-import org.jsecurity.jndi.JndiLocator;
-import org.jsecurity.realm.Realm;
-import org.jsecurity.realm.RealmFactory;
-import org.jsecurity.util.StringUtils;
+import org.ki.jndi.JndiLocator;
+import org.ki.realm.Realm;
+import org.ki.realm.RealmFactory;
+import org.ki.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/jndi/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/jndi/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/jndi/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/jndi/package-info.java Tue Mar 10 20:17:48 2009
@@ -18,4 +18,4 @@
  */
 /**
  * Support for acquiring Realms from JNDI, particularly useful for configuring JSecurity in JEE or EJB environments. */
-package org.jsecurity.realm.jndi;
\ No newline at end of file
+package org.ki.realm.jndi;
\ No newline at end of file

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/AbstractLdapRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/AbstractLdapRealm.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/AbstractLdapRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/AbstractLdapRealm.java Tue Mar 10 20:17:48 2009
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm.ldap;
+package org.ki.realm.ldap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.authc.AuthenticationException;
-import org.jsecurity.authc.AuthenticationInfo;
-import org.jsecurity.authc.AuthenticationToken;
-import org.jsecurity.authz.AuthorizationInfo;
-import org.jsecurity.realm.AuthorizingRealm;
-import org.jsecurity.realm.Realm;
-import org.jsecurity.subject.PrincipalCollection;
+import org.ki.authc.AuthenticationException;
+import org.ki.authc.AuthenticationInfo;
+import org.ki.authc.AuthenticationToken;
+import org.ki.authz.AuthorizationInfo;
+import org.ki.realm.AuthorizingRealm;
+import org.ki.realm.Realm;
+import org.ki.subject.PrincipalCollection;
 
 import javax.naming.NamingException;
 
@@ -37,7 +37,7 @@
  * list as well.</p>
  *
  * <p>Implementations would need to implement the
- * {@link #queryForAuthenticationInfo(org.jsecurity.authc.AuthenticationToken,LdapContextFactory)} and
+ * {@link #queryForAuthenticationInfo(org.ki.authc.AuthenticationToken,LdapContextFactory)} and
  * {@link #queryForAuthorizationInfo(PrincipalCollection,LdapContextFactory)} abstract methods.</p>
  *
  * <p>By default, this implementation will create an instance of {@link DefaultLdapContextFactory} to use for
@@ -48,7 +48,7 @@
  *
  * @author Jeremy Haile
  * @author Les Hazlewood
- * @see #queryForAuthenticationInfo(org.jsecurity.authc.AuthenticationToken, LdapContextFactory)
+ * @see #queryForAuthenticationInfo(org.ki.authc.AuthenticationToken, LdapContextFactory)
  * @see #queryForAuthorizationInfo(PrincipalCollection, LdapContextFactory)
  * @since 0.1
  */

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/DefaultLdapContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/DefaultLdapContextFactory.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/DefaultLdapContextFactory.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/DefaultLdapContextFactory.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm.ldap;
+package org.ki.realm.ldap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/LdapContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/LdapContextFactory.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/LdapContextFactory.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/LdapContextFactory.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm.ldap;
+package org.ki.realm.ldap;
 
 import javax.naming.NamingException;
 import javax.naming.ldap.LdapContext;

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/LdapUtils.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/LdapUtils.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/LdapUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/LdapUtils.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm.ldap;
+package org.ki.realm.ldap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/ldap/package-info.java Tue Mar 10 20:17:48 2009
@@ -20,4 +20,4 @@
  * Realms that acquire security data from an LDAP (Lightweight Directory Access Protocol) server
  * utilizing LDAP/Naming APIs.
  */
-package org.jsecurity.realm.ldap;
\ No newline at end of file
+package org.ki.realm.ldap;
\ No newline at end of file

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/package-info.java Tue Mar 10 20:17:48 2009
@@ -17,9 +17,9 @@
  * under the License.
  */
 /**
- * Components and sub-packages used in supporting the core {@link org.jsecurity.realm.Realm Realm} interface.
+ * Components and sub-packages used in supporting the core {@link org.ki.realm.Realm Realm} interface.
  * <p/>
  * Take particular note of the multiple sub-packages with existing Realm implementations supporting many
  * environments that you can use use directly or extend for custom behavior.
  */
-package org.jsecurity.realm;
\ No newline at end of file
+package org.ki.realm;
\ No newline at end of file

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/text/PropertiesRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/text/PropertiesRealm.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/text/PropertiesRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/text/PropertiesRealm.java Tue Mar 10 20:17:48 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm.text;
+package org.ki.realm.text;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.JSecurityException;
-import org.jsecurity.cache.CacheManager;
-import org.jsecurity.io.ResourceUtils;
-import org.jsecurity.util.Destroyable;
+import org.ki.JSecurityException;
+import org.ki.cache.CacheManager;
+import org.ki.io.ResourceUtils;
+import org.ki.util.Destroyable;
 
 import java.io.File;
 import java.io.IOException;
@@ -102,8 +102,8 @@
     private static final int DEFAULT_RELOAD_INTERVAL_SECONDS = 10;
     private static final String USERNAME_PREFIX = "user.";
     private static final String ROLENAME_PREFIX = "role.";
-    private static final String DEFAULT_RESOURCE_PATH = "classpath:jsecurity-users.properties";
-    private static final String FAILSAFE_RESOURCE_PATH = "classpath:org/jsecurity/realm/text/default-jsecurity-users.properties";
+    private static final String DEFAULT_RESOURCE_PATH = "classpath:ki-users.properties";
+    private static final String FAILSAFE_RESOURCE_PATH = "classpath:org/ki/realm/text/default-ki-users.properties";
 
     /*--------------------------------------------
     |    I N S T A N C E   V A R I A B L E S    |
@@ -133,7 +133,7 @@
             loadProperties();
         } catch (Exception e) {
             if (log.isInfoEnabled()) {
-                log.info("Unable to find a jsecurity-users.properties file at location [" + this.resourcePath + "].  " +
+                log.info("Unable to find a ki-users.properties file at location [" + this.resourcePath + "].  " +
                         "Defaulting to JSecurity's failsafe properties file (demo use only).");
             }
             this.resourcePath = FAILSAFE_RESOURCE_PATH;

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/text/TextConfigurationRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/text/TextConfigurationRealm.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/text/TextConfigurationRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/text/TextConfigurationRealm.java Tue Mar 10 20:17:48 2009
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.realm.text;
+package org.ki.realm.text;
 
-import org.jsecurity.authc.SimpleAccount;
-import org.jsecurity.authz.Permission;
-import org.jsecurity.authz.SimpleRole;
-import org.jsecurity.realm.SimpleAccountRealm;
-import org.jsecurity.subject.PrincipalCollection;
-import org.jsecurity.util.PermissionUtils;
-import org.jsecurity.util.StringUtils;
+import org.ki.authc.SimpleAccount;
+import org.ki.authz.Permission;
+import org.ki.authz.SimpleRole;
+import org.ki.realm.SimpleAccountRealm;
+import org.ki.subject.PrincipalCollection;
+import org.ki.util.PermissionUtils;
+import org.ki.util.StringUtils;
 
 import java.text.ParseException;
 import java.util.*;
@@ -90,7 +90,7 @@
      * <p><code><em>rolename</em> = <em>permissionDefinition1</em>, <em>permissionDefinition2</em>, ...</code></p>
      *
      * <p>where <em>permissionDefinition</em> is an arbitrary String, but must people will want to use
-     * Strings that conform to the {@link org.jsecurity.authz.permission.WildcardPermission WildcardPermission}
+     * Strings that conform to the {@link org.ki.authz.permission.WildcardPermission WildcardPermission}
      * format for ease of use and flexibility.  Note that if an individual <em>permissionDefnition</em> needs to
      * be internally comma-delimited (e.g. <code>printer:5thFloor:print,info</code>), you will need to surround that
      * definition with double quotes (&quot;) to avoid parsing errors (e.g.

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/text/default-jsecurity-users.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/text/default-jsecurity-users.properties?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/text/default-jsecurity-users.properties (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/text/default-jsecurity-users.properties Tue Mar 10 20:17:48 2009
@@ -30,7 +30,7 @@
 # own Realms in a real application.
 #
 # The key/value pairs format is defined in the
-# org.jsecurity.realm.text.PropertiesRealm JavaDoc, but it is probably simple
+# org.kitext.PropertiesRealm JavaDoc, but it is probably simple
 # enough that you could figure it out from looking at the definitions below.
 #
 # For those that might not understand the references in this file, the

Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/text/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/text/package-info.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/text/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/text/package-info.java Tue Mar 10 20:17:48 2009
@@ -20,4 +20,4 @@
  * Realms that acquire security data from text-based data sources such as <code>File</code>s or
  * text streams.
  */
-package org.jsecurity.realm.text;
\ No newline at end of file
+package org.ki.realm.text;
\ No newline at end of file

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/ExpiredSessionException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/ExpiredSessionException.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/ExpiredSessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/ExpiredSessionException.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session;
+package org.ki.session;
 
 import java.io.Serializable;
 

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/InvalidSessionException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/InvalidSessionException.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/InvalidSessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/InvalidSessionException.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session;
+package org.ki.session;
 
 import java.io.Serializable;
 
@@ -25,7 +25,7 @@
  * when that session is considered invalid.  The meaning of the term 'invalid' is based on
  * application behavior.  For example, a Session is considered invalid if it has been explicitly
  * stopped (e.g. when a user logs-out or when explicitly
- * {@link org.jsecurity.session.Session#stop() stopped} programmatically.  A Session can also be
+ * {@link org.ki.session.Session#stop() stopped} programmatically.  A Session can also be
  * considered invalid if it has expired.
  *
  * @author Les Hazlewood

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/ProxiedSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/ProxiedSession.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/ProxiedSession.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/ProxiedSession.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session;
+package org.ki.session;
 
 import java.io.Serializable;
 import java.net.InetAddress;

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/ReplacedSessionException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/ReplacedSessionException.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/ReplacedSessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/ReplacedSessionException.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session;
+package org.ki.session;
 
 import java.io.Serializable;
 

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/Session.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/Session.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/Session.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/Session.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session;
+package org.ki.session;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -75,7 +75,7 @@
      * </ul>
      *
      * @return the time in milliseconds the session may remain idle before expiring.
-     * @throws org.jsecurity.session.InvalidSessionException
+     * @throws org.ki.session.InvalidSessionException
      *          if the session has been stopped or expired prior to calling this method.
      * @since 0.2
      */
@@ -91,7 +91,7 @@
      * </ul>
      *
      * @param maxIdleTimeInMillis the time in milliseconds that the session may remain idle before expiring.
-     * @throws org.jsecurity.session.InvalidSessionException
+     * @throws org.ki.session.InvalidSessionException
      *          if the session has been stopped or expired prior to calling this method.
      * @since 0.2
      */
@@ -104,7 +104,7 @@
      *
      * @return the <tt>InetAddress</tt> of the host that originated this session, or <tt>null</tt>
      *         if the host address is unknown.
-     * @see org.jsecurity.session.mgt.SessionManager#start(java.net.InetAddress)
+     * @see org.ki.session.mgt.SessionManager#start(java.net.InetAddress)
      */
     InetAddress getHostAddress();
 
@@ -152,7 +152,7 @@
      * is explicitly stopped by application code by calling this method directly, it could clear out any
      * authentication state that might exist, thereby effectively &quot;unauthenticating&quot; the <code>Subject</code>.
      * <p/>
-     * As such, you might consider {@link org.jsecurity.subject.Subject#logout logging-out} the 'owning'
+     * As such, you might consider {@link org.ki.subject.Subject#logout logging-out} the 'owning'
      * <code>Subject</code> instead of manually calling this method, as a log out is expected to stop the
      * corresponding session automatically, and also allows framework code to execute additional cleanup logic.
      *

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/SessionException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/SessionException.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/SessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/SessionException.java Tue Mar 10 20:17:48 2009
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session;
+package org.ki.session;
 
-import org.jsecurity.JSecurityException;
+import org.ki.JSecurityException;
 
 import java.io.Serializable;
 

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/SessionListener.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/SessionListener.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/SessionListener.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/SessionListener.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session;
+package org.ki.session;
 
 /**
  * Interface to be implemented by components that wish to be notified of events that occur during a 

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/SessionListenerRegistrar.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/SessionListenerRegistrar.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/SessionListenerRegistrar.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/SessionListenerRegistrar.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session;
+package org.ki.session;
 
 import java.util.Collection;
 

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/StoppedSessionException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/StoppedSessionException.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/StoppedSessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/StoppedSessionException.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session;
+package org.ki.session;
 
 import java.io.Serializable;
 

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/UnknownSessionException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/UnknownSessionException.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/UnknownSessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/UnknownSessionException.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session;
+package org.ki.session;
 
 import java.io.Serializable;
 

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractSessionManager.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractSessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractSessionManager.java Tue Mar 10 20:17:48 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.authz.HostUnauthorizedException;
-import org.jsecurity.session.*;
+import org.ki.authz.HostUnauthorizedException;
+import org.ki.session.*;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -118,7 +118,7 @@
      * that the session has been invalidated (stopped or expired).
      * <p/>
      * The default implementation returns an
-     * {@link org.jsecurity.session.mgt.ImmutableProxiedSession ImmutableProxiedSession} instance to ensure
+     * {@link org.ki.session.mgt.ImmutableProxiedSession ImmutableProxiedSession} instance to ensure
      * that the specified <code>session</code> argument is not modified by any listeners.
      *
      * @param session the <code>Session</code> object being invalidated.

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractValidatingSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractValidatingSessionManager.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractValidatingSessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractValidatingSessionManager.java Tue Mar 10 20:17:48 2009
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.authz.HostUnauthorizedException;
-import org.jsecurity.session.ExpiredSessionException;
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.Session;
-import org.jsecurity.util.Destroyable;
-import org.jsecurity.util.LifecycleUtils;
+import org.ki.authz.HostUnauthorizedException;
+import org.ki.session.ExpiredSessionException;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.Session;
+import org.ki.util.Destroyable;
+import org.ki.util.LifecycleUtils;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -121,7 +121,7 @@
      * convenience and to match what most people are accustomed based on years of servlet container behavior.
      * <p/>
      * When true (the default), this {@code SessionManager} implementation throws an
-     * {@link org.jsecurity.session.ReplacedSessionException ReplacedSessionException} to the caller whenever a new session is created so
+     * {@link org.ki.session.ReplacedSessionException ReplacedSessionException} to the caller whenever a new session is created so
      * the caller can receive the new session ID and react accordingly for future {@code SessionManager SessionManager}
      * method invocations.
      *
@@ -138,7 +138,7 @@
      * convenience and to match what most people are accustomed based on years of servlet container behavior.
      * <p/>
      * When true (the default), this {@code SessionManager} implementation throws an
-     * {@link org.jsecurity.session.ReplacedSessionException ReplacedSessionException} to the caller whenever a new session is created so
+     * {@link org.ki.session.ReplacedSessionException ReplacedSessionException} to the caller whenever a new session is created so
      * the caller can receive the new session ID and react accordingly for future {@code SessionManager SessionManager}
      * method invocations.
      *
@@ -184,9 +184,9 @@
 
     /**
      * Subclass template hook in case per-session timeout is not based on
-     * {@link org.jsecurity.session.Session#getTimeout()}.
+     * {@link org.ki.session.Session#getTimeout()}.
      *
-     * <p>This implementation merely returns {@link org.jsecurity.session.Session#getTimeout()}</p>
+     * <p>This implementation merely returns {@link org.ki.session.Session#getTimeout()}</p>
      *
      * @param session the session for which to determine session timeout.
      * @return the time in milliseconds the specified session may remain idle before expiring.

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DefaultSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DefaultSessionManager.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DefaultSessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DefaultSessionManager.java Tue Mar 10 20:17:48 2009
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.cache.CacheManager;
-import org.jsecurity.cache.CacheManagerAware;
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.ReplacedSessionException;
-import org.jsecurity.session.Session;
-import org.jsecurity.session.mgt.eis.MemorySessionDAO;
-import org.jsecurity.session.mgt.eis.SessionDAO;
-import org.jsecurity.util.CollectionUtils;
-import org.jsecurity.util.ThreadContext;
+import org.ki.cache.CacheManager;
+import org.ki.cache.CacheManagerAware;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.ReplacedSessionException;
+import org.ki.session.Session;
+import org.ki.session.mgt.eis.MemorySessionDAO;
+import org.ki.session.mgt.eis.SessionDAO;
+import org.ki.util.CollectionUtils;
+import org.ki.util.ThreadContext;
 
 import java.io.Serializable;
 import java.net.InetAddress;

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DelegatingSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DelegatingSession.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DelegatingSession.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DelegatingSession.java Tue Mar 10 20:17:48 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.ReplacedSessionException;
-import org.jsecurity.session.Session;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.ReplacedSessionException;
+import org.ki.session.Session;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -29,7 +29,7 @@
 
 /**
  * A DelegatingSession is a client-tier representation of a server side
- * {@link org.jsecurity.session.Session Session}.
+ * {@link org.ki.session.Session Session}.
  * This implementation is basically a proxy to a server-side {@link SessionManager SessionManager},
  * which will return the proper results for each method call.
  *
@@ -133,7 +133,7 @@
     }
 
     /**
-     * @see org.jsecurity.session.Session#getLastAccessTime()
+     * @see org.ki.session.Session#getLastAccessTime()
      */
     public Date getLastAccessTime() {
         //can't cache - only business pojo knows the accurate time:
@@ -164,7 +164,7 @@
     }
 
     /**
-     * @see org.jsecurity.session.Session#getHostAddress()
+     * @see org.ki.session.Session#getHostAddress()
      */
     public InetAddress getHostAddress() {
         if (hostAddress == null) {
@@ -179,7 +179,7 @@
     }
 
     /**
-     * @see org.jsecurity.session.Session#touch()
+     * @see org.ki.session.Session#touch()
      */
     public void touch() throws InvalidSessionException {
         try {
@@ -191,7 +191,7 @@
     }
 
     /**
-     * @see org.jsecurity.session.Session#stop()
+     * @see org.ki.session.Session#stop()
      */
     public void stop() throws InvalidSessionException {
         try {
@@ -203,7 +203,7 @@
     }
 
     /**
-     * @see org.jsecurity.session.Session#getAttributeKeys
+     * @see org.ki.session.Session#getAttributeKeys
      */
     public Collection<Object> getAttributeKeys() throws InvalidSessionException {
         try {

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ImmutableProxiedSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ImmutableProxiedSession.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ImmutableProxiedSession.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ImmutableProxiedSession.java Tue Mar 10 20:17:48 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.ProxiedSession;
-import org.jsecurity.session.Session;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.ProxiedSession;
+import org.ki.session.Session;
 
 /**
  * Implementation of the {@link Session Session} interface that proxies another <code>Session</code>, but does not

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionManager.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionManager.java Tue Mar 10 20:17:48 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
-import org.jsecurity.authz.HostUnauthorizedException;
-import org.jsecurity.session.InvalidSessionException;
+import org.ki.authz.HostUnauthorizedException;
+import org.ki.session.InvalidSessionException;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -28,7 +28,7 @@
 
 /**
  * A SessionManager manages the creation, maintenance, and clean-up of all application
- * {@link org.jsecurity.session.Session Session}s.
+ * {@link org.ki.session.Session Session}s.
  *
  * @author Les Hazlewood
  * @since 0.1
@@ -82,7 +82,7 @@
      *
      * @param sessionId the system identifier for the session of interest.
      * @return the system time the specified session was started (i.e. created).
-     * @see org.jsecurity.session.Session#getStartTimestamp()
+     * @see org.ki.session.Session#getStartTimestamp()
      */
     Date getStartTimestamp(Serializable sessionId);
 
@@ -92,8 +92,8 @@
      *
      * @param sessionId the system identifier for the session of interest
      * @return tye time the session last accessed the system
-     * @see org.jsecurity.session.Session#getLastAccessTime()
-     * @see org.jsecurity.session.Session#touch()
+     * @see org.ki.session.Session#getLastAccessTime()
+     * @see org.ki.session.Session#touch()
      */
     Date getLastAccessTime(Serializable sessionId);
 
@@ -117,7 +117,7 @@
      *
      * @param sessionId the system identifier of the session of interest.
      * @return the time in milliseconds that the specified session may remain idle before expiring.
-     * @throws org.jsecurity.session.InvalidSessionException
+     * @throws org.ki.session.InvalidSessionException
      *          if the session has been stopped or expired prior to calling this method.
      * @since 0.2
      */
@@ -134,7 +134,7 @@
      *
      * @param sessionId           the system identifier of the session of interest.
      * @param maxIdleTimeInMillis the time in milliseconds that the specified session may remain idle before expiring.
-     * @throws org.jsecurity.session.InvalidSessionException
+     * @throws org.ki.session.InvalidSessionException
      *          if the session has been stopped or expired prior to calling this method.
      * @since 0.2
      */
@@ -145,9 +145,9 @@
      * can be used to explicitly ensure that a session does not time out.
      *
      * @param sessionId the id of the session to update.
-     * @throws org.jsecurity.session.InvalidSessionException
+     * @throws org.ki.session.InvalidSessionException
      *          if the session has been stopped or expired prior to calling this method.
-     * @see org.jsecurity.session.Session#touch
+     * @see org.ki.session.Session#touch
      */
     void touch(Serializable sessionId) throws InvalidSessionException;
 
@@ -170,7 +170,7 @@
      * @param sessionId the system identfier of the system to destroy.
      * @throws InvalidSessionException if the session has stopped or expired prior to calling
      *                                 this method.
-     * @see org.jsecurity.session.Session#stop
+     * @see org.ki.session.Session#stop
      */
     void stop(Serializable sessionId) throws InvalidSessionException;
 
@@ -182,7 +182,7 @@
      * @return the keys of all attributes stored under the specified session, or an empty collection if
      *         there are no session attributes.
      * @throws InvalidSessionException if the specified session has stopped or expired prior to calling this method.
-     * @see org.jsecurity.session.Session#getAttributeKeys()
+     * @see org.ki.session.Session#getAttributeKeys()
      * @since 0.2
      */
     Collection<Object> getAttributeKeys(Serializable sessionId);
@@ -196,7 +196,7 @@
      * @return the object bound under the specified <tt>key</tt> name or <tt>null</tt> if there is
      *         no object bound under that name.
      * @throws InvalidSessionException if the specified session has stopped or expired prior to calling this method.
-     * @see org.jsecurity.session.Session#getAttribute(Object key)
+     * @see org.ki.session.Session#getAttribute(Object key)
      */
     Object getAttribute(Serializable sessionId, Object key) throws InvalidSessionException;
 
@@ -212,7 +212,7 @@
      * @param key       the name under which the <tt>value</tt> object will be bound in this session
      * @param value     the object to bind in this session.
      * @throws InvalidSessionException if the specified session has stopped or expired prior to calling this method.
-     * @see org.jsecurity.session.Session#setAttribute(Object key, Object value)
+     * @see org.ki.session.Session#setAttribute(Object key, Object value)
      */
     void setAttribute(Serializable sessionId, Object key, Object value) throws InvalidSessionException;
 
@@ -224,7 +224,7 @@
      * @return the object removed or <tt>null</tt> if there was no object bound under the specified
      *         <tt>key</tt> name.
      * @throws InvalidSessionException if the specified session has stopped or expired prior to calling this method.
-     * @see org.jsecurity.session.Session#removeAttribute(Object key)
+     * @see org.ki.session.Session#removeAttribute(Object key)
      */
     Object removeAttribute(Serializable sessionId, Object key) throws InvalidSessionException;
 }

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionValidationScheduler.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionValidationScheduler.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionValidationScheduler.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionValidationScheduler.java Tue Mar 10 20:17:48 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
 /**
  * Interface that should be implemented by classes that can control validating sessions on a regular

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SimpleSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SimpleSession.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SimpleSession.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SimpleSession.java Tue Mar 10 20:17:48 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.session.ExpiredSessionException;
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.StoppedSessionException;
+import org.ki.session.ExpiredSessionException;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.StoppedSessionException;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -31,7 +31,7 @@
 import java.util.*;
 
 /**
- * Simple {@link org.jsecurity.session.Session} POJO implementation, intended to be used on the business/server tier.
+ * Simple {@link org.ki.session.Session} POJO implementation, intended to be used on the business/server tier.
  *
  * @author Les Hazlewood
  * @since 0.1

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSession.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSession.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSession.java Tue Mar 10 20:17:48 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
-import org.jsecurity.session.InvalidSessionException;
-import org.jsecurity.session.Session;
+import org.ki.session.InvalidSessionException;
+import org.ki.session.Session;
 
 /**
  * A <code>ValidatingSession</code> is a <code>Session</code> that is capable of determining it is valid or not and

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSessionManager.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSessionManager.java Tue Mar 10 20:17:48 2009
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt;
+package org.ki.session.mgt;
 
-import org.jsecurity.session.InvalidSessionException;
+import org.ki.session.InvalidSessionException;
 
 import java.io.Serializable;
 
@@ -77,7 +77,7 @@
      * Proactively validates a single session.
      *
      * @param sessionId the id of the session to validate
-     * @throws org.jsecurity.session.InvalidSessionException
+     * @throws org.ki.session.InvalidSessionException
      *          if, upon validation, the session was stopped or expired.
      */
     void validateSession(Serializable sessionId) throws InvalidSessionException;

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/CachingSessionDAO.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/CachingSessionDAO.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/CachingSessionDAO.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/CachingSessionDAO.java Tue Mar 10 20:17:48 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt.eis;
+package org.ki.session.mgt.eis;
 
-import org.jsecurity.cache.Cache;
-import org.jsecurity.cache.CacheManager;
-import org.jsecurity.cache.CacheManagerAware;
-import org.jsecurity.session.Session;
-import org.jsecurity.session.UnknownSessionException;
-import org.jsecurity.session.mgt.ValidatingSession;
+import org.ki.cache.Cache;
+import org.ki.cache.CacheManager;
+import org.ki.cache.CacheManagerAware;
+import org.ki.session.Session;
+import org.ki.session.UnknownSessionException;
+import org.ki.session.mgt.ValidatingSession;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -34,7 +34,7 @@
  * use it and the underlying EIS (Enterprise Information System) for enhanced performance.
  *
  * <p>This implementation caches all active sessions in a cache created by a
- * {@link org.jsecurity.cache.CacheManager}.  All <tt>SessionDAO</tt> methods are implemented by this class to employ
+ * {@link org.ki.cache.CacheManager}.  All <tt>SessionDAO</tt> methods are implemented by this class to employ
  * caching behavior and delegates the actual EIS operations to respective do* methods to be implemented by
  * subclasses (doCreate, doRead, etc).
  *
@@ -46,7 +46,7 @@
     /**
      * The default active sessions cache name, equal to <code>jsecurity-activeSessionCache</code>.
      */
-    public static final String ACTIVE_SESSION_CACHE_NAME = "jsecurity-activeSessionCache";
+    public static final String ACTIVE_SESSION_CACHE_NAME = "ki-activeSessionCache";
 
     /**
      * The CacheManager to use to acquire the Session cache.
@@ -203,8 +203,8 @@
 
     /**
      * Caches the specified session under the key <code>sessionId</code>.  If the Session is an instance of
-     * {@link org.jsecurity.session.mgt.ValidatingSession ValidatingSession}, it will only be cached if the
-     * session is {@link org.jsecurity.session.mgt.ValidatingSession#isValid() valid}.
+     * {@link org.ki.session.mgt.ValidatingSession ValidatingSession}, it will only be cached if the
+     * session is {@link org.ki.session.mgt.ValidatingSession#isValid() valid}.
      *
      * @param session the session to cache
      * @param sessionId the id of the session, to be used as the cache key.
@@ -272,7 +272,7 @@
      *
      * @param session the Session instance to persist to the EIS.
      * @return the id of the session created in the EIS (i.e. this is almost always a primary key and should be the
-     *         value returned from {@link org.jsecurity.session.Session#getId() Session.getId()}.
+     *         value returned from {@link org.ki.session.Session#getId() Session.getId()}.
      */
     protected abstract Serializable doCreate(Session session);
 

Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/MemorySessionDAO.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/MemorySessionDAO.java?rev=752240&r1=752210&r2=752240&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/MemorySessionDAO.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/MemorySessionDAO.java Tue Mar 10 20:17:48 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jsecurity.session.mgt.eis;
+package org.ki.session.mgt.eis;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jsecurity.cache.HashtableCacheManager;
-import org.jsecurity.session.Session;
-import org.jsecurity.session.mgt.SimpleSession;
-import org.jsecurity.util.JavaEnvironment;
+import org.ki.cache.HashtableCacheManager;
+import org.ki.session.Session;
+import org.ki.session.mgt.SimpleSession;
+import org.ki.util.JavaEnvironment;
 
 import java.io.Serializable;
 import java.util.Random;
@@ -33,7 +33,7 @@
  * {@link #setCacheManager CacheManager} for Session caching and in-memory persistence.
  *
  * <p><b>PLEASE NOTE</b> the default CacheManager internal to this implementation is a
- * {@link org.jsecurity.cache.HashtableCacheManager HashtableCacheManager}, which IS NOT RECOMMENDED for production environments.
+ * {@link org.ki.cache.HashtableCacheManager HashtableCacheManager}, which IS NOT RECOMMENDED for production environments.
  *
  * <p>If you
  * want to use the MemorySessionDAO in production environments, such as those that require session data to be
@@ -41,7 +41,7 @@
  *
  * <ul>
  * <li>Configure it with a production-quality CacheManager. The
- * {@link org.jsecurity.cache.ehcache.EhCacheManager EhCacheManager} is one such implementation.  It is not used by default
+ * {@link org.ki.cache.ehcache.EhCacheManager EhCacheManager} is one such implementation.  It is not used by default
  * to prevent a forced runtime dependency on ehcache.jar that may not be required in many environments)</li><br/>
  * <li>If you need session information beyond their transient start/stop lifetimes, you should subclass this one and
  * override the <tt>do*</tt> methods to perform CRUD operations using an EIS-tier API (e.g. Hibernate/JPA/JCR/etc).



Mime
View raw message