Return-Path: 
 <jsecurity-commits-return-132-apmail-incubator-jsecurity-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-jsecurity-commits-archive@minotaur.apache.org
Received: (qmail 23058 invoked from network); 11 Mar 2009 07:10:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Mar 2009 07:10:13 -0000
Received: (qmail 12619 invoked by uid 500); 11 Mar 2009 07:10:13 -0000
Delivered-To: apmail-incubator-jsecurity-commits-archive@incubator.apache.org
Received: (qmail 12593 invoked by uid 500); 11 Mar 2009 07:10:13 -0000
Mailing-List: contact jsecurity-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:jsecurity-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jsecurity-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jsecurity-commits@incubator.apache.org>
List-Id: <jsecurity-commits.incubator.apache.org>
Reply-To: jsecurity-dev@incubator.apache.org
Delivered-To: mailing list jsecurity-commits@incubator.apache.org
Received: (qmail 12582 invoked by uid 99); 11 Mar 2009 07:10:13 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Mar 2009 00:10:13 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Mar 2009 07:10:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B15CF2388920; Wed, 11 Mar 2009 07:09:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r752395 [1/3] - in /incubator/jsecurity/trunk: ./
 core/src/org/apache/ki/ core/src/org/apache/ki/aop/
 core/src/org/apache/ki/authc/ core/src/org/apache/ki/authc/credential/
 core/src/org/apache/ki/authc/pam/ core/src/org/apache/ki/authz/ cor...
Date: Wed, 11 Mar 2009 07:09:37 -0000
To: jsecurity-commits@incubator.apache.org
From: adc@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090311070943.B15CF2388920@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: adc
Date: Wed Mar 11 07:09:33 2009
New Revision: 752395

URL: http://svn.apache.org/viewvc?rev=752395&view=rev
Log:
KI-66 intermediate changes

Modified:
    incubator/jsecurity/trunk/NOTICE.txt
    incubator/jsecurity/trunk/README-runtime-requirements.txt
    incubator/jsecurity/trunk/build.xml
    incubator/jsecurity/trunk/changes.txt
    incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/SecurityUtils.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInterceptor.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInterceptorSupport.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInvocation.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AbstractAuthenticator.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/Account.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationInfo.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationToken.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/Authenticator.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/LogoutAware.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/UsernamePasswordToken.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/credential/HashedCredentialsMatcher.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/ModularRealmAuthenticator.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationInfo.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Authorizer.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizingAccount.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Permission.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresUser.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authz/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolver.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermission.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/cache/Cache.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheManager.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/cache/HashtableCache.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Base64.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecSupport.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Hex.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/codec/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/config/Configuration.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/config/ConfigurationException.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/config/IniConfiguration.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/config/ReflectionBuilder.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/config/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/BlowfishCipher.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/Cipher.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/AbstractHash.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/io/Serializer.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiCallback.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiLocator.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiTemplate.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AuthenticatingSecurityManager.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/AuthorizingSecurityManager.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/DefaultSecurityManager.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/RealmSecurityManager.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManager.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SecurityManagerAware.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SessionSubjectBinder.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/SessionsSecurityManager.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/mgt/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/realm/AuthenticatingRealm.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/realm/Realm.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/realm/RealmFactory.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/realm/jndi/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/default-ki-users.properties
    incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/ValidatingSessionManager.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/MemorySessionDAO.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/session/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/subject/Subject.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/subject/package-info.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/util/AntPathMatcher.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/util/CollectionUtils.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/JavaEnvironment.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/util/JdbcUtils.java
    incubator/jsecurity/trunk/core/src/org/apache/ki/util/UnknownClassException.java
    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/fopdf.xsl
    incubator/jsecurity/trunk/docs/reference/styles/html.xsl
    incubator/jsecurity/trunk/docs/reference/styles/html_chunk.xsl
    incubator/jsecurity/trunk/docs/reference/styles/tld.to.docbook.xsl
    incubator/jsecurity/trunk/ivy.xml
    incubator/jsecurity/trunk/samples/quickstart/src/Quickstart.java
    incubator/jsecurity/trunk/samples/quickstart/src/log4j.properties
    incubator/jsecurity/trunk/samples/spring-hibernate/src/org/jsecurity/samples/sprhib/security/SampleRealm.java
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/applicationContext.xml
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/classes/log4j.properties
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/jsp/editUser.jsp
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/jsp/home.jsp
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/jsp/login.jsp
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/jsp/manageUsers.jsp
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/jsp/signup.jsp
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/web.xml
    incubator/jsecurity/trunk/samples/spring-hibernate/web/unauthorized.jsp
    incubator/jsecurity/trunk/samples/spring/build.xml
    incubator/jsecurity/trunk/samples/spring/etc/ehcache.xml
    incubator/jsecurity/trunk/samples/spring/etc/jsecurity-sample.jks
    incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml
    incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/BootstrapDataPopulator.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/webroot/WEB-INF/applicationContext.xml
    incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/classes/log4j.properties
    incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp
    incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/resources/login.jsp
    incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/web.xml
    incubator/jsecurity/trunk/samples/standalone/src/log4j.properties
    incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties
    incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml
    incubator/jsecurity/trunk/samples/web/webroot/home.jsp
    incubator/jsecurity/trunk/samples/web/webroot/logout.jsp
    incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCache.java
    incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/EhCacheManager.java
    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/spring/src/org/apache/ki/spring/LifecycleBeanPostProcessor.java
    incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java
    incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.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/SecureRemoteInvocationExecutor.java
    incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.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/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
    incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
    incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java
    incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebRememberMeManager.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/IniWebConfiguration.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/config/WebConfiguration.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/AccessControlFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/AnonymousFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/filter/authc/BasicHttpAuthenticationFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityFilter.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpServletResponse.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpSession.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletRequest.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/DefaultWebSessionManager.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/ServletContainerSessionManager.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSession.java
    incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/jsecurity.tld
    incubator/jsecurity/trunk/web/src/org/ki/web/attr/package-info.java
    incubator/jsecurity/trunk/web/src/org/ki/web/tags/package-info.java
    incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java

