You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ad...@apache.org on 2009/03/11 06:40:54 UTC
svn commit: r752380 [8/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...
Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/LifecycleUtils.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/LifecycleUtils.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/LifecycleUtils.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/LifecycleUtils.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/LifecycleUtils.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/LifecycleUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/LifecycleUtils.java Wed Mar 11 05:40:38 2009
@@ -16,13 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.util;
+package org.apache.ki.util;
+
+import java.util.Collection;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.ki.JSecurityException;
-import java.util.Collection;
+import org.apache.ki.JSecurityException;
+
/**
* TODO - complete JavaDoc
Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/Nameable.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/Nameable.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/Nameable.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/Nameable.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/Nameable.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/Nameable.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/Nameable.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.util;
+package org.apache.ki.util;
/**
Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/PatternMatcher.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/PatternMatcher.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/PatternMatcher.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/PatternMatcher.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/PatternMatcher.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/PatternMatcher.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/PatternMatcher.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.util;
+package org.apache.ki.util;
/**
* Interface for components that can match source strings against a specified pattern string.
@@ -25,7 +25,7 @@
* regular expressions, or other types of text based patterns.
*
* @author Les Hazlewood
- * @see org.ki.util.AntPathMatcher AntPathMatcher
+ * @see org.apache.ki.util.AntPathMatcher AntPathMatcher
* @since 0.9 RC2
*/
public interface PatternMatcher {
Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/PermissionUtils.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/PermissionUtils.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/PermissionUtils.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/PermissionUtils.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/PermissionUtils.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/PermissionUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/PermissionUtils.java Wed Mar 11 05:40:38 2009
@@ -16,16 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.util;
-
-import org.ki.authz.Permission;
-import org.ki.authz.permission.PermissionResolver;
+package org.apache.ki.util;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
+import org.apache.ki.authz.Permission;
+import org.apache.ki.authz.permission.PermissionResolver;
+
+
/**
* TODO - comlete JavaDoc
* @author Les Hazlewood
Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/util/PermissionUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/util/PermissionUtils.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/SoftHashMap.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/SoftHashMap.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/SoftHashMap.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/SoftHashMap.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/SoftHashMap.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/SoftHashMap.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/SoftHashMap.java Wed Mar 11 05:40:38 2009
@@ -16,11 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.util;
+package org.apache.ki.util;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+
/**
* A <code><em>Soft</em>HashMap</code> is a memory-constrained map that stores its <em>values</em> in
@@ -79,7 +85,7 @@
} else {
//TODO - Will we still support 1.3 and 1.4 JVMs?
//noinspection unchecked
- map = (Map)ClassUtils.newInstance("edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap");
+ map = (Map) ClassUtils.newInstance("edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap");
}
}
Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/StringUtils.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/StringUtils.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/StringUtils.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/StringUtils.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/StringUtils.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/StringUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/StringUtils.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.util;
+package org.apache.ki.util;
import java.text.ParseException;
import java.util.ArrayList;
Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/ThreadContext.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/ThreadContext.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/ThreadContext.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/ThreadContext.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/ThreadContext.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/ThreadContext.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/ThreadContext.java Wed Mar 11 05:40:38 2009
@@ -16,18 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.util;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.ki.mgt.SecurityManager;
-import org.ki.subject.Subject;
+package org.apache.ki.util;
import java.io.Serializable;
import java.net.InetAddress;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.mgt.SecurityManager;
+import org.apache.ki.subject.Subject;
+
+
/**
* A ThreadContext provides a means of binding and unbinding objects to the
* current thread based on key/value pairs.
@@ -212,7 +214,7 @@
* @return the Subject object bound to the thread, or <tt>null</tt> if there isn't one bound.
* @since 0.9
*/
- public static SecurityManager getSecurityManager() {
+ public static org.apache.ki.mgt.SecurityManager getSecurityManager() {
return (SecurityManager) get(SECURITY_MANAGER_KEY);
}
Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/util/ThreadContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/util/ThreadContext.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnavailableConstructorException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/UnavailableConstructorException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnavailableConstructorException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnavailableConstructorException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/UnavailableConstructorException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/UnavailableConstructorException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnavailableConstructorException.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.util;
+package org.apache.ki.util;
-import org.ki.JSecurityException;
+import org.apache.ki.JSecurityException;
/**
* Exception thrown when attempting to instantiate a Class via reflection, but a suitable constructor (depending
Copied: incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java (from r752240, incubator/jsecurity/trunk/core/src/org/ki/util/UnknownClassException.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java?p2=incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java&p1=incubator/jsecurity/trunk/core/src/org/ki/util/UnknownClassException.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/util/UnknownClassException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.util;
+package org.apache.ki.util;
+
+import org.apache.ki.JSecurityException;
-import org.ki.JSecurityException;
/**
* The JSecurity framework's <code>RuntimeException</code> equivalent of the JDK's
Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/jsecurity/trunk/core/src/org/ki/authz/permission/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/authz/permission/package-info.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/authz/permission/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/authz/permission/package-info.java Wed Mar 11 05:40:38 2009
@@ -17,11 +17,11 @@
* under the License.
*/
/**
- * Support and default implementations for JSecurity's {@link org.ki.authz.Permission Permission}
+ * Support and default implementations for JSecurity's {@link org.apache.ki.authz.Permission Permission}
* interface.
* <p/>
- * Also note the {@link org.ki.authz.permission.PermissionResolver PermissionResolver} interface, as
- * it plays an important part in many of JSecurity's {@link org.ki.realm.Realm Realm} implementations
+ * Also note the {@link org.apache.ki.authz.permission.PermissionResolver PermissionResolver} interface, as
+ * it plays an important part in many of JSecurity's {@link org.apache.ki.realm.Realm Realm} implementations
* and AOP support.
*/
package org.ki.authz.permission;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/core/src/org/ki/config/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/config/Configuration.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/config/Configuration.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/config/Configuration.java Wed Mar 11 05:40:38 2009
@@ -18,11 +18,12 @@
*/
package org.ki.config;
-import org.ki.mgt.SecurityManagerFactory;
+import org.apache.ki.mgt.SecurityManagerFactory;
+
/**
* A <code>Configuration</code> is responsible for 'wiring' together all the JSecurity components for an
- * application, such as the {@link org.ki.mgt.SecurityManager SecurityManager}, and any of its
+ * application, such as the {@link org.apache.ki.mgt.SecurityManager SecurityManager}, and any of its
* dependencies.
* <p/>
* Once the SecurityManager is built by the <code>Configuration</code> it is then consulted for all security
Modified: incubator/jsecurity/trunk/core/src/org/ki/config/ConfigurationException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/config/ConfigurationException.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/config/ConfigurationException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/config/ConfigurationException.java Wed Mar 11 05:40:38 2009
@@ -18,7 +18,7 @@
*/
package org.ki.config;
-import org.ki.JSecurityException;
+import org.apache.ki.JSecurityException;
/**
* Root exception indicating there was a problem parsing or processing the JSecurity configuration.
Modified: incubator/jsecurity/trunk/core/src/org/ki/config/IniConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/config/IniConfiguration.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/config/IniConfiguration.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/config/IniConfiguration.java Wed Mar 11 05:40:38 2009
@@ -18,21 +18,28 @@
*/
package org.ki.config;
+import java.io.InputStream;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.ki.JSecurityException;
-import org.ki.io.IniResource;
-import org.ki.io.ResourceUtils;
-import org.ki.mgt.DefaultSecurityManager;
-import org.ki.mgt.RealmSecurityManager;
-import org.ki.mgt.SecurityManager;
-import org.ki.realm.Realm;
-import org.ki.realm.RealmFactory;
-import org.ki.util.LifecycleUtils;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.*;
+import org.apache.ki.JSecurityException;
+import org.apache.ki.io.IniResource;
+import org.apache.ki.io.ResourceUtils;
+import org.apache.ki.mgt.DefaultSecurityManager;
+import org.apache.ki.mgt.RealmSecurityManager;
+import org.apache.ki.mgt.SecurityManager;
+import org.apache.ki.realm.Realm;
+import org.apache.ki.realm.RealmFactory;
+import org.apache.ki.util.LifecycleUtils;
+
/**
* A Configuration based on the <a href="http://en.wikipedia.org/wiki/INI_file">.ini format</a>.
@@ -167,7 +174,7 @@
afterSecurityManagerSet(sections);
}
- protected SecurityManager createDefaultSecurityManager() {
+ protected org.apache.ki.mgt.SecurityManager createDefaultSecurityManager() {
return newSecurityManagerInstance();
}
Modified: incubator/jsecurity/trunk/core/src/org/ki/config/ReflectionBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/config/ReflectionBuilder.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/config/ReflectionBuilder.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/config/ReflectionBuilder.java Wed Mar 11 05:40:38 2009
@@ -18,17 +18,19 @@
*/
package org.ki.config;
+import java.beans.PropertyDescriptor;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.ki.util.ClassUtils;
-import org.ki.util.Nameable;
-import java.beans.PropertyDescriptor;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import org.apache.ki.util.ClassUtils;
+import org.apache.ki.util.Nameable;
+
/**
* Object builder that uses reflection and Apache Commons BeanUtils to build objects given a
Modified: incubator/jsecurity/trunk/core/src/org/ki/config/ResourceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/config/ResourceConfiguration.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/config/ResourceConfiguration.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/config/ResourceConfiguration.java Wed Mar 11 05:40:38 2009
@@ -18,11 +18,12 @@
*/
package org.ki.config;
-import org.ki.mgt.SecurityManager;
-
import java.io.InputStream;
import java.io.Serializable;
+import org.apache.ki.mgt.SecurityManager;
+
+
/**
* //TODO - complete JavaDoc
* @author Les Hazlewood
@@ -30,7 +31,7 @@
*/
public abstract class ResourceConfiguration implements Configuration, Serializable {
- protected transient SecurityManager securityManager;
+ protected transient org.apache.ki.mgt.SecurityManager securityManager;
public ResourceConfiguration() {
}
Modified: incubator/jsecurity/trunk/core/src/org/ki/config/TextConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/config/TextConfiguration.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/config/TextConfiguration.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/config/TextConfiguration.java Wed Mar 11 05:40:38 2009
@@ -18,17 +18,19 @@
*/
package org.ki.config;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.ki.JSecurityException;
-import org.ki.io.ResourceException;
-import org.ki.mgt.SecurityManager;
-import org.ki.util.Initializable;
-
import java.io.Reader;
import java.io.StringReader;
import java.util.Scanner;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.JSecurityException;
+import org.apache.ki.io.ResourceException;
+import org.apache.ki.mgt.SecurityManager;
+import org.apache.ki.util.Initializable;
+
+
/**
* //TODO - complete JavaDoc
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/package-info.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/crypto/hash/package-info.java Wed Mar 11 05:40:38 2009
@@ -19,7 +19,7 @@
/**
* Cryptographic Hashing components that greatly simplify one-way data hashing in an application.
* <p/>
- * The {@link org.ki.crypto.hash.Hash Hash} interface and its implementations are significantly
+ * The {@link org.apache.ki.crypto.hash.Hash Hash} interface and its implementations are significantly
* easier to understand and use compared to the JDK's <code>MessageDigest</code> mechanism.
*/
package org.ki.crypto.hash;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/core/src/org/ki/crypto/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/crypto/package-info.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/crypto/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/crypto/package-info.java Wed Mar 11 05:40:38 2009
@@ -20,7 +20,7 @@
* Cryptography Cipher and Hashing components that greatly simplify the JDK's cryptography concepts and
* add additional convenient behavior.
* <p/>
- * The most important interface in this package is the {@link org.ki.crypto.Cipher Cipher} interface, which
+ * The most important interface in this package is the {@link org.apache.ki.crypto.Cipher Cipher} interface, which
* allows other JSecurity components to encrypt and decrypt potentially sensitive data.
*/
package org.ki.crypto;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/core/src/org/ki/mgt/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/mgt/package-info.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/mgt/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/mgt/package-info.java Wed Mar 11 05:40:38 2009
@@ -17,7 +17,7 @@
* under the License.
*/
/**
- * Provides the master {@link org.ki.mgt.SecurityManager SecurityManager} interface and a default implementation
+ * Provides the master {@link org.apache.ki.mgt.SecurityManager SecurityManager} interface and a default implementation
* hierarchy for managing all aspects of JSecurity's functionality in an application.
*/
package org.ki.mgt;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/core/src/org/ki/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/package-info.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/package-info.java Wed Mar 11 05:40:38 2009
@@ -18,7 +18,7 @@
*/
/**
* This package primarily exists as a root classpath distinction, but it does contain two core classes widely used
- * by applications, {@link org.ki.SecurityUtils SecurityUtils} and
- * {@link org.ki.JSecurityException JSecurityException}.
+ * by applications, {@link org.apache.ki.SecurityUtils SecurityUtils} and
+ * {@link org.apache.ki.JSecurityException JSecurityException}.
*/
package org.ki;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/core/src/org/ki/realm/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/realm/package-info.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/realm/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/realm/package-info.java Wed Mar 11 05:40:38 2009
@@ -17,7 +17,7 @@
* under the License.
*/
/**
- * Components and sub-packages used in supporting the core {@link org.ki.realm.Realm Realm} interface.
+ * Components and sub-packages used in supporting the core {@link org.apache.ki.realm.Realm Realm} interface.
* <p/>
* Take particular note of the multiple sub-packages with existing Realm implementations supporting many
* environments that you can use use directly or extend for custom behavior.
Modified: incubator/jsecurity/trunk/core/src/org/ki/session/mgt/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/session/mgt/package-info.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/session/mgt/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/session/mgt/package-info.java Wed Mar 11 05:40:38 2009
@@ -17,6 +17,6 @@
* under the License.
*/
/**
- * {@link org.ki.session.mgt.SessionManager SessionManager} components supporting enterprise session management.
+ * {@link org.apache.ki.session.mgt.SessionManager SessionManager} components supporting enterprise session management.
*/
package org.ki.session.mgt;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/core/src/org/ki/subject/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/ki/subject/package-info.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/ki/subject/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/ki/subject/package-info.java Wed Mar 11 05:40:38 2009
@@ -17,7 +17,7 @@
* under the License.
*/
/**
- * Components supporting the {@link org.ki.subject.Subject Subject} interface, the most important concept in
+ * Components supporting the {@link org.apache.ki.subject.Subject Subject} interface, the most important concept in
* JSecurity's API.
* <p/>
* A <code>Subject</code> is <em>the</em> primary component when using JSecurity programatically for single-user
Modified: incubator/jsecurity/trunk/core/test/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/log4j.properties?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/log4j.properties (original)
+++ incubator/jsecurity/trunk/core/test/log4j.properties Wed Mar 11 05:40:38 2009
@@ -34,4 +34,4 @@
log4j.logger.net.sf.ehcache=WARN
-log4j.logger.org.ki.util.ThreadContext=WARN
\ No newline at end of file
+log4j.logger.org.apache.ki.util.ThreadContext=WARN
\ No newline at end of file
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/AtUnitTestBase.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/AtUnitTestBase.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/AtUnitTestBase.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/AtUnitTestBase.java&p1=incubator/jsecurity/trunk/core/test/org/ki/AtUnitTestBase.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/AtUnitTestBase.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/AtUnitTestBase.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki;
+package org.apache.ki;
/*import atunit.AtUnit;
import atunit.Container;
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/ExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/ExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/ExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/ExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/ExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/ExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/ExceptionTest.java Wed Mar 11 05:40:38 2009
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki;
+package org.apache.ki;
import junit.framework.TestCase;
-import org.ki.util.ClassUtils;
import org.junit.Test;
+import org.apache.ki.util.ClassUtils;
+
+
/**
* @author Les Hazlewood
*/
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ConcurrentAccessExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/ConcurrentAccessExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ConcurrentAccessExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ConcurrentAccessExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/ConcurrentAccessExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/ConcurrentAccessExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ConcurrentAccessExceptionTest.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc;
+package org.apache.ki.authc;
+
+import org.apache.ki.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* Created by IntelliJ IDEA.
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ExcessiveAttemptsExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/ExcessiveAttemptsExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ExcessiveAttemptsExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ExcessiveAttemptsExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/ExcessiveAttemptsExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/ExcessiveAttemptsExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ExcessiveAttemptsExceptionTest.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc;
+package org.apache.ki.authc;
+
+import org.apache.ki.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* Created by IntelliJ IDEA.
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ExpiredCredentialsExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/ExpiredCredentialsExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ExpiredCredentialsExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ExpiredCredentialsExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/ExpiredCredentialsExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/ExpiredCredentialsExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/ExpiredCredentialsExceptionTest.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc;
+package org.apache.ki.authc;
+
+import org.apache.ki.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* Created by IntelliJ IDEA.
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/IncorrectCredentialsExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/IncorrectCredentialsExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/IncorrectCredentialsExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/IncorrectCredentialsExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/IncorrectCredentialsExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/IncorrectCredentialsExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/IncorrectCredentialsExceptionTest.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc;
+package org.apache.ki.authc;
+
+import org.apache.ki.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* Created by IntelliJ IDEA.
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/LockedAccountExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/LockedAccountExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/LockedAccountExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/LockedAccountExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/LockedAccountExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/LockedAccountExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/LockedAccountExceptionTest.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc;
+package org.apache.ki.authc;
+
+import org.apache.ki.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* Created by IntelliJ IDEA.
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/SimpleAuthenticationInfoTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/SimpleAuthenticationInfoTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/SimpleAuthenticationInfoTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/SimpleAuthenticationInfoTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/SimpleAuthenticationInfoTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/SimpleAuthenticationInfoTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/SimpleAuthenticationInfoTest.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc;
+package org.apache.ki.authc;
import org.junit.Test;
+
/**
* @author Les Hazlewood
* @since 0.9
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/UnknownAccountExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/UnknownAccountExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/UnknownAccountExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/UnknownAccountExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/UnknownAccountExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/UnknownAccountExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/UnknownAccountExceptionTest.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc;
+package org.apache.ki.authc;
+
+import org.apache.ki.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* Created by IntelliJ IDEA.
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/AllowAllCredentialsMatcherTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/credential/AllowAllCredentialsMatcherTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/AllowAllCredentialsMatcherTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/AllowAllCredentialsMatcherTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/credential/AllowAllCredentialsMatcherTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/credential/AllowAllCredentialsMatcherTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/AllowAllCredentialsMatcherTest.java Wed Mar 11 05:40:38 2009
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc.credential;
+package org.apache.ki.authc.credential;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
+
/**
* @author Les Hazlewood
* @since Jun 10, 2008 4:35:27 PM
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/HashedCredentialsMatcherTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/credential/HashedCredentialsMatcherTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/HashedCredentialsMatcherTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/HashedCredentialsMatcherTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/credential/HashedCredentialsMatcherTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/credential/HashedCredentialsMatcherTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/HashedCredentialsMatcherTest.java Wed Mar 11 05:40:38 2009
@@ -16,17 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc.credential;
+package org.apache.ki.authc.credential;
import junit.framework.TestCase;
-import org.ki.authc.AuthenticationInfo;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authc.SimpleAuthenticationInfo;
-import org.ki.authc.UsernamePasswordToken;
-import org.ki.crypto.hash.AbstractHash;
-import org.ki.util.ClassUtils;
import org.junit.Test;
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.SimpleAuthenticationInfo;
+import org.apache.ki.authc.UsernamePasswordToken;
+import org.apache.ki.crypto.hash.AbstractHash;
+import org.apache.ki.util.ClassUtils;
+
+
/**
* @author Les Hazlewood
* @since Jun 10, 2008 4:47:09 PM
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Md2CredentialsMatcherTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Md2CredentialsMatcherTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Md2CredentialsMatcherTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Md2CredentialsMatcherTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Md2CredentialsMatcherTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Md2CredentialsMatcherTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Md2CredentialsMatcherTest.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc.credential;
+package org.apache.ki.authc.credential;
+
+import org.apache.ki.crypto.hash.AbstractHash;
+import org.apache.ki.crypto.hash.Md2Hash;
-import org.ki.crypto.hash.AbstractHash;
-import org.ki.crypto.hash.Md2Hash;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Md5CredentialsMatcherTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Md5CredentialsMatcherTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Md5CredentialsMatcherTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Md5CredentialsMatcherTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Md5CredentialsMatcherTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Md5CredentialsMatcherTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Md5CredentialsMatcherTest.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc.credential;
+package org.apache.ki.authc.credential;
+
+import org.apache.ki.crypto.hash.AbstractHash;
+import org.apache.ki.crypto.hash.Md5Hash;
-import org.ki.crypto.hash.AbstractHash;
-import org.ki.crypto.hash.Md5Hash;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha1CredentialsMatcherTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha1CredentialsMatcherTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha1CredentialsMatcherTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha1CredentialsMatcherTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha1CredentialsMatcherTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha1CredentialsMatcherTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha1CredentialsMatcherTest.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc.credential;
+package org.apache.ki.authc.credential;
+
+import org.apache.ki.crypto.hash.AbstractHash;
+import org.apache.ki.crypto.hash.Sha1Hash;
-import org.ki.crypto.hash.AbstractHash;
-import org.ki.crypto.hash.Sha1Hash;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha256CredentialsMatcherTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha256CredentialsMatcherTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha256CredentialsMatcherTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha256CredentialsMatcherTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha256CredentialsMatcherTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha256CredentialsMatcherTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha256CredentialsMatcherTest.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc.credential;
+package org.apache.ki.authc.credential;
+
+import org.apache.ki.crypto.hash.AbstractHash;
+import org.apache.ki.crypto.hash.Sha256Hash;
-import org.ki.crypto.hash.AbstractHash;
-import org.ki.crypto.hash.Sha256Hash;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha384CredentialsMatcherTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha384CredentialsMatcherTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha384CredentialsMatcherTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha384CredentialsMatcherTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha384CredentialsMatcherTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha384CredentialsMatcherTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha384CredentialsMatcherTest.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc.credential;
+package org.apache.ki.authc.credential;
+
+import org.apache.ki.crypto.hash.AbstractHash;
+import org.apache.ki.crypto.hash.Sha384Hash;
-import org.ki.crypto.hash.AbstractHash;
-import org.ki.crypto.hash.Sha384Hash;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha512CredentialsMatcherTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha512CredentialsMatcherTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha512CredentialsMatcherTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha512CredentialsMatcherTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha512CredentialsMatcherTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/credential/Sha512CredentialsMatcherTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/credential/Sha512CredentialsMatcherTest.java Wed Mar 11 05:40:38 2009
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc.credential;
+package org.apache.ki.authc.credential;
+
+import org.apache.ki.crypto.hash.AbstractHash;
+import org.apache.ki.crypto.hash.Sha512Hash;
-import org.ki.crypto.hash.AbstractHash;
-import org.ki.crypto.hash.Sha512Hash;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/pam/AllSuccessfulStrategyTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/pam/AllSuccessfulStrategyTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/pam/AllSuccessfulStrategyTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/pam/AllSuccessfulStrategyTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/pam/AllSuccessfulStrategyTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/pam/AllSuccessfulStrategyTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/pam/AllSuccessfulStrategyTest.java Wed Mar 11 05:40:38 2009
@@ -16,20 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc.pam;
+package org.apache.ki.authc.pam;
-import org.ki.authc.AuthenticationException;
-import org.ki.authc.AuthenticationInfo;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authz.AuthorizationInfo;
-import org.ki.realm.AuthorizingRealm;
-import org.ki.realm.Realm;
-import org.ki.realm.SimpleAccountRealm;
-import org.ki.subject.PrincipalCollection;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
import org.junit.Before;
import org.junit.Test;
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authz.AuthorizationInfo;
+import org.apache.ki.realm.AuthorizingRealm;
+import org.apache.ki.realm.Realm;
+import org.apache.ki.realm.SimpleAccountRealm;
+import org.apache.ki.subject.PrincipalCollection;
+
+
public class AllSuccessfulStrategyTest {
private AllSuccessfulStrategy strategy;
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authc/support/AbstractAuthenticatorTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authc/support/AbstractAuthenticatorTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authc/support/AbstractAuthenticatorTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authc/support/AbstractAuthenticatorTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authc/support/AbstractAuthenticatorTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authc/support/AbstractAuthenticatorTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authc/support/AbstractAuthenticatorTest.java Wed Mar 11 05:40:38 2009
@@ -16,14 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.authc.support;
+package org.apache.ki.authc.support;
import static org.easymock.EasyMock.*;
-import org.ki.authc.*;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
+import org.apache.ki.authc.AbstractAuthenticator;
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.AuthenticationListener;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.SimpleAuthenticationInfo;
+import org.apache.ki.authc.UsernamePasswordToken;
+
+
/**
* @author Les Hazlewood
* @since 0.1
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authz/AuthorizationExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authz/AuthorizationExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authz/AuthorizationExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authz/AuthorizationExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authz/AuthorizationExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authz/AuthorizationExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authz/AuthorizationExceptionTest.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.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authz/HostUnauthorizedExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authz/HostUnauthorizedExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authz/HostUnauthorizedExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authz/HostUnauthorizedExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authz/HostUnauthorizedExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authz/HostUnauthorizedExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authz/HostUnauthorizedExceptionTest.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.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authz/UnauthenticatedExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authz/UnauthenticatedExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authz/UnauthenticatedExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authz/UnauthenticatedExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authz/UnauthenticatedExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authz/UnauthenticatedExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authz/UnauthenticatedExceptionTest.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.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authz/UnauthorizedExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authz/UnauthorizedExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authz/UnauthorizedExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authz/UnauthorizedExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authz/UnauthorizedExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authz/UnauthorizedExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authz/UnauthorizedExceptionTest.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.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authz/permission/AllPermissionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authz/permission/AllPermissionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authz/permission/AllPermissionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authz/permission/AllPermissionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authz/permission/AllPermissionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authz/permission/AllPermissionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authz/permission/AllPermissionTest.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.permission;
+package org.apache.ki.authz.permission;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
+
/**
* @author Les Hazlewood
*/
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/authz/permission/WildcardPermissionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/authz/permission/WildcardPermissionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/authz/permission/WildcardPermissionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/authz/permission/WildcardPermissionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/authz/permission/WildcardPermissionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/authz/permission/WildcardPermissionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/authz/permission/WildcardPermissionTest.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;
+package org.apache.ki.authz.permission;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
+
/**
* @author Jeremy Haile
* @since 0.9
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/config/CompositeBean.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/config/CompositeBean.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/config/CompositeBean.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/config/CompositeBean.java&p1=incubator/jsecurity/trunk/core/test/org/ki/config/CompositeBean.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/config/CompositeBean.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/config/CompositeBean.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.config;
+package org.apache.ki.config;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/config/ReflectionBuilderTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/config/ReflectionBuilderTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/config/ReflectionBuilderTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/config/ReflectionBuilderTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/config/ReflectionBuilderTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/config/ReflectionBuilderTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/config/ReflectionBuilderTest.java Wed Mar 11 05:40:38 2009
@@ -16,14 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.config;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
+package org.apache.ki.config;
import java.util.LinkedHashMap;
import java.util.Map;
+import static org.junit.Assert.*;
+import org.junit.Test;
+import org.ki.config.ConfigurationException;
+import org.ki.config.ReflectionBuilder;
+import org.ki.config.UnresolveableReferenceException;
+
/**
* @author Les Hazlewood
* @since Aug 5, 2008 9:53:00 AM
@@ -33,7 +36,7 @@
@Test
public void testSimpleConfig() {
Map<String, String> defs = new LinkedHashMap<String, String>();
- defs.put("compositeBean", "org.ki.config.CompositeBean");
+ defs.put("compositeBean", "org.apache.ki.config.CompositeBean");
defs.put("compositeBean.stringProp", "blah");
defs.put("compositeBean.booleanProp", "true");
defs.put("compositeBean.intProp", "42");
@@ -51,7 +54,7 @@
@Test
public void testSimpleConfigWithDollarSignStringValue() {
Map<String, String> defs = new LinkedHashMap<String, String>();
- defs.put("compositeBean", "org.ki.config.CompositeBean");
+ defs.put("compositeBean", "org.apache.ki.config.CompositeBean");
defs.put("compositeBean.stringProp", "\\$500");
ReflectionBuilder builder = new ReflectionBuilder();
@@ -64,9 +67,9 @@
@Test
public void testObjectReferenceConfig() {
Map<String, String> defs = new LinkedHashMap<String, String>();
- defs.put("simpleBean", "org.ki.config.SimpleBean");
+ defs.put("simpleBean", "org.apache.ki.config.SimpleBean");
defs.put("simpleBean.intProp", "101");
- defs.put("compositeBean", "org.ki.config.CompositeBean");
+ defs.put("compositeBean", "org.apache.ki.config.CompositeBean");
defs.put("compositeBean.stringProp", "blah");
defs.put("compositeBean.simpleBean", "$simpleBean");
@@ -86,8 +89,8 @@
@Test(expected = ConfigurationException.class)
public void testObjectReferenceConfigWithTypeMismatch() {
Map<String, String> defs = new LinkedHashMap<String, String>();
- defs.put("simpleBean", "org.ki.config.SimpleBean");
- defs.put("compositeBean", "org.ki.config.CompositeBean");
+ defs.put("simpleBean", "org.apache.ki.config.SimpleBean");
+ defs.put("compositeBean", "org.apache.ki.config.CompositeBean");
defs.put("compositeBean.simpleBean", "simpleBean");
ReflectionBuilder builder = new ReflectionBuilder();
builder.buildObjects(defs);
@@ -96,8 +99,8 @@
@Test(expected = UnresolveableReferenceException.class)
public void testObjectReferenceConfigWithInvalidReference() {
Map<String, String> defs = new LinkedHashMap<String, String>();
- defs.put("simpleBean", "org.ki.config.SimpleBean");
- defs.put("compositeBean", "org.ki.config.CompositeBean");
+ defs.put("simpleBean", "org.apache.ki.config.SimpleBean");
+ defs.put("compositeBean", "org.apache.ki.config.CompositeBean");
defs.put("compositeBean.simpleBean", "$foo");
ReflectionBuilder builder = new ReflectionBuilder();
builder.buildObjects(defs);
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/config/SimpleBean.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/config/SimpleBean.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/config/SimpleBean.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/config/SimpleBean.java&p1=incubator/jsecurity/trunk/core/test/org/ki/config/SimpleBean.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/config/SimpleBean.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/config/SimpleBean.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.config;
+package org.apache.ki.config;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/io/ResourceExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/io/ResourceExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/io/ResourceExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/io/ResourceExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/io/ResourceExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/io/ResourceExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/io/ResourceExceptionTest.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.io;
+package org.apache.ki.io;
+
+import org.apache.ki.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/io/SerializationExceptionTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/io/SerializationExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/io/SerializationExceptionTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/io/SerializationExceptionTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/io/SerializationExceptionTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/io/SerializationExceptionTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/io/SerializationExceptionTest.java Wed Mar 11 05:40:38 2009
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.io;
+package org.apache.ki.io;
+
+import org.apache.ki.ExceptionTest;
-import org.ki.ExceptionTest;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/mgt/DefaultSecurityManagerTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/mgt/DefaultSecurityManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/mgt/DefaultSecurityManagerTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/mgt/DefaultSecurityManagerTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/mgt/DefaultSecurityManagerTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/mgt/DefaultSecurityManagerTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/mgt/DefaultSecurityManagerTest.java Wed Mar 11 05:40:38 2009
@@ -16,22 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.mgt;
+package org.apache.ki.mgt;
+
+import java.io.Serializable;
-import org.ki.SecurityUtils;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authc.UsernamePasswordToken;
-import org.ki.realm.text.PropertiesRealm;
-import org.ki.session.Session;
-import org.ki.session.mgt.AbstractValidatingSessionManager;
-import org.ki.subject.Subject;
-import org.ki.util.ThreadContext;
import org.junit.After;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
-import java.io.Serializable;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.UsernamePasswordToken;
+import org.apache.ki.realm.text.PropertiesRealm;
+import org.apache.ki.session.Session;
+import org.apache.ki.session.mgt.AbstractValidatingSessionManager;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.ThreadContext;
+
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/mgt/VMSingletonDefaultSecurityManagerTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/mgt/VMSingletonDefaultSecurityManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/mgt/VMSingletonDefaultSecurityManagerTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/mgt/VMSingletonDefaultSecurityManagerTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/mgt/VMSingletonDefaultSecurityManagerTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/mgt/VMSingletonDefaultSecurityManagerTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/mgt/VMSingletonDefaultSecurityManagerTest.java Wed Mar 11 05:40:38 2009
@@ -16,19 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.mgt;
+package org.apache.ki.mgt;
-import org.ki.SecurityUtils;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authc.UsernamePasswordToken;
-import org.ki.realm.text.PropertiesRealm;
-import org.ki.subject.Subject;
-import org.ki.util.ThreadContext;
import org.junit.After;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.UsernamePasswordToken;
+import org.apache.ki.realm.text.PropertiesRealm;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.ThreadContext;
+
+
/**
* @author Les Hazlewood
* @since May 8, 2008 12:26:23 AM
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/realm/AuthorizingRealmTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/realm/AuthorizingRealmTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/realm/AuthorizingRealmTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/realm/AuthorizingRealmTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/realm/AuthorizingRealmTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/realm/AuthorizingRealmTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/realm/AuthorizingRealmTest.java Wed Mar 11 05:40:38 2009
@@ -16,29 +16,40 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.realm;
+package org.apache.ki.realm;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
-import org.ki.authc.*;
-import org.ki.authc.credential.AllowAllCredentialsMatcher;
-import org.ki.authc.credential.CredentialsMatcher;
-import org.ki.authz.AuthorizationInfo;
-import org.ki.authz.Permission;
-import org.ki.authz.SimpleAuthorizationInfo;
-import org.ki.authz.UnauthorizedException;
-import org.ki.authz.permission.WildcardPermission;
-import org.ki.mgt.DefaultSecurityManager;
-import org.ki.subject.PrincipalCollection;
-import org.ki.subject.SimplePrincipalCollection;
-import org.ki.subject.Subject;
import org.junit.After;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.security.Principal;
-import java.util.*;
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.SimpleAccount;
+import org.apache.ki.authc.SimpleAuthenticationInfo;
+import org.apache.ki.authc.UsernamePasswordToken;
+import org.apache.ki.authc.credential.AllowAllCredentialsMatcher;
+import org.apache.ki.authc.credential.CredentialsMatcher;
+import org.apache.ki.authz.AuthorizationInfo;
+import org.apache.ki.authz.Permission;
+import org.apache.ki.authz.SimpleAuthorizationInfo;
+import org.apache.ki.authz.UnauthorizedException;
+import org.apache.ki.authz.permission.WildcardPermission;
+import org.apache.ki.mgt.DefaultSecurityManager;
+import org.apache.ki.subject.PrincipalCollection;
+import org.apache.ki.subject.SimplePrincipalCollection;
+import org.apache.ki.subject.Subject;
+
/**
* Simple test case for AuthorizingRealm.
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/realm/UserIdPrincipal.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/realm/UserIdPrincipal.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/realm/UserIdPrincipal.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/realm/UserIdPrincipal.java&p1=incubator/jsecurity/trunk/core/test/org/ki/realm/UserIdPrincipal.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/realm/UserIdPrincipal.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/realm/UserIdPrincipal.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.realm;
+package org.apache.ki.realm;
import java.io.Serializable;
import java.security.Principal;
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/realm/UsernamePrincipal.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/realm/UsernamePrincipal.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/realm/UsernamePrincipal.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/realm/UsernamePrincipal.java&p1=incubator/jsecurity/trunk/core/test/org/ki/realm/UsernamePrincipal.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/realm/UsernamePrincipal.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/realm/UsernamePrincipal.java Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.realm;
+package org.apache.ki.realm;
import java.io.Serializable;
import java.security.Principal;
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/realm/activedirectory/ActiveDirectoryRealmTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/realm/activedirectory/ActiveDirectoryRealmTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/realm/activedirectory/ActiveDirectoryRealmTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/realm/activedirectory/ActiveDirectoryRealmTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/realm/activedirectory/ActiveDirectoryRealmTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/realm/activedirectory/ActiveDirectoryRealmTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/realm/activedirectory/ActiveDirectoryRealmTest.java Wed Mar 11 05:40:38 2009
@@ -16,32 +16,38 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.realm.activedirectory;
+package org.apache.ki.realm.activedirectory;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashSet;
+import java.util.Set;
+import javax.naming.NamingException;
-import org.ki.SecurityUtils;
-import org.ki.authc.*;
-import org.ki.authc.credential.CredentialsMatcher;
-import org.ki.authz.AuthorizationInfo;
-import org.ki.authz.SimpleAuthorizationInfo;
-import org.ki.mgt.DefaultSecurityManager;
-import org.ki.realm.AuthorizingRealm;
-import org.ki.realm.UserIdPrincipal;
-import org.ki.realm.UsernamePrincipal;
-import org.ki.realm.ldap.LdapContextFactory;
-import org.ki.subject.PrincipalCollection;
-import org.ki.subject.SimplePrincipalCollection;
-import org.ki.subject.Subject;
-import org.ki.util.ThreadContext;
import org.junit.After;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
-import javax.naming.NamingException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.HashSet;
-import java.util.Set;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.SimpleAccount;
+import org.apache.ki.authc.UsernamePasswordToken;
+import org.apache.ki.authc.credential.CredentialsMatcher;
+import org.apache.ki.authz.AuthorizationInfo;
+import org.apache.ki.authz.SimpleAuthorizationInfo;
+import org.apache.ki.mgt.DefaultSecurityManager;
+import org.apache.ki.realm.AuthorizingRealm;
+import org.apache.ki.realm.UserIdPrincipal;
+import org.apache.ki.realm.UsernamePrincipal;
+import org.apache.ki.realm.ldap.LdapContextFactory;
+import org.apache.ki.subject.PrincipalCollection;
+import org.apache.ki.subject.SimplePrincipalCollection;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.ThreadContext;
+
/**
* Simple test case for ActiveDirectoryRealm.
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/subject/DelegatingSubjectTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/subject/DelegatingSubjectTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/subject/DelegatingSubjectTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/subject/DelegatingSubjectTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/subject/DelegatingSubjectTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/subject/DelegatingSubjectTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/subject/DelegatingSubjectTest.java Wed Mar 11 05:40:38 2009
@@ -16,17 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.subject;
+package org.apache.ki.subject;
+
+import java.io.Serializable;
-import org.ki.mgt.DefaultSecurityManager;
-import org.ki.session.Session;
-import org.ki.util.ThreadContext;
import org.junit.After;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
-import java.io.Serializable;
+import org.apache.ki.mgt.DefaultSecurityManager;
+import org.apache.ki.session.Session;
+import org.apache.ki.util.ThreadContext;
+
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/core/test/org/apache/ki/util/StringUtilsTest.java (from r752240, incubator/jsecurity/trunk/core/test/org/ki/util/StringUtilsTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/test/org/apache/ki/util/StringUtilsTest.java?p2=incubator/jsecurity/trunk/core/test/org/apache/ki/util/StringUtilsTest.java&p1=incubator/jsecurity/trunk/core/test/org/ki/util/StringUtilsTest.java&r1=752240&r2=752380&rev=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/test/org/ki/util/StringUtilsTest.java (original)
+++ incubator/jsecurity/trunk/core/test/org/apache/ki/util/StringUtilsTest.java Wed Mar 11 05:40:38 2009
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.util;
+package org.apache.ki.util;
import static org.junit.Assert.*;
import org.junit.Test;
+
/**
* @author Les Hazlewood
* @since 0.9
Modified: incubator/jsecurity/trunk/samples/quickstart/src/Quickstart.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/quickstart/src/Quickstart.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/quickstart/src/Quickstart.java (original)
+++ incubator/jsecurity/trunk/samples/quickstart/src/Quickstart.java Wed Mar 11 05:40:38 2009
@@ -19,11 +19,17 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.ki.SecurityUtils;
-import org.ki.authc.*;
-import org.ki.mgt.DefaultSecurityManager;
-import org.ki.session.Session;
-import org.ki.subject.Subject;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.mgt.DefaultSecurityManager;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.Subject;
+
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.IncorrectCredentialsException;
+import org.apache.ki.authc.LockedAccountException;
+import org.apache.ki.authc.UnknownAccountException;
+import org.apache.ki.authc.UsernamePasswordToken;
+
/**
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/samples/quickstart/src/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/quickstart/src/log4j.properties?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/quickstart/src/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/quickstart/src/log4j.properties Wed Mar 11 05:40:38 2009
@@ -32,5 +32,5 @@
log4j.logger.org.ki=TRACE
# Disable verbose logging
-log4j.logger.org.ki.util.ThreadContext=WARN
+log4j.logger.org.apache.ki.util.ThreadContext=WARN
log4j.logger.org.ki.cache.ehcache.EhCache=WARN
\ No newline at end of file
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/classes/log4j.properties?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/classes/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/classes/log4j.properties Wed Mar 11 05:40:38 2009
@@ -35,5 +35,5 @@
log4j.logger.org.ki=TRACE
# Disable verbose logging
-log4j.logger.org.ki.util.ThreadContext=WARN
+log4j.logger.org.apache.ki.util.ThreadContext=WARN
log4j.logger.org.ki.cache.ehcache.EhCache=WARN
Modified: incubator/jsecurity/trunk/samples/spring/etc/ehcache.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/etc/ehcache.xml?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/etc/ehcache.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/etc/ehcache.xml Wed Mar 11 05:40:38 2009
@@ -89,7 +89,7 @@
diskPersistent="true"
diskExpiryThreadIntervalSeconds="600"/>
- <cache name="org.ki.realm.SimpleAccountRealm.authorization"
+ <cache name="org.apache.ki.realm.SimpleAccountRealm.authorization"
maxElementsInMemory="100"
eternal="false"
timeToLiveSeconds="600"
Modified: incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java Wed Mar 11 05:40:38 2009
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.ki.crypto.hash.Sha256Hash;
+import org.apache.ki.crypto.hash.Sha256Hash;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -28,8 +28,8 @@
/**
* A data populator that creates a set of security tables and test data that can be used by the
- * JSecurity Spring sample application to demonstrate the use of the {@link org.ki.realm.jdbc.JdbcRealm}
- * The tables created by this class follow the default table and column names that {@link org.ki.realm.jdbc.JdbcRealm} uses.
+ * JSecurity Spring sample application to demonstrate the use of the {@link org.apache.ki.realm.jdbc.JdbcRealm}
+ * The tables created by this class follow the default table and column names that {@link org.apache.ki.realm.jdbc.JdbcRealm} uses.
*
* @author Les Hazlewood
*/
Modified: incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java Wed Mar 11 05:40:38 2009
@@ -20,9 +20,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.ki.SecurityUtils;
-import org.ki.session.Session;
-import org.ki.subject.Subject;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.Subject;
+
/**
* Default implementation of the {@link SampleManager} interface that stores
Modified: incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/SampleManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/SampleManager.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/SampleManager.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/SampleManager.java Wed Mar 11 05:40:38 2009
@@ -18,8 +18,9 @@
*/
package org.ki.samples.spring;
-import org.ki.authz.annotation.RequiresPermissions;
-import org.ki.authz.annotation.RequiresRoles;
+import org.apache.ki.authz.annotation.RequiresPermissions;
+import org.apache.ki.authz.annotation.RequiresRoles;
+
/**
* Business manager interface used for sample application.
Modified: incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartView.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartView.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartView.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartView.java Wed Mar 11 05:40:38 2009
@@ -18,7 +18,7 @@
*/
package org.ki.samples.spring.ui;
-import org.ki.authz.AuthorizationException;
+import org.apache.ki.authz.AuthorizationException;
import org.ki.samples.spring.DefaultSampleManager;
import org.ki.samples.spring.SampleManager;
import org.springframework.beans.factory.InitializingBean;
@@ -31,6 +31,7 @@
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+
/**
* Simple web start application that helps to demo single sign-on and
* remoting authorization using JSecurity. The injected <tt>SampleManager</tt>