You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2009/03/26 01:19:15 UTC
svn commit: r758476 [1/4] - in /incubator/jsecurity/trunk: ./
core/src/main/java/org/apache/ki/ core/src/main/java/org/apache/ki/aop/
core/src/main/java/org/apache/ki/authc/
core/src/main/java/org/apache/ki/authc/credential/
core/src/main/java/org/apac...
Author: lhazlewood
Date: Thu Mar 26 00:19:03 2009
New Revision: 758476
URL: http://svn.apache.org/viewvc?rev=758476&view=rev
Log:
Updated many files where a default JSecurity -> 'Apache Ki' was unnatural or didn't make sense (for example KiFilter -> Apache KiFilter in servlet filter definitions and related documentation). Just using 'Ki' was more appropriate and natural in these cases.
Modified:
incubator/jsecurity/trunk/NOTICE.txt
incubator/jsecurity/trunk/README-runtime-requirements.txt
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/KiException.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/SecurityUtils.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInterceptor.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInterceptorSupport.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInvocation.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AbstractAuthenticator.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/Account.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AuthenticationInfo.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AuthenticationToken.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/Authenticator.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/LogoutAware.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/UsernamePasswordToken.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/credential/HashedCredentialsMatcher.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/ModularRealmAuthenticator.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/AuthorizationInfo.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/Authorizer.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/AuthorizingAccount.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/Permission.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/annotation/RequiresUser.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/PermissionResolver.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/WildcardPermission.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/Cache.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/CacheException.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/CacheManager.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/HashtableCache.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/codec/Base64.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/codec/CodecSupport.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/codec/Hex.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/codec/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/config/Configuration.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/config/ConfigurationException.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/config/IniConfiguration.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/config/ReflectionBuilder.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/config/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/crypto/BlowfishCipher.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/crypto/Cipher.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/crypto/hash/AbstractHash.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/crypto/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/io/Serializer.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/jndi/JndiCallback.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/jndi/JndiLocator.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/jndi/JndiTemplate.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/jndi/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/AuthenticatingSecurityManager.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/AuthorizingSecurityManager.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/DefaultSecurityManager.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/RealmSecurityManager.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/SecurityManager.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/SecurityManagerAware.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/SessionSubjectBinder.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/SessionsSecurityManager.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/mgt/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/AuthenticatingRealm.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/Realm.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/RealmFactory.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/jndi/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/realm/text/PropertiesRealm.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/mgt/ValidatingSessionManager.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/session/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/subject/Subject.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/subject/package-info.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/AntPathMatcher.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/CollectionUtils.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/Destroyable.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/Initializable.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/JavaEnvironment.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/JdbcUtils.java
incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/util/UnknownClassException.java
incubator/jsecurity/trunk/core/src/main/resources/org/apache/ki/realm/text/default-ki-users.properties
incubator/jsecurity/trunk/docs/reference/src/index.xml
incubator/jsecurity/trunk/docs/reference/src/preface.xml
incubator/jsecurity/trunk/docs/reference/src/security-manager.xml
incubator/jsecurity/trunk/docs/reference/styles/html_chunk.xsl
incubator/jsecurity/trunk/docs/reference/styles/tld.to.docbook.xsl
incubator/jsecurity/trunk/samples/quickstart/src/main/java/Quickstart.java
incubator/jsecurity/trunk/samples/quickstart/src/main/resources/log4j.properties
incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/log4j.properties
incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/BootstrapDataPopulator.java
incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/ui/WebStartView.java
incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/web/IndexController.java
incubator/jsecurity/trunk/samples/spring/src/main/java/org/apache/ki/samples/spring/web/JnlpController.java
incubator/jsecurity/trunk/samples/spring/src/main/resources/ehcache.xml
incubator/jsecurity/trunk/samples/spring/src/main/resources/log4j.properties
incubator/jsecurity/trunk/samples/spring/src/main/resources/webstart.spring.xml
incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/applicationContext.xml
incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/resources/jsecurity.jnlp.jsp
incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp
incubator/jsecurity/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml
incubator/jsecurity/trunk/samples/standalone/src/main/resources/log4j.properties
incubator/jsecurity/trunk/samples/web/src/main/resources/log4j.properties
incubator/jsecurity/trunk/samples/web/src/main/webapp/WEB-INF/web.xml
incubator/jsecurity/trunk/samples/web/src/main/webapp/logout.jsp
incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java
incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java
incubator/jsecurity/trunk/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/package-info.java
incubator/jsecurity/trunk/support/ehcache/src/main/resources/org/apache/ki/cache/ehcache/ehcache.xml
incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java
incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java
incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/SpringKiFilter.java
incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/package-info.java
incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java
incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java
incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/remoting/package-info.java
incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
incubator/jsecurity/trunk/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/package-info.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebRememberMeManager.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/WebUtils.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/attr/package-info.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/IniWebConfiguration.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/config/WebConfiguration.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/AccessControlFilter.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/AnonymousFilter.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiFilter.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpServletRequest.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpServletResponse.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/servlet/KiHttpSession.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/DefaultWebSessionManager.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/ServletContainerSessionManager.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/session/WebSession.java
incubator/jsecurity/trunk/web/src/main/java/org/apache/ki/web/tags/package-info.java
Modified: incubator/jsecurity/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/NOTICE.txt?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/NOTICE.txt (original)
+++ incubator/jsecurity/trunk/NOTICE.txt Thu Mar 26 00:19:03 2009
@@ -1,4 +1,4 @@
-Apache Apache Ki
+Apache Ki
Copyright 2008 The Apache Software Foundation
This product includes software developed at
@@ -9,7 +9,7 @@
public posted version found here:
http://www.javaspecialists.eu/archive/Issue015.html)
with continued modifications. Per Heinz Kabutz: "you have my
-express permission to publish it in Apache Apache Ki - please
+express permission to publish it in Apache Ki - please
leave a link in the source code pointing to my website:
http://www.javaspecialists.eu
Modified: incubator/jsecurity/trunk/README-runtime-requirements.txt
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/README-runtime-requirements.txt?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/README-runtime-requirements.txt (original)
+++ incubator/jsecurity/trunk/README-runtime-requirements.txt Thu Mar 26 00:19:03 2009
@@ -15,6 +15,6 @@
Feature-based dependencies
--------------------------
-- .ini based configuration, either for a ki.ini file in the classpath or embedded .ini in the Apache KiFilter
+- .ini based configuration, either for a ki.ini file in the classpath or embedded .ini in the KiFilter
in web.xml:
. include Jakarta commons-beanutils-core.jar
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/KiException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/KiException.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/KiException.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/KiException.java Thu Mar 26 00:19:03 2009
@@ -21,7 +21,7 @@
import java.io.Serializable;
/**
- * Root exception for all Apache Ki runtime exceptions. This class is used as the root instead
+ * Root exception for all Ki runtime exceptions. This class is used as the root instead
* of {@link java.lang.SecurityException} to remove the potential for conflicts; many other
* frameworks and products (such as J2EE containers) perform special operations when
* encountering {@link java.lang.SecurityException}.
@@ -32,14 +32,14 @@
public class KiException extends RuntimeException implements Serializable {
/**
- * Creates a new Apache KiException.
+ * Creates a new KiException.
*/
public KiException() {
super();
}
/**
- * Constructs a new Apache KiException.
+ * Constructs a new KiException.
*
* @param message the reason for the exception
*/
@@ -48,7 +48,7 @@
}
/**
- * Constructs a new Apache KiException.
+ * Constructs a new KiException.
*
* @param cause the underlying Throwable that caused this exception to be thrown.
*/
@@ -57,7 +57,7 @@
}
/**
- * Constructs a new Apache KiException.
+ * Constructs a new KiException.
*
* @param message the reason for the exception
* @param cause the underlying Throwable that caused this exception to be thrown.
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/SecurityUtils.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/SecurityUtils.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/SecurityUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/SecurityUtils.java Thu Mar 26 00:19:03 2009
@@ -42,7 +42,7 @@
* runtime environment.
* <p/>
* This method is provided as a way of obtaining a <tt>Subject</tt> without having to resort to
- * implementation-specific methods. It also allows the Apache Ki team to change the underlying implementation of
+ * implementation-specific methods. It also allows the Ki team to change the underlying implementation of
* this method in the future depending on requirements/updates without affecting your code that uses it.
* <p/>
* <b>Implementation Note:</b> This implementation expects a
@@ -88,13 +88,13 @@
* <p><b>This method call exists mainly for framework development support. Application developers should rarely,
* if ever, need to call this method.</b></p>
*
- * <p>The Apache Ki development team prefers that SecurityManager instances are non-static application singletons
+ * <p>The Ki development team prefers that SecurityManager instances are non-static application singletons
* and <em>not</em> VM static singletons. Application singletons that do not use static memory require some sort
* of application configuration framework to maintain the application-wide SecurityManager instance for you
* (for example, Spring or EJB3 environments) such that the object reference does not need to be static.
*
- * <p>In these environments, Apache Ki acquires Subject data based on the currently executing Thread via its own
- * framework integration code, and this is the preferred way to use Apache Ki.</p>
+ * <p>In these environments, Ki acquires Subject data based on the currently executing Thread via its own
+ * framework integration code, and this is the preferred way to use Ki.</p>
*
* <p>However in some environments, such as a standalone desktop application or Applets that do not use Spring or
* EJB or similar config frameworks, a VM-singleton might make more sense (although the former is still preferred).</p>
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInterceptor.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInterceptor.java Thu Mar 26 00:19:03 2009
@@ -40,7 +40,7 @@
/**
* A <tt>MethodInterceptor</tt> intercepts a <tt>MethodInvocation</tt> to perform before or after logic (aka 'advice').
*
- * <p>Apache Ki's implementations of this interface mostly have to deal with ensuring a current Subject has the
+ * <p>Ki's implementations of this interface mostly have to deal with ensuring a current Subject has the
* ability to execute the method before allowing it to continue.
*
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInterceptorSupport.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInterceptorSupport.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInterceptorSupport.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInterceptorSupport.java Thu Mar 26 00:19:03 2009
@@ -42,7 +42,7 @@
/**
- * This class is an abstraction of AOP method interceptor behavior specific to Apache Ki that
+ * This class is an abstraction of AOP method interceptor behavior specific to Ki that
* leaves AOP implementation specifics to be handled by subclass implementations. This implementation primarily
* enables a <tt>Log</tt> and makes available the currently executing {@link Subject Subject}.
*
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInvocation.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInvocation.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInvocation.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/aop/MethodInvocation.java Thu Mar 26 00:19:03 2009
@@ -40,7 +40,7 @@
import java.lang.reflect.Method;
/**
- * 3rd-party API independent representation of a method invocation. This is needed so Apache Ki can support other
+ * 3rd-party API independent representation of a method invocation. This is needed so Ki can support other
* MethodInvocation instances from other AOP frameworks/APIs.
*
* @author Jeremy Haile
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AbstractAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AbstractAuthenticator.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AbstractAuthenticator.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AbstractAuthenticator.java Thu Mar 26 00:19:03 2009
@@ -238,7 +238,7 @@
*
* @param token the authentication token encapsulating the user's login information.
* @return an <tt>AuthenticationInfo</tt> object encapsulating the user's account information
- * important to Apache Ki.
+ * important to Ki.
* @throws AuthenticationException if there is a problem logging in the user.
*/
protected abstract AuthenticationInfo doAuthenticate(AuthenticationToken token)
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/Account.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/Account.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/Account.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/Account.java Thu Mar 26 00:19:03 2009
@@ -28,10 +28,10 @@
* This interface can be useful when an Realm implementation finds it more convenient to use a single object to
* encapsulate both the authentication and authorization information used by both authc and authz operations.
* <p/>
- * <b>Please Note</b>: Since Apache Ki sometimes logs account operations, please ensure your Account's <code>toString()</code>
+ * <b>Please Note</b>: Since Ki sometimes logs account operations, please ensure your Account's <code>toString()</code>
* implementation does <em>not</em> print out account credentials (password, etc), as these might be viewable to
* someone reading your logs. This is good practice anyway, and account principals should rarely (if ever) be printed
- * out for any reason. If you're using Apache Ki's default implementations of this interface, they only ever print the
+ * out for any reason. If you're using Ki's default implementations of this interface, they only ever print the
* account {@link #getPrincipals() principals}, so you do not need to do anything additional.
*
* @author Jeremy Haile
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AuthenticationInfo.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AuthenticationInfo.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AuthenticationInfo.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AuthenticationInfo.java Thu Mar 26 00:19:03 2009
@@ -34,7 +34,7 @@
* <code>AuthenticationInfo</code>).
* <p/>
* Because the act of authentication (log-in) is orthoganal to authorization (access control), this interface is
- * intended to represent only the account data needed by Apache Ki during an authentication attempt. Apache Ki also
+ * intended to represent only the account data needed by Ki during an authentication attempt. Ki also
* has a parallel {@link org.apache.ki.authz.AuthorizationInfo AuthorizationInfo} interface for use during the
* authorization process that references access control data such as roles and permissions.
* <p/>
@@ -45,10 +45,10 @@
* <code>Account</code> interface for a given <code>Realm</code> is entirely based on your application's needs or your
* preferences.
*
- * <p><b>Pleae note:</b> Since Apache Ki sometimes logs authentication operations, please ensure your AuthenticationInfo's
+ * <p><b>Pleae note:</b> Since Ki sometimes logs authentication operations, please ensure your AuthenticationInfo's
* <code>toString()</code> implementation does <em>not</em> print out account credentials (password, etc), as these might be viewable to
* someone reading your logs. This is good practice anyway, and account credentials should rarely (if ever) be printed
- * out for any reason. If you're using Apache Ki's default implementations of this interface, they only ever print the
+ * out for any reason. If you're using Ki's default implementations of this interface, they only ever print the
* account {@link #getPrincipals() principals}, so you do not need to do anything additional.</p>
*
* @author Jeremy Haile
@@ -78,7 +78,7 @@
/**
* Returns the credentials associated with the corresponding Subject. A credential verifies one or more of the
* {@link #getPrincipals() principals} associated with the Subject, such as a password or private key. Credentials
- * are used by Apache Ki particularly during the authentication process to ensure that submitted credentials
+ * are used by Ki particularly during the authentication process to ensure that submitted credentials
* during a login attempt match exactly the credentials here in the <code>AuthenticationInfo</code> instance.
*
* @return the credentials associated with the corresponding Subject.
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AuthenticationToken.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AuthenticationToken.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AuthenticationToken.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/AuthenticationToken.java Thu Mar 26 00:19:03 2009
@@ -35,7 +35,7 @@
* <p>Because applications represent user data and credentials in different ways, implementations
* of this interface are application-specific. You are free to acquire a user's principals and
* credentials however you wish (e.g. web form, Swing form, fingerprint identification, etc) and
- * then submit them to the Apache Ki framework in the form of an implementation of this
+ * then submit them to the Ki framework in the form of an implementation of this
* interface.
*
* <p>If your application's authentication process is username/password based
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/Authenticator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/Authenticator.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/Authenticator.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/Authenticator.java Thu Mar 26 00:19:03 2009
@@ -20,15 +20,15 @@
/**
* An Authenticator is responsible for authenticating accounts in an application. It
- * is one of the primary entry points into the Apache Ki API.
+ * is one of the primary entry points into the Ki API.
* <p/>
* Although not a requirement, there is usually a single 'master' Authenticator configured for
* an application. Enabling Pluggable Authentication Module (PAM) behavior
* (Two Phase Commit, etc.) is usually achieved by the single {@code Authenticator} coordinating
* and interacting with an application-configured set of {@link org.apache.ki.realm.Realm Realm}s.
* <p/>
- * Note that most Apache Ki users will not interact with an {@code Authenticator} instance directly.
- * Apache Ki's default architecture is based on an overall {@code SecurityManager} which typically
+ * Note that most Ki users will not interact with an {@code Authenticator} instance directly.
+ * Ki's default architecture is based on an overall {@code SecurityManager} which typically
* wraps an {@code Authenticator} instance.
*
* @author Les Hazlewood
@@ -44,7 +44,7 @@
* Authenticates a user based on the submitted {@code AuthenticationToken}.
* <p/>
* If the authentication is successful, an {@link AuthenticationInfo} instance is returned that represents the
- * user's account data relevant to Apache Ki. This returned object is generally used in turn to construct a
+ * user's account data relevant to Ki. This returned object is generally used in turn to construct a
* {@code Subject} representing a more complete security-specific 'view' of an account that also allows access to
* a {@code Session}.
*
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/LogoutAware.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/LogoutAware.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/LogoutAware.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/LogoutAware.java Thu Mar 26 00:19:03 2009
@@ -25,7 +25,7 @@
*
* <p>As it is an SPI interface, it is really intended for SPI implementors such as those implementing Realms.
*
- * <p>All of Apache Ki's concrete Realm implementations implement this interface as a convenience for those wishing
+ * <p>All of Ki's concrete Realm implementations implement this interface as a convenience for those wishing
* to subclass them.
*
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/UsernamePasswordToken.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/UsernamePasswordToken.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/UsernamePasswordToken.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/UsernamePasswordToken.java Thu Mar 26 00:19:03 2009
@@ -276,7 +276,7 @@
* is unknown or explicitly omitted. It is up to the Authenticator implementation processing this token if
* an authentication attempt without an inetAddress is valid or not.
*
- * <p>(Apache Ki's default Authenticator
+ * <p>(Ki's default Authenticator
* allows <tt>null</tt> IPs to support localhost and proxy server environments).</p>
*
* @return the inetAddress from where the authentication attempt occurs, or <tt>null</tt> if it is unknown or
@@ -291,7 +291,7 @@
* Sets the inetAddress from where the authentication attempt occurs. It is up to the Authenticator
* implementation processing this token if an authentication attempt without an inetAddress is valid or not.
*
- * <p>(Apache Ki's default Authenticator
+ * <p>(Ki's default Authenticator
* allows <tt>null</tt> IPs to allow localhost and proxy server environments).</p>
*
* @param inetAddress the inetAddress from where the authentication attempt occurs.
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/credential/HashedCredentialsMatcher.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/credential/HashedCredentialsMatcher.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/credential/HashedCredentialsMatcher.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/credential/HashedCredentialsMatcher.java Thu Mar 26 00:19:03 2009
@@ -48,7 +48,7 @@
* salting and multiple iterations and why you might want to use them. (Note of sections 5
* "Why add salt?" and 6 "Hardening against the attacker's attack").
*
- * <p>We should also note here that all of Apache Ki's Hash implementations (for example,
+ * <p>We should also note here that all of Ki's Hash implementations (for example,
* {@link org.apache.ki.crypto.hash.Md5Hash Md5Hash}, {@link org.apache.ki.crypto.hash.Sha1Hash Sha1Hash}, etc)
* support salting and multiple hash iterations via overloaded constructors.</p>
*
@@ -91,7 +91,7 @@
* Returns <tt>true</tt> if the system's stored credential hash is Hex encoded, <tt>false</tt> if it
* is Base64 encoded.
*
- * <p>Default value is <tt>true</tt> for convenience - all of Apache Ki's {@link Hash Hash#toString()}
+ * <p>Default value is <tt>true</tt> for convenience - all of Ki's {@link Hash Hash#toString()}
* implementations return Hex encoded values by default, making this class's use with those implementations
* easier.</p>
*
@@ -108,7 +108,7 @@
* <p>A value of <tt>true</tt> will cause this class to decode the system credential from Hex, a
* value of <tt>false</tt> will cause this class to decode the system credential from Base64.</p>
*
- * <p>Unless overridden via this method, the default value is <tt>true</tt> for convenience - all of Apache Ki's
+ * <p>Unless overridden via this method, the default value is <tt>true</tt> for convenience - all of Ki's
* {@link Hash Hash#toString()} implementations return Hex encoded values by default, making this class's use with
* those implementations easier.</p>.
*
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,29 +1,29 @@
-/*
- * 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.
- */
-/**
- * Core interfaces and exceptions concerning Authentication (the act of logging-in).
- * <p/>
- * Apache Ki abbreviates the word 'AuthentiCation' as <tt>authc</tt> to distinguish it seperately from
- * 'AuthoriZation', abbreviated as <tt>authz</tt>.
- * <p/>
- * The primary item of interest in this package is the <tt>Authenticator</tt> interface, which acts as the
- * entry point (facade) to all other other authentication components. Other components, interfaces and
- * exceptions are here to support <tt>Authenticator</tt> implementations.
- */
+/*
+ * 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.
+ */
+/**
+ * Core interfaces and exceptions concerning Authentication (the act of logging-in).
+ * <p/>
+ * Ki abbreviates the word 'AuthentiCation' as <tt>authc</tt> to distinguish it seperately from
+ * 'AuthoriZation', abbreviated as <tt>authz</tt>.
+ * <p/>
+ * The primary item of interest in this package is the <tt>Authenticator</tt> interface, which acts as the
+ * entry point (facade) to all other other authentication components. Other components, interfaces and
+ * exceptions are here to support <tt>Authenticator</tt> implementations.
+ */
package org.apache.ki.authc;
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java Thu Mar 26 00:19:03 2009
@@ -29,7 +29,7 @@
/**
- * Abstract base implementation for Apache Ki's concrete <code>AuthenticationStrategy</code>
+ * Abstract base implementation for Ki's concrete <code>AuthenticationStrategy</code>
* implementations.
*
* @author Jeremy Haile
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/ModularRealmAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/ModularRealmAuthenticator.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/ModularRealmAuthenticator.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/ModularRealmAuthenticator.java Thu Mar 26 00:19:03 2009
@@ -36,8 +36,8 @@
/**
* A <tt>ModularRealmAuthenticator</tt> delgates account lookups to a pluggable (modular) collection of
- * {@link Realm}s. This enables PAM (Pluggable Authentication Module) behavior in Apache Ki.
- * In addition to authorization duties, a Apache Ki Realm can also be thought of a PAM 'module'.
+ * {@link Realm}s. This enables PAM (Pluggable Authentication Module) behavior in Ki.
+ * In addition to authorization duties, a Ki Realm can also be thought of a PAM 'module'.
*
* <p>Using this Authenticator allows you to "plug-in" your own
* <tt>Realm</tt>s as you see fit. Common realms are those based on accessing
@@ -322,7 +322,7 @@
* <code>((LogoutAware)realm).onLogout(principals)</code> to allow each realm the opportunity to perform
* logout/cleanup operations during an user-logout.
*
- * <p>Apache Ki's Realm implementations all implement the <tt>LogoutAware</tt> interface by default and can be
+ * <p>Ki's Realm implementations all implement the <tt>LogoutAware</tt> interface by default and can be
* overridden for realm-specific logout logic.
*
* @param principals the application-specific Subject/user identifier.
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authc/pam/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,32 +1,32 @@
-/*
- * 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.
- */
-/**
- * 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.apache.ki.realm.Realm Realm}s).
- * <p/>
- * 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/>
- * How the <code>ModularRealmAuthenticator</code> actually coordinates this behavior is configurable based on your
- * application's needs using an injectible
- * {@link AuthenticationStrategy}.
- */
+/*
+ * 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.
+ */
+/**
+ * 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> (Ki
+ * calls these {@link org.apache.ki.realm.Realm Realm}s).
+ * <p/>
+ * 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/>
+ * How the <code>ModularRealmAuthenticator</code> actually coordinates this behavior is configurable based on your
+ * application's needs using an injectible
+ * {@link AuthenticationStrategy}.
+ */
package org.apache.ki.authc.pam;
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/AuthorizationInfo.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/AuthorizationInfo.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/AuthorizationInfo.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/AuthorizationInfo.java Thu Mar 26 00:19:03 2009
@@ -39,8 +39,8 @@
* or both depending on your preference and needs.
* <p/>
* Because the act of authorization (access control) is orthoganal to authentication (log-in), this interface is
- * intended to represent only the account data needed by Apache Ki during an access control check
- * (role, permission, etc). Apache Ki also has a parallel
+ * intended to represent only the account data needed by Ki during an access control check
+ * (role, permission, etc). Ki also has a parallel
* {@link org.apache.ki.authc.AuthenticationInfo AuthenticationInfo} interface for use during the authentication
* process that represents identity data such as principals and credentials.
* <p/>
@@ -77,7 +77,7 @@
* {@link org.apache.ki.authz.permission.PermissionResolver PermissionResolver}
* in order to perform the actual permission check. This is not a requirement of course, since <code>Realm</code>s
* can perform security checks in whatever manner deemed necessary, but this explains the conversion mechanism that
- * most Apache Ki Realms execute for string-based permission checks.
+ * most Ki Realms execute for string-based permission checks.
*
* @return all string-based permissions assigned to the corresponding Subject.
*/
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/Authorizer.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/Authorizer.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/Authorizer.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/Authorizer.java Thu Mar 26 00:19:03 2009
@@ -37,7 +37,7 @@
* {@link Permission Permission} instances. They are a convenience allowing the caller to use a String representation of
* a {@link Permission Permission} if desired. Most implementations of this interface will simply convert these
* String values to {@link Permission Permission} instances and then just call the corresponding type-safe method.
- * (Apache Ki's default implementations do String-to-Permission conversion for these methods using
+ * (Ki's default implementations do String-to-Permission conversion for these methods using
* {@link org.apache.ki.authz.permission.PermissionResolver PermissionResolver}s.)
*
* <p>These overloaded *Permission methods <em>do</em> forego type-saftey for the benefit of convenience and simplicity,
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/AuthorizingAccount.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/AuthorizingAccount.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/AuthorizingAccount.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/AuthorizingAccount.java Thu Mar 26 00:19:03 2009
@@ -29,7 +29,7 @@
* implementations that want to cache authorization state when doing an account lookup so multiple authorization checks
* do not need to access the Realm's underlying data store repeatedly.
* <p/>
- * Of course, an <tt>AuthorizingAccount</tt> concept is only a convenience mechansim if Apache Ki account caching
+ * Of course, an <tt>AuthorizingAccount</tt> concept is only a convenience mechansim if Ki account caching
* is enabled. Realm implementations are free to ignore this interface entirely and implement/override any of their
* <tt>Realm</tt>'s {@link Authorizer Authorizer} methods to execute the authorization checks as they see fit.
* ({@link org.apache.ki.realm.Realm Realm} is a sub-interface of {@link Authorizer Authorizer} and therefore must
@@ -40,7 +40,7 @@
* return an {@link Account} instance, or if you want fine-grained control over authorization behavior, extend
* a subclass of {@link org.apache.ki.realm.AuthorizingRealm} and implement your own security checks in the
* Realm itself instead of forcing this logic in your entity/domain classes where it could be error prone and
- * unnecessarily couple these objects to Apache Ki.
+ * unnecessarily couple these objects to Ki.
*
* @author Jeremy Haile
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/Permission.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/Permission.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/Permission.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/Permission.java Thu Mar 26 00:19:03 2009
@@ -27,7 +27,7 @@
* Granting access to an application functionality or a particular resource is done by the application's security
* configuration, typically by assigning Permissions to users, roles and/or groups.
*
- * <p>Most typical systems are what the Apache Ki team calls <em>role-based</em> in nature, where a role represents
+ * <p>Most typical systems are what the Ki team calls <em>role-based</em> in nature, where a role represents
* common behavior for certain user types. For example, a system might have an <em>Aministrator</em> role, a
* <em>User</em> or <em>Guest</em> roles, etc.
*
@@ -50,13 +50,13 @@
* and groups can all be created, configured and/or deleted at runtime. This enables an extremely powerful security
* model.
*
- * <p>A benefit to Apache Ki is that, although it assumes most systems are based on these types of static role or
+ * <p>A benefit to Ki is that, although it assumes most systems are based on these types of static role or
* dynamic role w/ permission schemes, it does not require a system to model their security data this way - all
* Permission checks are relegated to {@link org.apache.ki.realm.Realm} implementations, and only those implementatons
* really determine how a user 'has' a permission or not. The Realm could use the semantics described here, or it
* could utilize some other mechanism entirely - it is always up to the application developer.
*
- * <p>Apache Ki provides a very powerful default implementation of this interface in the form of the
+ * <p>Ki provides a very powerful default implementation of this interface in the form of the
* {@link org.apache.ki.authz.permission.WildcardPermission WildcardPermission}. We highly recommend that you
* investigate this class before trying to implement your own <code>Permission</code>s.
*
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/annotation/RequiresUser.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/annotation/RequiresUser.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/annotation/RequiresUser.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/annotation/RequiresUser.java Thu Mar 26 00:19:03 2009
@@ -28,7 +28,7 @@
* accessed or invoked. This is <em>less</em> restrictive than the {@link RequiresAuthentication RequiresAuthentication}
* annotation.
* <p/>
- * Apache Ki defines a "user" as a Subject that is either
+ * Ki defines a "user" as a Subject that is either
* "remembered" <b><em>or</em></b> authenticated:
* <ul>
* <li>An <b>authenticated</b> user is a Subject that has successfully logged in (proven their identity)
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,38 +1,38 @@
-/*
- * 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.
- */
-/**
- * Core interfaces and exceptions supporting Authorization (access control).
- * <p/>
- * Apache Ki abbreviates the word 'AuthoriZation' as <tt>authz</tt> to distinguish it seperately from
- * 'AuthentiCation', abbreviated as <tt>authc</tt>.
- * <p/>
- * This package's primary interface of interest, which is the core of Apache Ki authorization functionality,
- * is the <tt>Authorizer</tt>. This interface handles all aspects of principal-related security and is the
- * facade to all other Apache Ki authorization components.
- * <p/>
- * Apache Ki has the ability to authorize subjects (a.k.a. users) without being intrusive to the application's
- * domain model. Most applications will utilize the concepts of <tt>group</tt>s, <tt>role</tt>s, and
- * <tt>permission</tt>s, but Apache Ki tries to be as non-invasive as possible doesn't require any such
- * interfaces (although a Permission interface is made available for fine-grained access control policies if
- * you want to use Apache Ki's permission support out-of-the-box).
- * <p/>
- * 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.
- */
+/*
+ * 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.
+ */
+/**
+ * Core interfaces and exceptions supporting Authorization (access control).
+ * <p/>
+ * Ki abbreviates the word 'AuthoriZation' as <tt>authz</tt> to distinguish it seperately from
+ * 'AuthentiCation', abbreviated as <tt>authc</tt>.
+ * <p/>
+ * This package's primary interface of interest, which is the core of Ki authorization functionality,
+ * is the <tt>Authorizer</tt>. This interface handles all aspects of principal-related security and is the
+ * facade to all other Ki authorization components.
+ * <p/>
+ * Ki has the ability to authorize subjects (a.k.a. users) without being intrusive to the application's
+ * domain model. Most applications will utilize the concepts of <tt>group</tt>s, <tt>role</tt>s, and
+ * <tt>permission</tt>s, but Ki tries to be as non-invasive as possible doesn't require any such
+ * interfaces (although a Permission interface is made available for fine-grained access control policies if
+ * you want to use Ki's permission support out-of-the-box).
+ * <p/>
+ * Although it is possible for applications to implement this and other interfaces directly, it is not
+ * recommended. Ki already has base implementations which should be suitable for 99% of deployments.
+ */
package org.apache.ki.authz;
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/PermissionResolver.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/PermissionResolver.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/PermissionResolver.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/PermissionResolver.java Thu Mar 26 00:19:03 2009
@@ -30,18 +30,18 @@
* However, any resolver may be configured if an application wishes to use different
* {@link org.apache.ki.authz.Permission} implementations.</p>
*
- * <p>A <tt>PermissionResolver</tt> is used by many Apache Ki components such as annotations, property file
+ * <p>A <tt>PermissionResolver</tt> is used by many Ki components such as annotations, property file
* configuration, URL configuration, etc. It is useful whenever a String representation of a permission is specified
* and that String needs to be converted to a Permission instance before executing a security check.</p>
* <p/>
- * Apache Ki chooses to support {@link WildcardPermission Wildcardpermission}s by default in almost all components and
+ * Ki chooses to support {@link WildcardPermission Wildcardpermission}s by default in almost all components and
* we do that in the form of the {@link WildcardPermissionResolver WildcardPermissionResolver}. One of the nice
* things about <code>WildcardPermission</code>s being supported by default is that it makes it very easy to
* store complex permissions in the database - and also makes it very easy to represent permissions in JSP files,
* annotations, etc., where a simple string representation is useful.
* <p/>
- * Although this happens to be the Apache Ki default, you are of course free to provide custom
- * String-to-Permission conversion by providing Apache Ki components any instance of this interface.
+ * Although this happens to be the Ki default, you are of course free to provide custom
+ * String-to-Permission conversion by providing Ki components any instance of this interface.
*
* @author Jeremy Haile
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/WildcardPermission.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/WildcardPermission.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/WildcardPermission.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/WildcardPermission.java Thu Mar 26 00:19:03 2009
@@ -97,8 +97,8 @@
* <code>subject.isPermitted( "newsletter:edit:13" )</code>
* <p/>
* There is no limit to the number of tokens that can be used, so it is up to your imagination in terms of ways that
- * this could be used in your application. However, the Apache Ki team likes to standardize some common usages shown
- * above to help people get started and provide consistency in the Apache Ki community.
+ * this could be used in your application. However, the Ki team likes to standardize some common usages shown
+ * above to help people get started and provide consistency in the Ki community.
*
* @author Jeremy Haile
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/package-info.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/authz/permission/package-info.java Thu Mar 26 00:19:03 2009
@@ -1,27 +1,27 @@
-/*
- * 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.
- */
-/**
- * Support and default implementations for Apache Ki's {@link org.apache.ki.authz.Permission Permission}
- * interface.
- * <p/>
- * Also note the {@link org.apache.ki.authz.permission.PermissionResolver PermissionResolver} interface, as
- * it plays an important part in many of Apache Ki's {@link org.apache.ki.realm.Realm Realm} implementations
- * and AOP support.
- */
+/*
+ * 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.
+ */
+/**
+ * Support and default implementations for Ki's {@link org.apache.ki.authz.Permission Permission}
+ * interface.
+ * <p/>
+ * Also note the {@link org.apache.ki.authz.permission.PermissionResolver PermissionResolver} interface, as
+ * it plays an important part in many of Ki's {@link org.apache.ki.realm.Realm Realm} implementations
+ * and AOP support.
+ */
package org.apache.ki.authz.permission;
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/Cache.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/Cache.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/Cache.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/Cache.java Thu Mar 26 00:19:03 2009
@@ -1,91 +1,91 @@
-/*
- * 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.
- */
-package org.apache.ki.cache;
-
-import java.util.Set;
-
-/**
- * A Cache efficiently stores temporary objects primarily to improve an application's performance.
- *
- * <p>Apache Ki doesn't implement a full Cache mechanism itself, since that is outside the core competency of a
- * Security framework. Instead, this interface provides an abstraction (wrapper) API on top of an underlying
- * cache framework's cache instance (e.g. JCache, Ehcache, JCS, OSCache, JBossCache, TerraCotta, Coherence,
- * GigaSpaces, etc, etc), allowing a Apache Ki user to configure any cache mechanism they choose.
- *
- * @author Les Hazlewood
- * @author Jeremy Haile
- * @since 0.2
- */
-public interface Cache {
-
- /**
- * Returns the Cached value stored under the specified <code>key</code> or
- * <code>null</code> if there is no Cache entry for that <code>key</code>.
- *
- * @param key the key that the value was previous added with
- * @return the cached object or <tt>null</tt> if there is no Cache entry for the specified <code>key</code>
- * @throws CacheException if there is a problem accessing the underlying cache system
- */
- public Object get(Object key) throws CacheException;
-
- /**
- * Adds a Cache entry.
- *
- * @param key the key used to identify the object being stored.
- * @param value the value to be stored in the cache.
- * @throws CacheException if there is a problem accessing the underlying cache system
- */
- public void put(Object key, Object value) throws CacheException;
-
- /**
- * Remove the cache entry corresponding to the specified key.
- *
- * @param key the key of the entry to be removed.
- * @throws CacheException if there is a problem accessing the underlying cache system
- */
- public void remove(Object key) throws CacheException;
-
- /**
- * Clear all entries from the cache.
- *
- * @throws CacheException if there is a problem accessing the underlying cache system
- */
- public void clear() throws CacheException;
-
- /**
- * Returns the number of entries in the cache.
- *
- * @return the number of entries in the cache.
- */
- public int size();
-
- /**
- * Returns a view of all the keys for entries contained in this cache.
- *
- * @return a view of all the keys for entries contained in this cache.
- */
- public Set keys();
-
- /**
- * Returns a view of all of the values contained in this cache.
- *
- * @return a view of all of the values contained in this cache.
- */
- public Set values();
+/*
+ * 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.
+ */
+package org.apache.ki.cache;
+
+import java.util.Set;
+
+/**
+ * A Cache efficiently stores temporary objects primarily to improve an application's performance.
+ *
+ * <p>Ki doesn't implement a full Cache mechanism itself, since that is outside the core competency of a
+ * Security framework. Instead, this interface provides an abstraction (wrapper) API on top of an underlying
+ * cache framework's cache instance (e.g. JCache, Ehcache, JCS, OSCache, JBossCache, TerraCotta, Coherence,
+ * GigaSpaces, etc, etc), allowing a Ki user to configure any cache mechanism they choose.
+ *
+ * @author Les Hazlewood
+ * @author Jeremy Haile
+ * @since 0.2
+ */
+public interface Cache {
+
+ /**
+ * Returns the Cached value stored under the specified <code>key</code> or
+ * <code>null</code> if there is no Cache entry for that <code>key</code>.
+ *
+ * @param key the key that the value was previous added with
+ * @return the cached object or <tt>null</tt> if there is no Cache entry for the specified <code>key</code>
+ * @throws CacheException if there is a problem accessing the underlying cache system
+ */
+ public Object get(Object key) throws CacheException;
+
+ /**
+ * Adds a Cache entry.
+ *
+ * @param key the key used to identify the object being stored.
+ * @param value the value to be stored in the cache.
+ * @throws CacheException if there is a problem accessing the underlying cache system
+ */
+ public void put(Object key, Object value) throws CacheException;
+
+ /**
+ * Remove the cache entry corresponding to the specified key.
+ *
+ * @param key the key of the entry to be removed.
+ * @throws CacheException if there is a problem accessing the underlying cache system
+ */
+ public void remove(Object key) throws CacheException;
+
+ /**
+ * Clear all entries from the cache.
+ *
+ * @throws CacheException if there is a problem accessing the underlying cache system
+ */
+ public void clear() throws CacheException;
+
+ /**
+ * Returns the number of entries in the cache.
+ *
+ * @return the number of entries in the cache.
+ */
+ public int size();
+
+ /**
+ * Returns a view of all the keys for entries contained in this cache.
+ *
+ * @return a view of all the keys for entries contained in this cache.
+ */
+ public Set keys();
+
+ /**
+ * Returns a view of all of the values contained in this cache.
+ *
+ * @return a view of all of the values contained in this cache.
+ */
+ public Set values();
}
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/CacheException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/CacheException.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/CacheException.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/CacheException.java Thu Mar 26 00:19:03 2009
@@ -1,67 +1,67 @@
-/*
- * 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.
- */
-package org.apache.ki.cache;
-
-import org.apache.ki.KiException;
-
-
-/**
- * Root class of all Apache Ki exceptions related to caching operations.
- *
- * @author Jeremy Haile
- * @author Les Hazlewood
- * @since 0.2
- */
-public class CacheException extends KiException {
-
- /**
- * Creates a new <code>CacheException</code>.
- */
- public CacheException() {
- super();
- }
-
- /**
- * Creates a new <code>CacheException</code>.
- *
- * @param message the reason for the exception.
- */
- public CacheException(String message) {
- super(message);
- }
-
- /**
- * Creates a new <code>CacheException</code>.
- *
- * @param cause the underlying cause of the exception.
- */
- public CacheException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Creates a new <code>CacheException</code>.
- *
- * @param message the reason for the exception.
- * @param cause the underlying cause of the exception.
- */
- public CacheException(String message, Throwable cause) {
- super(message, cause);
- }
+/*
+ * 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.
+ */
+package org.apache.ki.cache;
+
+import org.apache.ki.KiException;
+
+
+/**
+ * Root class of all Ki exceptions related to caching operations.
+ *
+ * @author Jeremy Haile
+ * @author Les Hazlewood
+ * @since 0.2
+ */
+public class CacheException extends KiException {
+
+ /**
+ * Creates a new <code>CacheException</code>.
+ */
+ public CacheException() {
+ super();
+ }
+
+ /**
+ * Creates a new <code>CacheException</code>.
+ *
+ * @param message the reason for the exception.
+ */
+ public CacheException(String message) {
+ super(message);
+ }
+
+ /**
+ * Creates a new <code>CacheException</code>.
+ *
+ * @param cause the underlying cause of the exception.
+ */
+ public CacheException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Creates a new <code>CacheException</code>.
+ *
+ * @param message the reason for the exception.
+ * @param cause the underlying cause of the exception.
+ */
+ public CacheException(String message, Throwable cause) {
+ super(message, cause);
+ }
}
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/CacheManager.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/CacheManager.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/CacheManager.java Thu Mar 26 00:19:03 2009
@@ -1,43 +1,43 @@
-/*
- * 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.
- */
-package org.apache.ki.cache;
-
-/**
- * A CacheManager provides and maintains the lifecycles of {@link Cache Cache} instances.
- *
- * <p>Apache Ki doesn't implement a full Cache mechanism itself, since that is outside the core competency of a
- * Security framework. Instead, this interface provides an abstraction (wrapper) API on top of an underlying
- * cache framework's main Manager component (e.g. JCache, Ehcache, JCS, OSCache, JBossCache, TerraCotta, Coherence,
- * GigaSpaces, etc, etc), allowing a Apache Ki user to configure any cache mechanism they choose.
- *
- * @author Les Hazlewood
- * @since 0.9
- */
-public interface CacheManager {
-
- /**
- * Acquires the cache with the specified <code>name</code>. If a cache does not yet exist with that name, a new one
- * will be created with that name and returned.
- *
- * @param name the name of the cache to acquire.
- * @return the Cache with the given name
- * @throws CacheException if there is an error acquiring the Cache instance.
- */
- public Cache getCache(String name) throws CacheException;
+/*
+ * 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.
+ */
+package org.apache.ki.cache;
+
+/**
+ * A CacheManager provides and maintains the lifecycles of {@link Cache Cache} instances.
+ *
+ * <p>Ki doesn't implement a full Cache mechanism itself, since that is outside the core competency of a
+ * Security framework. Instead, this interface provides an abstraction (wrapper) API on top of an underlying
+ * cache framework's main Manager component (e.g. JCache, Ehcache, JCS, OSCache, JBossCache, TerraCotta, Coherence,
+ * GigaSpaces, etc, etc), allowing a Ki user to configure any cache mechanism they choose.
+ *
+ * @author Les Hazlewood
+ * @since 0.9
+ */
+public interface CacheManager {
+
+ /**
+ * Acquires the cache with the specified <code>name</code>. If a cache does not yet exist with that name, a new one
+ * will be created with that name and returned.
+ *
+ * @param name the name of the cache to acquire.
+ * @return the Cache with the given name
+ * @throws CacheException if there is an error acquiring the Cache instance.
+ */
+ public Cache getCache(String name) throws CacheException;
}
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/HashtableCache.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/HashtableCache.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/HashtableCache.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/cache/HashtableCache.java Thu Mar 26 00:19:03 2009
@@ -1,50 +1,50 @@
-/*
- * 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.
- */
-package org.apache.ki.cache;
-
-import java.util.Hashtable;
-
-/**
- * An implementation of the Apache Ki {@link Cache} interface that uses a
- * {@link Hashtable} to store cached objects. This implementation is only suitable for
- * development/testing use as it is prone to a potential memory leak if objects are not explicitly removed
- * from the cache.
- *
- * @author Jeremy Haile
- * @author Les Hazlewood
- * @since 0.2
- *
- * @deprecated Due to potential memory leaks caused by {@code Hashtable}s, it is highly recommended to avoid using
- * this class and instead switch to using a {@link SoftHashMapCache SoftHashMapCache}.
- */
-public class HashtableCache extends MapCache {
-
- /**
- * Creates a new <code>HashtableCache</code> instance with the specified name.
- * <p/>
- * This constructor simply calls <code>super(name, new {@link Hashtable Hashtable}());</code>
- *
- * @param name the name to assign to the cache.
- * @since 1.0
- */
- public HashtableCache(String name) {
- super(name, new Hashtable());
- }
-
+/*
+ * 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.
+ */
+package org.apache.ki.cache;
+
+import java.util.Hashtable;
+
+/**
+ * An implementation of the Ki {@link Cache} interface that uses a
+ * {@link Hashtable} to store cached objects. This implementation is only suitable for
+ * development/testing use as it is prone to a potential memory leak if objects are not explicitly removed
+ * from the cache.
+ *
+ * @author Jeremy Haile
+ * @author Les Hazlewood
+ * @since 0.2
+ *
+ * @deprecated Due to potential memory leaks caused by {@code Hashtable}s, it is highly recommended to avoid using
+ * this class and instead switch to using a {@link SoftHashMapCache SoftHashMapCache}.
+ */
+public class HashtableCache extends MapCache {
+
+ /**
+ * Creates a new <code>HashtableCache</code> instance with the specified name.
+ * <p/>
+ * This constructor simply calls <code>super(name, new {@link Hashtable Hashtable}());</code>
+ *
+ * @param name the name to assign to the cache.
+ * @since 1.0
+ */
+ public HashtableCache(String name) {
+ super(name, new Hashtable());
+ }
+
}
Modified: incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/codec/Base64.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/codec/Base64.java?rev=758476&r1=758475&r2=758476&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/codec/Base64.java (original)
+++ incubator/jsecurity/trunk/core/src/main/java/org/apache/ki/codec/Base64.java Thu Mar 26 00:19:03 2009
@@ -28,7 +28,7 @@
*
* <p>This class was borrowed from Apache Commons Codec SVN repository (rev. 618419) with modifications
* to enable Base64 conversion without a full dependecny on Commons Codec. We didn't want to reinvent the wheel of
- * great work they've done, but also didn't want to force every Apache Ki user to depend on the commons-codec.jar</p>
+ * great work they've done, but also didn't want to force every Ki user to depend on the commons-codec.jar</p>
*
* <p>As per the Apache 2.0 license, the original copyright notice and all author and copyright information have
* remained in tact.</p>
@@ -223,7 +223,7 @@
}
/**
- * Base64 encodes the specified byte array and then encodes it as a String using Apache Ki's preferred character
+ * Base64 encodes the specified byte array and then encodes it as a String using Ki's preferred character
* encoding (UTF-8).
*
* @param bytes the byte array to Base64 encode.