Modified: incubator/jsecurity/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/NOTICE.txt?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/NOTICE.txt (original)
+++ incubator/jsecurity/trunk/NOTICE.txt Wed Mar 11 07:09:33 2009
@@ -1,4 +1,4 @@
-Apache JSecurity
+Apache 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 JSecurity - please
+express permission to publish it in Apache 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=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/README-runtime-requirements.txt (original)
+++ incubator/jsecurity/trunk/README-runtime-requirements.txt Wed Mar 11 07:09:33 2009
@@ -1,4 +1,4 @@
-JSecurity Runtime Requirements
+Apache Ki Runtime Requirements
 ------------------------------
 
 All 3rd party dependencies mentioned below are accessible in two ways:
@@ -15,6 +15,6 @@
 
 Feature-based dependencies
 --------------------------
-- .ini based configuration, either for a jsecurity.ini file in the classpath or embedded .ini in the JSecurityFilter
+- .ini based configuration, either for a jsecurity.ini file in the classpath or embedded .ini in the Apache KiFilter
   in web.xml:
   . include Jakarta commons-beanutils-core.jar

Modified: incubator/jsecurity/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/build.xml?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/build.xml (original)
+++ incubator/jsecurity/trunk/build.xml Wed Mar 11 07:09:33 2009
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 
-<!-- JSecurity root build file.  If you want to understand how the JSecurity build environment
+<!-- Apache Ki root build file.  If you want to understand how the Apache Ki build environment
      works (useful if you want to build from scratch or join the project as a developer),
      Read this article:
 
@@ -176,17 +176,17 @@
     </target>
 
     <target name="samples.web.deploy" depends="package"
-            description="Deploys the JSecurity quickstart .war">
+            description="Deploys the Apache Ki quickstart .war">
         <ant dir="samples/web" target="deploy"/>
     </target>
 
     <target name="samples.spring.deploy" depends="package"
-            description="Deploys the sample JSecurity/Spring .war">
+            description="Deploys the sample Apache Ki/Spring .war">
         <ant dir="samples/spring" target="deploy"/>
     </target>
 
     <target name="samples.spring-hibernate.deploy" depends="package"
-            description="Deploys the sample JSecurity Spring/Hibernate .war">
+            description="Deploys the sample Apache Ki Spring/Hibernate .war">
         <ant dir="samples/spring-hibernate" target="deploy"/>
     </target>
 
@@ -199,17 +199,17 @@
         <delete dir="${api.dir}" failonerror="false"/>
         <mkdir dir="${api.dir}"/>
 
-        <javadoc destdir="${api.dir}" windowtitle="JSecurity API ${version}"
+        <javadoc destdir="${api.dir}" windowtitle="Apache Ki API ${version}"
                  source="1.5" access="package" author="true" version="true" use="true"
                  defaultexcludes="true"
-                 header='&lt;a href=\"http://www.jsecurity.org/\" target=\"_top\"&gt;JSecurity&lt;/a&gt;'>
+                 header='&lt;a href=\"http://www.jsecurity.org/\" target=\"_top\"&gt;Apache Ki&lt;/a&gt;'>
             <sourcepath refid="javadoc.src"/>
             <arg value="-breakiterator"/>
             <arg value="-J-Xmx128m"/>
             <arg value="-J-XX:MaxPermSize=128m"/>
             <!-- <arg value="-J-Dhttp.proxyHost=${javadoc.proxyhost}"/>
           <arg value="-J-Dhttp.proxyPort=${javadoc.proxyport}"/> -->
-            <doctitle><![CDATA[<h1>JSecurity API ${version}</h1>]]></doctitle>
+            <doctitle><![CDATA[<h1>Apache Ki API ${version}</h1>]]></doctitle>
             <!-- The following <bottom> block is to enable UA tracking via Google Analytics, but it fails the
                  JavaDoc task on a Windows Sun JDK.  It works fine on Mac OS X JavaDoc.  Since we want this UA
                  tracking, we use a Mac to build the release that end-users will download, so we leave this block
