shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r752380 [7/9] - in /incubator/jsecurity/trunk: ./ core/src/org/apache/ki/ core/src/org/apache/ki/aop/ core/src/org/apache/ki/authc/ core/src/org/apache/ki/authc/credential/ core/src/org/apache/ki/authc/pam/ core/src/org/apache/ki/authz/ cor...
Date Wed, 11 Mar 2009 05:40:54 GMT
Added: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/default-ki-users.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/default-ki-users.properties?rev=752380&view=auto
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/default-ki-users.properties (added)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/default-ki-users.properties Wed Mar 11 05:40:38 2009
@@ -0,0 +1,62 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# ============================================================================
+# Failsafe properties-based Realm configuration
+#
+# A Properties-based configuration is static by nature, which means its user,
+# role, and permission definitions contained within do not change during
+# runtime.  This means you can't add or remove any of them during runtime
+# which is probably of little value to a 'real' application.
+#
+# This file primarily exists as a failsafe mechanism in case you don't provide
+# any Realms to the JSecurity SecurityManager at startup.  It also serves as a
+# simple and fun example.  But you will want to provide one or more of your
+# own Realms in a real application.
+#
+# The key/value pairs format is defined in the
+# 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
+# definitions are all based on the classic Mel Brooks' film "Spaceballs". ;)
+# ============================================================================
+
+# ------------------------------
+# Users and their assigned roles
+# ------------------------------
+# user 'root' with password 'secret' and the 'root' role
+user.root = secret,root
+# user 'guest' with the password 'guest' and the 'guest' role
+user.guest = guest,guest
+# user 'presidentskroob' with password '12345' ("That's the same combination on my luggage!!!" ;)), and role 'president'
+user.presidentskroob = 12345,president
+# user 'darkhelmet' with password 'ludicrousspeed' and roles 'darklord' and 'schwartz'
+user.darkhelmet = ludicrousspeed,darklord,schwartz
+# user 'lonestarr' with password 'vespa' and roles 'goodguy' and 'schwartz'
+user.lonestarr = vespa,goodguy,schwartz
+
+# -------------------------------
+# Roles with assigned permissions
+# -------------------------------
+# 'root' role has all permissions, indicated by the wildcard '*'
+role.root = *
+# The 'schwartz' role can do anything (*) with any lightsaber:
+role.schwartz = lightsaber:*
+# The 'goodguy' role is allowed to 'drive' (action) the winnebago (type) with license plate 'eagle5' (instance specific id)
+role.goodguy = winnebago:drive:eagle5
\ No newline at end of file

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/default-ki-users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/default-ki-users.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/default-ki-users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/ExpiredSessionException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/ExpiredSessionException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/ExpiredSessionException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/ExpiredSessionException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/ExpiredSessionException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/ExpiredSessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/ExpiredSessionException.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session;
+package org.apache.ki.session;
 
 import java.io.Serializable;
 

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/ExpiredSessionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/ExpiredSessionException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/InvalidSessionException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/InvalidSessionException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/InvalidSessionException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/InvalidSessionException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/InvalidSessionException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/InvalidSessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/InvalidSessionException.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session;
+package org.apache.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.ki.session.Session#stop() stopped} programmatically.  A Session can also be
+ * {@link Session#stop() stopped} programmatically.  A Session can also be
  * considered invalid if it has expired.
  *
  * @author Les Hazlewood

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/InvalidSessionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/InvalidSessionException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/ProxiedSession.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/ProxiedSession.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/ProxiedSession.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/ProxiedSession.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/ProxiedSession.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/ProxiedSession.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/ProxiedSession.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session;
+package org.apache.ki.session;
 
 import java.io.Serializable;
 import java.net.InetAddress;

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/ReplacedSessionException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/ReplacedSessionException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/ReplacedSessionException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/ReplacedSessionException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/ReplacedSessionException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/ReplacedSessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/ReplacedSessionException.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session;
+package org.apache.ki.session;
 
 import java.io.Serializable;
 

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/Session.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/Session.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/Session.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/Session.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/Session.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/Session.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/Session.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session;
+package org.apache.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.ki.session.InvalidSessionException
+     * @throws 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.ki.session.InvalidSessionException
+     * @throws 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.ki.session.mgt.SessionManager#start(java.net.InetAddress)
+     * @see org.apache.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.ki.subject.Subject#logout logging-out} the 'owning'
+     * As such, you might consider {@link org.apache.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.
      *

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/Session.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/Session.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/SessionException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/SessionException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/SessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java Wed Mar 11 05:40:38 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session;
-
-import org.ki.JSecurityException;
+package org.apache.ki.session;
 
 import java.io.Serializable;
 
+import org.apache.ki.JSecurityException;
+
 /**
  * General security exception attributed to problems during interaction with the system during
  * a session.

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionListener.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/SessionListener.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionListener.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionListener.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/SessionListener.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/SessionListener.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionListener.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session;
+package org.apache.ki.session;
 
 /**
  * Interface to be implemented by components that wish to be notified of events that occur during a 

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionListenerRegistrar.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/SessionListenerRegistrar.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionListenerRegistrar.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionListenerRegistrar.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/SessionListenerRegistrar.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/SessionListenerRegistrar.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/SessionListenerRegistrar.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session;
+package org.apache.ki.session;
 
 import java.util.Collection;
 

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/StoppedSessionException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/StoppedSessionException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/StoppedSessionException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/StoppedSessionException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/StoppedSessionException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/StoppedSessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/StoppedSessionException.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session;
+package org.apache.ki.session;
 
 import java.io.Serializable;
 

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/StoppedSessionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/StoppedSessionException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/UnknownSessionException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/UnknownSessionException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/UnknownSessionException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/UnknownSessionException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/UnknownSessionException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/UnknownSessionException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/UnknownSessionException.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session;
+package org.apache.ki.session;
 
 import java.io.Serializable;
 

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/UnknownSessionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/UnknownSessionException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/AbstractSessionManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractSessionManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/AbstractSessionManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/AbstractSessionManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractSessionManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractSessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/AbstractSessionManager.java Wed Mar 11 05:40:38 2009
@@ -16,12 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.ki.authz.HostUnauthorizedException;
-import org.ki.session.*;
+package org.apache.ki.session.mgt;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -29,6 +24,17 @@
 import java.util.Collection;
 import java.util.Date;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.authz.HostUnauthorizedException;
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.Session;
+import org.apache.ki.session.SessionListener;
+import org.apache.ki.session.SessionListenerRegistrar;
+import org.apache.ki.session.UnknownSessionException;
+
+
 /**
  * TODO - complete JavaDoc
  *
@@ -118,7 +124,7 @@
      * that the session has been invalidated (stopped or expired).
      * <p/>
      * The default implementation returns an
-     * {@link org.ki.session.mgt.ImmutableProxiedSession ImmutableProxiedSession} instance to ensure
+     * {@link 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.

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/AbstractSessionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/AbstractSessionManager.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/AbstractValidatingSessionManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractValidatingSessionManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/AbstractValidatingSessionManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/AbstractValidatingSessionManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractValidatingSessionManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/AbstractValidatingSessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/AbstractValidatingSessionManager.java Wed Mar 11 05:40:38 2009
@@ -16,21 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-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;
+package org.apache.ki.session.mgt;
 
 import java.io.Serializable;
 import java.net.InetAddress;
 import java.util.Collection;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.authz.HostUnauthorizedException;
+import org.apache.ki.session.ExpiredSessionException;
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.Session;
+import org.apache.ki.util.Destroyable;
+import org.apache.ki.util.LifecycleUtils;
+
+
 /**
  * Default business-tier implementation of the {@link ValidatingSessionManager} interface.
  *
@@ -121,7 +123,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.ki.session.ReplacedSessionException ReplacedSessionException} to the caller whenever a new session is created so
+     * {@link org.apache.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 +140,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.ki.session.ReplacedSessionException ReplacedSessionException} to the caller whenever a new session is created so
+     * {@link org.apache.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 +186,9 @@
 
     /**
      * Subclass template hook in case per-session timeout is not based on
-     * {@link org.ki.session.Session#getTimeout()}.
+     * {@link org.apache.ki.session.Session#getTimeout()}.
      *
-     * <p>This implementation merely returns {@link org.ki.session.Session#getTimeout()}</p>
+     * <p>This implementation merely returns {@link org.apache.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.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DefaultSessionManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DefaultSessionManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DefaultSessionManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DefaultSessionManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DefaultSessionManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DefaultSessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DefaultSessionManager.java Wed Mar 11 05:40:38 2009
@@ -16,25 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-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;
+package org.apache.ki.session.mgt;
 
 import java.io.Serializable;
 import java.net.InetAddress;
 import java.util.Collection;
 import java.util.Date;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.cache.CacheManager;
+import org.apache.ki.cache.CacheManagerAware;
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.ReplacedSessionException;
+import org.apache.ki.session.Session;
+import org.apache.ki.session.mgt.eis.MemorySessionDAO;
+import org.apache.ki.session.mgt.eis.SessionDAO;
+import org.apache.ki.util.CollectionUtils;
+import org.apache.ki.util.ThreadContext;
+
+
 /**
  * Default business-tier implementation of the {@link ValidatingSessionManager} interface.
  *

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DefaultSessionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DefaultSessionManager.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DelegatingSession.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DelegatingSession.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DelegatingSession.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DelegatingSession.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DelegatingSession.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/DelegatingSession.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DelegatingSession.java Wed Mar 11 05:40:38 2009
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
-
-import org.ki.session.InvalidSessionException;
-import org.ki.session.ReplacedSessionException;
-import org.ki.session.Session;
+package org.apache.ki.session.mgt;
 
 import java.io.Serializable;
 import java.net.InetAddress;
 import java.util.Collection;
 import java.util.Date;
 
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.ReplacedSessionException;
+import org.apache.ki.session.Session;
+
 /**
  * A DelegatingSession is a client-tier representation of a server side
- * {@link org.ki.session.Session Session}.
+ * {@link org.apache.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.
  *
@@ -111,14 +111,14 @@
     }
 
     /**
-     * @see Session#getId()
+     * @see org.apache.ki.session.Session#getId()
      */
     public Serializable getId() {
         return id;
     }
 
     /**
-     * @see Session#getStartTimestamp()
+     * @see org.apache.ki.session.Session#getStartTimestamp()
      */
     public Date getStartTimestamp() {
         if (startTimestamp == null) {
@@ -133,7 +133,7 @@
     }
 
     /**
-     * @see org.ki.session.Session#getLastAccessTime()
+     * @see org.apache.ki.session.Session#getLastAccessTime()
      */
     public Date getLastAccessTime() {
         //can't cache - only business pojo knows the accurate time:
@@ -164,7 +164,7 @@
     }
 
     /**
-     * @see org.ki.session.Session#getHostAddress()
+     * @see org.apache.ki.session.Session#getHostAddress()
      */
     public InetAddress getHostAddress() {
         if (hostAddress == null) {
@@ -179,7 +179,7 @@
     }
 
     /**
-     * @see org.ki.session.Session#touch()
+     * @see org.apache.ki.session.Session#touch()
      */
     public void touch() throws InvalidSessionException {
         try {
@@ -191,7 +191,7 @@
     }
 
     /**
-     * @see org.ki.session.Session#stop()
+     * @see org.apache.ki.session.Session#stop()
      */
     public void stop() throws InvalidSessionException {
         try {
@@ -203,7 +203,7 @@
     }
 
     /**
-     * @see org.ki.session.Session#getAttributeKeys
+     * @see org.apache.ki.session.Session#getAttributeKeys
      */
     public Collection<Object> getAttributeKeys() throws InvalidSessionException {
         try {
@@ -215,7 +215,7 @@
     }
 
     /**
-     * @see Session#getAttribute(Object key)
+     * @see org.apache.ki.session.Session#getAttribute(Object key)
      */
     public Object getAttribute(Object key) throws InvalidSessionException {
         try {

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DelegatingSession.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/DelegatingSession.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ExecutorServiceSessionValidationScheduler.java Wed Mar 11 05:40:38 2009
@@ -16,15 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+package org.apache.ki.session.mgt;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
 /**
  * SessionValidationScheduler implementation that uses a
  * {@link ScheduledExecutorService} to call {@link ValidatingSessionManager#validateSessions()} every

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ImmutableProxiedSession.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ImmutableProxiedSession.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ImmutableProxiedSession.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ImmutableProxiedSession.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ImmutableProxiedSession.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ImmutableProxiedSession.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ImmutableProxiedSession.java Wed Mar 11 05:40:38 2009
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
+package org.apache.ki.session.mgt;
+
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.ProxiedSession;
+import org.apache.ki.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
@@ -30,11 +31,11 @@
  * proxy will immediately result in an {@link InvalidSessionException} being thrown:
  *
  * <ul>
- * <li>{@link Session#setTimeout(long) Session.setTimeout(long)}</li>
+ * <li>{@link org.apache.ki.session.Session#setTimeout(long) Session.setTimeout(long)}</li>
  * <li>{@link Session#touch() Session.touch()}</li>
  * <li>{@link Session#stop() Session.stop()}</li>
  * <li>{@link Session#setAttribute(Object, Object) Session.setAttribute(key,value)}</li>
- * <li>{@link Session#removeAttribute(Object) Session.removeAttribute(key)}</li>
+ * <li>{@link org.apache.ki.session.Session#removeAttribute(Object) Session.removeAttribute(key)}</li>
  * </ul>
  *
  * <p/>

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionManager.java Wed Mar 11 05:40:38 2009
@@ -16,19 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
-
-import org.ki.authz.HostUnauthorizedException;
-import org.ki.session.InvalidSessionException;
+package org.apache.ki.session.mgt;
 
 import java.io.Serializable;
 import java.net.InetAddress;
 import java.util.Collection;
 import java.util.Date;
 
+import org.apache.ki.authz.HostUnauthorizedException;
+import org.apache.ki.session.InvalidSessionException;
+
+
 /**
  * A SessionManager manages the creation, maintenance, and clean-up of all application
- * {@link org.ki.session.Session Session}s.
+ * {@link org.apache.ki.session.Session Session}s.
  *
  * @author Les Hazlewood
  * @since 0.1
@@ -68,7 +69,7 @@
      * @param originatingHost the originating host InetAddress of the external party
      *                        (user, 3rd party product, etc) that is attempting to interact with the system.
      * @return a handle to the newly created session.
-     * @throws HostUnauthorizedException if the system access control policy restricts access based
+     * @throws org.apache.ki.authz.HostUnauthorizedException if the system access control policy restricts access based
      *                                   on client location/IP and the specified hostAddress hasn't been enabled.
      * @throws IllegalArgumentException  if the system is configured to require a valid,
      *                                   non-<tt>null</tt> argument and the specified <tt>hostAddress</tt> is null.
@@ -82,7 +83,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.ki.session.Session#getStartTimestamp()
+     * @see org.apache.ki.session.Session#getStartTimestamp()
      */
     Date getStartTimestamp(Serializable sessionId);
 
@@ -92,8 +93,8 @@
      *
      * @param sessionId the system identifier for the session of interest
      * @return tye time the session last accessed the system
-     * @see org.ki.session.Session#getLastAccessTime()
-     * @see org.ki.session.Session#touch()
+     * @see org.apache.ki.session.Session#getLastAccessTime()
+     * @see org.apache.ki.session.Session#touch()
      */
     Date getLastAccessTime(Serializable sessionId);
 
@@ -117,7 +118,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.ki.session.InvalidSessionException
+     * @throws org.apache.ki.session.InvalidSessionException
      *          if the session has been stopped or expired prior to calling this method.
      * @since 0.2
      */
@@ -134,7 +135,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.ki.session.InvalidSessionException
+     * @throws org.apache.ki.session.InvalidSessionException
      *          if the session has been stopped or expired prior to calling this method.
      * @since 0.2
      */
@@ -145,9 +146,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.ki.session.InvalidSessionException
+     * @throws org.apache.ki.session.InvalidSessionException
      *          if the session has been stopped or expired prior to calling this method.
-     * @see org.ki.session.Session#touch
+     * @see org.apache.ki.session.Session#touch
      */
     void touch(Serializable sessionId) throws InvalidSessionException;
 
@@ -170,7 +171,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.ki.session.Session#stop
+     * @see org.apache.ki.session.Session#stop
      */
     void stop(Serializable sessionId) throws InvalidSessionException;
 
@@ -182,7 +183,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.ki.session.Session#getAttributeKeys()
+     * @see org.apache.ki.session.Session#getAttributeKeys()
      * @since 0.2
      */
     Collection<Object> getAttributeKeys(Serializable sessionId);
@@ -196,7 +197,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.ki.session.Session#getAttribute(Object key)
+     * @see org.apache.ki.session.Session#getAttribute(Object key)
      */
     Object getAttribute(Serializable sessionId, Object key) throws InvalidSessionException;
 
@@ -212,7 +213,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.ki.session.Session#setAttribute(Object key, Object value)
+     * @see org.apache.ki.session.Session#setAttribute(Object key, Object value)
      */
     void setAttribute(Serializable sessionId, Object key, Object value) throws InvalidSessionException;
 
@@ -224,7 +225,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.ki.session.Session#removeAttribute(Object key)
+     * @see org.apache.ki.session.Session#removeAttribute(Object key)
      */
     Object removeAttribute(Serializable sessionId, Object key) throws InvalidSessionException;
 }

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionManager.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionValidationScheduler.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionValidationScheduler.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionValidationScheduler.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionValidationScheduler.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionValidationScheduler.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SessionValidationScheduler.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionValidationScheduler.java Wed Mar 11 05:40:38 2009
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
+package org.apache.ki.session.mgt;
 
 /**
  * Interface that should be implemented by classes that can control validating sessions on a regular
- * basis.  This interface is used as a delegate for session validation by the {@link DefaultSessionManager}
+ * basis.  This interface is used as a delegate for session validation by the {@link org.apache.ki.session.mgt.DefaultSessionManager}
  *
  * @author Jeremy Haile
  * @author Les Hazlewood
- * @see DefaultSessionManager#setSessionValidationScheduler(SessionValidationScheduler)
+ * @see org.apache.ki.session.mgt.DefaultSessionManager#setSessionValidationScheduler(SessionValidationScheduler)
  * @since 0.1
  */
 public interface SessionValidationScheduler {

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionValidationScheduler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SessionValidationScheduler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SimpleSession.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SimpleSession.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SimpleSession.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SimpleSession.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SimpleSession.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/SimpleSession.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SimpleSession.java Wed Mar 11 05:40:38 2009
@@ -16,22 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.ki.session.ExpiredSessionException;
-import org.ki.session.InvalidSessionException;
-import org.ki.session.StoppedSessionException;
+package org.apache.ki.session.mgt;
 
 import java.io.Serializable;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.text.DateFormat;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.session.ExpiredSessionException;
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.StoppedSessionException;
+
 
 /**
- * Simple {@link org.ki.session.Session} POJO implementation, intended to be used on the business/server tier.
+ * Simple {@link org.apache.ki.session.Session} POJO implementation, intended to be used on the business/server tier.
  *
  * @author Les Hazlewood
  * @since 0.1

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SimpleSession.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/SimpleSession.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSession.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSession.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSession.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSession.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSession.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSession.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSession.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
+package org.apache.ki.session.mgt;
+
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSessionManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSessionManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSessionManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSessionManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSessionManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/ValidatingSessionManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSessionManager.java Wed Mar 11 05:40:38 2009
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt;
-
-import org.ki.session.InvalidSessionException;
+package org.apache.ki.session.mgt;
 
 import java.io.Serializable;
 
+import org.apache.ki.session.InvalidSessionException;
+
+
 /**
  * A ValidatingSessionManager is a SessionManager that can proactively validate any or all sessions
  * that may be expired.
@@ -77,7 +78,7 @@
      * Proactively validates a single session.
      *
      * @param sessionId the id of the session to validate
-     * @throws org.ki.session.InvalidSessionException
+     * @throws org.apache.ki.session.InvalidSessionException
      *          if, upon validation, the session was stopped or expired.
      */
     void validateSession(Serializable sessionId) throws InvalidSessionException;

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSessionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSessionManager.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/CachingSessionDAO.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/CachingSessionDAO.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/CachingSessionDAO.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java Wed Mar 11 05:40:38 2009
@@ -16,25 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt.eis;
-
-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;
+package org.apache.ki.session.mgt.eis;
 
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collections;
 
+import org.apache.ki.cache.Cache;
+import org.apache.ki.cache.CacheManager;
+import org.apache.ki.cache.CacheManagerAware;
+import org.apache.ki.session.Session;
+import org.apache.ki.session.UnknownSessionException;
+import org.apache.ki.session.mgt.ValidatingSession;
+
+
 /**
  * An CachingSessionDAO is a SessionDAO that provides a transparent caching layer between the components that
  * 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.ki.cache.CacheManager}.  All <tt>SessionDAO</tt> methods are implemented by this class to employ
+ * {@link org.apache.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).
  *
@@ -203,8 +204,8 @@
 
     /**
      * Caches the specified session under the key <code>sessionId</code>.  If the Session is an instance of
-     * {@link org.ki.session.mgt.ValidatingSession ValidatingSession}, it will only be cached if the
-     * session is {@link org.ki.session.mgt.ValidatingSession#isValid() valid}.
+     * {@link org.apache.ki.session.mgt.ValidatingSession ValidatingSession}, it will only be cached if the
+     * session is {@link org.apache.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 +273,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.ki.session.Session#getId() Session.getId()}.
+     *         value returned from {@link org.apache.ki.session.Session#getId() Session.getId()}.
      */
     protected abstract Serializable doCreate(Session session);
 

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/MemorySessionDAO.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/MemorySessionDAO.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/MemorySessionDAO.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java Wed Mar 11 05:40:38 2009
@@ -16,24 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt.eis;
+package org.apache.ki.session.mgt.eis;
+
+import java.io.Serializable;
+import java.util.Random;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-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;
+import org.apache.ki.cache.HashtableCacheManager;
+import org.apache.ki.session.Session;
+import org.apache.ki.session.mgt.SimpleSession;
+import org.apache.ki.util.JavaEnvironment;
+
 
 /**
  * Simple memory-based implementation of the SessionDAO that relies on its configured
  * {@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.ki.cache.HashtableCacheManager HashtableCacheManager}, which IS NOT RECOMMENDED for production environments.
+ * {@link org.apache.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

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/SessionDAO.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/SessionDAO.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/SessionDAO.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/SessionDAO.java&p1=incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/SessionDAO.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/eis/SessionDAO.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/SessionDAO.java Wed Mar 11 05:40:38 2009
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.session.mgt.eis;
-
-import org.ki.session.Session;
-import org.ki.session.UnknownSessionException;
+package org.apache.ki.session.mgt.eis;
 
 import java.io.Serializable;
 import java.util.Collection;
 
+import org.apache.ki.session.Session;
+import org.apache.ki.session.UnknownSessionException;
+
+
 /**
  * Data Access Object design pattern specification to enable {@link Session} access to an
  * EIS (Enterprise Information System).
@@ -37,7 +38,7 @@
      * Inserts a new Session record into the underling EIS (e.g. Relational database, file system, mainframe,
      * etc, depending on the DAO implementation).
      * <p/>
-     * After this method is invoked, the {@link org.ki.session.Session#getId()}
+     * After this method is invoked, the {@link org.apache.ki.session.Session#getId()}
      * method executed on the argument must return a valid session identifier.  That is, the following should
      * always be true:
      * <p/>
@@ -47,7 +48,7 @@
      * <p>Implementations are free to throw any exceptions that might occur due to
      * integrity violation constraints or other EIS related errors.
      *
-     * @param session the {@link Session} object to create in the EIS.
+     * @param session the {@link org.apache.ki.session.Session} object to create in the EIS.
      * @return the EIS id (e.g. primary key) of the created <tt>Session</tt> object.
      */
     Serializable create(Session session);
@@ -74,7 +75,7 @@
      * errors.
      *
      * @param session the Session to update
-     * @throws UnknownSessionException if no existing EIS session record exists with the
+     * @throws org.apache.ki.session.UnknownSessionException if no existing EIS session record exists with the
      *                                 identifier of {@link Session#getId() session.getSessionId()}
      */
     void update(Session session) throws UnknownSessionException;

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/SessionDAO.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/SessionDAO.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/DelegatingSubject.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/subject/DelegatingSubject.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/subject/DelegatingSubject.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/subject/DelegatingSubject.java&p1=incubator/jsecurity/trunk/core/src/org/ki/subject/DelegatingSubject.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/subject/DelegatingSubject.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/subject/DelegatingSubject.java Wed Mar 11 05:40:38 2009
@@ -16,22 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.subject;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.ki.authc.AuthenticationException;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authc.InetAuthenticationToken;
-import org.ki.authz.AuthorizationException;
-import org.ki.authz.Permission;
-import org.ki.authz.UnauthenticatedException;
-import org.ki.mgt.SecurityManager;
-import org.ki.session.InvalidSessionException;
-import org.ki.session.ProxiedSession;
-import org.ki.session.Session;
-import org.ki.session.mgt.DelegatingSession;
-import org.ki.util.ThreadContext;
+package org.apache.ki.subject;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -39,9 +24,25 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.InetAuthenticationToken;
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.Permission;
+import org.apache.ki.authz.UnauthenticatedException;
+import org.apache.ki.mgt.SecurityManager;
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.ProxiedSession;
+import org.apache.ki.session.Session;
+import org.apache.ki.session.mgt.DelegatingSession;
+import org.apache.ki.util.ThreadContext;
+
 /**
  * Implementation of the <tt>Subject</tt> interface that delegates
- * method calls to an underlying {@link org.ki.mgt.SecurityManager SecurityManager} instance for security checks.
+ * method calls to an underlying {@link org.apache.ki.mgt.SecurityManager SecurityManager} instance for security checks.
  * It is essentially a <tt>SecurityManager</tt> proxy.
  * <p/>
  * This implementation does not maintain state such as roles and permissions (only <code>Subject</code>
@@ -110,7 +111,7 @@
         }
     }
 
-    public org.ki.mgt.SecurityManager getSecurityManager() {
+    public SecurityManager getSecurityManager() {
         return securityManager;
     }
 
@@ -200,7 +201,8 @@
     }
 
     public void checkPermissions(String... permissions)
-            throws AuthorizationException {
+            throws AuthorizationException
+    {
         assertAuthzCheckPossible();
         securityManager.checkPermissions(getPrincipals(), permissions);
     }

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/DelegatingSubject.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/DelegatingSubject.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/InvalidSubjectException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/subject/InvalidSubjectException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/subject/InvalidSubjectException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/subject/InvalidSubjectException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/subject/InvalidSubjectException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/subject/InvalidSubjectException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/subject/InvalidSubjectException.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.subject;
+package org.apache.ki.subject;
 
 /**
  * Exception thrown when a <tt>Subject</tt> is accessed that has been invalidated.  Usually this occurs

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/MutablePrincipalCollection.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/subject/MutablePrincipalCollection.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/subject/MutablePrincipalCollection.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/subject/MutablePrincipalCollection.java&p1=incubator/jsecurity/trunk/core/src/org/ki/subject/MutablePrincipalCollection.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/subject/MutablePrincipalCollection.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/subject/MutablePrincipalCollection.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.subject;
+package org.apache.ki.subject;
 
 import java.util.Collection;
 
+
 /**
  * A {@link PrincipalCollection} that allows modification.
  *

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/PrincipalCollection.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/subject/PrincipalCollection.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/subject/PrincipalCollection.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/subject/PrincipalCollection.java&p1=incubator/jsecurity/trunk/core/src/org/ki/subject/PrincipalCollection.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/subject/PrincipalCollection.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/subject/PrincipalCollection.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.subject;
+package org.apache.ki.subject;
 
 import java.io.Serializable;
 import java.util.Collection;

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SimplePrincipalCollection.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/subject/SimplePrincipalCollection.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SimplePrincipalCollection.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SimplePrincipalCollection.java&p1=incubator/jsecurity/trunk/core/src/org/ki/subject/SimplePrincipalCollection.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/subject/SimplePrincipalCollection.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SimplePrincipalCollection.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.subject;
+package org.apache.ki.subject;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
-import java.util.*;
 
 /**
  * A simple implementation of the {@link MutablePrincipalCollection} interface that tracks principals internally

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/Subject.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/subject/Subject.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/subject/Subject.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/subject/Subject.java&p1=incubator/jsecurity/trunk/core/src/org/ki/subject/Subject.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/subject/Subject.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/subject/Subject.java Wed Mar 11 05:40:38 2009
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.subject;
-
-import org.ki.authc.AuthenticationException;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authz.AuthorizationException;
-import org.ki.authz.Permission;
-import org.ki.session.Session;
+package org.apache.ki.subject;
 
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.Permission;
+import org.apache.ki.session.Session;
+
 /**
  * A <tt>Subject</tt> represents state and security operations for a <em>single</em> application user.
  * These operations include authentication (login/logout), authorization (access control), and
@@ -37,7 +37,7 @@
  * a {@link Permission Permission} if desired.  The underlying Authorization subsystem implementations will usually
  * simply convert these String values to {@link Permission Permission} instances and then just call the corresponding
  * type-safe method.  (JSecurity's default implementations do String-to-Permission conversion for these methods using
- * {@link org.ki.authz.permission.PermissionResolver PermissionResolver}s.)
+ * {@link org.apache.ki.authz.permission.PermissionResolver PermissionResolver}s.)
  *
  * <p>These overloaded *Permission methods <em>do</em> forego type-saftey for the benefit of convenience and simplicity,
  * so you should choose which ones to use based on your preferences and needs.
@@ -162,7 +162,7 @@
     /**
      * Returns <tt>true</tt> if this Subject implies all of the specified permission strings, <tt>false</tt> otherwise.
      *
-     * <p>This is an overloaded method for the corresponding type-safe {@link Permission Permission} variant.
+     * <p>This is an overloaded method for the corresponding type-safe {@link org.apache.ki.authz.Permission Permission} variant.
      * Please see the class-level JavaDoc for more information on these String-based permission methods.
      *
      * @param permissions the String representations of the Permissions that are being checked.
@@ -187,13 +187,13 @@
      * Ensures this Subject implies the specified permission String.
      *
      * <p>If this subject's existing associated permissions do not {@link Permission#implies(Permission)} imply}
-     * the given permission, an {@link org.ki.authz.AuthorizationException} will be thrown.
+     * the given permission, an {@link org.apache.ki.authz.AuthorizationException} will be thrown.
      *
      * <p>This is an overloaded method for the corresponding type-safe {@link Permission Permission} variant.
      * Please see the class-level JavaDoc for more information on these String-based permission methods.
      *
      * @param permission the String representation of the Permission to check.
-     * @throws org.ki.authz.AuthorizationException
+     * @throws org.apache.ki.authz.AuthorizationException
      *          if the user does not have the permission.
      * @since 0.9
      */
@@ -203,22 +203,22 @@
      * Ensures this Subject {@link Permission#implies(Permission) implies} the specified <tt>Permission</tt>.
      *
      * <p>If this subject's exisiting associated permissions do not {@link Permission#implies(Permission) imply}
-     * the given permission, an {@link org.ki.authz.AuthorizationException} will be thrown.
+     * the given permission, an {@link org.apache.ki.authz.AuthorizationException} will be thrown.
      *
      * @param permission the Permission to check.
-     * @throws org.ki.authz.AuthorizationException
+     * @throws org.apache.ki.authz.AuthorizationException
      *          if this Subject does not have the permission.
      */
     void checkPermission(Permission permission) throws AuthorizationException;
 
     /**
      * Ensures this Subject
-     * {@link org.ki.authz.Permission#implies(org.ki.authz.Permission) implies} all of the
+     * {@link org.apache.ki.authz.Permission#implies(org.apache.ki.authz.Permission) implies} all of the
      * specified permission strings.
      *
      * If this subject's exisiting associated permissions do not
-     * {@link org.ki.authz.Permission#implies(org.ki.authz.Permission) imply} all of the given permissions,
-     * an {@link org.ki.authz.AuthorizationException} will be thrown.
+     * {@link org.apache.ki.authz.Permission#implies(org.apache.ki.authz.Permission) imply} all of the given permissions,
+     * an {@link org.apache.ki.authz.AuthorizationException} will be thrown.
      *
      * <p>This is an overloaded method for the corresponding type-safe {@link Permission Permission} variant.
      * Please see the class-level JavaDoc for more information on these String-based permission methods.
@@ -231,12 +231,12 @@
 
     /**
      * Ensures this Subject
-     * {@link org.ki.authz.Permission#implies(org.ki.authz.Permission) implies} all of the
+     * {@link org.apache.ki.authz.Permission#implies(org.apache.ki.authz.Permission) implies} all of the
      * specified permission strings.
      *
      * If this subject's exisiting associated permissions do not
-     * {@link org.ki.authz.Permission#implies(org.ki.authz.Permission) imply} all of the given permissions,
-     * an {@link org.ki.authz.AuthorizationException} will be thrown.
+     * {@link org.apache.ki.authz.Permission#implies(org.apache.ki.authz.Permission) imply} all of the given permissions,
+     * an {@link org.apache.ki.authz.AuthorizationException} will be thrown.
      *
      * @param permissions the Permissions to check.
      * @throws AuthorizationException if this Subject does not have all of the given permissions.
@@ -275,20 +275,20 @@
 
     /**
      * Asserts this Subject has the specified role by returning quietly if they do or throwing an
-     * {@link org.ki.authz.AuthorizationException} if they do not.
+     * {@link org.apache.ki.authz.AuthorizationException} if they do not.
      *
      * @param roleIdentifier the application-specific role identifier (usually a role id or role name ).
-     * @throws org.ki.authz.AuthorizationException
+     * @throws org.apache.ki.authz.AuthorizationException
      *          if this Subject does not have the role.
      */
     void checkRole(String roleIdentifier) throws AuthorizationException;
 
     /**
      * Asserts this Subject has all of the specified roles by returning quietly if they do or throwing an
-     * {@link org.ki.authz.AuthorizationException} if they do not.
+     * {@link org.apache.ki.authz.AuthorizationException} if they do not.
      *
      * @param roleIdentifiers the application-specific role identifiers to check (usually role ids or role names).
-     * @throws org.ki.authz.AuthorizationException
+     * @throws org.apache.ki.authz.AuthorizationException
      *          if this Subject does not have all of the specified roles.
      */
     void checkRoles(Collection<String> roleIdentifiers) throws AuthorizationException;
@@ -305,7 +305,7 @@
      *
      * @param token the token encapsulating the subject's principals and credentials to be passed to the
      *              Authentication subsystem for verification.
-     * @throws AuthenticationException if the authentication attempt fails.
+     * @throws org.apache.ki.authc.AuthenticationException if the authentication attempt fails.
      * @since 0.9
      */
     void login(AuthenticationToken token) throws AuthenticationException;
@@ -317,7 +317,7 @@
      * <p>Note that even if this Subject's identity has been remembered via 'remember me' services, this method will
      * still return <tt>false</tt> unless the user has actually logged in with proper credentials <em>during their
      * current session</em>.  See the
-     * {@link org.ki.authc.RememberMeAuthenticationToken RememberMeAuthenticationToken} class JavaDoc for why
+     * {@link org.apache.ki.authc.RememberMeAuthenticationToken RememberMeAuthenticationToken} class JavaDoc for why
      * this would occur.</p>
      *
      * @return <tt>true</tt> if this Subject has proven their identity during their current session

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/subject/SubjectException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/subject/SubjectException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/subject/SubjectException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.subject;
+package org.apache.ki.subject;
+
+import org.apache.ki.JSecurityException;
 
-import org.ki.JSecurityException;
 
 /**
  * Throws when there is an error accessing or interacting with a {@link Subject}.

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/SubjectException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/AntPathMatcher.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/AntPathMatcher.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/AntPathMatcher.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/AntPathMatcher.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/AntPathMatcher.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/AntPathMatcher.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/AntPathMatcher.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.util;
+package org.apache.ki.util;
 
 /**
  * <p>PathMatcher implementation for Ant-style path patterns.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/ClassUtils.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/ClassUtils.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/ClassUtils.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/ClassUtils.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/ClassUtils.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/ClassUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/ClassUtils.java Wed Mar 11 05:40:38 2009
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.util;
+package org.apache.ki.util;
+
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
 
 /**
  * Utility method library used to conveniently interact with <code>Class</code>es, such as acquiring them from the
@@ -159,7 +160,7 @@
         try {
             return clazz.newInstance();
         } catch (Exception e) {
-            throw new org.ki.util.InstantiationException("Unable to instantiate class [" + clazz.getName() + "]", e);
+            throw new InstantiationException("Unable to instantiate class [" + clazz.getName() + "]", e);
         }
     }
 
@@ -186,7 +187,7 @@
             return ctor.newInstance(args);
         } catch (Exception e) {
             String msg = "Unable to instantiate Permission instance with constructor [" + ctor + "]";
-            throw new org.ki.util.InstantiationException(msg, e);
+            throw new InstantiationException(msg, e);
         }
     }
 

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/util/ClassUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/util/ClassUtils.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/CollectionUtils.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/CollectionUtils.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/CollectionUtils.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/CollectionUtils.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/CollectionUtils.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/CollectionUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/CollectionUtils.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.util;
+package org.apache.ki.util;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Static helper class for use dealing with Arrays.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/Destroyable.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/Destroyable.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/Destroyable.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/Destroyable.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/Destroyable.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/Destroyable.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/Destroyable.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.util;
+package org.apache.ki.util;
 
 /**
  * JSecurity container-agnostic interface that indicates that this object requires a callback during destruction.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/Initializable.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/Initializable.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/Initializable.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.util;
+package org.apache.ki.util;
 
-import org.ki.JSecurityException;
+import org.apache.ki.JSecurityException;
 
 /**
  * JSecurity container-agnostic interface that indicates that this object requires initialization.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/InstantiationException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/InstantiationException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/InstantiationException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/InstantiationException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/InstantiationException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/InstantiationException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/InstantiationException.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.util;
+package org.apache.ki.util;
 
-import org.ki.JSecurityException;
+import org.apache.ki.JSecurityException;
 
 /**
  * Runtime exception thrown by the framework when unable to instantiate a Class via reflection.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/JavaEnvironment.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/JavaEnvironment.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/JavaEnvironment.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/JavaEnvironment.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/JavaEnvironment.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/JavaEnvironment.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/JavaEnvironment.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.util;
+package org.apache.ki.util;
 
 /**
  * Internal helper class used to find the Java/JDK version

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/JdbcUtils.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/JdbcUtils.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/JdbcUtils.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/JdbcUtils.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/JdbcUtils.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/JdbcUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/JdbcUtils.java Wed Mar 11 05:40:38 2009
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.util;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+package org.apache.ki.util;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * A set of static helper methods for managing JDBC API objects.
  * <p/>



Mime
View raw message