svn commit: r752380 [4/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...

[ad...@apache.org]

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/permission/InvalidPermissionStringException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/permission/InvalidPermissionStringException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/permission/InvalidPermissionStringException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/InvalidPermissionStringException.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.permission;
+package org.apache.ki.authz.permission;
+
+import org.apache.ki.JSecurityException;
 
-import org.ki.JSecurityException;
 
 /**
  * Thrown by {@link PermissionResolver#resolvePermission(String)} when the String being parsed is not

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolver.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/permission/PermissionResolver.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolver.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolver.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/permission/PermissionResolver.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/permission/PermissionResolver.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolver.java Wed Mar 11 05:40:38 2009
@@ -16,18 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.permission;
+package org.apache.ki.authz.permission;
+
+import org.apache.ki.authz.Permission;
 
-import org.ki.authz.Permission;
 
 /**
  * <p>A PermisisonResolver resolves a String value and converts it into a
- * {@link org.ki.authz.Permission} instance.
+ * {@link org.apache.ki.authz.Permission} instance.
  *
- * <p>The default {@link org.ki.authz.permission.WildcardPermissionResolver} should be
- * suitable for most purposes, which constructs {@link org.ki.authz.permission.WildcardPermission} objects.
+ * <p>The default {@link WildcardPermissionResolver} should be
+ * suitable for most purposes, which constructs {@link WildcardPermission} objects.
  * However, any resolver may be configured if an application wishes to use different
- * {@link org.ki.authz.Permission} implementations.</p>
+ * {@link org.apache.ki.authz.Permission} implementations.</p>
  *
  * <p>A <tt>PermissionResolver</tt> is used by many JSecurity components such as annotations, property file
  * configuration, URL configuration, etc.  It is useful whenever a String representation of a permission is specified
@@ -44,9 +45,9 @@
  *
  * @author Jeremy Haile
  * @author Les Hazlewood
- * @see org.ki.mgt.AuthorizingSecurityManager#setPermissionResolver(PermissionResolver) AuthorizingSecurityManager.setPermissionResolver
- * @see org.ki.authz.ModularRealmAuthorizer#setPermissionResolver(PermissionResolver) ModularRealmAuthorizer.setPermissionResolver
- * @see org.ki.realm.AuthorizingRealm#setPermissionResolver(PermissionResolver) AuthorizingRealm.setPermissionResolver
+ * @see org.apache.ki.mgt.AuthorizingSecurityManager#setPermissionResolver(PermissionResolver) AuthorizingSecurityManager.setPermissionResolver
+ * @see org.apache.ki.authz.ModularRealmAuthorizer#setPermissionResolver(PermissionResolver) ModularRealmAuthorizer.setPermissionResolver
+ * @see org.apache.ki.realm.AuthorizingRealm#setPermissionResolver(PermissionResolver) AuthorizingRealm.setPermissionResolver
  * @see PermissionResolverAware PermissionResolverAware
  * @since 0.9
  */

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolverAware.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/permission/PermissionResolverAware.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolverAware.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolverAware.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/permission/PermissionResolverAware.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/permission/PermissionResolverAware.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolverAware.java Wed Mar 11 05:40:38 2009
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.permission;
+package org.apache.ki.authz.permission;
 
 /**
  * Interface implemented by a component that wishes to use any application-configured <tt>PermissionResolver</tt> that
  * might already exist instead of potentially creating one itself.
  *
- * <p>This is mostly implemented by {@link org.ki.authz.Authorizer Authorizer} and
- * {@link org.ki.realm.Realm Realm} implementations since they
+ * <p>This is mostly implemented by {@link org.apache.ki.authz.Authorizer Authorizer} and
+ * {@link org.apache.ki.realm.Realm Realm} implementations since they
  * are the ones performing permission checks and need to know how to resolve Strings into
- * {@link org.ki.authz.Permission Permission} instances.
+ * {@link org.apache.ki.authz.Permission Permission} instances.
  *
  * @author Les Hazlewood
  * @since 0.9

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermission.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/permission/WildcardPermission.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermission.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermission.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/permission/WildcardPermission.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/permission/WildcardPermission.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermission.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.authz.permission;
-
-import org.ki.authz.Permission;
-import org.ki.util.CollectionUtils;
+package org.apache.ki.authz.permission;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -27,6 +24,9 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.ki.authz.Permission;
+import org.apache.ki.util.CollectionUtils;
+
 /**
  * A <code>WildcardPermission</code> is a very flexible permission construct supporting multiple levels of
  * permission matching. However, most people will probably follow some standard conventions as explained below.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermissionResolver.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/authz/permission/WildcardPermissionResolver.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermissionResolver.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermissionResolver.java&p1=incubator/jsecurity/trunk/core/src/org/ki/authz/permission/WildcardPermissionResolver.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/permission/WildcardPermissionResolver.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermissionResolver.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.permission;
+package org.apache.ki.authz.permission;
+
+import org.apache.ki.authz.Permission;
 
-import org.ki.authz.Permission;
 
 /**
  * <tt>PermissionResolver</tt> implementation that returns a new {@link WildcardPermission WildcardPermission}

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/cache/CacheException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/cache/CacheException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/cache/CacheException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.cache;
+package org.apache.ki.cache;
+
+import org.apache.ki.JSecurityException;
 
-import org.ki.JSecurityException;
 
 /**
  * Root class of all JSecurity exceptions related to caching operations.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/cache/CacheManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/cache/CacheManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/cache/CacheManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheManager.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.cache;
+package org.apache.ki.cache;
 
 /**
  * A CacheManager provides and maintains the lifecycles of {@link Cache Cache} instances.

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/DefaultCacheManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/cache/DefaultCacheManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/DefaultCacheManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/cache/DefaultCacheManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/cache/DefaultCacheManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/cache/DefaultCacheManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/DefaultCacheManager.java Wed Mar 11 05:40:38 2009
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.cache;
-
-import org.ki.util.Destroyable;
-import org.ki.util.LifecycleUtils;
+package org.apache.ki.cache;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.ki.util.Destroyable;
+import org.apache.ki.util.LifecycleUtils;
+
+
 /**
  * Default memory-only based {@link CacheManager CacheManager} implementation usable in production environments.
  * <p/>

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/HashtableCacheManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/cache/HashtableCacheManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/HashtableCacheManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/cache/HashtableCacheManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/cache/HashtableCacheManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/cache/HashtableCacheManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/HashtableCacheManager.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.cache;
+package org.apache.ki.cache;
 
 /**
  * A {@link CacheManager} that returns {@link HashtableCache} caches.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/MapCache.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/cache/MapCache.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/MapCache.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/cache/MapCache.java&p1=incubator/jsecurity/trunk/core/src/org/ki/cache/MapCache.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/cache/MapCache.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/MapCache.java Wed Mar 11 05:40:38 2009
@@ -16,11 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.cache;
+package org.apache.ki.cache;
 
-import org.ki.util.Destroyable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
 
-import java.util.*;
+import org.apache.ki.util.Destroyable;
 
 /**
  * A <code>MapCache</code> is a {@link Cache Cache} implementation that uses a backing {@link Map} instance to store

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/SoftHashMapCache.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/cache/SoftHashMapCache.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/SoftHashMapCache.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/cache/SoftHashMapCache.java&p1=incubator/jsecurity/trunk/core/src/org/ki/cache/SoftHashMapCache.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/cache/SoftHashMapCache.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/SoftHashMapCache.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.cache;
+package org.apache.ki.cache;
 
-import org.ki.util.SoftHashMap;
+import org.apache.ki.util.SoftHashMap;
 
 /**
  * A MapCache that uses a {@link SoftHashMap SoftHashMap} as its backing map.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Base64.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/codec/Base64.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Base64.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Base64.java&p1=incubator/jsecurity/trunk/core/src/org/ki/codec/Base64.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/codec/Base64.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Base64.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.codec;
+package org.apache.ki.codec;
 
 /**
  * Provides Base64 encoding and decoding as defined by RFC 2045.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/codec/CodecException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/codec/CodecException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/codec/CodecException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecException.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.codec;
+package org.apache.ki.codec;
 
-import org.ki.JSecurityException;
+import org.apache.ki.JSecurityException;
 
 /**
  * Root exception related to issues during encoding or decoding.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecSupport.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/codec/CodecSupport.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecSupport.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecSupport.java&p1=incubator/jsecurity/trunk/core/src/org/ki/codec/CodecSupport.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/codec/CodecSupport.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecSupport.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.codec;
+package org.apache.ki.codec;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 
 /**
  * Base abstract class that provides useful encoding and decoding operations, especially for character data.

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/BlowfishCipher.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/crypto/BlowfishCipher.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/BlowfishCipher.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/BlowfishCipher.java&p1=incubator/jsecurity/trunk/core/src/org/ki/crypto/BlowfishCipher.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/BlowfishCipher.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/BlowfishCipher.java Wed Mar 11 05:40:38 2009
@@ -16,19 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.crypto;
+package org.apache.ki.crypto;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.ki.codec.Base64;
-import org.ki.codec.CodecSupport;
-
-import javax.crypto.KeyGenerator;
-import javax.crypto.spec.SecretKeySpec;
 import java.security.InvalidKeyException;
 import java.security.Key;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
+import javax.crypto.KeyGenerator;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.codec.Base64;
+import org.apache.ki.codec.CodecSupport;
+
 
 /**
  * JSecurity's default symmetric block Cipher using the Blowfish algorithm.  As it is a symmetric Cipher, it uses the

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/Cipher.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/crypto/Cipher.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/Cipher.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/Cipher.java&p1=incubator/jsecurity/trunk/core/src/org/ki/crypto/Cipher.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/Cipher.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/Cipher.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.crypto;
+package org.apache.ki.crypto;
 
 /**
  * A <tt>Cipher</tt> is an algorithm used in cryptography that converts an original input source using a <tt>Key</tt> to

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/AbstractHash.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/AbstractHash.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/AbstractHash.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/AbstractHash.java&p1=incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/AbstractHash.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/AbstractHash.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/AbstractHash.java Wed Mar 11 05:40:38 2009
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.crypto.hash;
-
-import org.ki.codec.Base64;
-import org.ki.codec.CodecException;
-import org.ki.codec.CodecSupport;
-import org.ki.codec.Hex;
+package org.apache.ki.crypto.hash;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
+import org.apache.ki.codec.Base64;
+import org.apache.ki.codec.CodecException;
+import org.apache.ki.codec.CodecSupport;
+import org.apache.ki.codec.Hex;
+
 /**
  * Provides a base for all JSecurity Hash algorithms with support for salts and multiple hash iterations.
  *
@@ -103,7 +103,7 @@
      *
      * <p>By default, this class only supports Object method arguments of
      * type <tt>byte[]</tt>, <tt>char[]</tt> and <tt>String</tt>.  If either argument is anything other than these
-     * types a {@link org.ki.codec.CodecException CodecException} will be thrown.
+     * types a {@link org.apache.ki.codec.CodecException CodecException} will be thrown.
      *
      * <p>If you want to be able to hash other object types, or use other salt types, you need to override the
      * {@link #toBytes(Object) toBytes(Object)} method to support those specific types.  Your other option is to

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Hash.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Hash.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Hash.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Hash.java&p1=incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Hash.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Hash.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Hash.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.crypto.hash;
+package org.apache.ki.crypto.hash;
 
 /**
  * A Cryptoraphic <tt>Hash</tt> represents a one-way conversion algorithm that transforms an input source to an underlying

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Md2Hash.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Md2Hash.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Md2Hash.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Md2Hash.java&p1=incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Md2Hash.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Md2Hash.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Md2Hash.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.crypto.hash;
+package org.apache.ki.crypto.hash;
+
+import org.apache.ki.codec.Base64;
+import org.apache.ki.codec.Hex;
 
-import org.ki.codec.Base64;
-import org.ki.codec.Hex;
 
 /**
  * Generates an MD2 Hash (RFC 1319) from a given input <tt>source</tt> with an optional <tt>salt</tt> and

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Md5Hash.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Md5Hash.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Md5Hash.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Md5Hash.java&p1=incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Md5Hash.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Md5Hash.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Md5Hash.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.crypto.hash;
+package org.apache.ki.crypto.hash;
 
-import org.ki.codec.Base64;
-import org.ki.codec.Hex;
+import org.apache.ki.codec.Base64;
+import org.apache.ki.codec.Hex;
 
 /**
  * Generates an MD5 Hash (RFC 1321) from a given input <tt>source</tt> with an optional <tt>salt</tt> and

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha1Hash.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha1Hash.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha1Hash.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha1Hash.java&p1=incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha1Hash.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha1Hash.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha1Hash.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.crypto.hash;
+package org.apache.ki.crypto.hash;
+
+import org.apache.ki.codec.Base64;
+import org.apache.ki.codec.Hex;
 
-import org.ki.codec.Base64;
-import org.ki.codec.Hex;
 
 /**
  * Generates an SHA-1 Hash (Secure Hash Standard, NIST FIPS 180-1) from a given input <tt>source</tt> with an

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha256Hash.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha256Hash.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha256Hash.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha256Hash.java&p1=incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha256Hash.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha256Hash.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha256Hash.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.crypto.hash;
+package org.apache.ki.crypto.hash;
 
-import org.ki.codec.Base64;
-import org.ki.codec.Hex;
+import org.apache.ki.codec.Base64;
+import org.apache.ki.codec.Hex;
 
 /**
  * Generates an SHA-256 Hash from a given input <tt>source</tt> with an optional <tt>salt</tt> and hash iterations.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha384Hash.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha384Hash.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha384Hash.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha384Hash.java&p1=incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha384Hash.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha384Hash.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha384Hash.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.crypto.hash;
+package org.apache.ki.crypto.hash;
+
+import org.apache.ki.codec.Base64;
+import org.apache.ki.codec.Hex;
 
-import org.ki.codec.Base64;
-import org.ki.codec.Hex;
 
 /**
  * Generates an SHA-384 Hash from a given input <tt>source</tt> with an optional <tt>salt</tt> and hash iterations.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha512Hash.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha512Hash.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha512Hash.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha512Hash.java&p1=incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha512Hash.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/Sha512Hash.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/Sha512Hash.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.crypto.hash;
+package org.apache.ki.crypto.hash;
 
-import org.ki.codec.Base64;
-import org.ki.codec.Hex;
+import org.apache.ki.codec.Base64;
+import org.apache.ki.codec.Hex;
 
 /**
  * Generates an SHA-512 Hash from a given input <tt>source</tt> with an optional <tt>salt</tt> and hash iterations.

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/io/DefaultSerializer.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/io/DefaultSerializer.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/DefaultSerializer.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/io/DefaultSerializer.java&p1=incubator/jsecurity/trunk/core/src/org/ki/io/DefaultSerializer.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/io/DefaultSerializer.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/DefaultSerializer.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.io;
+package org.apache.ki.io;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
 /**
  * Serializer implementation that uses the default JVM serialization mechanism (Object Input/Output Streams).

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/io/IniResource.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/io/IniResource.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/IniResource.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/io/IniResource.java&p1=incubator/jsecurity/trunk/core/src/org/ki/io/IniResource.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/io/IniResource.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/IniResource.java Wed Mar 11 05:40:38 2009
@@ -16,12 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.io;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import static org.ki.util.StringUtils.clean;
-import static org.ki.util.StringUtils.splitKeyValue;
+package org.apache.ki.io;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -30,6 +25,12 @@
 import java.util.Map;
 import java.util.Scanner;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import static org.apache.ki.util.StringUtils.clean;
+import static org.apache.ki.util.StringUtils.splitKeyValue;
+
 /**
  * //TODO - complete JavaDoc
  *

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/io/ResourceException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/io/ResourceException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/io/ResourceException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceException.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.io;
+package org.apache.ki.io;
 
-import org.ki.JSecurityException;
+import org.apache.ki.JSecurityException;
 
 /**
  * Root exception when a problem occurs acquiring or processing a resource.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceUtils.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/io/ResourceUtils.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceUtils.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceUtils.java&p1=incubator/jsecurity/trunk/core/src/org/ki/io/ResourceUtils.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/io/ResourceUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/ResourceUtils.java Wed Mar 11 05:40:38 2009
@@ -16,17 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.io;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.ki.util.ClassUtils;
+package org.apache.ki.io;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.util.ClassUtils;
+
 /**
  * Static helper methods for loading resources.
  *

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/io/SerializationException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/io/SerializationException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/SerializationException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/io/SerializationException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/io/SerializationException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/io/SerializationException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/SerializationException.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.io;
+package org.apache.ki.io;
 
-import org.ki.JSecurityException;
+import org.apache.ki.JSecurityException;
 
 /**
  * Root exception for problems either serializing or de-serializing data.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/io/Serializer.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/io/Serializer.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/Serializer.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/io/Serializer.java&p1=incubator/jsecurity/trunk/core/src/org/ki/io/Serializer.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/io/Serializer.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/Serializer.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.io;
+package org.apache.ki.io;
 
 /**
  * A <code>Serializer</code> converts objects to raw binary data and vice versa, enabling persistent storage
@@ -24,7 +24,7 @@
  * <p/>
  * A <code>Serializer</code> should only do conversion, never change the data, such as encoding/decoding or
  * encryption.  These orthoganal concerns are handled elsewhere by JSecurity, for example, via
- * {@link org.ki.codec.CodecSupport CodecSupport} and {@link org.ki.crypto.Cipher Cipher}s.
+ * {@link org.apache.ki.codec.CodecSupport CodecSupport} and {@link org.apache.ki.crypto.Cipher Cipher}s.
  * @author Les Hazlewood
  * @since 0.9
  */

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/io/TextResource.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/io/TextResource.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/TextResource.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/io/TextResource.java&p1=incubator/jsecurity/trunk/core/src/org/ki/io/TextResource.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/io/TextResource.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/TextResource.java Wed Mar 11 05:40:38 2009
@@ -16,14 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.io;
+package org.apache.ki.io;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Scanner;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.*;
-import java.util.Scanner;
-
 /**
  * //TODO complete JavaDoc
  * @author Les Hazlewood

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

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

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiLocator.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/jndi/JndiLocator.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiLocator.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiLocator.java&p1=incubator/jsecurity/trunk/core/src/org/ki/jndi/JndiLocator.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/jndi/JndiLocator.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiLocator.java Wed Mar 11 05:40:38 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.jndi;
+package org.apache.ki.jndi;
+
+import java.util.Properties;
+import javax.naming.NamingException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.naming.NamingException;
-import java.util.Properties;
-
 /**
  * Convenient superclass for JNDI accessors, providing "jndiTemplate"
  * and "jndiEnvironment" bean properties.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiTemplate.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/jndi/JndiTemplate.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiTemplate.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiTemplate.java&p1=incubator/jsecurity/trunk/core/src/org/ki/jndi/JndiTemplate.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/jndi/JndiTemplate.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiTemplate.java Wed Mar 11 05:40:38 2009
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.jndi;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+package org.apache.ki.jndi;
 
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Properties;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Helper class that simplifies JNDI operations. It provides methods to lookup and

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AbstractRememberMeManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/AbstractRememberMeManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AbstractRememberMeManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AbstractRememberMeManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/AbstractRememberMeManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/AbstractRememberMeManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AbstractRememberMeManager.java Wed Mar 11 05:40:38 2009
@@ -16,27 +16,29 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
+package org.apache.ki.mgt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.authc.AuthenticationException;
-import org.ki.authc.AuthenticationInfo;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authc.RememberMeAuthenticationToken;
-import org.ki.codec.Base64;
-import org.ki.codec.Hex;
-import org.ki.crypto.BlowfishCipher;
-import org.ki.crypto.Cipher;
-import org.ki.io.DefaultSerializer;
-import org.ki.io.SerializationException;
-import org.ki.io.Serializer;
-import org.ki.subject.PrincipalCollection;
+
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.RememberMeAuthenticationToken;
+import org.apache.ki.codec.Base64;
+import org.apache.ki.codec.Hex;
+import org.apache.ki.crypto.BlowfishCipher;
+import org.apache.ki.crypto.Cipher;
+import org.apache.ki.io.DefaultSerializer;
+import org.apache.ki.io.SerializationException;
+import org.apache.ki.io.Serializer;
+import org.apache.ki.subject.PrincipalCollection;
+
 
 /**
  * Abstract implementation of the <code>RememberMeManager</code> interface that handles
- * {@link #setSerializer(org.ki.io.Serializer) serialization} and
- * {@link #setCipher(org.ki.crypto.Cipher) encryption} of the remembered user identity.
+ * {@link #setSerializer(org.apache.ki.io.Serializer) serialization} and
+ * {@link #setCipher(org.apache.ki.crypto.Cipher) encryption} of the remembered user identity.
  * <p/>
  * The remembered identity storage location is implementation-specific.
  *

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AuthenticatingSecurityManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/AuthenticatingSecurityManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AuthenticatingSecurityManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AuthenticatingSecurityManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/AuthenticatingSecurityManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/AuthenticatingSecurityManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AuthenticatingSecurityManager.java Wed Mar 11 05:40:38 2009
@@ -16,15 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
-
-import org.ki.authc.*;
-import org.ki.authc.pam.AuthenticationStrategy;
-import org.ki.authc.pam.ModularRealmAuthenticator;
-import org.ki.util.LifecycleUtils;
+package org.apache.ki.mgt;
 
 import java.util.Collection;
 
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.AuthenticationListener;
+import org.apache.ki.authc.AuthenticationListenerRegistrar;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.Authenticator;
+import org.apache.ki.authc.pam.AuthenticationStrategy;
+import org.apache.ki.authc.pam.ModularRealmAuthenticator;
+import org.apache.ki.util.LifecycleUtils;
+
+
 /**
  * JSecurity support of a {@link SecurityManager} class hierarchy that delegates all
  * authentication operations to a wrapped {@link Authenticator Authenticator} instance.  That is, this class
@@ -51,7 +57,7 @@
     /**
      * Default no-arg constructor that initializes its internal
      * <code>authenticator</code> instance to a
-     * {@link org.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator}.
+     * {@link org.apache.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator}.
      */
     public AuthenticatingSecurityManager() {
         super();
@@ -61,8 +67,8 @@
     /**
      * Returns the delegate <code>Authenticator</code> instance that this SecurityManager uses to perform all
      * authentication operations.  Unless overridden by the
-     * {@link #setAuthenticator(org.ki.authc.Authenticator) setAuthenticator}, the default instance is a
-     * {@link org.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator}.
+     * {@link #setAuthenticator(org.apache.ki.authc.Authenticator) setAuthenticator}, the default instance is a
+     * {@link org.apache.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator}.
      *
      * @return the delegate <code>Authenticator</code> instance that this SecurityManager uses to perform all
      *         authentication operations.
@@ -74,7 +80,7 @@
     /**
      * Sets the delegate <code>Authenticator</code> instance that this SecurityManager uses to perform all
      * authentication operations.  Unless overridden by this method, the default instance is a
-     * {@link org.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator}.
+     * {@link org.apache.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator}.
      *
      * @param authenticator the delegate <code>Authenticator</code> instance that this SecurityManager will use to
      *                      perform all authentication operations.
@@ -89,7 +95,7 @@
     }
 
     /**
-     * Sets the {@link org.ki.authc.pam.AuthenticationStrategy} to use
+     * Sets the {@link org.apache.ki.authc.pam.AuthenticationStrategy} to use
      * in multi-realm environments.
      *
      * @param strategy the <code>AuthenticationStrategy</code> to use in multi-realm environments.
@@ -115,7 +121,7 @@
      * and then apply these <tt>AuthenticationListener</tt>s on your behalf.
      *
      * <p>One notice however: The underlying Authenticator delegate must implement the
-     * {@link org.ki.authc.AuthenticationListenerRegistrar AuthenticationListenerRegistrar}
+     * {@link org.apache.ki.authc.AuthenticationListenerRegistrar AuthenticationListenerRegistrar}
      * interface in order for these listeners to be applied.  If it does not implement this interface, it is
      * considered a configuration error and an exception will be thrown.
      *
@@ -151,7 +157,7 @@
 
     /**
      * Ensures that <code>this.authenticator</code> implements the
-     * {@link org.ki.authc.AuthenticationListenerRegistrar AuthenticationListenerRegistrar} interface to ensure
+     * {@link org.apache.ki.authc.AuthenticationListenerRegistrar AuthenticationListenerRegistrar} interface to ensure
      * listeners can be registered.
      */
     private void assertAuthenticatorListenerSupport() {
@@ -176,7 +182,7 @@
     }
 
     /**
-     * Delegates to the wrapped {@link Authenticator Authenticator} for authentication.
+     * Delegates to the wrapped {@link org.apache.ki.authc.Authenticator Authenticator} for authentication.
      */
     public AuthenticationInfo authenticate(AuthenticationToken token) throws AuthenticationException {
         return this.authenticator.authenticate(token);

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AuthorizingSecurityManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/AuthorizingSecurityManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AuthorizingSecurityManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AuthorizingSecurityManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/AuthorizingSecurityManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/AuthorizingSecurityManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AuthorizingSecurityManager.java Wed Mar 11 05:40:38 2009
@@ -16,20 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
-
-import org.ki.authz.AuthorizationException;
-import org.ki.authz.Authorizer;
-import org.ki.authz.ModularRealmAuthorizer;
-import org.ki.authz.Permission;
-import org.ki.authz.permission.PermissionResolver;
-import org.ki.authz.permission.PermissionResolverAware;
-import org.ki.subject.PrincipalCollection;
-import org.ki.util.LifecycleUtils;
+package org.apache.ki.mgt;
 
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.Authorizer;
+import org.apache.ki.authz.ModularRealmAuthorizer;
+import org.apache.ki.authz.Permission;
+import org.apache.ki.authz.permission.PermissionResolver;
+import org.apache.ki.authz.permission.PermissionResolverAware;
+import org.apache.ki.subject.PrincipalCollection;
+import org.apache.ki.util.LifecycleUtils;
+
+
 /**
  * JSecurity support of a {@link SecurityManager} class hierarchy that delegates all
  * authorization (access control) operations to a wrapped {@link Authorizer Authorizer} instance.  That is,
@@ -55,7 +56,7 @@
 
     /**
      * Default no-arg constructor that initializes an internal default
-     * {@link ModularRealmAuthorizer ModularRealmAuthorizer}.
+     * {@link org.apache.ki.authz.ModularRealmAuthorizer ModularRealmAuthorizer}.
      */
     public AuthorizingSecurityManager() {
         super();
@@ -118,7 +119,7 @@
      * instance's wrapped {@link Authorizer Authorizer}.
      * <p/>
      * The setting of realms the Authorizer will only occur if it is an instance of
-     * {@link org.ki.authz.ModularRealmAuthorizer ModularRealmAuthorizer}, that is:
+     * {@link org.apache.ki.authz.ModularRealmAuthorizer ModularRealmAuthorizer}, that is:
      * <pre>
      * if ( this.authorizer instanceof ModularRealmAuthorizer ) {
      *     ((ModularRealmAuthorizer)this.authorizer).setRealms(realms);

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/CachingSecurityManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/CachingSecurityManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/CachingSecurityManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/CachingSecurityManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/CachingSecurityManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/CachingSecurityManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/CachingSecurityManager.java Wed Mar 11 05:40:38 2009
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
+package org.apache.ki.mgt;
+
+import org.apache.ki.cache.CacheManager;
+import org.apache.ki.cache.CacheManagerAware;
+import org.apache.ki.cache.DefaultCacheManager;
+import org.apache.ki.util.Destroyable;
+import org.apache.ki.util.LifecycleUtils;
 
-import org.ki.cache.CacheManager;
-import org.ki.cache.CacheManagerAware;
-import org.ki.cache.DefaultCacheManager;
-import org.ki.util.Destroyable;
-import org.ki.util.LifecycleUtils;
 
 /**
  * A very basic starting point for the SecurityManager interface that merely provides logging and caching
@@ -77,7 +78,7 @@
 
     /**
      * Template callback to notify subclasses that a
-     * {@link CacheManager CacheManager} has been set and is available for use via the
+     * {@link org.apache.ki.cache.CacheManager CacheManager} has been set and is available for use via the
      * {@link #getCacheManager getCacheManager()} method.
      */
     protected void afterCacheManagerSet() {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSecurityManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/DefaultSecurityManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSecurityManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSecurityManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/DefaultSecurityManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/DefaultSecurityManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSecurityManager.java Wed Mar 11 05:40:38 2009
@@ -16,31 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.ki.authc.*;
-import org.ki.authz.AuthorizationException;
-import org.ki.authz.Authorizer;
-import org.ki.crypto.Cipher;
-import org.ki.realm.Realm;
-import org.ki.session.InvalidSessionException;
-import org.ki.session.Session;
-import org.ki.session.mgt.DelegatingSession;
-import org.ki.subject.PrincipalCollection;
-import org.ki.subject.Subject;
-import org.ki.util.ThreadContext;
+package org.apache.ki.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.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.Authenticator;
+import org.apache.ki.authc.LogoutAware;
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.Authorizer;
+import org.apache.ki.crypto.Cipher;
+import org.apache.ki.realm.Realm;
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.Session;
+import org.apache.ki.session.mgt.DelegatingSession;
+import org.apache.ki.subject.PrincipalCollection;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.ThreadContext;
+
+
 /**
  * <p>The JSecurity framework's default concrete implementation of the {@link SecurityManager} interface,
- * based around a collection of {@link org.ki.realm.Realm}s.  This implementation delegates its
+ * based around a collection of {@link org.apache.ki.realm.Realm}s.  This implementation delegates its
  * authentication, authorization, and session operations to wrapped {@link Authenticator}, {@link Authorizer}, and
- * {@link org.ki.session.mgt.SessionManager SessionManager} instances respectively via superclass
+ * {@link org.apache.ki.session.mgt.SessionManager SessionManager} instances respectively via superclass
  * implementation.</p>
  *
  * <p>To greatly reduce and simplify configuration, this implementation (and its superclasses) will
@@ -469,17 +475,17 @@
      *
      * @param sessionId the id of the session that backs the desired Subject being acquired.
      * @return the {@code Subject} that owns the {@code Session Session} with the specified {@code sessionId}
-     * @throws org.ki.session.InvalidSessionException
+     * @throws org.apache.ki.session.InvalidSessionException
      *          if the session identified by <tt>sessionId</tt> has
      *          been stopped, expired, or doesn't exist.
-     * @throws org.ki.authz.AuthorizationException
+     * @throws org.apache.ki.authz.AuthorizationException
      *          if the executor of this method is not allowed to acquire the owning {@code Subject}.  The reason
      *          for the exception is implementation-specific and could be for any number of reasons.  A common
      *          reason in many systems would be if one host tried to acquire a {@code Subject} based on a
      *          {@code Session} that originated on an entirely different host (although it is not a JSecurity
      *          requirement this scenario is disallowed - its just an example that <em>may</em> throw an Exception in
      *          some systems).
-     * @see org.ki.authz.HostUnauthorizedException
+     * @see org.apache.ki.authz.HostUnauthorizedException
      * @since 1.0
      */
     private Subject getSubjectBySessionId(Serializable sessionId) throws InvalidSessionException, AuthorizationException {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSubjectFactory.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/DefaultSubjectFactory.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSubjectFactory.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSubjectFactory.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/DefaultSubjectFactory.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/DefaultSubjectFactory.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSubjectFactory.java Wed Mar 11 05:40:38 2009
@@ -16,19 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
-
-import org.ki.authc.AuthenticationInfo;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authc.InetAuthenticationToken;
-import org.ki.session.Session;
-import org.ki.subject.DelegatingSubject;
-import org.ki.subject.PrincipalCollection;
-import org.ki.subject.Subject;
-import org.ki.util.ThreadContext;
+package org.apache.ki.mgt;
 
 import java.net.InetAddress;
 
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.InetAuthenticationToken;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.DelegatingSubject;
+import org.apache.ki.subject.PrincipalCollection;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.ThreadContext;
+
+
 /**
  * Default {@link SubjectFactory SubjectFactory} implementation that creates {@link DelegatingSubject DelegatingSubject}
  * instances.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/RealmSecurityManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/RealmSecurityManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/RealmSecurityManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/RealmSecurityManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/RealmSecurityManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/RealmSecurityManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/RealmSecurityManager.java Wed Mar 11 05:40:38 2009
@@ -16,19 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
-
-import org.ki.cache.CacheManager;
-import org.ki.cache.CacheManagerAware;
-import org.ki.realm.Realm;
-import org.ki.util.LifecycleUtils;
+package org.apache.ki.mgt;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.ki.cache.CacheManager;
+import org.apache.ki.cache.CacheManagerAware;
+import org.apache.ki.realm.Realm;
+import org.apache.ki.util.LifecycleUtils;
+
+
 /**
  * JSecurity support of a {@link SecurityManager} class hierarchy based around a collection of
- * {@link org.ki.realm.Realm}s.  All actual {@code SecurityManager} method implementations are left to
+ * {@link org.apache.ki.realm.Realm}s.  All actual {@code SecurityManager} method implementations are left to
  * subclasses.
  *
  * @author Les Hazlewood
@@ -96,10 +97,10 @@
 
     /**
      * Sets the internal {@link #getCacheManager CacheManager} on any internal configured
-     * {@link #getRealms Realms} that implement the {@link CacheManagerAware CacheManagerAware} interface.
+     * {@link #getRealms Realms} that implement the {@link org.apache.ki.cache.CacheManagerAware CacheManagerAware} interface.
      * <p/>
      * This method is called after setting a cacheManager on this securityManager via the
-     * {@link #setCacheManager(org.ki.cache.CacheManager) setCacheManager} method to allow it to be propagated
+     * {@link #setCacheManager(org.apache.ki.cache.CacheManager) setCacheManager} method to allow it to be propagated
      * down to all the internal Realms that would need to use it.
      * <p/>
      * It is also called after setting one or more realms via the {@link #setRealm setRealm} or
@@ -120,7 +121,7 @@
 
     /**
      * Simply calls {@link #applyCacheManagerToRealms() applyCacheManagerToRealms()} to allow the
-     * newly set {@link CacheManager CacheManager} to be propagated to the internal collection of <code>Realm</code>
+     * newly set {@link org.apache.ki.cache.CacheManager CacheManager} to be propagated to the internal collection of <code>Realm</code>
      * that would need to use it.
      */
     protected void afterCacheManagerSet() {

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/RememberMeManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/RememberMeManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/RememberMeManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/RememberMeManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/RememberMeManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/RememberMeManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/RememberMeManager.java Wed Mar 11 05:40:38 2009
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
+package org.apache.ki.mgt;
+
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.subject.PrincipalCollection;
 
-import org.ki.authc.AuthenticationException;
-import org.ki.authc.AuthenticationInfo;
-import org.ki.authc.AuthenticationToken;
-import org.ki.subject.PrincipalCollection;
 
 /**
  * A RememberMeManager is responsible for remembering a Subject's identity across that Subject's sessions with

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManager.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/SecurityManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManager.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManager.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/SecurityManager.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/SecurityManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManager.java Wed Mar 11 05:40:38 2009
@@ -16,21 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
+package org.apache.ki.mgt;
+
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.Authenticator;
+import org.apache.ki.authz.Authorizer;
+import org.apache.ki.session.mgt.SessionManager;
+import org.apache.ki.subject.PrincipalCollection;
+import org.apache.ki.subject.Subject;
 
-import org.ki.authc.AuthenticationException;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authc.Authenticator;
-import org.ki.authz.Authorizer;
-import org.ki.session.mgt.SessionManager;
-import org.ki.subject.PrincipalCollection;
-import org.ki.subject.Subject;
 
 /**
  * A <tt>SecurityManager</tt> executes all security operations for <em>all</em> Subjects (aka users) across a
  * single application.
  *
- * <p>The interface itself primarily exists as a convenience - it extends the {@link Authenticator},
+ * <p>The interface itself primarily exists as a convenience - it extends the {@link org.apache.ki.authc.Authenticator},
  * {@link Authorizer}, and {@link SessionManager} interfaces, thereby consolidating
  * these behaviors into a single point of reference.  For most JSecurity usages, this simplifies configuration and
  * tends to be a more convenient approach than referencing <code>Authenticator</code>, <code>Authorizer</code>, and
@@ -38,7 +39,7 @@
  * single <tt>SecurityManager</tt> instance.</p>
  *
  * <p>In addition to the above three interfaces, three unique methods are provided by this interface by itself,
- * {@link #login}, {@link #logout} and {@link #getSubject}.  A {@link Subject Subject} executes
+ * {@link #login}, {@link #logout} and {@link #getSubject}.  A {@link org.apache.ki.subject.Subject Subject} executes
  * authentication, authorization, and session operations for a <em>single</em> user, and as such can only be
  * managed by <tt>A SecurityManager</tt> which is aware of all three functions.  The three parent interfaces on the
  * other hand do not 'know' about <tt>Subject</tt>s to ensure a clean separation of concerns.
@@ -50,13 +51,13 @@
  * <p>In that case, the application programmer can call the
  * {@link #getSubject() getSubject()} method and then use that returned instance for continued interaction with
  * JSecurity.  If your application code does not have a direct handle to the application's
- * <code>SecurityManager</code>, you can use {@link org.ki.SecurityUtils SecurityUtils} anywhere in your code
+ * <code>SecurityManager</code>, you can use {@link org.apache.ki.SecurityUtils SecurityUtils} anywhere in your code
  * to achieve the same result.
  *
  * <p>Framework developers on the other hand might find working with an actual SecurityManager useful.
  *
  * @author Les Hazlewood
- * @see DefaultSecurityManager
+ * @see org.apache.ki.mgt.DefaultSecurityManager
  * @since 0.2
  */
 public interface SecurityManager extends Authenticator, Authorizer, SessionManager {
@@ -67,14 +68,14 @@
      * <p/>
      * Note that most application developers should probably not call this method directly unless they have a good
      * reason for doing so.  The preferred way to log in a Subject is to call
-     * <code>{@link Subject#login Subject.login(authenticationToken)}</code> (usually after acquiring the
-     * Subject by calling {@link org.ki.SecurityUtils#getSubject() SecurityUtils.getSubject()}).
+     * <code>{@link org.apache.ki.subject.Subject#login Subject.login(authenticationToken)}</code> (usually after acquiring the
+     * Subject by calling {@link org.apache.ki.SecurityUtils#getSubject() SecurityUtils.getSubject()}).
      * <p/>
      * Framework developers on the other hand might find calling this method directly useful in certain cases.
      *
      * @param authenticationToken the token representing the Subject's principal(s) and credential(s)
      * @return an authenticated Subject upon a successful attempt
-     * @throws AuthenticationException if the login attempt failed.
+     * @throws org.apache.ki.authc.AuthenticationException if the login attempt failed.
      * @since 0.9
      */
     Subject login(AuthenticationToken authenticationToken) throws AuthenticationException;
@@ -83,7 +84,7 @@
      * Logs out the specified Subject from the system.
      *
      * <p>Note that most application developers should not call this method unless they have a good reason for doing
-     * so.  The preferred way to logout a Subject is to call <code>{@link Subject#logout Subject.logout()}</code>, not
+     * so.  The preferred way to logout a Subject is to call <code>{@link org.apache.ki.subject.Subject#logout Subject.logout()}</code>, not
      * the <code>SecurityManager</code> directly.
      * <p/>
      * Framework developers on the other hand might find calling this method directly useful in certain cases.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManagerAware.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/SecurityManagerAware.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManagerAware.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManagerAware.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/SecurityManagerAware.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/SecurityManagerAware.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManagerAware.java Wed Mar 11 05:40:38 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
+package org.apache.ki.mgt;
 
 /**
  * Interface providing a callback method that allows an implementation of this interface to receive a reference to
- * the {@link SecurityManager SecurityManager} if they require one.  This is mostly used by core implementation classes
+ * the {@link org.apache.ki.mgt.SecurityManager SecurityManager} if they require one.  This is mostly used by core implementation classes
  * for framework code and is rarely necessary for software developers enabling JSecurity in their applications.
  *
  * @author Les Hazlewood
@@ -29,10 +29,10 @@
 public interface SecurityManagerAware {
 
     /**
-     * Callback method that allows a component to receive the {@link SecurityManager SecurityManager} instance if it
+     * Callback method that allows a component to receive the {@link org.apache.ki.mgt.SecurityManager SecurityManager} instance if it
      * requires one.
      *
      * @param securityManager the application's <code>SecurityManager</code>
      */
-    void setSecurityManager(SecurityManager securityManager);
+    void setSecurityManager(org.apache.ki.mgt.SecurityManager securityManager);
 }

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManagerFactory.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/SecurityManagerFactory.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManagerFactory.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManagerFactory.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/SecurityManagerFactory.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/SecurityManagerFactory.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManagerFactory.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
+package org.apache.ki.mgt;
 
 /**
  * Allows implementations to create and return an application's SecurityManager instance in any manner necessary.

Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SessionSubjectBinder.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/mgt/SessionSubjectBinder.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SessionSubjectBinder.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SessionSubjectBinder.java&p1=incubator/jsecurity/trunk/core/src/org/ki/mgt/SessionSubjectBinder.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/SessionSubjectBinder.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SessionSubjectBinder.java Wed Mar 11 05:40:38 2009
@@ -16,15 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.ki.mgt;
+package org.apache.ki.mgt;
+
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.PrincipalCollection;
+import org.apache.ki.subject.Subject;
 
-import org.ki.session.Session;
-import org.ki.subject.PrincipalCollection;
-import org.ki.subject.Subject;
 
 /**
  * Binds the Subject's state to the accessible {@link Session Session} in addition to the
- * {@link org.ki.util.ThreadContext ThreadContext}
+ * {@link org.apache.ki.util.ThreadContext ThreadContext}
  * <p/>
  * The very notion of this class's existence might sound backwards:  typically a {@link Session Session} is something
  * that is created <em>after</em> a {@link Subject Subject} is acquired - for example by calling
@@ -42,7 +43,7 @@
  * <ol>
  * <li>A session ID would be acquired based on an incoming request or remote method invocation</li>
  * <li>The <code>Session</code> would be retrieved from the application's {@link SecurityManager SecurityManager}
- * (using the {@link org.ki.session.mgt.SessionManager SessionManager} parent methods)</li>
+ * (using the {@link org.apache.ki.session.mgt.SessionManager SessionManager} parent methods)</li>
  * <li>A <code>Subject</code> instance would be created based on the attributes found in that session</code>
  * <li>The constructed <code>Subject</code> would be 'bound' to the application for use during the request or method
  * invocation (say, bound to the processing thread)</li>