You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ad...@apache.org on 2009/03/11 17:54:35 UTC
svn commit: r752521 - in /incubator/jsecurity/trunk: ./
core/src/org/apache/ki/aop/ core/src/org/apache/ki/realm/
core/src/org/apache/ki/realm/text/ core/src/org/apache/ki/session/mgt/eis/
core/src/org/apache/ki/util/ docs/reference/src/ samples/spring...
Author: adc
Date: Wed Mar 11 16:54:34 2009
New Revision: 752521
URL: http://svn.apache.org/viewvc?rev=752521&view=rev
Log:
KI-66 intermediate changes
Added:
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringKiFilter.java
- copied, changed from r752395, incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiFilter.java
- copied, changed from r752395, incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityFilter.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletResponse.java
- copied, changed from r752395, incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpServletResponse.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpSession.java
- copied, changed from r752395, incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpSession.java
Removed:
incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.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
Modified:
incubator/jsecurity/trunk/README-runtime-requirements.txt
incubator/jsecurity/trunk/build.xml
incubator/jsecurity/trunk/common.ant.xml
incubator/jsecurity/trunk/core/src/org/apache/ki/aop/package-info.java
incubator/jsecurity/trunk/core/src/org/apache/ki/realm/AuthorizingRealm.java
incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java
incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java
incubator/jsecurity/trunk/core/src/org/apache/ki/util/AntPathMatcher.java
incubator/jsecurity/trunk/docs/reference/src/index.xml
incubator/jsecurity/trunk/ivy.xml
incubator/jsecurity/trunk/samples/spring-hibernate/build.xml
incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml
incubator/jsecurity/trunk/web/src/org/apache/ki/web/DefaultWebSecurityManager.java
incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.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/WebSession.java
incubator/jsecurity/trunk/web/test/org/ki/web/DefaultWebSecurityManagerTest.java
Modified: incubator/jsecurity/trunk/README-runtime-requirements.txt
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/README-runtime-requirements.txt?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/README-runtime-requirements.txt (original)
+++ incubator/jsecurity/trunk/README-runtime-requirements.txt Wed Mar 11 16:54:34 2009
@@ -2,19 +2,19 @@
------------------------------
All 3rd party dependencies mentioned below are accessible in two ways:
-1) In the jsecurity-<version>-with-dependencies.zip distribution's lib directory
-2) After downloading jsecurity-<version>.zip (no dependencies), run 'ant retrieve-dependencies'. This will download
+1) In the ki-<version>-with-dependencies.zip distribution's lib directory
+2) After downloading ki-<version>.zip (no dependencies), run 'ant retrieve-dependencies'. This will download
the dependencies to a lib directory (peer to the build.xml).
Minimal required dependencies
-------------
-Java 1.5 and later: Ensure jsecurity.jar and Apache commons-logging.jar are in your application's classpath.
-Java 1.3 and 1.4 only: jsecurity.jar, commons-logging.jar and retroweaver.jar and its associated dependendencies
+Java 1.5 and later: Ensure ki.jar and Apache commons-logging.jar are in your application's classpath.
+Java 1.3 and 1.4 only: ki.jar, commons-logging.jar and retroweaver.jar and its associated dependendencies
Feature-based dependencies
--------------------------
-- .ini based configuration, either for a jsecurity.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 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=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/build.xml (original)
+++ incubator/jsecurity/trunk/build.xml Wed Mar 11 16:54:34 2009
@@ -27,7 +27,7 @@
Reading this will instantly make you familiar with our build.
-->
-<project name="jsecurity" default="all" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="ki" default="all" xmlns:ivy="antlib:org.apache.ivy.ant">
<import file="./common.ant.xml"/>
@@ -202,7 +202,7 @@
<javadoc destdir="${api.dir}" windowtitle="Apache Ki API ${version}"
source="1.5" access="package" author="true" version="true" use="true"
defaultexcludes="true"
- header='<a href=\"http://www.jsecurity.org/\" target=\"_top\">Apache Ki</a>'>
+ header='<a href=\"http://ki.apache.org/\" target=\"_top\">Apache Ki</a>'>
<sourcepath refid="javadoc.src"/>
<arg value="-breakiterator"/>
<arg value="-J-Xmx128m"/>
@@ -217,7 +217,7 @@
run successfully. -->
<bottom>
<![CDATA[
- <i>Copyright © 2004-2008 <a href="http://www.jsecurity.org/" target="_top">Apache Ki</a>.</i>
+ <i>Copyright © 2004-2008 <a href="http://ki.apache.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"));
@@ -302,7 +302,7 @@
</fileset>
</classpath>
<arg value="${dist.ref.dir}/pdf/docbook_fop.tmp"/>
- <arg value="${dist.ref.dir}/pdf/jsecurity-reference.pdf"/>
+ <arg value="${dist.ref.dir}/pdf/ki-reference.pdf"/>
</java>
<delete file="${dist.ref.dir}/pdf/docbook_fop.tmp"/>
Modified: incubator/jsecurity/trunk/common.ant.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/common.ant.xml?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/common.ant.xml (original)
+++ incubator/jsecurity/trunk/common.ant.xml Wed Mar 11 16:54:34 2009
@@ -3,14 +3,14 @@
<project name="common" default="package">
<!-- Static property definitions. These will remain the same for any module or submodule. -->
- <property name="project.name" value="jsecurity"/>
+ <property name="project.name" value="ki"/>
<property name="root.base.dir" value="${basedir}"/>
<!-- Allow override of default build properties from properties file. -->
<property file="build.properties"/>
<property file="${root.base.dir}/build.properties"/>
- <property file="${user.home}/.jsecurity/build.properties"/>
+ <property file="${user.home}/.ki/build.properties"/>
<!-- Environment variables (e.g. to pickup CATALINA_HOME for test deployment) -->
<property environment="env"/>
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/aop/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/aop/package-info.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/aop/package-info.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/aop/package-info.java Wed Mar 11 16:54:34 2009
@@ -19,8 +19,8 @@
/**
* Components used to support the framework's AOP/interception support classes.
* <p/>
- * As this package is a root-level package under <tt>org.jsecurity</tt>, it contains AOP support classes
+ * As this package is a root-level package under <tt>org.apache.ki</tt>, it contains AOP support classes
* useful for any AOP environment and/or function. Feature-dependent AOP classes (e.g. authorization,
* authentication, etc) will use these classes as their base in their respective packages.
*/
-package org.ki.aop;
\ No newline at end of file
+package org.apache.ki.aop;
\ No newline at end of file
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/AuthorizingRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/realm/AuthorizingRealm.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/realm/AuthorizingRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/realm/AuthorizingRealm.java Wed Mar 11 16:54:34 2009
@@ -156,7 +156,7 @@
* the {@link #setCacheManager cacheManager} property will be checked.
* If a <tt>cacheManager</tt> has been set, it will be used to create an authorization
* <tt>cache</tt>, and this newly created cache which will be used as specified in #1.</li>
- * <li>If neither the {@link #setAuthorizationCache (org.jsecurity.cache.Cache) cache}
+ * <li>If neither the {@link #setAuthorizationCache (org.apache.ki.cache.Cache) cache}
* or {@link #setCacheManager(org.apache.ki.cache.CacheManager) cacheManager}
* properties are set, caching will be disabled and authorization lookups will be delegated to
* subclass implementations for each authorization check.</li>
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/realm/text/PropertiesRealm.java Wed Mar 11 16:54:34 2009
@@ -45,14 +45,14 @@
* permission configuration.
*
* <p>For convenience, if the {@link #setResourcePath resourcePath} attribute is not set, this class defaults to lookup
- * the properties file definition from <tt>classpath:jsecurity-users.properties</tt> (root of the classpath).
+ * the properties file definition from <tt>classpath:ki-users.properties</tt> (root of the classpath).
* This allows you to use this implementation by simply defining this file at the classpath root, instantiating this
* class, and then calling {@link #init init()}.
*
* <p>Or, you may of course specify any other file path using the <tt>url:</tt>, <tt>file:</tt>, or <tt>classpath:</tt>
* prefixes.</p>
*
- * <p>If none of these are specified, and the jsecurity-users.properties is not included at the root of the classpath,
+ * <p>If none of these are specified, and the ki-users.properties is not included at the root of the classpath,
* a default failsafe configuration will be used. This is not recommended as it only contains a few simple users and
* roles which are probably of little value to production applications.</p>
*
@@ -83,7 +83,7 @@
* user.abrown = <em>abrownPassword</em>,qa,employee<br/>
* user.djones = <em>djonesPassword</em>,qa,contractor<br/>
* <br/>
- * role.administrator = org.jsecurity.authz.support.AllPermission<br/>
+ * role.administrator = org.apache.ki.authz.support.AllPermission<br/>
* role.manager = com.domain.UserPermission,*,read,write;com.domain.FilePermission,/usr/local/emailManagers.sh,execute<br/>
* role.engineer = com.domain.FilePermission,/usr/local/tomcat/bin/startup.sh,read,execute<br/>
* role.employee = com.domain.IntranetPermission,useWiki<br/>
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/session/mgt/eis/CachingSessionDAO.java Wed Mar 11 16:54:34 2009
@@ -45,7 +45,7 @@
public abstract class CachingSessionDAO implements SessionDAO, CacheManagerAware {
/**
- * The default active sessions cache name, equal to <code>jsecurity-activeSessionCache</code>.
+ * The default active sessions cache name, equal to <code>ki-activeSessionCache</code>.
*/
public static final String ACTIVE_SESSION_CACHE_NAME = "ki-activeSessionCache";
Modified: incubator/jsecurity/trunk/core/src/org/apache/ki/util/AntPathMatcher.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/src/org/apache/ki/util/AntPathMatcher.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/src/org/apache/ki/util/AntPathMatcher.java (original)
+++ incubator/jsecurity/trunk/core/src/org/apache/ki/util/AntPathMatcher.java Wed Mar 11 16:54:34 2009
@@ -40,11 +40,11 @@
* <code>com</code> directory</li>
* <li><code>com/**/test.jsp</code> - matches all <code>test.jsp</code>
* files underneath the <code>com</code> path</li>
- * <li><code>org/jsecurity/**/*.jsp</code> - matches all <code>.jsp</code>
- * files underneath the <code>org/jsecurity</code> path</li>
+ * <li><code>org/apache/ki/**/*.jsp</code> - matches all <code>.jsp</code>
+ * files underneath the <code>org/apache/ki</code> path</li>
* <li><code>org/**/servlet/bla.jsp</code> - matches
- * <code>org/jsecurity/servlet/bla.jsp</code> but also
- * <code>org/jsecurity/testing/servlet/bla.jsp</code> and
+ * <code>org/apache/ki/servlet/bla.jsp</code> but also
+ * <code>org/apache/ki/testing/servlet/bla.jsp</code> and
* <code>org/servlet/bla.jsp</code></li>
* </ul>
*
Modified: incubator/jsecurity/trunk/docs/reference/src/index.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/docs/reference/src/index.xml?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/docs/reference/src/index.xml (original)
+++ incubator/jsecurity/trunk/docs/reference/src/index.xml Wed Mar 11 16:54:34 2009
@@ -32,7 +32,7 @@
<!ENTITY web-support SYSTEM "web-support.xml">
<!ENTITY web-filter SYSTEM "web-filter.xml">
<!ENTITY web-taglibs SYSTEM "web-taglibs.xml">
- <!ENTITY jsecurity.tld SYSTEM "jsecurity.tld.xml">
+ <!ENTITY ki.tld SYSTEM "ki.tld.xml">
]>
<book>
<bookinfo>
@@ -57,9 +57,9 @@
<!-- front matter -->
<toc/>
&preface;
- <part id="jsecurity-quickstart">
+ <part id="ki-quickstart">
<title>Apache Ki Quickstart</title>
- <partintro id="jsecurity-quickstart-intro">
+ <partintro id="ki-quickstart-intro">
<para>
This initial part of the reference documentation walks through the simplest quickstart application
so that you may become familiarized Apache Ki's programming API and general concepts. While this
@@ -77,9 +77,9 @@
</note>
</partintro>
</part>
- <part id="jsecurity-core">
+ <part id="ki-core">
<title>Apache Ki Core</title>
- <partintro id="jsecurity-core-intro">
+ <partintro id="ki-core-intro">
<para>
This part of the reference documentation covers
Apache Ki's core architectural components that support
@@ -224,5 +224,5 @@
</partintro>
</part> -->
<!-- back matter -->
- &jsecurity.tld;
+ &ki.tld;
</book>
Modified: incubator/jsecurity/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/ivy.xml?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/ivy.xml (original)
+++ incubator/jsecurity/trunk/ivy.xml Wed Mar 11 16:54:34 2009
@@ -20,11 +20,11 @@
<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
- <info organisation="org.ki" module="jsecurity" revision="0.9.0" status="snapshot"
+ <info organisation="org.ki" module="ki" revision="0.9.0" status="snapshot"
publication="20080814234001">
<license name="Apache License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.html"/>
<ivyauthor name="Les Hazlewood" url="http://www.leshazlewood.com"/>
- <description homepage="http://www.jsecurity.org">
+ <description homepage="http://ki.apache.org">
Apache Ki is a powerful and flexible open-source Java security framework that cleanly handles
authentication, authorization, enterprise session management, single sign-on and cryptography services.
Modified: incubator/jsecurity/trunk/samples/spring-hibernate/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/build.xml?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/build.xml (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/build.xml Wed Mar 11 16:54:34 2009
@@ -59,7 +59,7 @@
<echo message="DIST DIR: ${dist.dir}"/>
<war warfile="${dist.war}" webxml="web/WEB-INF/web.xml">
<lib dir="${dist.dir}" includes="*.jar"/>
- <lib dir="${dist.dir}/samples" includes="jsecurity-samples-sprhib*.jar"/>
+ <lib dir="${dist.dir}/samples" includes="ki-samples-sprhib*.jar"/>
<lib dir="${dist.dir}/modules" includes="*.jar"/>
<lib dir="${lib.dir}/samples">
<include name="jstl-*.jar"/>
Modified: incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml Wed Mar 11 16:54:34 2009
@@ -27,7 +27,7 @@
user.home - User's home directory
user.dir - User's current working directory
java.io.tmpdir - Default temp file path -->
- <diskStore path="java.io.tmpdir/jsecurity-ehcache"/>
+ <diskStore path="java.io.tmpdir/ki-ehcache"/>
<!--Default Cache configuration. These will applied to caches programmatically created through
Copied: incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringKiFilter.java (from r752395, incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringKiFilter.java?p2=incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringKiFilter.java&p1=incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java&r1=752395&r2=752521&rev=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringJSecurityFilter.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/apache/ki/spring/SpringKiFilter.java Wed Mar 11 16:54:34 2009
@@ -18,19 +18,20 @@
*/
package org.apache.ki.spring;
-import org.apache.ki.web.servlet.Apache KiFilter;
+import org.apache.ki.web.servlet.KiFilter;
+
/**
- * Extension of Apache KiFilter that uses {@link SpringIniWebConfiguration} to configure Apache Ki in a Spring web
+ * Extension of KiFilter that uses {@link SpringIniWebConfiguration} to configure Apache Ki in a Spring web
* environment.
* <p/>
* Using this class in web.xml essentially enables the following:
* <pre><filter>
- * <filter-name>Apache KiFilter</filter-name>
- * <filter-class>org.jsecurity.web.servlet.Apache KiFilter</filter-class>
+ * <filter-name>KiFilter</filter-name>
+ * <filter-class>org.apache.ki.web.servlet.KiFilter</filter-class>
* <init-param>
* <param-name>configClassName</param-name>
- * <param-value>org.jsecurity.spring.SpringIniWebConfiguration<param-value>
+ * <param-value>org.apache.ki.spring.SpringIniWebConfiguration<param-value>
* </init-param>
* <init-param>
* <param-name>config</param-name>
@@ -46,7 +47,7 @@
* @author Jeremy Haile
* @since 0.2
*/
-public class SpringApache KiFilter extends Apache KiFilter {
+public class SpringKiFilter extends KiFilter {
//TODO - complete JavaDoc
@@ -54,7 +55,7 @@
* Default constructor, merely calls
* <code>{@link #configClassName this.configClassName} = {@link SpringIniWebConfiguration SpringIniWebConfiguration}.class.getName()}</code>.
*/
- public SpringApache KiFilter() {
+ public SpringKiFilter() {
this.configClassName = SpringIniWebConfiguration.class.getName();
}
}
Modified: incubator/jsecurity/trunk/web/src/org/apache/ki/web/DefaultWebSecurityManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/DefaultWebSecurityManager.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/DefaultWebSecurityManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/DefaultWebSecurityManager.java Wed Mar 11 16:54:34 2009
@@ -49,7 +49,7 @@
private static final Log log = LogFactory.getLog(DefaultWebSecurityManager.class);
public static final String HTTP_SESSION_MODE = "http";
- public static final String JSECURITY_SESSION_MODE = "ki";
+ public static final String KI_SESSION_MODE = "ki";
/**
* The key that is used to store subject principals in the session.
@@ -141,10 +141,10 @@
throw new IllegalArgumentException("sessionMode argument cannot be null.");
}
mode = sessionMode.toLowerCase();
- if (!HTTP_SESSION_MODE.equals(mode) && !JSECURITY_SESSION_MODE.equals(mode)) {
+ if (!HTTP_SESSION_MODE.equals(mode) && !KI_SESSION_MODE.equals(mode)) {
String msg = "Invalid sessionMode [" + sessionMode + "]. Allowed values are " +
"public static final String constants in the " + getClass().getName() + " class: '"
- + HTTP_SESSION_MODE + "' or '" + JSECURITY_SESSION_MODE + "', with '" +
+ + HTTP_SESSION_MODE + "' or '" + KI_SESSION_MODE + "', with '" +
HTTP_SESSION_MODE + "' being the default.";
throw new IllegalArgumentException(msg);
}
@@ -169,7 +169,7 @@
return new ServletContainerSessionManager();
} else {
if (log.isInfoEnabled()) {
- log.info(JSECURITY_SESSION_MODE + " mode - enabling DefaultWebSessionManager (HTTP + heterogeneous-client sessions)");
+ log.info(KI_SESSION_MODE + " mode - enabling DefaultWebSessionManager (HTTP + heterogeneous-client sessions)");
}
return new DefaultWebSessionManager();
}
Modified: incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/WebUtils.java Wed Mar 11 16:54:34 2009
@@ -64,14 +64,14 @@
"Make sure WebUtils.bind() is being called. (typically called by Apache KiFilter) " +
"This could also happen when running integration tests that don't properly call WebUtils.bind().";
- public static final String SERVLET_REQUEST_KEY = ServletRequest.class.getName() + "_JSECURITY_THREAD_CONTEXT_KEY";
- public static final String SERVLET_RESPONSE_KEY = ServletResponse.class.getName() + "_JSECURITY_THREAD_CONTEXT_KEY";
+ public static final String SERVLET_REQUEST_KEY = ServletRequest.class.getName() + "_KI_THREAD_CONTEXT_KEY";
+ public static final String SERVLET_RESPONSE_KEY = ServletResponse.class.getName() + "_KI_THREAD_CONTEXT_KEY";
/**
* {@link org.apache.ki.session.Session Session} key used to save a request and later restore it, for example when redirecting to a
* requested page after login, equal to <code>jsecuritySavedRequest</code>.
*/
- public static final String SAVED_REQUEST_KEY = "jsecuritySavedRequest";
+ public static final String SAVED_REQUEST_KEY = "kiSavedRequest";
/**
@@ -319,7 +319,7 @@
* {@link #getRequiredServletRequest() getRequiredServletRequest()} method always assumes a
* servlet-only environment.
* <p/>
- * <b>THIS IS NOT PART OF JSECURITY'S PUBLIC API.</b> It exists for Apache Ki implementation requirements only.
+ * <b>THIS IS NOT PART OF APACHE KI'S PUBLIC API.</b> It exists for Apache Ki implementation requirements only.
*
* @return the current thread-bound {@code ServletRequest} or {@code null} if there is not one bound.
* @since 1.0
@@ -405,7 +405,7 @@
* {@link #getRequiredServletResponse() getRequiredServletResponse()} method always assumes a
* servlet-only environment.
* <p/>
- * <b>THIS IS NOT PART OF JSECURITY'S PUBLIC API.</b> It exists for Apache Ki implementation requirements only.
+ * <b>THIS IS NOT PART OF APACHE KI'S PUBLIC API.</b> It exists for Apache Ki implementation requirements only.
*
* @return the current thread-bound {@code ServletResponse} or {@code null} if there is not one bound.
* @since 1.0
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiFilter.java (from r752395, incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiFilter.java&p1=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityFilter.java&r1=752395&r2=752521&rev=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiFilter.java Wed Mar 11 16:54:34 2009
@@ -52,8 +52,8 @@
* The following is a fully commented example that documents how to configure it:
* <p/>
* <pre><filter>
- * <filter-name>Apache KiFilter</filter-name>
- * <filter-class>org.jsecurity.web.servlet.Apache KiFilter</filter-class>
+ * <filter-name>JSecurityFilter</filter-name>
+ * <filter-class>org.jsecurity.web.servlet.JSecurityFilter</filter-class>
* <init-param><param-name>config</param-name><param-value>
* <p/>
* #NOTE: This config looks pretty long - but its not - its only 5 lines of actual config.
@@ -173,7 +173,7 @@
* <p/>
* <p/>
* <filter-mapping>
- * <filter-name>Apache KiFilter</filter-name>
+ * <filter-name>JSecurityFilter</filter-name>
* <url-pattern>/*</url-pattern>
* </filter-mapping></pre>
*
@@ -181,7 +181,7 @@
* @author Jeremy Haile
* @since 0.1
*/
-public class Apache KiFilter extends OncePerRequestFilter {
+public class KiFilter extends OncePerRequestFilter {
//TODO - complete JavaDoc
@@ -191,7 +191,7 @@
public static final String CONFIG_INIT_PARAM_NAME = "config";
public static final String CONFIG_URL_INIT_PARAM_NAME = "configUrl";
- private static final Log log = LogFactory.getLog(Apache KiFilter.class);
+ private static final Log log = LogFactory.getLog(KiFilter.class);
protected String config;
protected String configUrl;
@@ -201,7 +201,7 @@
// Reference to the security manager used by this filter
protected SecurityManager securityManager;
- public Apache KiFilter() {
+ public KiFilter() {
this.configClassName = IniWebConfiguration.class.getName();
}
@@ -374,7 +374,7 @@
/** @since 1.0 */
protected ServletResponse wrapServletResponse(HttpServletResponse orig, KiHttpServletRequest request) {
- return new Apache KiHttpServletResponse(orig, getServletContext(), request);
+ return new KiHttpServletResponse(orig, getServletContext(), request);
}
/** @since 1.0 */
@@ -383,7 +383,7 @@
ServletResponse toUse = response;
if (isHttpSessions() && (request instanceof KiHttpServletRequest) &&
(response instanceof HttpServletResponse)) {
- //the Apache KiHttpServletResponse exists to support URL rewriting for session ids. This is only needed if
+ //the KiHttpServletResponse exists to support URL rewriting for session ids. This is only needed if
//using Apache Ki sessions (i.e. not simple HttpSession based sessions):
toUse = wrapServletResponse((HttpServletResponse) response, (KiHttpServletRequest) request);
}
Modified: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletRequest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletRequest.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletRequest.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletRequest.java Wed Mar 11 16:54:34 2009
@@ -47,7 +47,7 @@
public static final String REFERENCED_SESSION_ID_IS_VALID = KiHttpServletRequest.class.getName() + "_REQUESTED_SESSION_ID_VALID";
public static final String REFERENCED_SESSION_IS_NEW = KiHttpServletRequest.class.getName() + "_REFERENCED_SESSION_IS_NEW";
public static final String REFERENCED_SESSION_ID_SOURCE = KiHttpServletRequest.class.getName() + "REFERENCED_SESSION_ID_SOURCE";
- public static final String SESSION_ID_NAME = Apache KiHttpSession.DEFAULT_SESSION_ID_NAME;
+ public static final String SESSION_ID_NAME = KiHttpSession.DEFAULT_SESSION_ID_NAME;
/**
* Key that may be used to alert that the request's referenced Apache Ki Session has expired prior to
* request processing.
@@ -161,7 +161,7 @@
Session jsecSession = getSubject().getSession(create);
if (jsecSession != null) {
- this.session = new Apache KiHttpSession(jsecSession, this, this.servletContext);
+ this.session = new KiHttpSession(jsecSession, this, this.servletContext);
if (!existing) {
setAttribute(REFERENCED_SESSION_IS_NEW, Boolean.TRUE);
}
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletResponse.java (from r752395, incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpServletResponse.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletResponse.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletResponse.java&p1=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpServletResponse.java&r1=752395&r2=752521&rev=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpServletResponse.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpServletResponse.java Wed Mar 11 16:54:34 2009
@@ -44,17 +44,17 @@
* @since 0.2
*/
@SuppressWarnings({"deprecated", "deprecation"})
-public class Apache KiHttpServletResponse extends HttpServletResponseWrapper {
+public class KiHttpServletResponse extends HttpServletResponseWrapper {
//TODO - complete JavaDoc
- private static final String DEFAULT_SESSION_ID_PARAMETER_NAME = Apache KiHttpSession.DEFAULT_SESSION_ID_NAME;
+ private static final String DEFAULT_SESSION_ID_PARAMETER_NAME = KiHttpSession.DEFAULT_SESSION_ID_NAME;
private ServletContext context = null;
//the associated request
private KiHttpServletRequest request = null;
- public Apache KiHttpServletResponse(HttpServletResponse wrapped, ServletContext context, KiHttpServletRequest request) {
+ public KiHttpServletResponse(HttpServletResponse wrapped, ServletContext context, KiHttpServletRequest request) {
super(wrapped);
this.context = context;
this.request = request;
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpSession.java (from r752395, incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpSession.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpSession.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpSession.java&p1=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpSession.java&r1=752395&r2=752521&rev=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/JSecurityHttpSession.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/KiHttpSession.java Wed Mar 11 16:54:34 2009
@@ -45,7 +45,7 @@
* @since 0.2
*/
@SuppressWarnings({"deprecation"})
-public class Apache KiHttpSession implements HttpSession {
+public class KiHttpSession implements HttpSession {
//TODO - complete JavaDoc
@@ -75,7 +75,7 @@
protected HttpServletRequest currentRequest = null;
protected Session session = null; //'real' Apache Ki Session
- public Apache KiHttpSession(Session session, HttpServletRequest currentRequest, ServletContext servletContext) {
+ public KiHttpSession(Session session, HttpServletRequest currentRequest, ServletContext servletContext) {
if (session instanceof WebSession) {
String msg = "Session constructor argument cannot be an instance of WebSession. This is enforced to " +
"prevent circular dependencies and infinite loops.";
Modified: incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/DefaultWebSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/DefaultWebSessionManager.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/DefaultWebSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/DefaultWebSessionManager.java Wed Mar 11 16:54:34 2009
@@ -36,7 +36,7 @@
import org.apache.ki.web.attr.RequestParamAttribute;
import org.apache.ki.web.attr.WebAttribute;
import org.apache.ki.web.servlet.KiHttpServletRequest;
-import org.apache.ki.web.servlet.Apache KiHttpSession;
+import org.apache.ki.web.servlet.KiHttpSession;
/**
@@ -141,7 +141,7 @@
protected void ensureCookieSessionIdStore() {
CookieAttribute<Serializable> cookieStore = getSessionIdCookieAttribute();
if (cookieStore == null) {
- cookieStore = new CookieAttribute<Serializable>(Apache KiHttpSession.DEFAULT_SESSION_ID_NAME);
+ cookieStore = new CookieAttribute<Serializable>(KiHttpSession.DEFAULT_SESSION_ID_NAME);
cookieStore.setCheckRequestParams(false);
setSessionIdCookieAttribute(cookieStore);
}
@@ -150,7 +150,7 @@
protected void ensureRequestParamSessionIdStore() {
RequestParamAttribute<Serializable> reqParamStore = getSessionIdRequestParamAttribute();
if (reqParamStore == null) {
- reqParamStore = new RequestParamAttribute<Serializable>(Apache KiHttpSession.DEFAULT_SESSION_ID_NAME);
+ reqParamStore = new RequestParamAttribute<Serializable>(KiHttpSession.DEFAULT_SESSION_ID_NAME);
setSessionIdRequestParamAttribute(reqParamStore);
}
}
Modified: incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSession.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSession.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSession.java Wed Mar 11 16:54:34 2009
@@ -28,7 +28,7 @@
import org.apache.ki.session.InvalidSessionException;
import org.apache.ki.session.Session;
-import org.apache.ki.web.servlet.Apache KiHttpSession;
+import org.apache.ki.web.servlet.KiHttpSession;
/**
* TODO class JavaDoc
@@ -50,8 +50,8 @@
String msg = "HttpSession constructor argument cannot be null.";
throw new IllegalArgumentException(msg);
}
- if (httpSession instanceof Apache KiHttpSession) {
- String msg = "HttpSession constructor argument cannot be an instance of Apache KiHttpSession. This " +
+ if (httpSession instanceof KiHttpSession) {
+ String msg = "HttpSession constructor argument cannot be an instance of KiHttpSession. This " +
"is enforced to prevent circular dependencies and infinite loops.";
throw new IllegalArgumentException(msg);
}
Modified: incubator/jsecurity/trunk/web/test/org/ki/web/DefaultWebSecurityManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/test/org/ki/web/DefaultWebSecurityManagerTest.java?rev=752521&r1=752520&r2=752521&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/test/org/ki/web/DefaultWebSecurityManagerTest.java (original)
+++ incubator/jsecurity/trunk/web/test/org/ki/web/DefaultWebSecurityManagerTest.java Wed Mar 11 16:54:34 2009
@@ -47,7 +47,7 @@
@Test
public void jsecuritySessionModeInit() {
- sm.setSessionMode(DefaultWebSecurityManager.JSECURITY_SESSION_MODE);
+ sm.setSessionMode(DefaultWebSecurityManager.KI_SESSION_MODE);
}
}