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 19:54:33 UTC
svn commit: r752571 [1/2] - in /incubator/jsecurity/trunk:
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/
core/src/org/apache/ki/authz/annotation/ core/src/org/apac...
Author: adc
Date: Wed Mar 11 18:54:30 2009
New Revision: 752571
URL: http://svn.apache.org/viewvc?rev=752571&view=rev
Log:
KI-66 intermediate changes
Added:
incubator/jsecurity/trunk/docs/reference/src/ki.tld.xml
- copied unchanged from r752537, incubator/jsecurity/trunk/docs/reference/src/jsecurity.tld.xml
incubator/jsecurity/trunk/samples/spring/src/org/apache/
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/BootstrapDataPopulator.java
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/DefaultSampleManager.java
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/SampleManager.java
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/SampleManager.java
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/ui/
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartDriver.java
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartDriver.java
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartView.java
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartView.java
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java (contents, props changed)
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/IndexController.java
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/JnlpController.java
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/JnlpController.java
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java (contents, props changed)
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginCommand.java
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java (contents, props changed)
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginController.java
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java (contents, props changed)
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LogoutController.java
incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/SessionValueCommand.java
- copied, changed from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/SessionValueCommand.java
incubator/jsecurity/trunk/samples/standalone/src/ki.ini
- copied unchanged from r752537, incubator/jsecurity/trunk/samples/standalone/src/jsecurity.ini
incubator/jsecurity/trunk/support/spring/test/org/apache/
incubator/jsecurity/trunk/support/spring/test/org/apache/ki/
incubator/jsecurity/trunk/support/spring/test/org/apache/ki/spring/
incubator/jsecurity/trunk/support/spring/test/org/apache/ki/spring/SpringKiFilterTest.java
- copied, changed from r752550, incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringKiFilterTest.java
Removed:
incubator/jsecurity/trunk/docs/reference/src/jsecurity.tld.xml
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/SampleManager.java
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartDriver.java
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartView.java
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/IndexController.java
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/JnlpController.java
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginCommand.java
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginController.java
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LogoutController.java
incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/SessionValueCommand.java
incubator/jsecurity/trunk/samples/standalone/src/jsecurity.ini
incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringKiFilterTest.java
Modified:
incubator/jsecurity/trunk/core/src/org/apache/ki/authc/credential/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/authc/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/authz/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/cache/DefaultCacheManager.java
incubator/jsecurity/trunk/core/src/org/apache/ki/cache/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/codec/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/config/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/io/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSecurityManager.java
incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/realm/activedirectory/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jdbc/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jndi/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/realm/ldap/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/realm/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/session/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/subject/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/util/Destroyable.java
incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java
incubator/jsecurity/trunk/core/src/org/apache/ki/util/package-info.java
incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/dao/BootstrapDataPopulator.java
incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/security/SampleRealm.java
incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/service/DefaultUserService.java
incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserCommand.java
incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserValidator.java
incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/ManageUsersController.java
incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SecurityController.java
incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupController.java
incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupValidator.java
incubator/jsecurity/trunk/samples/spring/etc/jsecurity-sample.jks
incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml
incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml
incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/remoting-servlet.xml
incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp
incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/sample-servlet.xml
incubator/jsecurity/trunk/samples/standalone/src/MyRealm.java
incubator/jsecurity/trunk/samples/standalone/src/Standalone.java
incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties
incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml
incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java
incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/package-info.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/package-info.java
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/package-info.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/package-info.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/package-info.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authz/package-info.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/package-info.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/package-info.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/package-info.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/package-info.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/package-info.java
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/credential/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/credential/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/credential/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/credential/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/aop/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/DefaultCacheManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/DefaultCacheManager.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/cache/DefaultCacheManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/DefaultCacheManager.java Wed Mar 11 18:54:30 2009
@@ -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
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/cache/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/codec/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/codec/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/codec/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/codec/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/config/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/config/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/config/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/config/package-info.java Wed Mar 11 18:54:30 2009
@@ -19,4 +19,4 @@
/**
* Components that support configuring Apache Ki in any application.
*/
-package org.ki.config;
+package org.apache.ki.config;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/io/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/io/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSecurityManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSecurityManager.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSecurityManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSecurityManager.java Wed Mar 11 18:54:30 2009
@@ -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 {
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/activedirectory/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/realm/activedirectory/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/realm/activedirectory/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/realm/activedirectory/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jdbc/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jdbc/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jdbc/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jdbc/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jndi/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jndi/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jndi/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jndi/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/ldap/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/realm/ldap/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/realm/ldap/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/realm/ldap/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/realm/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/realm/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/realm/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java Wed Mar 11 18:54:30 2009
@@ -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).
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/session/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/session/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/subject/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/subject/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/subject/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/subject/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/util/Destroyable.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/Destroyable.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/util/Destroyable.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/Destroyable.java Wed Mar 11 18:54:30 2009
@@ -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 {
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/Initializable.java Wed Mar 11 18:54:30 2009
@@ -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 {
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/util/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/util/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/dao/BootstrapDataPopulator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/dao/BootstrapDataPopulator.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/dao/BootstrapDataPopulator.java (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/dao/BootstrapDataPopulator.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/security/SampleRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/security/SampleRealm.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/security/SampleRealm.java (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/security/SampleRealm.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/service/DefaultUserService.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/service/DefaultUserService.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/service/DefaultUserService.java (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/service/DefaultUserService.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserCommand.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserCommand.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserCommand.java (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserCommand.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserValidator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserValidator.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserValidator.java (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/EditUserValidator.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/ManageUsersController.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/ManageUsersController.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/ManageUsersController.java (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/ManageUsersController.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SecurityController.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SecurityController.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SecurityController.java (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SecurityController.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupController.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupController.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupController.java (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupController.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupValidator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupValidator.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupValidator.java (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/web/SignupValidator.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/samples/spring/etc/jsecurity-sample.jks
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/etc/jsecurity-sample.jks?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml Wed Mar 11 18:54:30 2009
@@ -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>
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/BootstrapDataPopulator.java (from r752537, 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/apache/ki/samples/spring/BootstrapDataPopulator.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/BootstrapDataPopulator.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/BootstrapDataPopulator.java Wed Mar 11 18:54:30 2009
@@ -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 javax.sql.DataSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ki.crypto.hash.Sha256Hash;
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
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/DefaultSampleManager.java (from r752537, 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/apache/ki/samples/spring/DefaultSampleManager.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/DefaultSampleManager.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/DefaultSampleManager.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/DefaultSampleManager.java Wed Mar 11 18:54:30 2009
@@ -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;
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/SampleManager.java (from r752537, 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/apache/ki/samples/spring/SampleManager.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/SampleManager.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/SampleManager.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/SampleManager.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/SampleManager.java Wed Mar 11 18:54:30 2009
@@ -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;
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartDriver.java (from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartDriver.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartDriver.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartDriver.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartDriver.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartDriver.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartDriver.java Wed Mar 11 18:54:30 2009
@@ -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;
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartView.java (from r752537, 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/apache/ki/samples/spring/ui/WebStartView.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartView.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartView.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/ui/WebStartView.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartView.java Wed Mar 11 18:54:30 2009
@@ -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;
/**
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java (from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/IndexController.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/IndexController.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/IndexController.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java Wed Mar 11 18:54:30 2009
@@ -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
Propchange: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/JnlpController.java (from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/JnlpController.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/JnlpController.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/JnlpController.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/JnlpController.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/JnlpController.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/JnlpController.java Wed Mar 11 18:54:30 2009
@@ -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
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java (from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginCommand.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginCommand.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginCommand.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java Wed Mar 11 18:54:30 2009
@@ -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
Propchange: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java (from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginController.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginController.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginController.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java Wed Mar 11 18:54:30 2009
@@ -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.
Propchange: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java (from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LogoutController.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LogoutController.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LogoutController.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java Wed Mar 11 18:54:30 2009
@@ -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()}
Propchange: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/SessionValueCommand.java (from r752537, incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/SessionValueCommand.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/SessionValueCommand.java?p2=incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/SessionValueCommand.java&p1=incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/SessionValueCommand.java&r1=752537&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/SessionValueCommand.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/apache/ki/samples/spring/web/SessionValueCommand.java Wed Mar 11 18:54:30 2009
@@ -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
Modified: incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml Wed Mar 11 18:54:30 2009
@@ -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"/>
Modified: incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/remoting-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/remoting-servlet.xml?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/remoting-servlet.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/remoting-servlet.xml Wed Mar 11 18:54:30 2009
@@ -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>
Modified: incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp (original)
+++ incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp Wed Mar 11 18:54:30 2009
@@ -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>
Modified: incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/sample-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/sample-servlet.xml?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/sample-servlet.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/sample-servlet.xml Wed Mar 11 18:54:30 2009
@@ -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"/>
Modified: incubator/jsecurity/trunk/samples/standalone/src/MyRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/standalone/src/MyRealm.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/standalone/src/MyRealm.java (original)
+++ incubator/jsecurity/trunk/samples/standalone/src/MyRealm.java Wed Mar 11 18:54:30 2009
@@ -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
Modified: incubator/jsecurity/trunk/samples/standalone/src/Standalone.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/standalone/src/Standalone.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/standalone/src/Standalone.java (original)
+++ incubator/jsecurity/trunk/samples/standalone/src/Standalone.java Wed Mar 11 18:54:30 2009
@@ -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)
Modified: incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties Wed Mar 11 18:54:30 2009
@@ -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
Modified: incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml Wed Mar 11 18:54:30 2009
@@ -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"/>
Modified: incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java (original)
+++ incubator/jsecurity/trunk/support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/package-info.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/package-info.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Copied: incubator/jsecurity/trunk/support/spring/test/org/apache/ki/spring/SpringKiFilterTest.java (from r752550, incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringKiFilterTest.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/test/org/apache/ki/spring/SpringKiFilterTest.java?p2=incubator/jsecurity/trunk/support/spring/test/org/apache/ki/spring/SpringKiFilterTest.java&p1=incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringKiFilterTest.java&r1=752550&r2=752571&rev=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringKiFilterTest.java (original)
+++ incubator/jsecurity/trunk/support/spring/test/org/apache/ki/spring/SpringKiFilterTest.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/attr/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;
Modified: incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/package-info.java?rev=752571&r1=752570&r2=752571&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/package-info.java Wed Mar 11 18:54:30 2009
@@ -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;