@@ -217,7 +217,7 @@
                  run successfully. -->
             <bottom>
                 <![CDATA[
-                <i>Copyright &copy; 2004-2008 <a href="http://www.jsecurity.org/" target="_top">JSecurity</a>.</i>
+                <i>Copyright &copy; 2004-2008 <a href="http://www.jsecurity.org/" target="_top">Apache Ki</a>.</i>
                 <script type="text/javascript">
                     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
                     document.write(unescape("%3Cscript src=%22" + gaJsHost + "google-analytics.com/ga.js%22 type=%22text/javascript%22%3E%3C/script%3E"));
@@ -544,7 +544,7 @@
     </target>
 
     <target name="release" depends="package,src.zip,makepom,javadoc,doc.all"
-            description="Create all artifacts for a JSecurity release">
+            description="Create all artifacts for a Apache Ki release">
         <property name="release.dir.name" value="${project.name}-${version}"/>
         <property name="release.zip.name" value="${release.dir.name}.zip"/>
         <property name="release.depzip.name" value="${release.dir.name}-with-dependencies.zip"/>

Modified: incubator/jsecurity/trunk/changes.txt
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/changes.txt?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/changes.txt (original)
+++ incubator/jsecurity/trunk/changes.txt Wed Mar 11 07:09:33 2009
@@ -16,10 +16,10 @@
 * DelegatingSubject is now still usable after it is logged out (no invalid exceptions thrown).
   The Subject is now just considered 'anonymous' again at that point.
 
-* ReflectionBuilder (used in JSecurity .ini and web.xml based text configuration) now handles setting
+* ReflectionBuilder (used in Apache Ki .ini and web.xml based text configuration) now handles setting
   primitive attributes correctly, performing proper string-to-primitive conversion (BeanUtils does this automatically).
 
-* ReflectionBuilder (used for JSecurity .ini and web.xml configuration) now supports setting other previously configured
+* ReflectionBuilder (used for Apache Ki .ini and web.xml configuration) now supports setting other previously configured
   objects by '$' reference. For example:
   bar = some.package.class.Bar
   foo = some.package.class.Foo

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/KiException.java Wed Mar 11 07:09:33 2009
@@ -21,7 +21,7 @@
 import java.io.Serializable;
 
 /**
- * Root exception for all JSecurity runtime exceptions.  This class is used as the root instead
+ * Root exception for all Apache 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 JSecurityException.
+     * Creates a new Apache KiException.
      */
     public KiException() {
         super();
     }
 
     /**
-     * Constructs a new JSecurityException.
+     * Constructs a new Apache KiException.
      *
      * @param message the reason for the exception
      */
@@ -48,7 +48,7 @@
     }
 
     /**
-     * Constructs a new JSecurityException.
+     * Constructs a new Apache KiException.
      *
      * @param cause the underlying Throwable that caused this exception to be thrown.
      */
@@ -57,7 +57,7 @@
     }
 
     /**
-     * Constructs a new JSecurityException.
+     * Constructs a new Apache 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/org/apache/ki/SecurityUtils.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/SecurityUtils.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/SecurityUtils.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/SecurityUtils.java Wed Mar 11 07:09:33 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 JSecurity team to change the underlying implementation of
+     * implementation-specific methods.  It also allows the Apache 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 JSecurity development team prefers that SecurityManager instances are non-static application singletons
+     * <p>The Apache 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, JSecurity acquires Subject data based on the currently executing Thread via its own
-     * framework integration code, and this is the preferred way to use JSecurity.</p>
+     * <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>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/org/apache/ki/aop/MethodInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInterceptor.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInterceptor.java Wed Mar 11 07:09:33 2009
@@ -40,7 +40,7 @@
 /**
  * A <tt>MethodInterceptor</tt> intercepts a <tt>MethodInvocation</tt> to perform before or after logic (aka 'advice').
  *
- * <p>JSecurity's implementations of this interface mostly have to deal with ensuring a current Subject has the
+ * <p>Apache 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/org/apache/ki/aop/MethodInterceptorSupport.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInterceptorSupport.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInterceptorSupport.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInterceptorSupport.java Wed Mar 11 07:09:33 2009
@@ -42,7 +42,7 @@
 
 
 /**
- * This class is an abstraction of AOP method interceptor behavior specific to JSecurity that
+ * This class is an abstraction of AOP method interceptor behavior specific to Apache 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/org/apache/ki/aop/MethodInvocation.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInvocation.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInvocation.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/aop/MethodInvocation.java Wed Mar 11 07:09:33 2009
@@ -40,7 +40,7 @@
 import java.lang.reflect.Method;
 
 /**
- * 3rd-party API independent representation of a method invocation.  This is needed so JSecurity can support other
+ * 3rd-party API independent representation of a method invocation.  This is needed so Apache Ki can support other
  * MethodInvocation instances from other AOP frameworks/APIs.
  *
  * @author Jeremy Haile

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AbstractAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AbstractAuthenticator.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AbstractAuthenticator.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AbstractAuthenticator.java Wed Mar 11 07:09:33 2009
@@ -238,11 +238,11 @@
      *
      * @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 JSecurity.
+     *         important to Apache Ki.
      * @throws AuthenticationException if there is a problem logging in the user.
      */
     protected abstract AuthenticationInfo doAuthenticate(AuthenticationToken token)
             throws AuthenticationException;
 
 
