KI-66 intermediate changes
git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@752571 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/org/apache/ki/authc/credential/package-info.java b/core/src/org/apache/ki/authc/credential/package-info.java
index 4f75fe1..f85f37c 100644
--- a/core/src/org/apache/ki/authc/credential/package-info.java
+++ b/core/src/org/apache/ki/authc/credential/package-info.java
@@ -18,7 +18,7 @@
*/
/**
* Support for validating <em>credentials</em> (such as passwords or X509 certificates) during
- * authentication via the {@link org.ki.authc.credential.CredentialsMatcher CredentialsMatcher}
+ * authentication via the {@link org.apache.ki.authc.credential.CredentialsMatcher CredentialsMatcher}
* interface and its supporting implementations.
*/
-package org.ki.authc.credential;
\ No newline at end of file
+package org.apache.ki.authc.credential;
diff --git a/core/src/org/apache/ki/authc/package-info.java b/core/src/org/apache/ki/authc/package-info.java
index df4be83..7190b75 100644
--- a/core/src/org/apache/ki/authc/package-info.java
+++ b/core/src/org/apache/ki/authc/package-info.java
@@ -26,4 +26,4 @@
* entry point (facade) to all other other authentication components. Other components, interfaces and
* exceptions are here to support <tt>Authenticator</tt> implementations.
*/
-package org.ki.authc;
+package org.apache.ki.authc;
diff --git a/core/src/org/apache/ki/authc/pam/package-info.java b/core/src/org/apache/ki/authc/pam/package-info.java
index e0ddaff..01bbe61 100644
--- a/core/src/org/apache/ki/authc/pam/package-info.java
+++ b/core/src/org/apache/ki/authc/pam/package-info.java
@@ -19,9 +19,9 @@
/**
* Support for <em>PAM</em>, or <b>P</b>luggable <b>A</b>uthentication <b>M</b>odules, which is
* the capability to authenticate a user against multiple configurable (pluggable) <em>modules</em> (Apache Ki
- * calls these {@link org.ki.realm.Realm Realm}s).
+ * calls these {@link org.apache.ki.realm.Realm Realm}s).
* <p/>
- * The primary class of interest here is the {@link org.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator}
+ * The primary class of interest here is the {@link org.apache.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator}
* which is an <code>Authenticator</code> implementation that coordinates authentication attempts across
* one or more Realm instances.
* <p/>
@@ -29,4 +29,4 @@
* application's needs using an injectible
* {@link AuthenticationStrategy}.
*/
-package org.ki.authc.pam;
+package org.apache.ki.authc.pam;
diff --git a/core/src/org/apache/ki/authz/annotation/package-info.java b/core/src/org/apache/ki/authz/annotation/package-info.java
index def90d2..098ee7f 100644
--- a/core/src/org/apache/ki/authz/annotation/package-info.java
+++ b/core/src/org/apache/ki/authz/annotation/package-info.java
@@ -20,4 +20,4 @@
* Annotations used to restrict which classes, instances, or methods may be accessed or invoked depending on the
* caller's access abilities or authentication state.
*/
-package org.ki.authz.annotation;
\ No newline at end of file
+package org.apache.ki.authz.annotation;
diff --git a/core/src/org/apache/ki/authz/aop/package-info.java b/core/src/org/apache/ki/authz/aop/package-info.java
index c2a4a77..b1d6788 100644
--- a/core/src/org/apache/ki/authz/aop/package-info.java
+++ b/core/src/org/apache/ki/authz/aop/package-info.java
@@ -20,4 +20,4 @@
* Contains AOP implementation support classes specifically used for authorization operations, particularly supporting
* AOP Method Interceptors and JSR-175 metadata Annotations.
*/
-package org.ki.authz.aop;
\ No newline at end of file
+package org.apache.ki.authz.aop;
diff --git a/core/src/org/apache/ki/authz/package-info.java b/core/src/org/apache/ki/authz/package-info.java
index b0f364d..0753c6f 100644
--- a/core/src/org/apache/ki/authz/package-info.java
+++ b/core/src/org/apache/ki/authz/package-info.java
@@ -35,4 +35,4 @@
* Although it is possible for applications to implement this and other interfaces directly, it is not
* recommended. Apache Ki already has base implementations which should be suitable for 99% of deployments.
*/
-package org.ki.authz;
+package org.apache.ki.authz;
diff --git a/core/src/org/apache/ki/authz/permission/package-info.java b/core/src/org/apache/ki/authz/permission/package-info.java
index 286fe93..019cd0e 100644
--- a/core/src/org/apache/ki/authz/permission/package-info.java
+++ b/core/src/org/apache/ki/authz/permission/package-info.java
@@ -24,4 +24,4 @@
* it plays an important part in many of Apache Ki's {@link org.apache.ki.realm.Realm Realm} implementations
* and AOP support.
*/
-package org.ki.authz.permission;
+package org.apache.ki.authz.permission;
diff --git a/core/src/org/apache/ki/cache/DefaultCacheManager.java b/core/src/org/apache/ki/cache/DefaultCacheManager.java
index 4215483..ec050f2 100644
--- a/core/src/org/apache/ki/cache/DefaultCacheManager.java
+++ b/core/src/org/apache/ki/cache/DefaultCacheManager.java
@@ -30,7 +30,7 @@
* <p/>
* This implementation does not offer any enterprise-level features such as cache coherency, optimistic locking,
* failover or other similar features. It relies on memory-based {@link java.util.Map Map} caches. For more
- * enterprise features, consider using an {@link org.ki.cache.ehcache.EhCacheManager EhCacheManager} or other
+ * enterprise features, consider using an {@link org.apache.ki.cache.ehcache.EhCacheManager EhCacheManager} or other
* similar implementation that wraps an enterprise-grade Caching solution.
*
* @author Les Hazlewood
diff --git a/core/src/org/apache/ki/cache/package-info.java b/core/src/org/apache/ki/cache/package-info.java
index 1ec1df8..e8c3863 100644
--- a/core/src/org/apache/ki/cache/package-info.java
+++ b/core/src/org/apache/ki/cache/package-info.java
@@ -19,4 +19,4 @@
/**
* Caching support used to enhance performance for any security operation.
*/
-package org.ki.cache;
\ No newline at end of file
+package org.apache.ki.cache;
diff --git a/core/src/org/apache/ki/codec/package-info.java b/core/src/org/apache/ki/codec/package-info.java
index 751f915..43f01c0 100644
--- a/core/src/org/apache/ki/codec/package-info.java
+++ b/core/src/org/apache/ki/codec/package-info.java
@@ -20,4 +20,4 @@
* Components for encoding and decoding of data across multiple formats, especially useful in Apache Ki's
* cryptography and web functionality.
*/
-package org.ki.codec;
+package org.apache.ki.codec;
diff --git a/core/src/org/apache/ki/config/package-info.java b/core/src/org/apache/ki/config/package-info.java
index 4234cee..0fbe5f8 100644
--- a/core/src/org/apache/ki/config/package-info.java
+++ b/core/src/org/apache/ki/config/package-info.java
@@ -19,4 +19,4 @@
/**
* Components that support configuring Apache Ki in any application.
*/
-package org.ki.config;
+package org.apache.ki.config;
diff --git a/core/src/org/apache/ki/crypto/hash/package-info.java b/core/src/org/apache/ki/crypto/hash/package-info.java
index f4523b1..8b524f4 100644
--- a/core/src/org/apache/ki/crypto/hash/package-info.java
+++ b/core/src/org/apache/ki/crypto/hash/package-info.java
@@ -22,4 +22,4 @@
* 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
+package org.apache.ki.crypto.hash;
diff --git a/core/src/org/apache/ki/crypto/package-info.java b/core/src/org/apache/ki/crypto/package-info.java
index 008b839..89da878 100644
--- a/core/src/org/apache/ki/crypto/package-info.java
+++ b/core/src/org/apache/ki/crypto/package-info.java
@@ -23,4 +23,4 @@
* The most important interface in this package is the {@link org.apache.ki.crypto.Cipher Cipher} interface, which
* allows other Apache Ki components to encrypt and decrypt potentially sensitive data.
*/
-package org.ki.crypto;
+package org.apache.ki.crypto;
diff --git a/core/src/org/apache/ki/io/package-info.java b/core/src/org/apache/ki/io/package-info.java
index 3ba5e23..4116a47 100644
--- a/core/src/org/apache/ki/io/package-info.java
+++ b/core/src/org/apache/ki/io/package-info.java
@@ -19,4 +19,4 @@
/**
* Support for reading and writing (input/output) raw data from multiple resource locations.
*/
-package org.ki.io;
\ No newline at end of file
+package org.apache.ki.io;
diff --git a/core/src/org/apache/ki/jndi/package-info.java b/core/src/org/apache/ki/jndi/package-info.java
index 2c0cf86..b784a4b 100644
--- a/core/src/org/apache/ki/jndi/package-info.java
+++ b/core/src/org/apache/ki/jndi/package-info.java
@@ -19,4 +19,4 @@
/**
* Enables accessing objects located in JNDI that might be useful when configuring a Apache Ki-enabled application.
*/
-package org.ki.jndi;
+package org.apache.ki.jndi;
diff --git a/core/src/org/apache/ki/mgt/DefaultSecurityManager.java b/core/src/org/apache/ki/mgt/DefaultSecurityManager.java
index 4259c0f..ff65904 100644
--- a/core/src/org/apache/ki/mgt/DefaultSecurityManager.java
+++ b/core/src/org/apache/ki/mgt/DefaultSecurityManager.java
@@ -67,12 +67,12 @@
* instance yourself via the {@link #setRememberMeManager(RememberMeManager) setRememberMeManager}
* mutator. However if you're reading this JavaDoc with the
* expectation of operating in a Web environment, take a look at the
- * {@link org.ki.web.DefaultWebSecurityManager DefaultWebSecurityManager} implementation, which
+ * {@link org.apache.ki.web.DefaultWebSecurityManager DefaultWebSecurityManager} implementation, which
* <em>does</em> support <tt>RememberMe</tt> services by default at startup.
*
* @author Les Hazlewood
* @author Jeremy Haile
- * @see org.ki.web.DefaultWebSecurityManager
+ * @see org.apache.ki.web.DefaultWebSecurityManager
* @since 0.2
*/
public class DefaultSecurityManager extends SessionsSecurityManager {
diff --git a/core/src/org/apache/ki/mgt/package-info.java b/core/src/org/apache/ki/mgt/package-info.java
index ac9c860..0055a95 100644
--- a/core/src/org/apache/ki/mgt/package-info.java
+++ b/core/src/org/apache/ki/mgt/package-info.java
@@ -20,4 +20,4 @@
* Provides the master {@link org.apache.ki.mgt.SecurityManager SecurityManager} interface and a default implementation
* hierarchy for managing all aspects of Apache Ki's functionality in an application.
*/
-package org.ki.mgt;
+package org.apache.ki.mgt;
diff --git a/core/src/org/apache/ki/realm/activedirectory/package-info.java b/core/src/org/apache/ki/realm/activedirectory/package-info.java
index f6504dd..7023fce 100644
--- a/core/src/org/apache/ki/realm/activedirectory/package-info.java
+++ b/core/src/org/apache/ki/realm/activedirectory/package-info.java
@@ -19,4 +19,4 @@
/**
* Realms that acquire security data from a Microsoft Active Directory.
*/
-package org.ki.realm.activedirectory;
\ No newline at end of file
+package org.apache.ki.realm.activedirectory;
diff --git a/core/src/org/apache/ki/realm/jdbc/package-info.java b/core/src/org/apache/ki/realm/jdbc/package-info.java
index 87b3f50..e5c8d3a 100644
--- a/core/src/org/apache/ki/realm/jdbc/package-info.java
+++ b/core/src/org/apache/ki/realm/jdbc/package-info.java
@@ -20,4 +20,4 @@
* Realms that acquire security data from an RDBMS (Relational Database Management System) using the
* JDBC API.
*/
-package org.ki.realm.jdbc;
\ No newline at end of file
+package org.apache.ki.realm.jdbc;
diff --git a/core/src/org/apache/ki/realm/jndi/package-info.java b/core/src/org/apache/ki/realm/jndi/package-info.java
index 13cda89..1e908d4 100644
--- a/core/src/org/apache/ki/realm/jndi/package-info.java
+++ b/core/src/org/apache/ki/realm/jndi/package-info.java
@@ -18,4 +18,4 @@
*/
/**
* Support for acquiring Realms from JNDI, particularly useful for configuring Apache Ki in JEE or EJB environments. */
-package org.ki.realm.jndi;
+package org.apache.ki.realm.jndi;
diff --git a/core/src/org/apache/ki/realm/ldap/package-info.java b/core/src/org/apache/ki/realm/ldap/package-info.java
index f703ec6..8fb0d97 100644
--- a/core/src/org/apache/ki/realm/ldap/package-info.java
+++ b/core/src/org/apache/ki/realm/ldap/package-info.java
@@ -20,4 +20,4 @@
* Realms that acquire security data from an LDAP (Lightweight Directory Access Protocol) server
* utilizing LDAP/Naming APIs.
*/
-package org.ki.realm.ldap;
\ No newline at end of file
+package org.apache.ki.realm.ldap;
diff --git a/core/src/org/apache/ki/realm/package-info.java b/core/src/org/apache/ki/realm/package-info.java
index e11876e..06b1d56 100644
--- a/core/src/org/apache/ki/realm/package-info.java
+++ b/core/src/org/apache/ki/realm/package-info.java
@@ -22,4 +22,4 @@
* Take particular note of the multiple sub-packages with existing Realm implementations supporting many
* environments that you can use use directly or extend for custom behavior.
*/
-package org.ki.realm;
\ No newline at end of file
+package org.apache.ki.realm;
diff --git a/core/src/org/apache/ki/realm/text/package-info.java b/core/src/org/apache/ki/realm/text/package-info.java
index eb36f02..0677360 100644
--- a/core/src/org/apache/ki/realm/text/package-info.java
+++ b/core/src/org/apache/ki/realm/text/package-info.java
@@ -20,4 +20,4 @@
* Realms that acquire security data from text-based data sources such as <code>File</code>s or
* text streams.
*/
-package org.ki.realm.text;
\ No newline at end of file
+package org.apache.ki.realm.text;
diff --git a/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java b/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
index 1bbbf4a..440b821 100644
--- a/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
+++ b/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
@@ -43,7 +43,7 @@
*
* <ul>
* <li>Configure it with a production-quality CacheManager. The
- * {@link org.ki.cache.ehcache.EhCacheManager EhCacheManager} is one such implementation. It is not used by default
+ * {@link org.apache.ki.cache.ehcache.EhCacheManager EhCacheManager} is one such implementation. It is not used by default
* to prevent a forced runtime dependency on ehcache.jar that may not be required in many environments)</li><br/>
* <li>If you need session information beyond their transient start/stop lifetimes, you should subclass this one and
* override the <tt>do*</tt> methods to perform CRUD operations using an EIS-tier API (e.g. Hibernate/JPA/JCR/etc).
diff --git a/core/src/org/apache/ki/session/mgt/eis/package-info.java b/core/src/org/apache/ki/session/mgt/eis/package-info.java
index 2716c8d..09f082b 100644
--- a/core/src/org/apache/ki/session/mgt/eis/package-info.java
+++ b/core/src/org/apache/ki/session/mgt/eis/package-info.java
@@ -20,4 +20,4 @@
* EIS (Enterprise Information System)-tier components that can perform CRUD operations for sessions
* using any EIS API.
*/
-package org.ki.session.mgt.eis;
\ No newline at end of file
+package org.apache.ki.session.mgt.eis;
diff --git a/core/src/org/apache/ki/session/mgt/package-info.java b/core/src/org/apache/ki/session/mgt/package-info.java
index d299a84..e14f001 100644
--- a/core/src/org/apache/ki/session/mgt/package-info.java
+++ b/core/src/org/apache/ki/session/mgt/package-info.java
@@ -19,4 +19,4 @@
/**
* {@link org.apache.ki.session.mgt.SessionManager SessionManager} components supporting enterprise session management.
*/
-package org.ki.session.mgt;
\ No newline at end of file
+package org.apache.ki.session.mgt;
diff --git a/core/src/org/apache/ki/session/package-info.java b/core/src/org/apache/ki/session/package-info.java
index e374e21..866da90 100644
--- a/core/src/org/apache/ki/session/package-info.java
+++ b/core/src/org/apache/ki/session/package-info.java
@@ -33,4 +33,4 @@
* Also because of this freedom, Apache Ki naturally supports Single Sign-On for any application as well, using
* this heterogeneous session support.
*/
-package org.ki.session;
+package org.apache.ki.session;
diff --git a/core/src/org/apache/ki/subject/package-info.java b/core/src/org/apache/ki/subject/package-info.java
index 9292425..f53b0d8 100644
--- a/core/src/org/apache/ki/subject/package-info.java
+++ b/core/src/org/apache/ki/subject/package-info.java
@@ -24,4 +24,4 @@
* security operations, and it is the handle to any accessible user security data. All single-user
* authentication, authorization and session operations are performed via a <code>Subject</code> instance.
*/
-package org.ki.subject;
+package org.apache.ki.subject;
diff --git a/core/src/org/apache/ki/util/Destroyable.java b/core/src/org/apache/ki/util/Destroyable.java
index fffd4bb..cdb9c37 100644
--- a/core/src/org/apache/ki/util/Destroyable.java
+++ b/core/src/org/apache/ki/util/Destroyable.java
@@ -23,7 +23,7 @@
*
* @author Les Hazlewood
* @author Jeremy Haile
- * @see org.ki.spring.LifecycleBeanPostProcessor
+ * @see org.apache.ki.spring.LifecycleBeanPostProcessor
* @since 0.2
*/
public interface Destroyable {
diff --git a/core/src/org/apache/ki/util/Initializable.java b/core/src/org/apache/ki/util/Initializable.java
index 8005c61..8761bfd 100644
--- a/core/src/org/apache/ki/util/Initializable.java
+++ b/core/src/org/apache/ki/util/Initializable.java
@@ -25,7 +25,7 @@
*
* @author Les Hazlewood
* @author Jeremy Haile
- * @see org.ki.spring.LifecycleBeanPostProcessor
+ * @see org.apache.ki.spring.LifecycleBeanPostProcessor
* @since 0.2
*/
public interface Initializable {
diff --git a/core/src/org/apache/ki/util/package-info.java b/core/src/org/apache/ki/util/package-info.java
index 19ad553..49d7a8f 100644
--- a/core/src/org/apache/ki/util/package-info.java
+++ b/core/src/org/apache/ki/util/package-info.java
@@ -20,4 +20,4 @@
* Your run-of-the-mill 'util' pacakge for components and logic widely used across the framework that can't
* find their home into a proper OO hierarchy (or, most likely for things used across many hierarchies).
*/
-package org.ki.util;
\ No newline at end of file
+package org.apache.ki.util;
diff --git a/docs/reference/src/jsecurity.tld.xml b/docs/reference/src/ki.tld.xml
similarity index 100%
rename from docs/reference/src/jsecurity.tld.xml
rename to docs/reference/src/ki.tld.xml
diff --git a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/dao/BootstrapDataPopulator.java b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/dao/BootstrapDataPopulator.java
index 4f90700..56fcfd0 100644
--- a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/dao/BootstrapDataPopulator.java
+++ b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/dao/BootstrapDataPopulator.java
@@ -19,7 +19,7 @@
package org.jsecurity.samples.sprhib.dao;
import org.hibernate.SessionFactory;
-import org.jsecurity.crypto.hash.Sha256Hash;
+import org.apache.ki.crypto.hash.Sha256Hash;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/security/SampleRealm.java b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/security/SampleRealm.java
index 67235cd..cd39c9f 100644
--- a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/security/SampleRealm.java
+++ b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/security/SampleRealm.java
@@ -18,15 +18,15 @@
*/
package org.jsecurity.samples.sprhib.security;
-import org.jsecurity.authc.*;
-import org.jsecurity.authc.credential.Sha256CredentialsMatcher;
-import org.jsecurity.authz.AuthorizationInfo;
-import org.jsecurity.authz.SimpleAuthorizationInfo;
-import org.jsecurity.realm.AuthorizingRealm;
+import org.apache.ki.authc.*;
+import org.apache.ki.authc.credential.Sha256CredentialsMatcher;
+import org.apache.ki.authz.AuthorizationInfo;
+import org.apache.ki.authz.SimpleAuthorizationInfo;
+import org.apache.ki.realm.AuthorizingRealm;
import org.jsecurity.samples.sprhib.dao.UserDAO;
import org.jsecurity.samples.sprhib.model.Role;
import org.jsecurity.samples.sprhib.model.User;
-import org.jsecurity.subject.PrincipalCollection;
+import org.apache.ki.subject.PrincipalCollection;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/service/DefaultUserService.java b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/service/DefaultUserService.java
index 1485f9c..cd9342a 100644
--- a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/service/DefaultUserService.java
+++ b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/service/DefaultUserService.java
@@ -18,8 +18,8 @@
*/
package org.jsecurity.samples.sprhib.service;
-import org.jsecurity.SecurityUtils;
-import org.jsecurity.crypto.hash.Sha256Hash;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.crypto.hash.Sha256Hash;
import org.jsecurity.samples.sprhib.dao.UserDAO;
import org.jsecurity.samples.sprhib.model.User;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserCommand.java b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserCommand.java
index 92e65d6..c8d7e12 100644
--- a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserCommand.java
+++ b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserCommand.java
@@ -18,7 +18,7 @@
*/
package org.jsecurity.samples.sprhib.web;
-import org.jsecurity.crypto.hash.Sha256Hash;
+import org.apache.ki.crypto.hash.Sha256Hash;
import org.jsecurity.samples.sprhib.model.User;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
diff --git a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserValidator.java b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserValidator.java
index 5f78cd0..2b3b535 100644
--- a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserValidator.java
+++ b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserValidator.java
@@ -18,7 +18,7 @@
*/
package org.jsecurity.samples.sprhib.web;
-import org.jsecurity.util.StringUtils;
+import org.apache.ki.util.StringUtils;
import org.springframework.validation.Errors;
import org.springframework.validation.ValidationUtils;
import org.springframework.validation.Validator;
diff --git a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/ManageUsersController.java b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/ManageUsersController.java
index f43b0e0..a0e3038 100644
--- a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/ManageUsersController.java
+++ b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/ManageUsersController.java
@@ -18,7 +18,7 @@
*/
package org.jsecurity.samples.sprhib.web;
-import org.jsecurity.authz.annotation.RequiresPermissions;
+import org.apache.ki.authz.annotation.RequiresPermissions;
import org.jsecurity.samples.sprhib.model.User;
import org.jsecurity.samples.sprhib.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SecurityController.java b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SecurityController.java
index 0ef19d7..aa79b61 100644
--- a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SecurityController.java
+++ b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SecurityController.java
@@ -18,9 +18,9 @@
*/
package org.jsecurity.samples.sprhib.web;
-import org.jsecurity.SecurityUtils;
-import org.jsecurity.authc.AuthenticationException;
-import org.jsecurity.authc.UsernamePasswordToken;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.UsernamePasswordToken;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
diff --git a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupController.java b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupController.java
index 94d0783..a807a40 100644
--- a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupController.java
+++ b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupController.java
@@ -18,8 +18,8 @@
*/
package org.jsecurity.samples.sprhib.web;
-import org.jsecurity.SecurityUtils;
-import org.jsecurity.authc.UsernamePasswordToken;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.authc.UsernamePasswordToken;
import org.jsecurity.samples.sprhib.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
diff --git a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupValidator.java b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupValidator.java
index 0e7f27f..cf459e4 100644
--- a/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupValidator.java
+++ b/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupValidator.java
@@ -18,7 +18,7 @@
*/
package org.jsecurity.samples.sprhib.web;
-import org.jsecurity.util.StringUtils;
+import org.apache.ki.util.StringUtils;
import org.springframework.validation.Errors;
import org.springframework.validation.ValidationUtils;
import org.springframework.validation.Validator;
diff --git a/samples/spring/etc/jsecurity-sample.jks b/samples/spring/etc/jsecurity-sample.jks
index cba1368..eb2ff9b 100644
--- a/samples/spring/etc/jsecurity-sample.jks
+++ b/samples/spring/etc/jsecurity-sample.jks
Binary files differ
diff --git a/samples/spring/etc/webstart.spring.xml b/samples/spring/etc/webstart.spring.xml
index 7d2a8cc..88c6ae7 100644
--- a/samples/spring/etc/webstart.spring.xml
+++ b/samples/spring/etc/webstart.spring.xml
@@ -25,14 +25,14 @@
<beans>
<bean id="webStartView"
- class="org.ki.samples.spring.ui.WebStartView">
+ class="org.apache.ki.samples.spring.ui.WebStartView">
<property name="sampleManager" ref="sampleManager"/>
</bean>
<bean id="sampleManager"
class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
<property name="serviceUrl" value="http://localhost:8080/jsecurity-spring/remoting/sampleManager"/>
- <property name="serviceInterface" value="org.ki.samples.spring.SampleManager"/>
+ <property name="serviceInterface" value="org.apache.ki.samples.spring.SampleManager"/>
<property name="remoteInvocationFactory" ref="secureRemoteInvocationFactory"/>
</bean>
diff --git a/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java b/samples/spring/src/org/apache/ki/samples/spring/BootstrapDataPopulator.java
similarity index 98%
rename from samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java
rename to samples/spring/src/org/apache/ki/samples/spring/BootstrapDataPopulator.java
index d789274..7128ea0 100644
--- a/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/BootstrapDataPopulator.java
@@ -16,15 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring;
+package org.apache.ki.samples.spring;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ki.crypto.hash.Sha256Hash;
+import javax.sql.DataSource;
+
import org.springframework.beans.factory.InitializingBean;
import org.springframework.jdbc.core.JdbcTemplate;
-import javax.sql.DataSource;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.ki.crypto.hash.Sha256Hash;
/**
* A data populator that creates a set of security tables and test data that can be used by the
diff --git a/samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java b/samples/spring/src/org/apache/ki/samples/spring/DefaultSampleManager.java
similarity index 98%
rename from samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java
rename to samples/spring/src/org/apache/ki/samples/spring/DefaultSampleManager.java
index fedcb61..567b389 100644
--- a/samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/DefaultSampleManager.java
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring;
+package org.apache.ki.samples.spring;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.ki.SecurityUtils;
import org.apache.ki.session.Session;
import org.apache.ki.subject.Subject;
diff --git a/samples/spring/src/org/ki/samples/spring/SampleManager.java b/samples/spring/src/org/apache/ki/samples/spring/SampleManager.java
similarity index 97%
rename from samples/spring/src/org/ki/samples/spring/SampleManager.java
rename to samples/spring/src/org/apache/ki/samples/spring/SampleManager.java
index fc66a95..8ec70b4 100644
--- a/samples/spring/src/org/ki/samples/spring/SampleManager.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/SampleManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring;
+package org.apache.ki.samples.spring;
import org.apache.ki.authz.annotation.RequiresPermissions;
import org.apache.ki.authz.annotation.RequiresRoles;
diff --git a/samples/spring/src/org/ki/samples/spring/ui/WebStartDriver.java b/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartDriver.java
similarity index 96%
rename from samples/spring/src/org/ki/samples/spring/ui/WebStartDriver.java
rename to samples/spring/src/org/apache/ki/samples/spring/ui/WebStartDriver.java
index 20b1c07..7747302 100644
--- a/samples/spring/src/org/ki/samples/spring/ui/WebStartDriver.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartDriver.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring.ui;
+package org.apache.ki.samples.spring.ui;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/samples/spring/src/org/ki/samples/spring/ui/WebStartView.java b/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartView.java
similarity index 97%
rename from samples/spring/src/org/ki/samples/spring/ui/WebStartView.java
rename to samples/spring/src/org/apache/ki/samples/spring/ui/WebStartView.java
index ed1b22e..6c7e541 100644
--- a/samples/spring/src/org/ki/samples/spring/ui/WebStartView.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartView.java
@@ -16,20 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring.ui;
+package org.apache.ki.samples.spring.ui;
-import org.apache.ki.authz.AuthorizationException;
-import org.ki.samples.spring.DefaultSampleManager;
-import org.ki.samples.spring.SampleManager;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.io.ClassPathResource;
-
-import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import javax.swing.*;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.io.ClassPathResource;
+
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.samples.spring.DefaultSampleManager;
+import org.apache.ki.samples.spring.SampleManager;
/**
diff --git a/samples/spring/src/org/ki/samples/spring/web/IndexController.java b/samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java
similarity index 97%
rename from samples/spring/src/org/ki/samples/spring/web/IndexController.java
rename to samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java
index 95138ca..f1e6be7 100644
--- a/samples/spring/src/org/ki/samples/spring/web/IndexController.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring.web;
+package org.apache.ki.samples.spring.web;
-import org.apache.ki.SecurityUtils;
-import org.ki.samples.spring.SampleManager;
-import org.apache.ki.subject.Subject;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.springframework.validation.BindException;
import org.springframework.validation.Errors;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.samples.spring.SampleManager;
+import org.apache.ki.subject.Subject;
/**
* Spring MVC controller responsible for rendering the Apache Ki Spring sample
diff --git a/samples/spring/src/org/ki/samples/spring/web/JnlpController.java b/samples/spring/src/org/apache/ki/samples/spring/web/JnlpController.java
similarity index 98%
rename from samples/spring/src/org/ki/samples/spring/web/JnlpController.java
rename to samples/spring/src/org/apache/ki/samples/spring/web/JnlpController.java
index b4f12a6..80209b0 100644
--- a/samples/spring/src/org/ki/samples/spring/web/JnlpController.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/web/JnlpController.java
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring.web;
+package org.apache.ki.samples.spring.web;
-import org.apache.ki.SecurityUtils;
-import org.apache.ki.session.Session;
-import org.apache.ki.subject.Subject;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.AbstractController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.Subject;
/**
* Controller used to dynamically build a JNLP file used to launch the Apache Ki
diff --git a/samples/spring/src/org/ki/samples/spring/web/LoginCommand.java b/samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java
similarity index 97%
rename from samples/spring/src/org/ki/samples/spring/web/LoginCommand.java
rename to samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java
index 7cc52e9..64c0761 100644
--- a/samples/spring/src/org/ki/samples/spring/web/LoginCommand.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring.web;
+package org.apache.ki.samples.spring.web;
/**
* Command object that parameters are bound to when logging into the sample
diff --git a/samples/spring/src/org/ki/samples/spring/web/LoginController.java b/samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java
similarity index 98%
rename from samples/spring/src/org/ki/samples/spring/web/LoginController.java
rename to samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java
index 2f54a4e..f783d16 100644
--- a/samples/spring/src/org/ki/samples/spring/web/LoginController.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring.web;
+package org.apache.ki.samples.spring.web;
-import org.apache.ki.authc.AuthenticationException;
-import org.apache.ki.authc.UsernamePasswordToken;
-import org.apache.ki.mgt.SecurityManager;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.springframework.validation.BindException;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.UsernamePasswordToken;
+import org.apache.ki.mgt.SecurityManager;
/**
* Spring MVC controller responsible for authenticating the user.
diff --git a/samples/spring/src/org/ki/samples/spring/web/LogoutController.java b/samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java
similarity index 97%
rename from samples/spring/src/org/ki/samples/spring/web/LogoutController.java
rename to samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java
index 1f0e29c..dd547c5 100644
--- a/samples/spring/src/org/ki/samples/spring/web/LogoutController.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java
@@ -16,17 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring.web;
-
-import org.apache.ki.SecurityUtils;
-import org.apache.ki.subject.Subject;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.AbstractController;
+package org.apache.ki.samples.spring.web;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.AbstractController;
+
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.subject.Subject;
+
/**
* Controller responsible for logging out the current user by invoking
* {@link org.apache.ki.subject.Subject#logout()}
diff --git a/samples/spring/src/org/ki/samples/spring/web/SessionValueCommand.java b/samples/spring/src/org/apache/ki/samples/spring/web/SessionValueCommand.java
similarity index 97%
rename from samples/spring/src/org/ki/samples/spring/web/SessionValueCommand.java
rename to samples/spring/src/org/apache/ki/samples/spring/web/SessionValueCommand.java
index 4bff511..70229e0 100644
--- a/samples/spring/src/org/ki/samples/spring/web/SessionValueCommand.java
+++ b/samples/spring/src/org/apache/ki/samples/spring/web/SessionValueCommand.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.samples.spring.web;
+package org.apache.ki.samples.spring.web;
/**
* Command object used to bind parameters when submitting a value to be
diff --git a/samples/spring/webroot/WEB-INF/applicationContext.xml b/samples/spring/webroot/WEB-INF/applicationContext.xml
index f95435f..2a8aab0 100644
--- a/samples/spring/webroot/WEB-INF/applicationContext.xml
+++ b/samples/spring/webroot/WEB-INF/applicationContext.xml
@@ -28,18 +28,18 @@
<property name="username" value="sa"/>
</bean>
<!-- Populates the sample database with sample users and roles. -->
- <bean id="bootstrapDataPopulator" class="org.ki.samples.spring.BootstrapDataPopulator">
+ <bean id="bootstrapDataPopulator" class="org.apache.ki.samples.spring.BootstrapDataPopulator">
<property name="dataSource" ref="dataSource"/>
</bean>
<!-- Simulated business-tier "Manager", not Apache Ki related, just an example -->
- <bean id="sampleManager" class="org.ki.samples.spring.DefaultSampleManager"/>
+ <bean id="sampleManager" class="org.apache.ki.samples.spring.DefaultSampleManager"/>
<!-- =========================================================
Apache Ki Core Components - Not Spring Specific
========================================================= -->
<!-- Apache Ki's main business-tier object for web-enabled applications
- (use org.kifaultSecurityManager instead when there is no web environment)-->
+ (use DefaultSecurityManager instead when there is no web environment)-->
<bean id="securityManager" class="org.apache.ki.web.DefaultWebSecurityManager">
<!-- Single realm app. If you have multiple realms, use the 'realms' property instead. -->
<property name="realm" ref="jdbcRealm"/>
diff --git a/samples/spring/webroot/WEB-INF/remoting-servlet.xml b/samples/spring/webroot/WEB-INF/remoting-servlet.xml
index 6bf6c46..be66d65 100644
--- a/samples/spring/webroot/WEB-INF/remoting-servlet.xml
+++ b/samples/spring/webroot/WEB-INF/remoting-servlet.xml
@@ -26,7 +26,7 @@
<bean name="/sampleManager" class="org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter">
<property name="service" ref="sampleManager"/>
- <property name="serviceInterface" value="org.ki.samples.spring.SampleManager"/>
+ <property name="serviceInterface" value="org.apache.ki.samples.spring.SampleManager"/>
<property name="remoteInvocationExecutor" ref="secureRemoteInvocationExecutor"/>
</bean>
diff --git a/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp b/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp
index 4b4420d..dfbaedd 100644
--- a/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp
+++ b/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp
@@ -1,47 +1,47 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-<%@ page contentType="application/x-java-jnlp-file" %>
-
-<?xml version="1.0" encoding="utf-8"?>
-<!-- JNLP File for Apache Ki Sample Application -->
-<jnlp spec="1.0+" codebase="${codebaseUrl}">
- <information>
- <title>Apache Ki Sample Application</title>
- <vendor>Apache Ki</vendor>
- <homepage href="http://www.jsecurity.org"/>
- <description>Apache Ki Sample Application</description>
- <description kind="short">A webstart application used to demonstrate Apache Ki session and security
- management.
- </description>
- <icon kind="splash" href="logo.png"/>
- <offline-allowed/>
- </information>
- <security>
- <all-permissions/>
- </security>
- <resources>
- <j2se version="1.5"/>
- <jar href="jsecurity-spring-sample.jar"/>
- <jar href="jsecurity.jar"/>
- <jar href="spring.jar"/>
- <jar href="slf4j-api.jar"/>
- <property name="jsecurity.session.id" value="${sessionId}"/>
- </resources>
- <application-desc main-class="org.ki.samples.spring.ui.WebStartDriver"/>
+<%--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ --%>
+<%@ page contentType="application/x-java-jnlp-file" %>
+
+<?xml version="1.0" encoding="utf-8"?>
+<!-- JNLP File for Apache Ki Sample Application -->
+<jnlp spec="1.0+" codebase="${codebaseUrl}">
+ <information>
+ <title>Apache Ki Sample Application</title>
+ <vendor>Apache Ki</vendor>
+ <homepage href="http://www.jsecurity.org"/>
+ <description>Apache Ki Sample Application</description>
+ <description kind="short">A webstart application used to demonstrate Apache Ki session and security
+ management.
+ </description>
+ <icon kind="splash" href="logo.png"/>
+ <offline-allowed/>
+ </information>
+ <security>
+ <all-permissions/>
+ </security>
+ <resources>
+ <j2se version="1.5"/>
+ <jar href="jsecurity-spring-sample.jar"/>
+ <jar href="jsecurity.jar"/>
+ <jar href="spring.jar"/>
+ <jar href="slf4j-api.jar"/>
+ <property name="jsecurity.session.id" value="${sessionId}"/>
+ </resources>
+ <application-desc main-class="org.apache.ki.samples.spring.ui.WebStartDriver"/>
</jnlp>
diff --git a/samples/spring/webroot/WEB-INF/sample-servlet.xml b/samples/spring/webroot/WEB-INF/sample-servlet.xml
index cc3d27d..1df1d9b 100644
--- a/samples/spring/webroot/WEB-INF/sample-servlet.xml
+++ b/samples/spring/webroot/WEB-INF/sample-servlet.xml
@@ -46,21 +46,21 @@
<!-- =========================================================
Spring controllers
========================================================= -->
- <bean name="loginController" class="org.ki.samples.spring.web.LoginController">
- <property name="commandClass" value="org.ki.samples.spring.web.LoginCommand"/>
+ <bean name="loginController" class="org.apache.ki.samples.spring.web.LoginController">
+ <property name="commandClass" value="org.apache.ki.samples.spring.web.LoginCommand"/>
<property name="formView" value="login"/>
<property name="successView" value="redirect:/s/index"/>
<property name="securityManager" ref="securityManager"/>
</bean>
- <bean name="logoutController" class="org.ki.samples.spring.web.LogoutController"/>
+ <bean name="logoutController" class="org.apache.ki.samples.spring.web.LogoutController"/>
- <bean id="jnlpController" class="org.ki.samples.spring.web.JnlpController">
+ <bean id="jnlpController" class="org.apache.ki.samples.spring.web.JnlpController">
<property name="jnlpView" value="jsecurity.jnlp"/>
</bean>
- <bean id="indexController" class="org.ki.samples.spring.web.IndexController">
- <property name="commandClass" value="org.ki.samples.spring.web.SessionValueCommand"/>
+ <bean id="indexController" class="org.apache.ki.samples.spring.web.IndexController">
+ <property name="commandClass" value="org.apache.ki.samples.spring.web.SessionValueCommand"/>
<property name="formView" value="sampleIndex"/>
<property name="successView" value="sampleIndex"/>
<property name="sampleManager" ref="sampleManager"/>
diff --git a/samples/standalone/src/MyRealm.java b/samples/standalone/src/MyRealm.java
index 3afdae3..fd3449c 100644
--- a/samples/standalone/src/MyRealm.java
+++ b/samples/standalone/src/MyRealm.java
@@ -17,10 +17,10 @@
* under the License.
*/
-import org.jsecurity.authc.*;
-import org.jsecurity.authz.AuthorizationInfo;
-import org.jsecurity.realm.AuthorizingRealm;
-import org.jsecurity.subject.PrincipalCollection;
+import org.apache.ki.authc.*;
+import org.apache.ki.authz.AuthorizationInfo;
+import org.apache.ki.realm.AuthorizingRealm;
+import org.apache.ki.subject.PrincipalCollection;
import java.util.Collection;
@@ -38,10 +38,10 @@
* an underlying data store via an EIS API (JDBC, JPA, Hibernate, etc).
* <p/>
* Note that when implementing your own realm, there is no need to check against a password (or other credentials)
- * in this method. The {@link org.jsecurity.realm.AuthenticatingRealm AuthenticatingRealm} superclass will do
+ * in this method. The {@link org.apache.ki.realm.AuthenticatingRealm AuthenticatingRealm} superclass will do
* that automatically via the use of a configured
- * {@link org.jsecurity.authc.credential.CredentialsMatcher CredentialsMatcher} (see this example's corresponding
- * <code>jsecurity.ini</code> file to see a configured credentials matcher).
+ * {@link org.apache.ki.authc.credential.CredentialsMatcher CredentialsMatcher} (see this example's corresponding
+ * <code>ki.ini</code> file to see a configured credentials matcher).
* <p/>
* All that is required is that the account information include directly the credentials found in the EIS.
*
@@ -79,8 +79,8 @@
//get only the principals that this realm cares about:
Collection thisRealmPrincipals = principals.fromRealm(getName());
- //note that the return value of 'getName()' here is whatever you specify it to be in jsecurity.ini
- //in this case, the jsecurity.ini file calls it 'myRealm'. All realms must have a unique name.
+ //note that the return value of 'getName()' here is whatever you specify it to be in ki.ini
+ //in this case, the ki.ini file calls it 'myRealm'. All realms must have a unique name.
//Since this realm supplied these principals from the doGetAuthenticationInfo method above when the
//user logged-in and that method in this simple example has only one principal - a username - we can safely
diff --git a/samples/standalone/src/Standalone.java b/samples/standalone/src/Standalone.java
index a8dfb95..5e48d4f 100644
--- a/samples/standalone/src/Standalone.java
+++ b/samples/standalone/src/Standalone.java
@@ -17,9 +17,9 @@
* under the License.
*/
-import org.jsecurity.SecurityUtils;
-import org.jsecurity.config.IniConfiguration;
-import org.jsecurity.subject.Subject;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.config.IniConfiguration;
+import org.apache.ki.subject.Subject;
/**
* @author Les Hazlewood
@@ -30,7 +30,7 @@
public static void main(String[] args) {
IniConfiguration config = new IniConfiguration();
- //the following call will automatically use jsecurity.ini at the root of the classpath:
+ //the following call will automatically use ki.ini at the root of the classpath:
config.init();
//This is for Standalone (single-VM) applications that don't use a configuration container (Spring, JBoss, etc)
diff --git a/samples/standalone/src/jsecurity.ini b/samples/standalone/src/ki.ini
similarity index 100%
rename from samples/standalone/src/jsecurity.ini
rename to samples/standalone/src/ki.ini
diff --git a/samples/web/webroot/WEB-INF/classes/log4j.properties b/samples/web/webroot/WEB-INF/classes/log4j.properties
index c37ce9b..3ffb74c 100644
--- a/samples/web/webroot/WEB-INF/classes/log4j.properties
+++ b/samples/web/webroot/WEB-INF/classes/log4j.properties
@@ -42,6 +42,6 @@
# Apache Ki security framework
log4j.logger.org.apache.ki.realm.text.PropertiesRealm=INFO
log4j.logger.org.apache.ki.cache.ehcache.EhCache=INFO
-log4j.logger.org.ki.io=INFO
-log4j.logger.org.ki.web.servlet=INFO
+log4j.logger.org.apache.ki.io=INFO
+log4j.logger.org.apache.ki.web.servlet=INFO
log4j.logger.org.apache.ki.util.ThreadContext=INFO
diff --git a/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml b/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml
index dee81d1..2956ccf 100644
--- a/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml
+++ b/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml
@@ -87,7 +87,7 @@
diskPersistent="true"
diskExpiryThreadIntervalSeconds="600"/> -->
- <cache name="org.ki.realm.text.PropertiesRealm-0-accounts"
+ <cache name="org.apache.ki.realm.text.PropertiesRealm-0-accounts"
maxElementsInMemory="1000"
eternal="true"
overflowToDisk="true"/>
diff --git a/support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java b/support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java
index 800c9ea..fe6f6e4 100644
--- a/support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java
+++ b/support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java
@@ -20,4 +20,4 @@
* <a href="http://ehcache.sourceforge.net" target="_top">Ehcache</a>-based implementations of Apache Ki's
* cache interfaces.
*/
-package org.ki.cache.ehcache;
+package org.apache.ki.cache.ehcache;
diff --git a/support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java b/support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java
index c40a3f8..f0343a8 100644
--- a/support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java
+++ b/support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java
@@ -21,4 +21,4 @@
* components that help <tt>SessionManager</tt> implementations maintain sessions (timed expiration, orphan cleanup,
* etc).
*/
-package org.ki.session.mgt.quartz;
\ No newline at end of file
+package org.apache.ki.session.mgt.quartz;
diff --git a/support/spring/src/org/apache/ki/spring/package-info.java b/support/spring/src/org/apache/ki/spring/package-info.java
index 78c6846..dcb23e0 100644
--- a/support/spring/src/org/apache/ki/spring/package-info.java
+++ b/support/spring/src/org/apache/ki/spring/package-info.java
@@ -20,4 +20,4 @@
* <a href="http://www.springframework.org" target="_top">Spring Application Framework</a> support for enabling
* Apache Ki in spring applications.
*/
-package org.ki.spring;
+package org.apache.ki.spring;
diff --git a/support/spring/src/org/apache/ki/spring/remoting/package-info.java b/support/spring/src/org/apache/ki/spring/remoting/package-info.java
index b7e6a37..c8b1c89 100644
--- a/support/spring/src/org/apache/ki/spring/remoting/package-info.java
+++ b/support/spring/src/org/apache/ki/spring/remoting/package-info.java
@@ -20,4 +20,4 @@
* Support to enable Spring-based remote method invocations to carry a Apache Ki session ID as part of the
* invocation payload, allowing remote clients to perform security operations.
*/
-package org.ki.spring.remoting;
+package org.apache.ki.spring.remoting;
diff --git a/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java b/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java
index 64b5455..7b04c2d 100644
--- a/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java
+++ b/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java
@@ -19,4 +19,4 @@
/**
* Spring AOP support for enabling Apache Ki annotations in Spring-configured applications.
*/
-package org.ki.spring.security.interceptor;
+package org.apache.ki.spring.security.interceptor;
diff --git a/support/spring/test/org/ki/spring/SpringKiFilterTest.java b/support/spring/test/org/apache/ki/spring/SpringKiFilterTest.java
similarity index 98%
rename from support/spring/test/org/ki/spring/SpringKiFilterTest.java
rename to support/spring/test/org/apache/ki/spring/SpringKiFilterTest.java
index ca59399..9c3a610 100644
--- a/support/spring/test/org/ki/spring/SpringKiFilterTest.java
+++ b/support/spring/test/org/apache/ki/spring/SpringKiFilterTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.spring;
+package org.apache.ki.spring;
import java.util.HashMap;
import java.util.Map;
diff --git a/web/src/org/apache/ki/web/attr/package-info.java b/web/src/org/apache/ki/web/attr/package-info.java
index 565cf3d..561ce4d 100644
--- a/web/src/org/apache/ki/web/attr/package-info.java
+++ b/web/src/org/apache/ki/web/attr/package-info.java
@@ -20,4 +20,4 @@
* Supporting implementation of Apache Ki's concept of a {@link org.apache.ki.web.attr.WebAttribute WebAttribute}, a
* component that can save and recall an object beyond transient requests.
*/
-package org.ki.web.attr;
+package org.apache.ki.web.attr;
diff --git a/web/src/org/apache/ki/web/config/package-info.java b/web/src/org/apache/ki/web/config/package-info.java
index b776e02..51d1024 100644
--- a/web/src/org/apache/ki/web/config/package-info.java
+++ b/web/src/org/apache/ki/web/config/package-info.java
@@ -19,4 +19,4 @@
/**
* Web-specific implementation extensions to the <code>org.jsecurity.config</code> components.
*/
-package org.ki.web.config;
\ No newline at end of file
+package org.apache.ki.web.config;
diff --git a/web/src/org/apache/ki/web/filter/authc/package-info.java b/web/src/org/apache/ki/web/filter/authc/package-info.java
index 26fed6f..d8a5de3 100644
--- a/web/src/org/apache/ki/web/filter/authc/package-info.java
+++ b/web/src/org/apache/ki/web/filter/authc/package-info.java
@@ -20,4 +20,4 @@
* Servlet {@link javax.servlet.Filter Filter} implementations specific to controlling access based on a
* subject's authentication status, or those that can execute authentications (log-ins) directly.
*/
-package org.ki.web.filter.authc;
\ No newline at end of file
+package org.apache.ki.web.filter.authc;
diff --git a/web/src/org/apache/ki/web/filter/authz/package-info.java b/web/src/org/apache/ki/web/filter/authz/package-info.java
index 737b16a..625fec8 100644
--- a/web/src/org/apache/ki/web/filter/authz/package-info.java
+++ b/web/src/org/apache/ki/web/filter/authz/package-info.java
@@ -20,4 +20,4 @@
* Servlet {@link javax.servlet.Filter Filter} implementations that perform authorization (access control)
* checks based on the Subject's abilities (for example, role or permission checks).
*/
-package org.ki.web.filter.authz;
\ No newline at end of file
+package org.apache.ki.web.filter.authz;
diff --git a/web/src/org/apache/ki/web/filter/package-info.java b/web/src/org/apache/ki/web/filter/package-info.java
index c99ed01..859e851 100644
--- a/web/src/org/apache/ki/web/filter/package-info.java
+++ b/web/src/org/apache/ki/web/filter/package-info.java
@@ -20,4 +20,4 @@
* Base package supporting all Servlet {@link javax.servlet.Filter Filter} implementations used to control
* access to web pages and URL resources.
*/
-package org.ki.web.filter;
\ No newline at end of file
+package org.apache.ki.web.filter;
diff --git a/web/src/org/apache/ki/web/package-info.java b/web/src/org/apache/ki/web/package-info.java
index 6d1f56b..a85e376 100644
--- a/web/src/org/apache/ki/web/package-info.java
+++ b/web/src/org/apache/ki/web/package-info.java
@@ -19,4 +19,4 @@
/**
* Framework support for any web-enabled application.
*/
-package org.ki.web;
\ No newline at end of file
+package org.apache.ki.web;
diff --git a/web/src/org/apache/ki/web/servlet/package-info.java b/web/src/org/apache/ki/web/servlet/package-info.java
index 0a8e3bb..3f01da7 100644
--- a/web/src/org/apache/ki/web/servlet/package-info.java
+++ b/web/src/org/apache/ki/web/servlet/package-info.java
@@ -20,4 +20,4 @@
* Support implementations that depend heavily on the <tt>javax.servlet.*</tt> API and are meant to be
* directly used in web.xml (Servlet Filters, Servlet Context Listeners, Servlets, etc)
*/
-package org.ki.web.servlet;
\ No newline at end of file
+package org.apache.ki.web.servlet;
diff --git a/web/src/org/apache/ki/web/session/package-info.java b/web/src/org/apache/ki/web/session/package-info.java
index a7ce707..9fbf610 100644
--- a/web/src/org/apache/ki/web/session/package-info.java
+++ b/web/src/org/apache/ki/web/session/package-info.java
@@ -19,4 +19,4 @@
/**
* Components supporting Session management in web-enabled applications.
*/
-package org.ki.web.session;
\ No newline at end of file
+package org.apache.ki.web.session;
diff --git a/web/src/org/apache/ki/web/tags/package-info.java b/web/src/org/apache/ki/web/tags/package-info.java
index decd2ae..84473c8 100644
--- a/web/src/org/apache/ki/web/tags/package-info.java
+++ b/web/src/org/apache/ki/web/tags/package-info.java
@@ -22,4 +22,4 @@
* Apache Ki JSP Tags can be used to evalute or not evaluate (show or not show) parts of a JSP page based on the
* current user's authentication status and/or authorization (access control) abilities.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
