shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r752380 [3/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
Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/ModularRealmAuthenticator.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/UnsupportedTokenException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authc/pam/UnsupportedTokenException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/UnsupportedTokenException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/UnsupportedTokenException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authc/pam/UnsupportedTokenException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authc/pam/UnsupportedTokenException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/UnsupportedTokenException.java Wed Mar 11 05:40:38 2009
@@ -16,17 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authc.pam;
+package org.apache.ki.authc.pam;
+
+import org.apache.ki.authc.AuthenticationException;
 
-import org.ki.authc.AuthenticationException;
 
 /**
  * Exception thrown during the authentication process when an
- * {@link org.ki.authc.AuthenticationToken AuthenticationToken} implementation is encountered that is not
- * supported by one or more configured {@link org.ki.realm.Realm Realm}s.
+ * {@link org.apache.ki.authc.AuthenticationToken AuthenticationToken} implementation is encountered that is not
+ * supported by one or more configured {@link org.apache.ki.realm.Realm Realm}s.
  *
  * @author Les Hazlewood
- * @see AuthenticationStrategy
+ * @see org.apache.ki.authc.pam.AuthenticationStrategy
  * @since 0.2
  */
 public class UnsupportedTokenException extends AuthenticationException {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/AuthorizationException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/AuthorizationException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/AuthorizationException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationException.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
+package org.apache.ki.authz;
+
+import org.apache.ki.JSecurityException;
 
-import org.ki.JSecurityException;
 
 /**
  * Exception thrown if there is a problem during authorization (access control check).

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

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationInfo.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/AuthorizationInfo.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationInfo.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationInfo.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/AuthorizationInfo.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/AuthorizationInfo.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationInfo.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
+package org.apache.ki.authz;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -32,7 +32,7 @@
  * <ul>
  * <li>A <code>Collection</code> of Strings, where each String can usually be converted into <code>Permission</code>
  * objects by a <code>Realm</code>'s
- * {@link org.ki.authz.permission.PermissionResolver PermissionResolver}</li>
+ * {@link org.apache.ki.authz.permission.PermissionResolver PermissionResolver}</li>
  * <li>A <code>Collection</code> of {@link Permission Permission} objects</li>
  * </ul>
  * Both permission collections together represent the total aggregate collection of permissions.  You may use one
@@ -41,20 +41,20 @@
  * Because the act of authorization (access control) is orthoganal to authentication (log-in), this interface is
  * intended to represent only the account data needed by JSecurity during an access control check
  * (role, permission, etc).  JSecurity also has a parallel
- * {@link org.ki.authc.AuthenticationInfo AuthenticationInfo} interface for use during the authentication
+ * {@link org.apache.ki.authc.AuthenticationInfo AuthenticationInfo} interface for use during the authentication
  * process that represents identity data such as principals and credentials.
  * <p/>
- * Because many if not most {@link org.ki.realm.Realm Realm}s store both sets of data for a Subject, it might be
+ * Because many if not most {@link org.apache.ki.realm.Realm Realm}s store both sets of data for a Subject, it might be
  * convenient for a <code>Realm</code> implementation to utilize an implementation of the
- * {@link org.ki.authc.Account Account} interface instead, which is a convenience interface that combines both
+ * {@link org.apache.ki.authc.Account Account} interface instead, which is a convenience interface that combines both
  * <code>AuthenticationInfo</code> and <code>AuthorizationInfo</code>.  Whether you choose to implement these two
  * interfaces separately or implement the one <code>Account</code> interface for a given <code>Realm</code> is
  * entirely based on your application's needs or your preferences.
  *
  * @author Jeremy Haile
  * @author Les Hazlewood
- * @see org.ki.authc.AuthenticationInfo AuthenticationInfo
- * @see org.ki.authc.Account
+ * @see org.apache.ki.authc.AuthenticationInfo AuthenticationInfo
+ * @see org.apache.ki.authc.Account
  * @since 0.9
  */
 public interface AuthorizationInfo extends Serializable {
@@ -74,7 +74,7 @@
      * This method is a convenience mechanism that allows Realms to represent permissions as Strings if they choose.
      * When performing a security check, a <code>Realm</code> usually converts these strings to object
      * {@link Permission Permission}s via an internal
-     * {@link org.ki.authz.permission.PermissionResolver PermissionResolver}
+     * {@link org.apache.ki.authz.permission.PermissionResolver PermissionResolver}
      * in order to perform the actual permission check.  This is not a requirement of course, since <code>Realm</code>s
      * can perform security checks in whatever manner deemed necessary, but this explains the conversion mechanism that
      * most JSecurity Realms execute for string-based permission checks.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Authorizer.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/Authorizer.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Authorizer.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Authorizer.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/Authorizer.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/Authorizer.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Authorizer.java Wed Mar 11 05:40:38 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
-
-import org.ki.subject.PrincipalCollection;
+package org.apache.ki.authz;
 
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.ki.subject.PrincipalCollection;
+
 /**
  * An <tt>Authorizer</tt> performs authorization (access control) operations for any given Subject
  * (aka 'application user').
@@ -38,7 +38,7 @@
  * a {@link Permission Permission} if desired.  Most implementations of this interface will 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.
@@ -146,14 +146,14 @@
      * Ensures the corresponding Subject/user implies the specified permission String.
      *
      * <p>If the 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 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 subjectPrincipal the application-specific subject/user identifier.
      * @param permission       the String representation of the Permission to check.
-     * @throws org.ki.authz.AuthorizationException
+     * @throws AuthorizationException
      *          if the user does not have the permission.
      * @since 0.9
      */
@@ -162,23 +162,23 @@
     /**
      * Ensures a subject/user {@link Permission#implies(Permission)} implies} the specified <tt>Permission</tt>.
      * If the 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 AuthorizationException} will be thrown.
      *
      * @param subjectPrincipal the application-specific subject/user identifier.
      * @param permission       the Permission to check.
-     * @throws org.ki.authz.AuthorizationException
+     * @throws AuthorizationException
      *          if the user does not have the permission.
      */
     void checkPermission(PrincipalCollection subjectPrincipal, Permission permission) throws AuthorizationException;
 
     /**
      * Ensures the corresponding Subject/user
-     * {@link org.ki.authz.Permission#implies(org.ki.authz.Permission) implies} all of the
+     * {@link Permission#implies(Permission) implies} all of the
      * specified permission strings.
      *
      * If the 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 Permission#implies(Permission) imply} all of the given permissions,
+     * an {@link 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.
@@ -192,12 +192,12 @@
 
     /**
      * Ensures the corresponding Subject/user
-     * {@link org.ki.authz.Permission#implies(org.ki.authz.Permission) implies} all of the
+     * {@link Permission#implies(Permission) implies} all of the
      * specified permission strings.
      *
      * If the 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 Permission#implies(Permission) imply} all of the given permissions,
+     * an {@link AuthorizationException} will be thrown.
      *
      * @param subjectPrincipal the application-specific subject/user identifier.
      * @param permissions      the Permissions to check.
@@ -240,22 +240,22 @@
 
     /**
      * Asserts the corresponding Subject/user has the specified role by returning quietly if they do or throwing an
-     * {@link org.ki.authz.AuthorizationException} if they do not.
+     * {@link AuthorizationException} if they do not.
      *
      * @param subjectPrincipal the application-specific subject/user identifier.
      * @param roleIdentifier   the application-specific role identifier (usually a role id or role name ).
-     * @throws org.ki.authz.AuthorizationException
+     * @throws AuthorizationException
      *          if the user does not have the role.
      */
     void checkRole(PrincipalCollection subjectPrincipal, String roleIdentifier) throws AuthorizationException;
 
     /**
      * Asserts the corresponding Subject/user has all of the specified roles by returning quietly if they do or
-     * throwing an {@link org.ki.authz.AuthorizationException} if they do not.
+     * throwing an {@link AuthorizationException} if they do not.
      *
      * @param subjectPrincipal the application-specific subject/user identifier.
      * @param roleIdentifiers  the application-specific role identifiers to check (usually role ids or role names).
-     * @throws org.ki.authz.AuthorizationException
+     * @throws AuthorizationException
      *          if the user does not have all of the specified roles.
      */
     void checkRoles(PrincipalCollection subjectPrincipal, Collection<String> roleIdentifiers) throws AuthorizationException;

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

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizingAccount.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/AuthorizingAccount.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizingAccount.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizingAccount.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/AuthorizingAccount.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/AuthorizingAccount.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizingAccount.java Wed Mar 11 05:40:38 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
-
-import org.ki.authc.Account;
+package org.apache.ki.authz;
 
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.ki.authc.Account;
+
 /**
  * An <tt>AuthorizingAccount</tt> is an {@link Account Account} that knows about its assiged roles and permissions
  * and can perform its own authorization (access control) checks.  It primarily exists as a support class for Realm
@@ -32,71 +32,71 @@
  * Of course, an <tt>AuthorizingAccount</tt> concept is only a convenience mechansim if JSecurity account caching
  * is enabled.  Realm implementations are free to ignore this interface entirely and implement/override any of their
  * <tt>Realm</tt>'s {@link Authorizer Authorizer} methods to execute the authorization checks as they see fit.
- * ({@link org.ki.realm.Realm Realm} is a sub-interface of {@link Authorizer Authorizer} and therefore must
+ * ({@link org.apache.ki.realm.Realm Realm} is a sub-interface of {@link Authorizer Authorizer} and therefore must
  * implement those methods as well).
  * <p/>
  * <b>DEPRECATION NOTE</b>: This interface and its default {@link SimpleAuthorizingAccount SimpleAuthorizingAccount}
  * implementation is deprecated and will be removed prior to 1.0 being released.  Instead, either just
  * return an {@link Account} instance, or if you want fine-grained control over authorization behavior, extend
- * a subclass of {@link org.ki.realm.AuthorizingRealm} and implement your own security checks in the
+ * a subclass of {@link org.apache.ki.realm.AuthorizingRealm} and implement your own security checks in the
  * Realm itself instead of forcing this logic in your entity/domain classes where it could be error prone and
  * unnecessarily couple these objects to JSecurity.
  *
  * @author Jeremy Haile
  * @author Les Hazlewood
- * @see org.ki.realm.AuthorizingRealm
+ * @see org.apache.ki.realm.AuthorizingRealm
  * @since 0.9
  * @deprecated
  */
 public interface AuthorizingAccount extends Account {
 
     /**
-     * @see org.ki.subject.Subject#isPermitted(Permission)
+     * @see org.apache.ki.subject.Subject#isPermitted(Permission)
      */
     boolean isPermitted(Permission permission);
 
     /**
-     * @see org.ki.subject.Subject#isPermitted(java.util.List)
+     * @see org.apache.ki.subject.Subject#isPermitted(java.util.List)
      */
     boolean[] isPermitted(List<Permission> permissions);
 
     /**
-     * @see org.ki.subject.Subject#isPermittedAll(java.util.Collection)
+     * @see org.apache.ki.subject.Subject#isPermittedAll(java.util.Collection)
      */
     boolean isPermittedAll(Collection<Permission> permissions);
 
     /**
-     * @see org.ki.subject.Subject#checkPermission(Permission)
+     * @see org.apache.ki.subject.Subject#checkPermission(Permission)
      */
     void checkPermission(Permission permission) throws AuthorizationException;
 
     /**
-     * @see org.ki.subject.Subject#checkPermissions(java.util.Collection)
+     * @see org.apache.ki.subject.Subject#checkPermissions(java.util.Collection)
      */
     void checkPermissions(Collection<Permission> permissions) throws AuthorizationException;
 
     /**
-     * @see org.ki.subject.Subject#hasRole(String)
+     * @see org.apache.ki.subject.Subject#hasRole(String)
      */
     boolean hasRole(String roleIdentifier);
 
     /**
-     * @see org.ki.subject.Subject#hasRoles(java.util.List)
+     * @see org.apache.ki.subject.Subject#hasRoles(java.util.List)
      */
     boolean[] hasRoles(List<String> roleIdentifiers);
 
     /**
-     * @see org.ki.subject.Subject#hasAllRoles(java.util.Collection)
+     * @see org.apache.ki.subject.Subject#hasAllRoles(java.util.Collection)
      */
     boolean hasAllRoles(Collection<String> roleIdentifiers);
 
     /**
-     * @see org.ki.subject.Subject#checkRole(String)
+     * @see org.apache.ki.subject.Subject#checkRole(String)
      */
     void checkRole(String role);
 
     /**
-     * @see org.ki.subject.Subject#checkRoles
+     * @see org.apache.ki.subject.Subject#checkRoles
      */
     void checkRoles(Collection<String> roles);
 }

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/HostUnauthorizedException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/HostUnauthorizedException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/HostUnauthorizedException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/HostUnauthorizedException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/HostUnauthorizedException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/HostUnauthorizedException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/HostUnauthorizedException.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
+package org.apache.ki.authz;
 
 import java.net.InetAddress;
 
@@ -26,7 +26,7 @@
  * or access a particular resource.
  *
  * @author Les Hazlewood
- * @see org.ki.session.mgt.SessionManager#start(java.net.InetAddress)
+ * @see org.apache.ki.session.mgt.SessionManager#start(java.net.InetAddress)
  * @since 0.1
  */
 public class HostUnauthorizedException extends UnauthorizedException {

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

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/ModularRealmAuthorizer.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/ModularRealmAuthorizer.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/ModularRealmAuthorizer.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/ModularRealmAuthorizer.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/ModularRealmAuthorizer.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/ModularRealmAuthorizer.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/ModularRealmAuthorizer.java Wed Mar 11 05:40:38 2009
@@ -16,16 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
-
-import org.ki.authz.permission.PermissionResolver;
-import org.ki.authz.permission.PermissionResolverAware;
-import org.ki.realm.Realm;
-import org.ki.subject.PrincipalCollection;
+package org.apache.ki.authz;
 
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.ki.authz.permission.PermissionResolver;
+import org.apache.ki.authz.permission.PermissionResolverAware;
+import org.apache.ki.realm.Realm;
+import org.apache.ki.subject.PrincipalCollection;
+
+
 /**
  * A <tt>ModularRealmAuthorizer</tt> is an <tt>Authorizer</tt> implementation that consults one or more configured
  * {@link Realm Realm}s during an authorization operation.
@@ -95,14 +96,14 @@
 
     /**
      * Sets the specified {@link PermissionResolver PermissionResolver} on <em>all</em> of the wrapped realms that
-     * implement the {@link org.ki.authz.permission.PermissionResolverAware PermissionResolverAware} interface.
+     * implement the {@link org.apache.ki.authz.permission.PermissionResolverAware PermissionResolverAware} interface.
      * <p/>
      * Only call this method if you want the permission resolver to be passed to all realms that implement the
      * <code>PermissionResolver</code> interface.  If you do not want this to occur, the realms must
      * configure themselves individually (or be configured individually).
      *
      * @param permissionResolver the permissionResolver to set on all of the wrapped realms that implement the
-     *                           {@link org.ki.authz.permission.PermissionResolverAware PermissionResolverAware} interface.
+     *                           {@link org.apache.ki.authz.permission.PermissionResolverAware PermissionResolverAware} interface.
      */
     public void setPermissionResolver(PermissionResolver permissionResolver) {
         this.permissionResolver = permissionResolver;
@@ -111,10 +112,10 @@
 
     /**
      * Sets the internal {@link #getPermissionResolver} on any internal configured
-     * {@link #getRealms Realms} that implement the {@link PermissionResolverAware PermissionResolverAware} interface.
+     * {@link #getRealms Realms} that implement the {@link org.apache.ki.authz.permission.PermissionResolverAware PermissionResolverAware} interface.
      * <p/>
      * This method is called after setting a permissionResolver on this ModularRealmAuthorizer via the
-     * {@link #setPermissionResolver(org.ki.authz.permission.PermissionResolver) setPermissionResolver} method.
+     * {@link #setPermissionResolver(org.apache.ki.authz.permission.PermissionResolver) setPermissionResolver} method.
      * <p/>
      * It is also called after setting one or more realms via the {@link #setRealms setRealms} method to allow these
      * newly available realms to be given the <code>PermissionResolver</code> already in use.
@@ -151,7 +152,7 @@
 
     /**
      * Returns <code>true</code> if any of the configured realms'
-     * {@link Realm#isPermitted(org.ki.subject.PrincipalCollection, String)} returns <code>true</code>,
+     * {@link Realm#isPermitted(org.apache.ki.subject.PrincipalCollection , String)} returns <code>true</code>,
      * <code>false</code> otherwise.
      */
     public boolean isPermitted(PrincipalCollection principals, String permission) {
@@ -166,7 +167,7 @@
 
     /**
      * Returns <code>true</code> if any of the configured realms'
-     * {@link Realm#isPermitted(org.ki.subject.PrincipalCollection, Permission)} call returns <code>true</code>,
+     * {@link Realm#isPermitted(org.apache.ki.subject.PrincipalCollection , Permission)} call returns <code>true</code>,
      * <code>false</code> otherwise.
      */
     public boolean isPermitted(PrincipalCollection principals, Permission permission) {
@@ -181,7 +182,7 @@
 
     /**
      * Returns <code>true</code> if any of the configured realms'
-     * {@link Realm#isPermitted(org.ki.subject.PrincipalCollection, String[])} call returns <code>true</code>,
+     * {@link Realm#isPermitted(org.apache.ki.subject.PrincipalCollection , String[])} call returns <code>true</code>,
      * <code>false</code> otherwise.
      */
     public boolean[] isPermitted(PrincipalCollection principals, String... permissions) {
@@ -198,7 +199,7 @@
 
     /**
      * Returns <code>true</code> if any of the configured realms'
-     * {@link Realm#isPermitted(org.ki.subject.PrincipalCollection, List)} call returns <code>true</code>,
+     * {@link org.apache.ki.realm.Realm#isPermitted(org.apache.ki.subject.PrincipalCollection , List)} call returns <code>true</code>,
      * <code>false</code> otherwise.
      */
     public boolean[] isPermitted(PrincipalCollection principals, List<Permission> permissions) {
@@ -217,7 +218,7 @@
 
     /**
      * Returns <code>true</code> if any of the configured realms'
-     * {@link Realm#isPermitted(org.ki.subject.PrincipalCollection, String)} call returns <code>true</code>
+     * {@link Realm#isPermitted(org.apache.ki.subject.PrincipalCollection , String)} call returns <code>true</code>
      * for <em>all</em> of the specified string permissions, <code>false</code> otherwise.
      */
     public boolean isPermittedAll(PrincipalCollection principals, String... permissions) {
@@ -234,7 +235,7 @@
 
     /**
      * Returns <code>true</code> if any of the configured realms'
-     * {@link Realm#isPermitted(org.ki.subject.PrincipalCollection, Permission)} call returns <code>true</code>
+     * {@link Realm#isPermitted(org.apache.ki.subject.PrincipalCollection , Permission)} call returns <code>true</code>
      * for <em>all</em> of the specified Permissions, <code>false</code> otherwise.
      */
     public boolean isPermittedAll(PrincipalCollection principals, Collection<Permission> permissions) {
@@ -250,7 +251,7 @@
     }
 
     /**
-     * If !{@link #isPermitted(org.ki.subject.PrincipalCollection, String) isPermitted(permission)}, throws
+     * If !{@link #isPermitted(org.apache.ki.subject.PrincipalCollection , String) isPermitted(permission)}, throws
      * an <code>UnauthorizedException</code> otherwise returns quietly.
      */
     public void checkPermission(PrincipalCollection principals, String permission) throws AuthorizationException {
@@ -261,7 +262,7 @@
     }
 
     /**
-     * If !{@link #isPermitted(org.ki.subject.PrincipalCollection, Permission) isPermitted(permission)}, throws
+     * If !{@link #isPermitted(org.apache.ki.subject.PrincipalCollection , Permission) isPermitted(permission)}, throws
      * an <code>UnauthorizedException</code> otherwise returns quietly.
      */
     public void checkPermission(PrincipalCollection principals, Permission permission) throws AuthorizationException {
@@ -272,7 +273,7 @@
     }
 
     /**
-     * If !{@link #isPermitted(org.ki.subject.PrincipalCollection, String[]) isPermitted(permission)}, throws
+     * If !{@link #isPermitted(org.apache.ki.subject.PrincipalCollection , String[]) isPermitted(permission)}, throws
      * an <code>UnauthorizedException</code> otherwise returns quietly.
      */
     public void checkPermissions(PrincipalCollection principals, String... permissions) throws AuthorizationException {
@@ -285,7 +286,7 @@
     }
 
     /**
-     * If !{@link #isPermitted(org.ki.subject.PrincipalCollection, Permission) isPermitted(permission)} for
+     * If !{@link #isPermitted(org.apache.ki.subject.PrincipalCollection , Permission) isPermitted(permission)} for
      * <em>all</em> the given Permissions, throws
      * an <code>UnauthorizedException</code> otherwise returns quietly.
      */
@@ -300,7 +301,7 @@
 
     /**
      * Returns <code>true</code> if any of the configured realms'
-     * {@link Realm#hasRole(org.ki.subject.PrincipalCollection, String)} call returns <code>true</code>,
+     * {@link Realm#hasRole(org.apache.ki.subject.PrincipalCollection , String)} call returns <code>true</code>,
      * <code>false</code> otherwise.
      */
     public boolean hasRole(PrincipalCollection principals, String roleIdentifier) {
@@ -314,7 +315,7 @@
     }
 
     /**
-     * Calls {@link #hasRole(org.ki.subject.PrincipalCollection, String)} for each role name in the specified
+     * Calls {@link #hasRole(org.apache.ki.subject.PrincipalCollection , String)} for each role name in the specified
      * collection and places the return value from each call at the respective location in the returned array.
      */
     public boolean[] hasRoles(PrincipalCollection principals, List<String> roleIdentifiers) {
@@ -333,7 +334,7 @@
 
     /**
      * Returns <code>true</code> iff any of the configured realms'
-     * {@link Realm#hasRole(org.ki.subject.PrincipalCollection, String)} call returns <code>true</code> for
+     * {@link Realm#hasRole(org.apache.ki.subject.PrincipalCollection , String)} call returns <code>true</code> for
      * <em>all</em> roles specified, <code>false</code> otherwise.
      */
     public boolean hasAllRoles(PrincipalCollection principals, Collection<String> roleIdentifiers) {
@@ -347,7 +348,7 @@
     }
 
     /**
-     * If !{@link #hasRole(org.ki.subject.PrincipalCollection, String) hasRole(role)}, throws
+     * If !{@link #hasRole(org.apache.ki.subject.PrincipalCollection , String) hasRole(role)}, throws
      * an <code>UnauthorizedException</code> otherwise returns quietly.
      */
     public void checkRole(PrincipalCollection principals, String role) throws AuthorizationException {
@@ -358,7 +359,7 @@
     }
 
     /**
-     * Calls {@link #checkRole(org.ki.subject.PrincipalCollection, String) checkRole} for each role specified.
+     * Calls {@link #checkRole(org.apache.ki.subject.PrincipalCollection , String) checkRole} for each role specified.
      */
     public void checkRoles(PrincipalCollection principals, Collection<String> roles) throws AuthorizationException {
         assertRealmsConfigured();

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Permission.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/Permission.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Permission.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Permission.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/Permission.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/Permission.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Permission.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
+package org.apache.ki.authz;
 
 /**
  * A Permission represents the ability to perform an action or access a resource.  A Permission is the most
@@ -52,16 +52,16 @@
  *
  * <p>A benefit to JSecurity is that, although it assumes most systems are based on these types of static role or
  * dynamic role w/ permission schemes, it does not require a system to model their security data this way - all
- * Permission checks are relegated to {@link org.ki.realm.Realm} implementations, and only those implementatons
+ * Permission checks are relegated to {@link org.apache.ki.realm.Realm} implementations, and only those implementatons
  * really determine how a user 'has' a permission or not.  The Realm could use the semantics described here, or it
  * could utilize some other mechanism entirely - it is always up to the application developer.
  *
  * <p>JSecurity provides a very powerful default implementation of this interface in the form of the
- * {@link org.ki.authz.permission.WildcardPermission WildcardPermission}.  We highly recommend that you
+ * {@link org.apache.ki.authz.permission.WildcardPermission WildcardPermission}.  We highly recommend that you
  * investigate this class before trying to implement your own <code>Permission</code>s.
  *
  * @author Les Hazlewood
- * @see org.ki.authz.permission.WildcardPermission WildcardPermission
+ * @see org.apache.ki.authz.permission.WildcardPermission WildcardPermission
  * @since 0.2
  */
 public interface Permission {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/SimpleAuthorizationInfo.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/SimpleAuthorizationInfo.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/SimpleAuthorizationInfo.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/SimpleAuthorizationInfo.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/SimpleAuthorizationInfo.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/SimpleAuthorizationInfo.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/SimpleAuthorizationInfo.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
+package org.apache.ki.authz;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -26,7 +26,7 @@
  * Simple POJO implementation of the {@link AuthorizationInfo} interface that stores roles and permissions as internal
  * attributes.
  *
- * @see org.ki.realm.AuthorizingRealm
+ * @see org.apache.ki.realm.AuthorizingRealm
  * @since 0.9
  * @author Jeremy Haile
  * @author Les Hazlewood

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/SimpleAuthorizingAccount.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/SimpleAuthorizingAccount.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/SimpleAuthorizingAccount.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/SimpleAuthorizingAccount.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/SimpleAuthorizingAccount.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/SimpleAuthorizingAccount.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/SimpleAuthorizingAccount.java Wed Mar 11 05:40:38 2009
@@ -16,13 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
+package org.apache.ki.authz;
 
-import org.ki.authc.Account;
-import org.ki.authc.SimpleAccount;
-import org.ki.subject.PrincipalCollection;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.ki.authc.Account;
+import org.apache.ki.authc.SimpleAccount;
+import org.apache.ki.subject.PrincipalCollection;
 
 /**
  * <p>A simple implementation of the {@link AuthorizingAccount} interface that is useful

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/UnauthenticatedException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/UnauthenticatedException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/UnauthenticatedException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/UnauthenticatedException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/UnauthenticatedException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/UnauthenticatedException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/UnauthenticatedException.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
+package org.apache.ki.authz;
 
 /**
  * Exception thrown when attempting to execute an authorization action when a successful

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

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/UnauthorizedException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/UnauthorizedException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/UnauthorizedException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/UnauthorizedException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/UnauthorizedException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/UnauthorizedException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/UnauthorizedException.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz;
+package org.apache.ki.authz;
 
 /**
  * Thrown to indicate a requested operation or access to a requested resource is not allowed.

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

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresAuthentication.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresAuthentication.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresAuthentication.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresAuthentication.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresAuthentication.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresAuthentication.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresAuthentication.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.annotation;
+package org.apache.ki.authz.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -29,10 +29,10 @@
  * {@link RequiresUser RequiresUser} annotation.
  * <p/>
  * This annotation basically ensures that
- * <code>{@link org.ki.subject.Subject subject}.{@link org.ki.subject.Subject#isAuthenticated() isAuthenticated()} === true</code>
+ * <code>{@link org.apache.ki.subject.Subject subject}.{@link org.apache.ki.subject.Subject#isAuthenticated() isAuthenticated()} === true</code>
  * <p/>
  * See the {@link RequiresUser RequiresUser} and
- * {@link org.ki.authc.RememberMeAuthenticationToken RememberMeAuthenticationToken} JavaDoc for an
+ * {@link org.apache.ki.authc.RememberMeAuthenticationToken RememberMeAuthenticationToken} JavaDoc for an
  * explaination of why these two states are considered different.
  *
  * @see RequiresUser

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresGuest.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresGuest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresGuest.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresGuest.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresGuest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresGuest.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresGuest.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.annotation;
+package org.apache.ki.authz.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -30,7 +30,7 @@
  * This annotation is the logical inverse of the {@link RequiresUser RequiresUser} annotation. That is,
  * <code>RequiresUser == !RequiresGuest</code>, or more accurately,
  * <p/>
- * <code>RequiresGuest === subject.{@link org.ki.subject.Subject#getPrincipal() getPrincipal()} == null</code>.
+ * <code>RequiresGuest === subject.{@link org.apache.ki.subject.Subject#getPrincipal() getPrincipal()} == null</code>.
  *
  * @see RequiresAuthentication
  * @see RequiresUser

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresPermissions.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresPermissions.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresPermissions.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresPermissions.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresPermissions.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresPermissions.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresPermissions.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.annotation;
+package org.apache.ki.authz.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -27,7 +27,7 @@
  * <p>
  * Requires the current executor's Subject to imply a particular permission in
  * order to execute the annotated method.  If the executor's associated
- * {@link org.ki.subject.Subject Subject} determines that the
+ * {@link org.apache.ki.subject.Subject Subject} determines that the
  * executor does not imply the specified permission, the method will not be executed.
  * </p>
  *
@@ -38,11 +38,11 @@
  * <p/>
  * indicates the current user must be able to both <tt>read</tt> and <tt>write</tt>
  * to the file <tt>aFile.txt</tt> in order for the <tt>someMethod()</tt> to execute, otherwise
- * an {@link org.ki.authz.AuthorizationException AuthorizationException} will be thrown.
+ * an {@link org.apache.ki.authz.AuthorizationException AuthorizationException} will be thrown.
  *
  * @author Jeremy Haile
  * @author Les Hazlewood
- * @see org.ki.subject.Subject#checkPermission
+ * @see org.apache.ki.subject.Subject#checkPermission
  * @since 0.1
  */
 @Target(ElementType.METHOD)
@@ -50,7 +50,7 @@
 public @interface RequiresPermissions {
 
     /**
-     * The permission string which will be passed to {@link org.ki.subject.Subject#isPermitted(String)}
+     * The permission string which will be passed to {@link org.apache.ki.subject.Subject#isPermitted(String)}
      * to determine if the user is allowed to invoke the code protected by this annotation.
      */
     String value();

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresPermissions.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresRoles.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresRoles.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresRoles.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresRoles.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresRoles.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresRoles.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresRoles.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.annotation;
+package org.apache.ki.authz.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -24,9 +24,9 @@
 import java.lang.annotation.Target;
 
 /**
- * Requires the currently executing {@link org.ki.subject.Subject Subject} to have one or more specified roles
+ * Requires the currently executing {@link org.apache.ki.subject.Subject Subject} to have one or more specified roles
  * in order to execute the annotated method. If they do not have the role(s), the method will not be executed and
- * an {@link org.ki.authz.AuthorizationException AuthorizationException} is thrown.
+ * an {@link org.apache.ki.authz.AuthorizationException AuthorizationException} is thrown.
  * <p/>
  * For example,
  * <p/>
@@ -49,7 +49,7 @@
  *
  * @author Jeremy Haile
  * @author Les Hazlewood
- * @see org.ki.subject.Subject#hasRole(String)
+ * @see org.apache.ki.subject.Subject#hasRole(String)
  * @since 0.1
  */
 @Target(ElementType.METHOD)

Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresRoles.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresUser.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresUser.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresUser.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresUser.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresUser.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/annotation/RequiresUser.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresUser.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.annotation;
+package org.apache.ki.authz.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -37,7 +37,7 @@
  * during their current session, and asked the system to remember them.</li>
  * </ul>
  * <p/>
- * See the {@link org.ki.authc.RememberMeAuthenticationToken RememberMeAuthenticationToken} JavaDoc for an
+ * See the {@link org.apache.ki.authc.RememberMeAuthenticationToken RememberMeAuthenticationToken} JavaDoc for an
  * explaination of why these two states are considered different.
  *
  * @see RequiresAuthentication

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AnnotationsAuthorizingMethodInterceptor.java Wed Mar 11 05:40:38 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
-
-import org.ki.aop.MethodInvocation;
-import org.ki.authz.AuthorizationException;
+package org.apache.ki.authz.aop;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.ki.aop.MethodInvocation;
+import org.apache.ki.authz.AuthorizationException;
+
 /**
  * An <tt>AnnotationsAuthorizingMethodInterceptor</tt> is a MethodInterceptor that asserts a given method is authorized
  * to execute based on one or more configured <tt>AuthorizingAnnotationMethodInterceptor</tt>s.
@@ -48,8 +48,8 @@
     /**
      * Default no-argument constructor that defaults the 
      * {@link #methodInterceptors methodInterceptors} attribute to contain two interceptors by default - the
-     * {@link org.ki.authz.aop.RoleAnnotationMethodInterceptor RoleAnnotationMethodInterceptor} and the
-     * {@link org.ki.authz.aop.PermissionAnnotationMethodInterceptor PermissionAnnotationMethodInterceptor} to
+     * {@link RoleAnnotationMethodInterceptor RoleAnnotationMethodInterceptor} and the
+     * {@link PermissionAnnotationMethodInterceptor PermissionAnnotationMethodInterceptor} to
      * support role and permission annotations.
      */
     public AnnotationsAuthorizingMethodInterceptor() {
@@ -66,8 +66,8 @@
      * <p/>
      * Unless overridden by the {@link #setMethodInterceptors(java.util.Collection)} method, the default collection
      * contains a
-     * {@link org.ki.authz.aop.RoleAnnotationMethodInterceptor RoleAnnotationMethodInterceptor} and a
-     * {@link org.ki.authz.aop.PermissionAnnotationMethodInterceptor PermissionAnnotationMethodInterceptor} to
+     * {@link RoleAnnotationMethodInterceptor RoleAnnotationMethodInterceptor} and a
+     * {@link PermissionAnnotationMethodInterceptor PermissionAnnotationMethodInterceptor} to
      * support role and permission annotations automatically.
      * @return the method interceptors to execute for the annotated method.
      */
@@ -87,9 +87,9 @@
     /**
      * Iterates over the internal {@link #getMethodInterceptors() methodInterceptors} collection, and for each one,
      * ensures that if the interceptor
-     * {@link org.ki.authz.aop.AuthorizingAnnotationMethodInterceptor#supports(org.ki.aop.MethodInvocation) supports}
+     * {@link AuthorizingAnnotationMethodInterceptor#supports(org.apache.ki.aop.MethodInvocation) supports}
      * the invocation, that the interceptor
-     * {@link org.ki.authz.aop.AuthorizingAnnotationMethodInterceptor#assertAuthorized(org.ki.aop.MethodInvocation) asserts}
+     * {@link AuthorizingAnnotationMethodInterceptor#assertAuthorized(org.apache.ki.aop.MethodInvocation) asserts}
      * that the invocation is authorized to proceed.
      */
     protected void assertAuthorized(MethodInvocation methodInvocation) throws AuthorizationException {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationHandler.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthenticatedAnnotationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationHandler.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationHandler.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthenticatedAnnotationHandler.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthenticatedAnnotationHandler.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationHandler.java Wed Mar 11 05:40:38 2009
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
-
-import org.ki.authz.UnauthenticatedException;
-import org.ki.authz.annotation.RequiresAuthentication;
+package org.apache.ki.authz.aop;
 
 import java.lang.annotation.Annotation;
 
+import org.apache.ki.authz.UnauthenticatedException;
+import org.apache.ki.authz.annotation.RequiresAuthentication;
+
+
 /**
  * Handles {@link RequiresAuthentication RequiresAuthentication} annotations and ensures the calling subject is
  * authenticated before allowing access.
@@ -34,7 +35,7 @@
 
     /**
      * Default no-argument constructor that ensures this handler to process
-     * {@link org.ki.authz.annotation.RequiresAuthentication RequiresAuthentication} annotations.
+     * {@link org.apache.ki.authz.annotation.RequiresAuthentication RequiresAuthentication} annotations.
      */
     public AuthenticatedAnnotationHandler() {
         super(RequiresAuthentication.class);
@@ -42,10 +43,10 @@
 
     /**
      * Ensures that the calling <code>Subject</code> is authenticated, and if not, throws an
-     * {@link org.ki.authz.UnauthenticatedException UnauthenticatedException} indicating the method is not allowed to be executed.
+     * {@link org.apache.ki.authz.UnauthenticatedException UnauthenticatedException} indicating the method is not allowed to be executed.
      *
      * @param a the annotation to inspect
-     * @throws org.ki.authz.UnauthenticatedException if the calling <code>Subject</code> has not yet
+     * @throws org.apache.ki.authz.UnauthenticatedException if the calling <code>Subject</code> has not yet
      * authenticated.
      */
     public void assertAuthorized(Annotation a) throws UnauthenticatedException {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthenticatedAnnotationMethodInterceptor.java Wed Mar 11 05:40:38 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
+package org.apache.ki.authz.aop;
 
 /**
- * Checks to see if a @{@link org.ki.authz.annotation.RequiresAuthentication RequiresAuthenticated} annotation
+ * Checks to see if a @{@link org.apache.ki.authz.annotation.RequiresAuthentication RequiresAuthenticated} annotation
  * is declared, and if so, ensures the calling
- * <code>Subject</code>.{@link org.ki.subject.Subject#isAuthenticated() isAuthenticated()} before invoking
+ * <code>Subject</code>.{@link org.apache.ki.subject.Subject#isAuthenticated() isAuthenticated()} before invoking
  * the method.
  *
  * @since 0.9.0
@@ -31,7 +31,7 @@
 
     /**
      * Default no-argument constructor that ensures this interceptor looks for
-     * {@link org.ki.authz.annotation.RequiresAuthentication RequiresAuthentication} annotations in a method
+     * {@link org.apache.ki.authz.annotation.RequiresAuthentication RequiresAuthentication} annotations in a method
      * declaration.
      */
     public AuthenticatedAnnotationMethodInterceptor() {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingAnnotationHandler.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthorizingAnnotationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingAnnotationHandler.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingAnnotationHandler.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthorizingAnnotationHandler.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthorizingAnnotationHandler.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingAnnotationHandler.java Wed Mar 11 05:40:38 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
-
-import org.ki.aop.AnnotationHandler;
-import org.ki.authz.AuthorizationException;
+package org.apache.ki.authz.aop;
 
 import java.lang.annotation.Annotation;
 
+import org.apache.ki.aop.AnnotationHandler;
+import org.apache.ki.authz.AuthorizationException;
+
 /**
  * An AnnotationHandler that executes authorization (access control) behavior based on directive(s) found in a
  * JSR-175 Annotation.
@@ -50,7 +50,7 @@
      * and perform a corresponding authorization check based.
      *
      * @param a the <code>Annotation</code> to check for performing an authorization check.
-     * @throws org.ki.authz.AuthorizationException if the class/instance/method is not allowed to proceed/execute.
+     * @throws org.apache.ki.authz.AuthorizationException if the class/instance/method is not allowed to proceed/execute.
      */
     public abstract void assertAuthorized(Annotation a) throws AuthorizationException;
 }

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingAnnotationMethodInterceptor.java Wed Mar 11 05:40:38 2009
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
+package org.apache.ki.authz.aop;
+
+import org.apache.ki.aop.AnnotationMethodInterceptor;
+import org.apache.ki.aop.MethodInvocation;
+import org.apache.ki.authz.AuthorizationException;
 
-import org.ki.aop.AnnotationMethodInterceptor;
-import org.ki.aop.MethodInvocation;
-import org.ki.authz.AuthorizationException;
 
 /**
  * An <tt>AnnotationMethodInterceptor</tt> that asserts the calling code is authorized to execute the method
@@ -29,7 +30,8 @@
  * @author Les Hazlewood
  * @since 0.1
  */
-public abstract class AuthorizingAnnotationMethodInterceptor extends AnnotationMethodInterceptor {
+public abstract class AuthorizingAnnotationMethodInterceptor extends AnnotationMethodInterceptor
+{
     
     /**
      * Constructor that ensures the internal <code>handler</code> is set which will be used to perform the
@@ -43,11 +45,11 @@
 
     /**
      * Ensures the <code>methodInvocation</code> is allowed to execute first before proceeding by calling the
-     * {@link #assertAuthorized(org.ki.aop.MethodInvocation) assertAuthorized} method first.
+     * {@link #assertAuthorized(org.apache.ki.aop.MethodInvocation) assertAuthorized} method first.
      *
      * @param methodInvocation the method invocation to check for authorization prior to allowing it to proceed/execute.
-     * @return the return value from the method invocation (the value of {@link org.ki.aop.MethodInvocation#proceed() MethodInvocation.proceed()}).
-     * @throws AuthorizationException if the <code>MethodInvocation</code> is not allowed to proceed.
+     * @return the return value from the method invocation (the value of {@link org.apache.ki.aop.MethodInvocation#proceed() MethodInvocation.proceed()}).
+     * @throws org.apache.ki.authz.AuthorizationException if the <code>MethodInvocation</code> is not allowed to proceed.
      * @throws Throwable if any other error occurs.
      */
     public Object invoke(MethodInvocation methodInvocation) throws Throwable {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingMethodInterceptor.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthorizingMethodInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingMethodInterceptor.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingMethodInterceptor.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthorizingMethodInterceptor.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/AuthorizingMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/AuthorizingMethodInterceptor.java Wed Mar 11 05:40:38 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
+package org.apache.ki.authz.aop;
 
-import org.ki.aop.MethodInterceptorSupport;
-import org.ki.aop.MethodInvocation;
-import org.ki.authz.AuthorizationException;
+import org.apache.ki.aop.MethodInterceptorSupport;
+import org.apache.ki.aop.MethodInvocation;
+import org.apache.ki.authz.AuthorizationException;
 
 /**
  * Basic abstract class to support intercepting methods that perform authorization (access control) checks.
@@ -31,9 +31,9 @@
 public abstract class AuthorizingMethodInterceptor extends MethodInterceptorSupport {
 
     /**
-     * Invokes the specified method (<code>methodInvocation.{@link org.ki.aop.MethodInvocation#proceed proceed}()</code>
+     * Invokes the specified method (<code>methodInvocation.{@link org.apache.ki.aop.MethodInvocation#proceed proceed}()</code>
      * if authorization is allowed by first
-     * calling {@link #assertAuthorized(org.ki.aop.MethodInvocation) assertAuthorized}.
+     * calling {@link #assertAuthorized(org.apache.ki.aop.MethodInvocation) assertAuthorized}.
      */
     public Object invoke(MethodInvocation methodInvocation) throws Throwable {
         assertAuthorized(methodInvocation);

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/GuestAnnotationHandler.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/GuestAnnotationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/GuestAnnotationHandler.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/GuestAnnotationHandler.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/GuestAnnotationHandler.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/GuestAnnotationHandler.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/GuestAnnotationHandler.java Wed Mar 11 05:40:38 2009
@@ -16,20 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
-
-import org.ki.authz.AuthorizationException;
-import org.ki.authz.UnauthenticatedException;
-import org.ki.authz.annotation.RequiresGuest;
+package org.apache.ki.authz.aop;
 
 import java.lang.annotation.Annotation;
 
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.UnauthenticatedException;
+import org.apache.ki.authz.annotation.RequiresGuest;
+
+
 /**
- * Checks to see if a @{@link org.ki.authz.annotation.RequiresGuest RequiresGuest} annotation
+ * Checks to see if a @{@link org.apache.ki.authz.annotation.RequiresGuest RequiresGuest} annotation
  * is declared, and if so, ensures the calling <code>Subject</code> does <em>not</em>
- * have an {@link org.ki.subject.Subject#getPrincipal() identity} before invoking the method.
+ * have an {@link org.apache.ki.subject.Subject#getPrincipal() identity} before invoking the method.
  * <p>
- * This annotation essentially ensures that <code>subject.{@link org.ki.subject.Subject#getPrincipal() getPrincipal()} == null</code>.
+ * This annotation essentially ensures that <code>subject.{@link org.apache.ki.subject.Subject#getPrincipal() getPrincipal()} == null</code>.
  *
  * @author Les Hazlewood
  * @since 0.9.0
@@ -39,7 +40,7 @@
     /**
      * Default no-argument constructor that ensures this interceptor looks for
      *
-     * {@link org.ki.authz.annotation.RequiresGuest RequiresGuest} annotations in a method
+     * {@link org.apache.ki.authz.annotation.RequiresGuest RequiresGuest} annotations in a method
      * declaration.
      */
     public GuestAnnotationHandler() {
@@ -48,12 +49,12 @@
 
     /**
      * Ensures that the calling <code>Subject</code> is NOT a <em>user</em>, that is, they do not
-     * have an {@link org.ki.subject.Subject#getPrincipal() identity} before continuing.  If they are
-     * a user ({@link org.ki.subject.Subject#getPrincipal() Subject.getPrincipal()} != null), an
+     * have an {@link org.apache.ki.subject.Subject#getPrincipal() identity} before continuing.  If they are
+     * a user ({@link org.apache.ki.subject.Subject#getPrincipal() Subject.getPrincipal()} != null), an
      * <code>AuthorizingException</code> will be thrown indicating that execution is not allowed to continue.
      *
      * @param a the annotation to check for one or more roles
-     * @throws org.ki.authz.AuthorizationException
+     * @throws org.apache.ki.authz.AuthorizationException
      *          if the calling <code>Subject</code> is not a &quot;guest&quot;.
      */
     public void assertAuthorized(Annotation a) throws AuthorizationException {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/GuestAnnotationMethodInterceptor.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/GuestAnnotationMethodInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/GuestAnnotationMethodInterceptor.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/GuestAnnotationMethodInterceptor.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/GuestAnnotationMethodInterceptor.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/GuestAnnotationMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/GuestAnnotationMethodInterceptor.java Wed Mar 11 05:40:38 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
+package org.apache.ki.authz.aop;
 
 /**
- * Checks to see if a @{@link org.ki.authz.annotation.RequiresGuest RequiresGuest} annotation
+ * Checks to see if a @{@link org.apache.ki.authz.annotation.RequiresGuest RequiresGuest} annotation
  * is declared, and if so, ensures the calling <code>Subject</code> does <em>not</em>
- * have an {@link org.ki.subject.Subject#getPrincipal() identity} before invoking the method.
+ * have an {@link org.apache.ki.subject.Subject#getPrincipal() identity} before invoking the method.
  * <p>
- * This annotation essentially ensures that <code>subject.{@link org.ki.subject.Subject#getPrincipal() getPrincipal()} == null</code>.
+ * This annotation essentially ensures that <code>subject.{@link org.apache.ki.subject.Subject#getPrincipal() getPrincipal()} == null</code>.
  *
  * @author Les Hazlewood
  * @since 0.9.0
@@ -32,7 +32,7 @@
 
     /**
      * Default no-argument constructor that ensures this interceptor looks for
-     * {@link org.ki.authz.annotation.RequiresGuest RequiresGuest} annotations in a method
+     * {@link org.apache.ki.authz.annotation.RequiresGuest RequiresGuest} annotations in a method
      * declaration.
      */
     public GuestAnnotationMethodInterceptor() {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/PermissionAnnotationHandler.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/PermissionAnnotationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/PermissionAnnotationHandler.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/PermissionAnnotationHandler.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/PermissionAnnotationHandler.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/PermissionAnnotationHandler.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/PermissionAnnotationHandler.java Wed Mar 11 05:40:38 2009
@@ -16,19 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
-
-import org.ki.authz.AuthorizationException;
-import org.ki.authz.UnauthorizedException;
-import org.ki.authz.annotation.RequiresPermissions;
-import org.ki.subject.Subject;
-import org.ki.util.PermissionUtils;
+package org.apache.ki.authz.aop;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.UnauthorizedException;
+import org.apache.ki.authz.annotation.RequiresPermissions;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.PermissionUtils;
+
+
 /**
- * Checks to see if a @{@link org.ki.authz.annotation.RequiresPermissions RequiresPermissions} annotation is
+ * Checks to see if a @{@link org.apache.ki.authz.annotation.RequiresPermissions RequiresPermissions} annotation is
  * declared, and if so, performs a permission check to see if the calling <code>Subject</code> is allowed continued
  * access.
  *
@@ -39,7 +40,7 @@
 
     /**
      * Default no-argument constructor that ensures this handler looks for
-     * {@link org.ki.authz.annotation.RequiresPermissions RequiresPermissions} annotations.
+     * {@link org.apache.ki.authz.annotation.RequiresPermissions RequiresPermissions} annotations.
      */
     public PermissionAnnotationHandler() {
         super(RequiresPermissions.class);
@@ -61,7 +62,7 @@
      * <code>AuthorizingException</code> indicating access is denied.
      *
      * @param a the RequiresPermission annotation being inspected to check for one or more permissions
-     * @throws org.ki.authz.AuthorizationException if the calling <code>Subject</code> does not have the permission(s) necessary to
+     * @throws org.apache.ki.authz.AuthorizationException if the calling <code>Subject</code> does not have the permission(s) necessary to
      * continue access or execution.
      */
     public void assertAuthorized(Annotation a) throws AuthorizationException {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/PermissionAnnotationMethodInterceptor.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/PermissionAnnotationMethodInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/PermissionAnnotationMethodInterceptor.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/PermissionAnnotationMethodInterceptor.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/PermissionAnnotationMethodInterceptor.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/PermissionAnnotationMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/PermissionAnnotationMethodInterceptor.java Wed Mar 11 05:40:38 2009
@@ -16,12 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
-
-import org.ki.authz.annotation.RequiresPermissions;
+package org.apache.ki.authz.aop;
 
 /**
- * Checks to see if a @{@link RequiresPermissions RequiresPermissions} annotation is declared, and if so, performs
+ * Checks to see if a @{@link org.apache.ki.authz.annotation.RequiresPermissions RequiresPermissions} annotation is declared, and if so, performs
  * a permission check to see if the calling <code>Subject</code> is allowed to call the method.
  * @author Les Hazlewood
  * @since 0.9
@@ -35,7 +33,7 @@
 
     /**
      * Default no-argument constructor that ensures this interceptor looks for
-     * {@link RequiresPermissions RequiresPermissions} annotations in a method declaration.
+     * {@link org.apache.ki.authz.annotation.RequiresPermissions RequiresPermissions} annotations in a method declaration.
      */
     public PermissionAnnotationMethodInterceptor() {
         super( new PermissionAnnotationHandler() );

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/RoleAnnotationHandler.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/RoleAnnotationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/RoleAnnotationHandler.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/RoleAnnotationHandler.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/RoleAnnotationHandler.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/RoleAnnotationHandler.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/RoleAnnotationHandler.java Wed Mar 11 05:40:38 2009
@@ -16,19 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
-
-import org.ki.authz.AuthorizationException;
-import org.ki.authz.UnauthorizedException;
-import org.ki.authz.annotation.RequiresRoles;
+package org.apache.ki.authz.aop;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.UnauthorizedException;
+import org.apache.ki.authz.annotation.RequiresRoles;
+
+
 /**
- * Checks to see if a @{@link org.ki.authz.annotation.RequiresRoles RequiresRoles} annotation is declared, and if so, performs
+ * Checks to see if a @{@link org.apache.ki.authz.annotation.RequiresRoles RequiresRoles} annotation is declared, and if so, performs
  * a role check to see if the calling <code>Subject</code> is allowed to proceed.
  *
  * @author Les Hazlewood
@@ -38,7 +39,7 @@
 
     /**
      * Default no-argument constructor that ensures this handler looks for
-     * {@link org.ki.authz.annotation.RequiresRoles RequiresRoles} annotations.
+     * {@link org.apache.ki.authz.annotation.RequiresRoles RequiresRoles} annotations.
      */
     public RoleAnnotationHandler() {
         super(RequiresRoles.class);
@@ -49,7 +50,7 @@
      * <code>AuthorizingException</code> indicating that access is denied.
      *
      * @param a the RequiresRoles annotation to use to check for one or more roles
-     * @throws org.ki.authz.AuthorizationException if the calling <code>Subject</code> does not have the role(s) necessary to
+     * @throws org.apache.ki.authz.AuthorizationException if the calling <code>Subject</code> does not have the role(s) necessary to
      * proceed.
      */
     public void assertAuthorized(Annotation a) throws AuthorizationException {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/RoleAnnotationMethodInterceptor.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/RoleAnnotationMethodInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/RoleAnnotationMethodInterceptor.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/RoleAnnotationMethodInterceptor.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/RoleAnnotationMethodInterceptor.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/RoleAnnotationMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/RoleAnnotationMethodInterceptor.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
+package org.apache.ki.authz.aop;
+
+import org.apache.ki.authz.annotation.RequiresRoles;
 
-import org.ki.authz.annotation.RequiresRoles;
 
 /**
  * Checks to see if a @{@link RequiresRoles RequiresRoles} annotation is declared, and if so, performs

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/UserAnnotationHandler.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/UserAnnotationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/UserAnnotationHandler.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/UserAnnotationHandler.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/UserAnnotationHandler.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/UserAnnotationHandler.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/UserAnnotationHandler.java Wed Mar 11 05:40:38 2009
@@ -16,21 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
-
-import org.ki.authz.AuthorizationException;
-import org.ki.authz.UnauthenticatedException;
-import org.ki.authz.annotation.RequiresUser;
+package org.apache.ki.authz.aop;
 
 import java.lang.annotation.Annotation;
 
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.UnauthenticatedException;
+import org.apache.ki.authz.annotation.RequiresUser;
+
+
 /**
- * Checks to see if a @{@link org.ki.authz.annotation.RequiresUser RequiresUser} annotation
+ * Checks to see if a @{@link org.apache.ki.authz.annotation.RequiresUser RequiresUser} annotation
  * is declared, and if so, ensures the calling <code>Subject</code> is <em>either</em>
- * {@link org.ki.subject.Subject#isAuthenticated() authenticated} <b><em>or</em></b> remembered via remember
+ * {@link org.apache.ki.subject.Subject#isAuthenticated() authenticated} <b><em>or</em></b> remembered via remember
  * me services before allowing access.
  * <p>
- * This annotation essentially ensures that <code>subject.{@link org.ki.subject.Subject#getPrincipal() getPrincipal()} != null</code>.
+ * This annotation essentially ensures that <code>subject.{@link org.apache.ki.subject.Subject#getPrincipal() getPrincipal()} != null</code>.
  *
  * @author Les Hazlewood
  * @since 0.9.0
@@ -40,7 +41,7 @@
     /**
      * Default no-argument constructor that ensures this handler looks for
      *
-     * {@link org.ki.authz.annotation.RequiresUser RequiresUser} annotations.
+     * {@link org.apache.ki.authz.annotation.RequiresUser RequiresUser} annotations.
      */
     public UserAnnotationHandler() {
         super(RequiresUser.class);
@@ -48,12 +49,12 @@
 
     /**
      * Ensures that the calling <code>Subject</code> is a <em>user</em>, that is, they are <em>either</code>
-     * {@link org.ki.subject.Subject#isAuthenticated() authenticated} <b><em>or</em></b> remembered via remember
+     * {@link org.apache.ki.subject.Subject#isAuthenticated() authenticated} <b><em>or</em></b> remembered via remember
      * me services before allowing access, and if not, throws an
      * <code>AuthorizingException</code> indicating access is not allowed.
      *
      * @param a the RequiresUser annotation to check
-     * @throws org.ki.authz.AuthorizationException
+     * @throws org.apache.ki.authz.AuthorizationException
      *         if the calling <code>Subject</code> is not authenticated or remembered via rememberMe services.
      */
     public void assertAuthorized(Annotation a) throws AuthorizationException {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/UserAnnotationMethodInterceptor.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/aop/UserAnnotationMethodInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/UserAnnotationMethodInterceptor.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/UserAnnotationMethodInterceptor.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/aop/UserAnnotationMethodInterceptor.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/aop/UserAnnotationMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/UserAnnotationMethodInterceptor.java Wed Mar 11 05:40:38 2009
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.aop;
+package org.apache.ki.authz.aop;
 
 /**
- * Checks to see if a @{@link org.ki.authz.annotation.RequiresUser RequiresUser} annotation
+ * Checks to see if a @{@link org.apache.ki.authz.annotation.RequiresUser RequiresUser} annotation
  * is declared, and if so, ensures the calling <code>Subject</code> is <em>either</em>
- * {@link org.ki.subject.Subject#isAuthenticated() authenticated} <b><em>or</em></b> remembered via remember
+ * {@link org.apache.ki.subject.Subject#isAuthenticated() authenticated} <b><em>or</em></b> remembered via remember
  * me services before invoking the method.
  * <p>
- * This annotation essentially ensures that <code>subject.{@link org.ki.subject.Subject#getPrincipal() getPrincipal()} != null</code>.
+ * This annotation essentially ensures that <code>subject.{@link org.apache.ki.subject.Subject#getPrincipal() getPrincipal()} != null</code>.
  *
  * @author Les Hazlewood
  * @since 0.9.0
@@ -34,7 +34,7 @@
     /**
      * Default no-argument constructor that ensures this interceptor looks for
      *
-     * {@link org.ki.authz.annotation.RequiresUser RequiresUser} annotations in a method
+     * {@link org.apache.ki.authz.annotation.RequiresUser RequiresUser} annotations in a method
      * declaration.
      */
     public UserAnnotationMethodInterceptor() {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/AllPermission.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/permission/AllPermission.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/AllPermission.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/AllPermission.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/permission/AllPermission.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/permission/AllPermission.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/AllPermission.java Wed Mar 11 05:40:38 2009
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.permission;
-
-import org.ki.authz.Permission;
+package org.apache.ki.authz.permission;
 
 import java.io.Serializable;
 
+import org.apache.ki.authz.Permission;
+
+
 /**
  * An all <tt>AllPermission</tt> instance is one that always implies any other permission; that is, its
  * {@link #implies implies} method always returns <tt>true</tt>.



Mime
View raw message