-}
\ No newline at end of file
+}

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/Account.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/Account.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/Account.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/Account.java Wed Mar 11 07:09:33 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 JSecurity sometimes logs account operations, please ensure your Account's <code>toString()</code>
+ * <b>Please Note</b>:  Since Apache 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 JSecurity's default implementations of this interface, they only ever print the
+ * out for any reason.  If you're using Apache 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
@@ -41,4 +41,4 @@
  */
 public interface Account extends AuthenticationInfo, AuthorizationInfo {
 
-}
\ No newline at end of file
+}

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationInfo.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationInfo.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationInfo.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationInfo.java Wed Mar 11 07:09:33 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 JSecurity during an authentication attempt.  JSecurity also
+ * intended to represent only the account data needed by Apache Ki during an authentication attempt.  Apache 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 JSecurity sometimes logs authentication operations, please ensure your AuthenticationInfo's
+ * <p><b>Pleae note:</b>  Since Apache 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 JSecurity's default implementations of this interface, they only ever print the
+ * out for any reason.  If you're using Apache 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 JSecurity particularly during the authentication process to ensure that submitted credentials
+     * are used by Apache 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/org/apache/ki/authc/AuthenticationToken.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationToken.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationToken.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/AuthenticationToken.java Wed Mar 11 07:09:33 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 JSecurity framework in the form of an implementation of this
+ * then submit them to the Apache Ki framework in the form of an implementation of this
  * interface.
  *
  * <p>If your application's authentication process is  username/password based
@@ -92,4 +92,4 @@
      */
     Object getCredentials();
 
-}
\ No newline at end of file
+}

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/Authenticator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/Authenticator.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/Authenticator.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/Authenticator.java Wed Mar 11 07:09:33 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 JSecurity API.
+ * is one of the primary entry points into the Apache 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 JSecurity users will not interact with an {@code Authenticator} instance directly.
- * JSecurity's default architecture is based on an overall {@code SecurityManager} which typically
+ * 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
  * 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 JSecurity.  This returned object is generally used in turn to construct a
+     * user's account data relevant to Apache 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/org/apache/ki/authc/LogoutAware.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/LogoutAware.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/LogoutAware.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/LogoutAware.java Wed Mar 11 07:09:33 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 JSecurity's concrete Realm implementations implement this interface as a convenience for those wishing
+ * <p>All of Apache 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/org/apache/ki/authc/UsernamePasswordToken.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/UsernamePasswordToken.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/UsernamePasswordToken.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/UsernamePasswordToken.java Wed Mar 11 07:09:33 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>(JSecurity's default Authenticator
+     * <p>(Apache 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>(JSecurity's default Authenticator
+     * <p>(Apache 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.
@@ -367,4 +367,4 @@
         return sb.toString();
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/credential/HashedCredentialsMatcher.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/credential/HashedCredentialsMatcher.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/credential/HashedCredentialsMatcher.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/credential/HashedCredentialsMatcher.java Wed Mar 11 07:09:33 2009
@@ -48,7 +48,7 @@
  * salting and multiple iterations and why you might want to use them. (Note of sections 5
  * &quot;Why add salt?&quot; and 6 "Hardening against the attacker's attack").
  *
- * <p>We should also note here that all of JSecurity's Hash implementations (for example,
+ * <p>We should also note here that all of Apache 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 JSecurity's {@link Hash Hash#toString()}
+     * <p>Default value is <tt>true</tt> for convenience - all of Apache 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 JSecurity's
+     * <p>Unless overridden via this method, the default value is <tt>true</tt> for convenience - all of Apache 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/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=752395&r1=752394&r2=752395&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 07:09:33 2009
@@ -19,11 +19,11 @@
 /**
  * Core interfaces and exceptions concerning Authentication (the act of logging-in).
  * <p/>
- * JSecurity abbreviates the word 'AuthentiCation' as <tt>authc</tt> to distinguish it seperately from
+ * 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.
  */
-package org.ki.authc;
\ No newline at end of file
+package org.ki.authc;

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/AbstractAuthenticationStrategy.java Wed Mar 11 07:09:33 2009
@@ -29,7 +29,7 @@
 
 
 /**
- * Abstract base implementation for JSecurity's concrete <code>AuthenticationStrategy</code>
+ * Abstract base implementation for Apache Ki's concrete <code>AuthenticationStrategy</code>
  * implementations.
  *
  * @author Jeremy Haile

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/ModularRealmAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/ModularRealmAuthenticator.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/ModularRealmAuthenticator.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authc/pam/ModularRealmAuthenticator.java Wed Mar 11 07:09:33 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 JSecurity.
- * In addition to authorization duties, a JSecurity Realm can also be thought of a PAM 'module'.
+ * {@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'.
  *
  * <p>Using this Authenticator allows you to &quot;plug-in&quot; 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>JSecurity's Realm implementations all implement the <tt>LogoutAware</tt> interface by default and can be
+     * <p>Apache 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.
@@ -338,4 +338,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

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=752395&r1=752394&r2=752395&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 07:09:33 2009
@@ -18,7 +18,7 @@
  */
 /**
  * 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> (JSecurity
+ * the capability to authenticate a user against multiple configurable (pluggable) <em>modules</em> (Apache Ki
  * calls these {@link org.ki.realm.Realm Realm}s).
  * <p/>
  * The primary class of interest here is the {@link org.ki.authc.pam.ModularRealmAuthenticator ModularRealmAuthenticator}
@@ -29,4 +29,4 @@
  * application's needs using an injectible
  * {@link AuthenticationStrategy}.
  */
-package org.ki.authc.pam;
\ No newline at end of file
+package org.ki.authc.pam;

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationInfo.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationInfo.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationInfo.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizationInfo.java Wed Mar 11 07:09:33 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 JSecurity during an access control check
- * (role, permission, etc).  JSecurity also has a parallel
+ * 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
  * {@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 JSecurity Realms execute for string-based permission checks.
+     * most Apache Ki Realms execute for string-based permission checks.
      *
      * @return all string-based permissions assigned to the corresponding Subject.
      */
@@ -91,4 +91,4 @@
      * @return all type-safe {@link Permission Permission}s assigned to the corresponding Subject.
      */
     Collection<Permission> getObjectPermissions();
-}
\ No newline at end of file
+}

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Authorizer.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Authorizer.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Authorizer.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Authorizer.java Wed Mar 11 07:09:33 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.
- * (JSecurity's default implementations do String-to-Permission conversion for these methods using
+ * (Apache 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/org/apache/ki/authz/AuthorizingAccount.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizingAccount.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizingAccount.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/AuthorizingAccount.java Wed Mar 11 07:09:33 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 JSecurity account caching
+ * Of course, an <tt>AuthorizingAccount</tt> concept is only a convenience mechansim if Apache 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 JSecurity.
+ * unnecessarily couple these objects to Apache Ki.
  *
  * @author Jeremy Haile
  * @author Les Hazlewood

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Permission.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Permission.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Permission.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/Permission.java Wed Mar 11 07:09:33 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 JSecurity team calls <em>role-based</em> in nature, where a role represents
+ * <p>Most typical systems are what the Apache 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 JSecurity is that, although it assumes most systems are based on these types of static role or
+ * <p>A benefit to Apache 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>JSecurity provides a very powerful default implementation of this interface in the form of the
+ * <p>Apache 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/org/apache/ki/authz/annotation/RequiresUser.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresUser.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresUser.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/annotation/RequiresUser.java Wed Mar 11 07:09:33 2009
@@ -28,7 +28,7 @@
  * accessed or invoked.  This is <em>less</em> restrictive than the {@link RequiresAuthentication RequiresAuthentication}
  * annotation.
  * <p/>
- * JSecurity defines a &quot;user&quot; as a Subject that is either
+ * Apache Ki defines a &quot;user&quot; as a Subject that is either
  * &quot;remembered&quot; <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/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=752395&r1=752394&r2=752395&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 07:09:33 2009
@@ -19,20 +19,20 @@
 /**
  * Core interfaces and exceptions supporting Authorization (access control).
  * <p/>
- * JSecurity abbreviates the word 'AuthoriZation' as <tt>authz</tt> to distinguish it seperately from
+ * 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 JSecurity authorization functionality,
+ * 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 JSecurity authorization components.
+ * facade to all other Apache Ki authorization components.
  * <p/>
- * JSecurity has the ability to authorize subjects (a.k.a. users) without being intrusive to the application's
+ * 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 JSecurity tries to be as non-invasive as possible doesn't require any such
+ * <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 JSecurity's permission support out-of-the-box).
+ * 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. JSecurity already has base implementations which should be suitable for 99% of deployments.
+ * recommended. Apache Ki already has base implementations which should be suitable for 99% of deployments.
  */
-package org.ki.authz;
\ No newline at end of file
+package org.ki.authz;

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolver.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolver.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolver.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/PermissionResolver.java Wed Mar 11 07:09:33 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 JSecurity components such as annotations, property file
+ * <p>A <tt>PermissionResolver</tt> is used by many Apache 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/>
- * JSecurity chooses to support {@link WildcardPermission Wildcardpermission}s by default in almost all components and
+ * Apache 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 JSecurity default, you are of course free to provide custom
- * String-to-Permission conversion by providing JSecurity components any instance of this interface.
+ * 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.
  *
  * @author Jeremy Haile
  * @author Les Hazlewood

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermission.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermission.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermission.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/authz/permission/WildcardPermission.java Wed Mar 11 07:09:33 2009
@@ -97,8 +97,8 @@
  * <code>subject.isPermitted( &quot;newsletter:edit:13&quot; )</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 JSecurity team likes to standardize some common usages shown
- * above to help people get started and provide consistency in the JSecurity community.
+ * 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.
  *
  * @author Jeremy Haile
  * @author Les Hazlewood

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=752395&r1=752394&r2=752395&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 07:09:33 2009
@@ -17,11 +17,11 @@
  * under the License.
  */
 /**
- * Support and default implementations for JSecurity's {@link org.apache.ki.authz.Permission Permission}
+ * 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 JSecurity's {@link org.apache.ki.realm.Realm Realm} implementations
+ * 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;
\ No newline at end of file
+package org.ki.authz.permission;

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/Cache.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/Cache.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/cache/Cache.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/Cache.java Wed Mar 11 07:09:33 2009
@@ -23,10 +23,10 @@
 /**
  * A Cache efficiently stores temporary objects primarily to improve an application's performance.
  *
- * <p>JSecurity doesn't implement a full Cache mechanism itself, since that is outside the core competency of a
+ * <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 JSecurity user to configure any cache mechanism they choose.
+ * GigaSpaces, etc, etc), allowing a Apache Ki user to configure any cache mechanism they choose.
  *
  * @author Les Hazlewood
  * @author Jeremy Haile
@@ -88,4 +88,4 @@
      * @return a view of all of the values contained in this cache.
      */
     public Set values();
-}
\ No newline at end of file
+}

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheException.java Wed Mar 11 07:09:33 2009
@@ -22,7 +22,7 @@
 
 
 /**
- * Root class of all JSecurity exceptions related to caching operations.
+ * Root class of all Apache Ki exceptions related to caching operations.
  *
  * @author Jeremy Haile
  * @author Les Hazlewood
@@ -64,4 +64,4 @@
     public CacheException(String message, Throwable cause) {
         super(message, cause);
     }
-}
\ No newline at end of file
+}

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheManager.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheManager.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/CacheManager.java Wed Mar 11 07:09:33 2009
@@ -21,10 +21,10 @@
 /**
  * A CacheManager provides and maintains the lifecycles of {@link Cache Cache} instances.
  *
- * <p>JSecurity doesn't implement a full Cache mechanism itself, since that is outside the core competency of a
+ * <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 JSecurity user to configure any cache mechanism they choose.
+ * GigaSpaces, etc, etc), allowing a Apache Ki user to configure any cache mechanism they choose.
  *
  * @author Les Hazlewood
  * @since 0.9
@@ -40,4 +40,4 @@
      * @throws CacheException if there is an error acquiring the Cache instance.
      */
     public Cache getCache(String name) throws CacheException;
-}
\ No newline at end of file
+}

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/cache/HashtableCache.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/cache/HashtableCache.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/cache/HashtableCache.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/cache/HashtableCache.java Wed Mar 11 07:09:33 2009
@@ -21,7 +21,7 @@
 import java.util.Hashtable;
 
 /**
- * An implementation of the JSecurity {@link Cache} interface that uses a
+ * 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.
@@ -47,4 +47,4 @@
         super(name, new Hashtable());
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Base64.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Base64.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Base64.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Base64.java Wed Mar 11 07:09:33 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 JSecurity user to depend on the commons-codec.jar</p>
+ * great work they've done, but also didn't want to force every Apache 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 JSecurity's preferred character
+     * Base64 encodes the specified byte array and then encodes it as a String using Apache Ki's preferred character
      * encoding (UTF-8).
      *
      * @param bytes the byte array to Base64 encode.
@@ -503,4 +503,4 @@
         return packedData;
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecSupport.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecSupport.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecSupport.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/codec/CodecSupport.java Wed Mar 11 07:09:33 2009
@@ -35,12 +35,12 @@
 public abstract class CodecSupport {
 
     /**
-     * JSecurity's default preferred Character encoding, equal to <b><code>UTF-8</code></b>.
+     * Apache Ki's default preferred Character encoding, equal to <b><code>UTF-8</code></b>.
      */
     public static final String PREFERRED_ENCODING = "UTF-8";
 
     /**
-     * Converts the specified character array to a byte array using the JSecurity's preferred encoding (UTF-8).
+     * Converts the specified character array to a byte array using the Apache Ki's preferred encoding (UTF-8).
      * <p/>
      * This is a convenience method equivalent to calling the {@link #toBytes(String,String)} method with a
      * a wrapping String and {@link CodecSupport#PREFERRED_ENCODING PREFERRED_ENCODING}, i.e.
@@ -72,11 +72,11 @@
     }
 
     /**
-     * Converts the specified source argument to a byte array with JSecurity's
+     * Converts the specified source argument to a byte array with Apache Ki's
      * {@link CodecSupport#PREFERRED_ENCODING PREFERRED_ENCODING}.
      *
      * @param source the string to convert to a byte array.
-     * @return the bytes representing the specified string under JSecurity's {@link CodecSupport#PREFERRED_ENCODING PREFERRED_ENCODING}.
+     * @return the bytes representing the specified string under Apache Ki's {@link CodecSupport#PREFERRED_ENCODING PREFERRED_ENCODING}.
      */
     public static byte[] toBytes(String source) {
         return toBytes(source, PREFERRED_ENCODING);
@@ -102,7 +102,7 @@
     }
 
     /**
-     * Converts the specified byte array to a string using JSecurity's {@link CodecSupport#PREFERRED_ENCODING PREFERRED_ENCODING}.
+     * Converts the specified byte array to a string using Apache Ki's {@link CodecSupport#PREFERRED_ENCODING PREFERRED_ENCODING}.
      *
      * @param bytes the byte array to turn into a String.
      * @return the specified byte array as an encoded String ({@link CodecSupport#PREFERRED_ENCODING PREFERRED_ENCODING}).
@@ -129,7 +129,7 @@
     }
 
     /**
-     * Returns the specified byte array as a character array using JSecurity's {@link CodecSupport#PREFERRED_ENCODING PREFERRED_ENCODING}.
+     * Returns the specified byte array as a character array using Apache Ki's {@link CodecSupport#PREFERRED_ENCODING PREFERRED_ENCODING}.
      *
      * @param bytes the byte array to convert to a char array
      * @return the specified byte array encoded as a character array ({@link CodecSupport#PREFERRED_ENCODING PREFERRED_ENCODING}).

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Hex.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Hex.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Hex.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/codec/Hex.java Wed Mar 11 07:09:33 2009
@@ -23,7 +23,7 @@
  *
  * <p>This class was borrowed from Apache Commons Codec SVN repository (rev. 560660 ) with modifications
  * to enable Hex conversion without a full dependency 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 JSecurity user to depend on the commons-codec.jar</p>
+ * great work they've done, but also didn't want to force every Apache 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>

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=752395&r1=752394&r2=752395&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 07:09:33 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Components for encoding and decoding of data across multiple formats, especially useful in JSecurity's
+ * Components for encoding and decoding of data across multiple formats, especially useful in Apache Ki's
  * cryptography and web functionality.
  */
-package org.ki.codec;
\ No newline at end of file
+package org.ki.codec;

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/config/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/config/Configuration.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/config/Configuration.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/config/Configuration.java Wed Mar 11 07:09:33 2009
@@ -22,7 +22,7 @@
 
 
 /**
- * A <code>Configuration</code> is responsible for 'wiring' together all the JSecurity components for an
+ * A <code>Configuration</code> is responsible for 'wiring' together all the Apache Ki components for an
  * application, such as the {@link org.apache.ki.mgt.SecurityManager SecurityManager}, and any of its
  * dependencies.
  * <p/>

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/config/ConfigurationException.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/config/ConfigurationException.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/config/ConfigurationException.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/config/ConfigurationException.java Wed Mar 11 07:09:33 2009
@@ -21,7 +21,7 @@
 import org.apache.ki.KiException;
 
 /**
- * Root exception indicating there was a problem parsing or processing the JSecurity configuration.
+ * Root exception indicating there was a problem parsing or processing the Apache Ki configuration.
  *
  * @author Les Hazlewood
  * @since 0.9

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/config/IniConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/config/IniConfiguration.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/config/IniConfiguration.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/config/IniConfiguration.java Wed Mar 11 07:09:33 2009
@@ -96,11 +96,11 @@
             } else {
                 if (ignoreResourceNotFound) {
                     if (log.isDebugEnabled()) {
-                        log.debug("JSecurity resource [" + configUrl + "] not found.  Ignoring since " +
+                        log.debug("Apache Ki resource [" + configUrl + "] not found.  Ignoring since " +
                                 "'ignoreResourceNotFound' is set to true.");
                     }
                 } else {
-                    throw new ConfigurationException("JSecurity resource [" + configUrl + "] specified as a 'configUrl' " +
+                    throw new ConfigurationException("Apache Ki resource [" + configUrl + "] specified as a 'configUrl' " +
                             "cannot be found.  If you want to fall back on default configuration specified " +
                             "via the 'config' parameter, then set 'ignoreResourceNotFound' to true.");
                 }

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/config/ReflectionBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/config/ReflectionBuilder.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/config/ReflectionBuilder.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/config/ReflectionBuilder.java Wed Mar 11 07:09:33 2009
@@ -34,7 +34,7 @@
 
 /**
  * Object builder that uses reflection and Apache Commons BeanUtils to build objects given a
- * map of "property values".  Typically these come from the JSecurity INI configuration and are used
+ * map of "property values".  Typically these come from the Apache Ki INI configuration and are used
  * to construct or modify the SecurityManager, its dependencies, and web-based security filters.
  *
  * @author Les Hazlewood

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=752395&r1=752394&r2=752395&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 07:09:33 2009
@@ -17,6 +17,6 @@
  * under the License.
  */
 /**
- * Components that support configuring JSecurity in any application.
+ * Components that support configuring Apache Ki in any application.
  */
-package org.ki.config;
\ No newline at end of file
+package org.ki.config;

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/BlowfishCipher.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/BlowfishCipher.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/BlowfishCipher.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/BlowfishCipher.java Wed Mar 11 07:09:33 2009
@@ -33,15 +33,15 @@
 
 
 /**
- * JSecurity's default symmetric block Cipher using the Blowfish algorithm.  As it is a symmetric Cipher, it uses the
+ * Apache Ki's default symmetric block Cipher using the Blowfish algorithm.  As it is a symmetric Cipher, it uses the
  * same <tt>Key</tt> to both encrypt and decrypt data.  If one is not provided via the {@link #setKey setKey} method,
  * a default one will be used, BUT NOTE:
  *
- * <p>Because JSecurity is an open-source project, if anyone knew that you were using JSecurity's default
+ * <p>Because Apache Ki is an open-source project, if anyone knew that you were using Apache Ki's default
  * <code>Key</code>, they could download/view the source, and with enough effort, reconstruct the <code>Key</code>
  * and decode encrypted data at will.
  *
- * <p>JSecurity only really uses Ciphers to encrypt user ids and session ids, so if that information is not critical
+ * <p>Apache Ki only really uses Ciphers to encrypt user ids and session ids, so if that information is not critical
  * to you and you think the default key still makes things 'sufficiently difficult', then you can ignore this issue.
  *
  * <p>However, if you do feel this constitutes sensitive information, it is recommended that you provide your own
@@ -70,7 +70,7 @@
     //The following KEY_BYTES String was created by running
     //System.out.println( Base64.encode( generateNewKey().getEncoded() ) ); and copying-n-pasting the output here.
     //You should run the same and set the resulting output as a property of this class instead of using
-    //JSecurity's default Key for proper security.
+    //Apache Ki's default Key for proper security.
     private static final byte[] KEY_BYTES = Base64.decode("jJ9Kg1BAevbvhSg3vBfwfQ==");
     private static final Key DEFAULT_CIPHER_KEY = new SecretKeySpec(KEY_BYTES, ALGORITHM);
 

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/Cipher.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/Cipher.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/Cipher.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/Cipher.java Wed Mar 11 07:09:33 2009
@@ -40,9 +40,9 @@
  * data shared between two parties, the same Key must also be shared and may be compromised.
  *
  * <p>Note that a symmetric cipher is perfectly fine to use if you just want to encode data in a format no one else
- * can understand and you never give away the key.  JSecurity uses a symmetric cipher when using certain
+ * can understand and you never give away the key.  Apache Ki uses a symmetric cipher when using certain
  * HTTP Cookies for example - because it is often undesireable to have user's identity stored in a plain-text cookie,
- * that identity can be converted via a symmetric cipher.  Since the the same exact JSecurity application will receive
+ * that identity can be converted via a symmetric cipher.  Since the the same exact Apache Ki application will receive
  * the cookie, it can decrypt it via the same <tt>Key</tt> and there is no potential for discovery since that Key
  * is never shared with anyone.
  *

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/AbstractHash.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/AbstractHash.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/AbstractHash.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/crypto/hash/AbstractHash.java Wed Mar 11 07:09:33 2009
@@ -28,7 +28,7 @@
 import org.apache.ki.codec.Hex;
 
 /**
- * Provides a base for all JSecurity Hash algorithms with support for salts and multiple hash iterations.
+ * Provides a base for all Apache Ki Hash algorithms with support for salts and multiple hash iterations.
  *
  * <p>Read <a href="http://www.owasp.org/index.php/Hashing_Java" target="blank">http://www.owasp.org/index.php/Hashing_Java</a> for a
  * good article on the benefits of hashing, including what a 'salt' is as well as why it and multiple hash iterations

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=752395&r1=752394&r2=752395&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 07:09:33 2009
@@ -21,6 +21,6 @@
  * add additional convenient behavior.
  * <p/>
  * The most important interface in this package is the {@link org.apache.ki.crypto.Cipher Cipher} interface, which
- * allows other JSecurity components to encrypt and decrypt potentially sensitive data.
+ * allows other Apache Ki components to encrypt and decrypt potentially sensitive data.
  */
-package org.ki.crypto;
\ No newline at end of file
+package org.ki.crypto;

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/io/Serializer.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/io/Serializer.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/io/Serializer.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/io/Serializer.java Wed Mar 11 07:09:33 2009
@@ -23,7 +23,7 @@
  * of objects to files, HTTP cookies, or other mechanism.
  * <p/>
  * A <code>Serializer</code> should only do conversion, never change the data, such as encoding/decoding or
- * encryption.  These orthoganal concerns are handled elsewhere by JSecurity, for example, via
+ * encryption.  These orthoganal concerns are handled elsewhere by Apache Ki, for example, via
  * {@link org.apache.ki.codec.CodecSupport CodecSupport} and {@link org.apache.ki.crypto.Cipher Cipher}s.
  * @author Les Hazlewood
  * @since 0.9

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiCallback.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiCallback.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiCallback.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiCallback.java Wed Mar 11 07:09:33 2009
@@ -34,7 +34,7 @@
  * <p>Note that this interface is an exact copy of the Spring Framework's identically named interface from
  * their 2.5.4 distribution - we didn't want to re-invent the wheel, but not require a full dependency on the
  * Spring framework, nor does Spring make available only its JNDI classes in a small jar, or we would have used that.
- * Since JSecurity is also Apache 2.0 licensed, all regular licenses and conditions and authors have remained in tact.
+ * Since Apache Ki is also Apache 2.0 licensed, all regular licenses and conditions and authors have remained in tact.
  *
  * @author Rod Johnson
  * @see JndiTemplate

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiLocator.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiLocator.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiLocator.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiLocator.java Wed Mar 11 07:09:33 2009
@@ -31,7 +31,7 @@
  * <p>Note that this implementation is an almost exact combined copy of the Spring Framework's 'JndiAccessor' and
  * 'JndiLocatorSupport' classes from their 2.5.4 distribution - we didn't want to re-invent the wheel, but not require
  * a full dependency on the Spring framework, nor does Spring make available only its JNDI classes in a small jar, or
- * we would have used that. Since JSecurity is also Apache 2.0 licensed, all regular licenses and conditions and
+ * we would have used that. Since Apache Ki is also Apache 2.0 licensed, all regular licenses and conditions and
  * authors have remained in tact.
  *
  * @author Juergen Hoeller

Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiTemplate.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiTemplate.java?rev=752395&r1=752394&r2=752395&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiTemplate.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/jndi/JndiTemplate.java Wed Mar 11 07:09:33 2009
@@ -37,7 +37,7 @@
  * <p>Note that this implementation is an almost exact copy of the Spring Framework's identically named class from
  * their 2.5.4 distribution - we didn't want to re-invent the wheel, but not require a full dependency on the
  * Spring framework, nor does Spring make available only its JNDI classes in a small jar, or we would have used that.
- * Since JSecurity is also Apache 2.0 licensed, all regular licenses and conditions and authors have remained in tact.
+ * Since Apache Ki is also Apache 2.0 licensed, all regular licenses and conditions and authors have remained in tact.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller