shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r752380 [9/9] - 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 05:40:54 GMT
Modified: incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/IndexController.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/IndexController.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/IndexController.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/IndexController.java Wed Mar 11 05:40:38 2009
@@ -18,9 +18,10 @@
  */
 package org.ki.samples.spring.web;
 
-import org.ki.SecurityUtils;
+import org.apache.ki.SecurityUtils;
 import org.ki.samples.spring.SampleManager;
-import org.ki.subject.Subject;
+import org.apache.ki.subject.Subject;
+
 import org.springframework.validation.BindException;
 import org.springframework.validation.Errors;
 import org.springframework.web.servlet.ModelAndView;

Modified: incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/JnlpController.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/JnlpController.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/JnlpController.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/JnlpController.java Wed Mar 11 05:40:38 2009
@@ -18,9 +18,10 @@
  */
 package org.ki.samples.spring.web;
 
-import org.ki.SecurityUtils;
-import org.ki.session.Session;
-import org.ki.subject.Subject;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.Subject;
+
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.AbstractController;
 

Modified: incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginController.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginController.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginController.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LoginController.java Wed Mar 11 05:40:38 2009
@@ -18,9 +18,10 @@
  */
 package org.ki.samples.spring.web;
 
-import org.ki.authc.AuthenticationException;
-import org.ki.authc.UsernamePasswordToken;
-import org.ki.mgt.SecurityManager;
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.UsernamePasswordToken;
+import org.apache.ki.mgt.SecurityManager;
+
 import org.springframework.validation.BindException;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.SimpleFormController;
@@ -43,7 +44,7 @@
     /*--------------------------------------------
     |    I N S T A N C E   V A R I A B L E S    |
     ============================================*/
-    private SecurityManager securityManager;
+    private org.apache.ki.mgt.SecurityManager securityManager;
 
     /*--------------------------------------------
     |         C O N S T R U C T O R S           |

Modified: incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LogoutController.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LogoutController.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LogoutController.java (original)
+++ incubator/jsecurity/trunk/samples/spring/src/org/ki/samples/spring/web/LogoutController.java Wed Mar 11 05:40:38 2009
@@ -18,8 +18,8 @@
  */
 package org.ki.samples.spring.web;
 
-import org.ki.SecurityUtils;
-import org.ki.subject.Subject;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.subject.Subject;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.AbstractController;
 
@@ -29,7 +29,7 @@
 
 /**
  * Controller responsible for logging out the current user by invoking
- * {@link org.ki.subject.Subject#logout()}
+ * {@link org.apache.ki.subject.Subject#logout()}
  *
  * @author Jeremy Haile
  * @since 0.1

Modified: incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/applicationContext.xml Wed Mar 11 05:40:38 2009
@@ -49,12 +49,12 @@
     <!-- Used by the SecurityManager to access security data (users, roles, etc).
          Many other realm implementations can be used too (PropertiesRealm,
          LdapRealm, etc. -->
-    <bean id="jdbcRealm" class="org.ki.realm.jdbc.JdbcRealm">
+    <bean id="jdbcRealm" class="org.apache.ki.realm.jdbc.JdbcRealm">
         <property name="dataSource" ref="dataSource"/>
         <property name="credentialsMatcher">
             <!-- The 'bootstrapDataPopulator' Sha256 hashes the password
                  (using the username as the salt) then base64 encodes it: -->
-            <bean class="org.ki.authc.credential.Sha256CredentialsMatcher">
+            <bean class="org.apache.ki.authc.credential.Sha256CredentialsMatcher">
                 <!-- true means hex encoded, false means base64 encoded -->
                 <property name="storedCredentialsHexEncoded" value="false"/>
                 <!-- We salt the password using the username, the most common practice: -->

Modified: incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/classes/log4j.properties?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/classes/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/spring/webroot/WEB-INF/classes/log4j.properties Wed Mar 11 05:40:38 2009
@@ -32,5 +32,5 @@
 log4j.logger.org.ki=TRACE
 
 # Disable verbose logging
-log4j.logger.org.ki.util.ThreadContext=WARN
+log4j.logger.org.apache.ki.util.ThreadContext=WARN
 log4j.logger.org.ki.cache.ehcache.EhCache=WARN

Modified: incubator/jsecurity/trunk/samples/standalone/src/jsecurity.ini
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/standalone/src/jsecurity.ini?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/standalone/src/jsecurity.ini (original)
+++ incubator/jsecurity/trunk/samples/standalone/src/jsecurity.ini Wed Mar 11 05:40:38 2009
@@ -27,7 +27,7 @@
 # This simple example uses only a single realm, but you could add more for more complicated requirements.
 
 # We'll use credentials hashing, since that keeps the users' credentials (passwords, private keys, etc) safe:
-myRealmCredentialsMatcher = org.ki.authc.credential.Sha256CredentialsMatcher
+myRealmCredentialsMatcher = org.apache.ki.authc.credential.Sha256CredentialsMatcher
 
 # now define the realm, and specify that it use the above credentials matcher:
 myRealm = MyRealm

Modified: incubator/jsecurity/trunk/samples/standalone/src/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/standalone/src/log4j.properties?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/standalone/src/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/standalone/src/log4j.properties Wed Mar 11 05:40:38 2009
@@ -32,6 +32,6 @@
 log4j.logger.org.ki=TRACE
 
 # Disable verbose logging
-log4j.logger.org.ki.util.ThreadContext=WARN
+log4j.logger.org.apache.ki.util.ThreadContext=WARN
 log4j.logger.org.ki.cache.ehcache.EhCache=WARN
 

Modified: incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties (original)
+++ incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties Wed Mar 11 05:40:38 2009
@@ -40,8 +40,8 @@
 # JSecurity
 # =============================================================================
 # JSecurity security framework
-log4j.logger.org.ki.realm.text.PropertiesRealm=INFO
+log4j.logger.org.apache.ki.realm.text.PropertiesRealm=INFO
 log4j.logger.org.ki.cache.ehcache.EhCache=INFO
 log4j.logger.org.ki.io=INFO
 log4j.logger.org.ki.web.servlet=INFO
-log4j.logger.org.ki.util.ThreadContext=INFO
\ No newline at end of file
+log4j.logger.org.apache.ki.util.ThreadContext=INFO
\ No newline at end of file

Modified: incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml (original)
+++ incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml Wed Mar 11 05:40:38 2009
@@ -36,7 +36,7 @@
 
                 [main]
 
-                demoRealm = org.ki.realm.text.PropertiesRealm
+                demoRealm = org.apache.ki.realm.text.PropertiesRealm
 
                 [filters]
                 jsecurity.loginUrl = /login.jsp

Modified: incubator/jsecurity/trunk/samples/web/webroot/include.jsp
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/webroot/include.jsp?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/webroot/include.jsp (original)
+++ incubator/jsecurity/trunk/samples/web/webroot/include.jsp Wed Mar 11 05:40:38 2009
@@ -16,7 +16,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   --%>
-<%@ page import="org.ki.SecurityUtils" %>
+<%@ page import="org.apache.ki.SecurityUtils" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="jsec" uri="http://www.jsecurity.org/tags" %>
\ No newline at end of file

Modified: incubator/jsecurity/trunk/samples/web/webroot/logout.jsp
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/webroot/logout.jsp?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/webroot/logout.jsp (original)
+++ incubator/jsecurity/trunk/samples/web/webroot/logout.jsp Wed Mar 11 05:40:38 2009
@@ -1,21 +1,22 @@
+<%@ page import="org.apache.ki.SecurityUtils" %>
 <%--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  --%>
+~ Licensed to the Apache Software Foundation (ASF) under one
+~ or more contributor license agreements.  See the NOTICE file
+~ distributed with this work for additional information
+~ regarding copyright ownership.  The ASF licenses this file
+~ to you under the Apache License, Version 2.0 (the
+~ "License"); you may not use this file except in compliance
+~ with the License.  You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied.  See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+--%>
 <%@ include file="include.jsp" %>
 <%
     /*

Modified: incubator/jsecurity/trunk/support/ehcache/src/org/ki/cache/ehcache/EhCache.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/org/ki/cache/ehcache/EhCache.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/org/ki/cache/ehcache/EhCache.java (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/org/ki/cache/ehcache/EhCache.java Wed Mar 11 05:40:38 2009
@@ -21,8 +21,8 @@
 import net.sf.ehcache.Element;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.cache.Cache;
-import org.ki.cache.CacheException;
+import org.apache.ki.cache.Cache;
+import org.apache.ki.cache.CacheException;
 
 import java.util.Collections;
 import java.util.LinkedHashSet;
@@ -30,7 +30,7 @@
 import java.util.Set;
 
 /**
- * JSecurity {@link org.ki.cache.Cache} implementation that wraps an {@link net.sf.ehcache.Ehcache} instance.
+ * JSecurity {@link org.apache.ki.cache.Cache} implementation that wraps an {@link net.sf.ehcache.Ehcache} instance.
  *
  * @author Jeremy Haile
  * @author Les Hazlewood

Modified: incubator/jsecurity/trunk/support/ehcache/src/org/ki/cache/ehcache/EhCacheManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/src/org/ki/cache/ehcache/EhCacheManager.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/src/org/ki/cache/ehcache/EhCacheManager.java (original)
+++ incubator/jsecurity/trunk/support/ehcache/src/org/ki/cache/ehcache/EhCacheManager.java Wed Mar 11 05:40:38 2009
@@ -20,13 +20,15 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.cache.Cache;
-import org.ki.cache.CacheException;
-import org.ki.cache.CacheManager;
-import org.ki.io.ResourceUtils;
-import org.ki.session.mgt.eis.CachingSessionDAO;
-import org.ki.util.Destroyable;
-import org.ki.util.Initializable;
+import org.apache.ki.cache.Cache;
+import org.apache.ki.cache.CacheException;
+import org.apache.ki.cache.CacheManager;
+
+import org.apache.ki.io.ResourceUtils;
+import org.apache.ki.session.mgt.eis.CachingSessionDAO;
+import org.apache.ki.util.Destroyable;
+
+import org.apache.ki.util.Initializable;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -53,7 +55,7 @@
 
     /**
      * The default name for the active sessions cache, equal to
-     * {@link CachingSessionDAO#ACTIVE_SESSION_CACHE_NAME CachingSessionDAO.ACTIVE_SESSION_CACHE_NAME}.
+     * {@link org.apache.ki.session.mgt.eis.CachingSessionDAO#ACTIVE_SESSION_CACHE_NAME CachingSessionDAO.ACTIVE_SESSION_CACHE_NAME}.
      */
     public static final String DEFAULT_ACTIVE_SESSIONS_CACHE_NAME = CachingSessionDAO.ACTIVE_SESSION_CACHE_NAME;
 
@@ -115,7 +117,7 @@
     /**
      * Returns the resource location of the config file used to initialize a new
      * EhCache CacheManager instance.  The string can be any resource path supported by the
-     * {@link ResourceUtils#getInputStreamForPath(String)} call.
+     * {@link org.apache.ki.io.ResourceUtils#getInputStreamForPath(String)} call.
      *
      * <p>This property is ignored if the CacheManager instance is injected directly - that is, it is only used to
      * lazily create a CacheManager if one is not already provided.</p>
@@ -130,7 +132,7 @@
     /**
      * Sets the resource location of the config file used to initialize the wrapped
      * EhCache CacheManager instance.  The string can be any resource path supported by the
-     * {@link org.ki.io.ResourceUtils#getInputStreamForPath(String)} call.
+     * {@link org.apache.ki.io.ResourceUtils#getInputStreamForPath(String)} call.
      *
      * <p>This property is ignored if the CacheManager instance is injected directly - that is, it is only used to
      * lazily create a CacheManager if one is not already provided.</p>
@@ -236,7 +238,7 @@
      * something not desireable for JSecurity sessions), this class manages an internal default configuration for
      * this case.</p>
      *
-     * @throws org.ki.cache.CacheException
+     * @throws org.apache.ki.cache.CacheException
      *          if there are any CacheExceptions thrown by EhCache.
      * @see net.sf.ehcache.CacheManager#create
      */

Modified: incubator/jsecurity/trunk/support/quartz/src/org/ki/session/mgt/quartz/QuartzSessionValidationJob.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/quartz/src/org/ki/session/mgt/quartz/QuartzSessionValidationJob.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/quartz/src/org/ki/session/mgt/quartz/QuartzSessionValidationJob.java (original)
+++ incubator/jsecurity/trunk/support/quartz/src/org/ki/session/mgt/quartz/QuartzSessionValidationJob.java Wed Mar 11 05:40:38 2009
@@ -20,14 +20,14 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.session.mgt.ValidatingSessionManager;
+import org.apache.ki.session.mgt.ValidatingSessionManager;
 import org.quartz.Job;
 import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
 /**
- * A quartz job that basically just calls the {@link org.ki.session.mgt.ValidatingSessionManager#validateSessions()}
+ * A quartz job that basically just calls the {@link org.apache.ki.session.mgt.ValidatingSessionManager#validateSessions()}
  * method on a configured session manager.  The session manager will automatically be injected by the
  * superclass if it is in the job data map or the scheduler map.
  *

Modified: incubator/jsecurity/trunk/support/quartz/src/org/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/quartz/src/org/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/quartz/src/org/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java (original)
+++ incubator/jsecurity/trunk/support/quartz/src/org/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java Wed Mar 11 05:40:38 2009
@@ -20,18 +20,20 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.session.mgt.DefaultSessionManager;
-import org.ki.session.mgt.SessionValidationScheduler;
-import org.ki.session.mgt.ValidatingSessionManager;
+import org.apache.ki.session.mgt.DefaultSessionManager;
+import org.apache.ki.session.mgt.SessionValidationScheduler;
+import org.apache.ki.session.mgt.ValidatingSessionManager;
+
 import org.quartz.JobDetail;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
 import org.quartz.SimpleTrigger;
 import org.quartz.impl.StdSchedulerFactory;
 
+
 /**
- * An implementation of the {@link SessionValidationScheduler SessionValidationScheduler} that uses Quartz to schedule a
- * job to call {@link org.ki.session.mgt.ValidatingSessionManager#validateSessions()} on
+ * An implementation of the {@link org.apache.ki.session.mgt.SessionValidationScheduler SessionValidationScheduler} that uses Quartz to schedule a
+ * job to call {@link org.apache.ki.session.mgt.ValidatingSessionManager#validateSessions()} on
  * a regular basis.
  *
  * @author Jeremy Haile
@@ -126,7 +128,7 @@
 
     /**
      * Specifies how frequently (in milliseconds) this Scheduler will call the
-     * {@link org.ki.session.mgt.ValidatingSessionManager#validateSessions() ValidatingSessionManager#validateSessions()} method.
+     * {@link org.apache.ki.session.mgt.ValidatingSessionManager#validateSessions() ValidatingSessionManager#validateSessions()} method.
      *
      * <p>Unless this method is called, the default value is {@link #DEFAULT_SESSION_VALIDATION_INTERVAL}.
      *

Modified: incubator/jsecurity/trunk/support/spring/src/org/ki/spring/LifecycleBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/ki/spring/LifecycleBeanPostProcessor.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/LifecycleBeanPostProcessor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/ki/spring/LifecycleBeanPostProcessor.java Wed Mar 11 05:40:38 2009
@@ -20,16 +20,17 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.util.Destroyable;
-import org.ki.util.Initializable;
+import org.apache.ki.util.Destroyable;
+import org.apache.ki.util.Initializable;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
 
+
 /**
  * <p>Bean post processor for Spring that automatically calls the <tt>init()</tt> and/or
- * <tt>destroy()</tt> methods on JSecurity objects that implement the {@link org.ki.util.Initializable}
- * or {@link org.ki.util.Destroyable} interfaces, respectfully.  This post processor makes it easier
+ * <tt>destroy()</tt> methods on JSecurity objects that implement the {@link org.apache.ki.util.Initializable}
+ * or {@link org.apache.ki.util.Destroyable} interfaces, respectfully.  This post processor makes it easier
  * to configure JSecurity beans in Spring, since the user never has to worry about whether or not if they
  * have to specify init-method and destroy-method bean attributes.</p>
  *
@@ -48,7 +49,7 @@
     private static final Log log = LogFactory.getLog(LifecycleBeanPostProcessor.class);
 
     /**
-     * Calls the <tt>init()</tt> methods on the bean if it implements {@link org.ki.util.Initializable}
+     * Calls the <tt>init()</tt> methods on the bean if it implements {@link org.apache.ki.util.Initializable}
      *
      * @param object the object being initialized.
      * @param name   the name of the bean being initialized.
@@ -81,7 +82,7 @@
 
 
     /**
-     * Calls the <tt>destroy()</tt> methods on the bean if it implements {@link org.ki.util.Destroyable}
+     * Calls the <tt>destroy()</tt> methods on the bean if it implements {@link org.apache.ki.util.Destroyable}
      *
      * @param object the object being initialized.
      * @param name   the name of the bean being initialized.

Modified: incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/ki/spring/SpringIniWebConfiguration.java Wed Mar 11 05:40:38 2009
@@ -20,10 +20,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.JSecurityException;
-import org.ki.mgt.RealmSecurityManager;
-import org.ki.mgt.SecurityManager;
-import org.ki.realm.Realm;
+import org.apache.ki.realm.Realm;
+
+import org.apache.ki.JSecurityException;
+
+import org.apache.ki.mgt.SecurityManager;
+
 import org.ki.web.config.IniWebConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextException;
@@ -33,6 +35,9 @@
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.ki.mgt.RealmSecurityManager;
+
+
 /**
  * <p>JSecurity configuration that relies on Spring to define and initialize the JSecurity SecurityManager
  * instance (and all of its dependencies) and makes it available to the JSecurityFilter by performing a Spring bean
@@ -112,7 +117,7 @@
 
         SecurityManager securityManager = null;
         if (beanName != null) {
-            securityManager = (SecurityManager) appCtx.getBean(beanName, SecurityManager.class);
+            securityManager = (SecurityManager) appCtx.getBean(beanName, org.apache.ki.mgt.SecurityManager.class);
         }
 
         if (securityManager == null) {

Modified: incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationExecutor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationExecutor.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationExecutor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationExecutor.java Wed Mar 11 05:40:38 2009
@@ -20,14 +20,15 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.mgt.SecurityManager;
-import org.ki.util.ThreadContext;
+import org.apache.ki.mgt.SecurityManager;
+import org.apache.ki.util.ThreadContext;
 import org.springframework.remoting.support.DefaultRemoteInvocationExecutor;
 import org.springframework.remoting.support.RemoteInvocation;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 
+
 /**
  * An implementation of the Spring {@link org.springframework.remoting.support.RemoteInvocationExecutor}
  * that binds a {@code sessionId} to the incoming thread to make it available to the {@code SecurityManager}
@@ -65,7 +66,7 @@
     |  A C C E S S O R S / M O D I F I E R S    |
     ============================================*/
 
-    public void setSecurityManager(org.ki.mgt.SecurityManager securityManager) {
+    public void setSecurityManager(org.apache.ki.mgt.SecurityManager securityManager) {
         this.securityManager = securityManager;
     }
 

Modified: incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationFactory.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationFactory.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/ki/spring/remoting/SecureRemoteInvocationFactory.java Wed Mar 11 05:40:38 2009
@@ -21,15 +21,16 @@
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.SecurityUtils;
-import org.ki.session.Session;
-import org.ki.subject.Subject;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.Subject;
 import org.springframework.remoting.support.DefaultRemoteInvocationFactory;
 import org.springframework.remoting.support.RemoteInvocation;
 import org.springframework.remoting.support.RemoteInvocationFactory;
 
 import java.io.Serializable;
 
+
 /**
  * A {@link RemoteInvocationFactory} that passes the session ID to the server via a
  * {@link RemoteInvocation} {@link RemoteInvocation#getAttribute(String) attribute}.

Modified: incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java Wed Mar 11 05:40:38 2009
@@ -20,7 +20,7 @@
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.ki.authz.aop.AnnotationsAuthorizingMethodInterceptor;
+import org.apache.ki.authz.aop.AnnotationsAuthorizingMethodInterceptor;
 
 import java.lang.reflect.Method;
 
@@ -43,10 +43,10 @@
      * @param implSpecificMethodInvocation AOP Alliance {@link org.aopalliance.intercept.MethodInvocation MethodInvocation}
      * @return a JSecurity {@link MethodInvocation MethodInvocation} instance that wraps the AOP Alliance instance.
      */
-    protected org.ki.aop.MethodInvocation createMethodInvocation(Object implSpecificMethodInvocation) {
+    protected org.apache.ki.aop.MethodInvocation createMethodInvocation(Object implSpecificMethodInvocation) {
         final MethodInvocation mi = (MethodInvocation) implSpecificMethodInvocation;
 
-        return new org.ki.aop.MethodInvocation() {
+        return new org.apache.ki.aop.MethodInvocation() {
             public Method getMethod() {
                 return mi.getMethod();
             }
@@ -80,14 +80,14 @@
 
     /**
      * Creates a JSecurity {@link MethodInvocation MethodInvocation} instance and then immediately calls
-     * {@link org.ki.authz.aop.AuthorizingMethodInterceptor#invoke super.invoke}.
+     * {@link org.apache.ki.authz.aop.AuthorizingMethodInterceptor#invoke super.invoke}.
      *
      * @param methodInvocation the AOP Alliance-specific <code>methodInvocation</code> instance.
      * @return the return value from invoking the method invocation.
      * @throws Throwable if the underlying AOP Alliance method invocation throws a <code>Throwable</code>.
      */
     public Object invoke(MethodInvocation methodInvocation) throws Throwable {
-        org.ki.aop.MethodInvocation mi = createMethodInvocation(methodInvocation);
+        org.apache.ki.aop.MethodInvocation mi = createMethodInvocation(methodInvocation);
         return super.invoke(mi);
     }
 }

Modified: incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java (original)
+++ incubator/jsecurity/trunk/support/spring/src/org/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java Wed Mar 11 05:40:38 2009
@@ -20,13 +20,20 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.authz.annotation.*;
-import org.ki.mgt.SecurityManager;
+
+import org.apache.ki.mgt.SecurityManager;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
 import org.springframework.beans.factory.InitializingBean;
 
 import java.lang.reflect.Method;
 
+import org.apache.ki.authz.annotation.RequiresAuthentication;
+import org.apache.ki.authz.annotation.RequiresGuest;
+import org.apache.ki.authz.annotation.RequiresPermissions;
+import org.apache.ki.authz.annotation.RequiresRoles;
+import org.apache.ki.authz.annotation.RequiresUser;
+
+
 /**
  * TODO - complete JavaDoc
  * @author Les Hazlewood
@@ -49,7 +56,7 @@
         return securityManager;
     }
 
-    public void setSecurityManager(SecurityManager securityManager) {
+    public void setSecurityManager(org.apache.ki.mgt.SecurityManager securityManager) {
         this.securityManager = securityManager;
     }
 
@@ -57,11 +64,11 @@
      * Returns <tt>true</tt> if the method has any JSecurity annotations, false otherwise.
      * The annotations inspected are:
      * <ul>
-     * <li>{@link org.ki.authz.annotation.RequiresAuthentication RequiresAuthentication}</li>
-     * <li>{@link org.ki.authz.annotation.RequiresUser RequiresUser}</li>
-     * <li>{@link org.ki.authz.annotation.RequiresGuest RequiresGuest}</li>
-     * <li>{@link org.ki.authz.annotation.RequiresRoles RequiresRoles}</li>
-     * <li>{@link org.ki.authz.annotation.RequiresPermissions RequiresPermissions}</li>
+     * <li>{@link org.apache.ki.authz.annotation.RequiresAuthentication RequiresAuthentication}</li>
+     * <li>{@link org.apache.ki.authz.annotation.RequiresUser RequiresUser}</li>
+     * <li>{@link org.apache.ki.authz.annotation.RequiresGuest RequiresGuest}</li>
+     * <li>{@link org.apache.ki.authz.annotation.RequiresRoles RequiresRoles}</li>
+     * <li>{@link org.apache.ki.authz.annotation.RequiresPermissions RequiresPermissions}</li>
      * </ul>
      *
      * @param method      the method to check for a JSecurity annotation

Modified: incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java (original)
+++ incubator/jsecurity/trunk/support/spring/test/org/ki/spring/SpringJSecurityFilterTest.java Wed Mar 11 05:40:38 2009
@@ -19,7 +19,7 @@
 package org.ki.spring;
 
 import static org.easymock.EasyMock.*;
-import org.ki.mgt.SecurityManager;
+import org.apache.ki.mgt.SecurityManager;
 import org.ki.web.servlet.JSecurityFilter;
 import org.junit.Test;
 import org.springframework.web.context.WebApplicationContext;
@@ -29,6 +29,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+
 /**
  * @author Les Hazlewood
  * @since Jul 28, 2008 1:34:33 PM
@@ -48,7 +49,7 @@
         ServletContext mockContext = createMock(ServletContext.class);
         WebApplicationContext appCtx = createMock(WebApplicationContext.class);
         SecurityManager secMgr = createMock(SecurityManager.class);
-        Map<String, SecurityManager> beansOfType = new HashMap<String, SecurityManager>(1);
+        Map<String, org.apache.ki.mgt.SecurityManager> beansOfType = new HashMap<String, SecurityManager>(1);
         beansOfType.put("securityManager", secMgr);
 
         expect(mockContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(appCtx);

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/DefaultWebSecurityManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/DefaultWebSecurityManager.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/DefaultWebSecurityManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/DefaultWebSecurityManager.java Wed Mar 11 05:40:38 2009
@@ -20,19 +20,22 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.mgt.DefaultSecurityManager;
-import org.ki.realm.Realm;
-import org.ki.session.mgt.SessionManager;
-import org.ki.util.LifecycleUtils;
+import org.apache.ki.realm.Realm;
+
+import org.apache.ki.mgt.DefaultSecurityManager;
+import org.apache.ki.session.mgt.SessionManager;
+import org.apache.ki.subject.PrincipalCollection;
+import org.apache.ki.util.LifecycleUtils;
+
 import org.ki.web.session.DefaultWebSessionManager;
 import org.ki.web.session.ServletContainerSessionManager;
 import org.ki.web.session.WebSessionManager;
 import org.ki.web.servlet.JSecurityHttpServletRequest;
-import org.ki.subject.PrincipalCollection;
 
 import javax.servlet.ServletRequest;
 import java.util.Collection;
 
+
 /**
  * SecurityManager implementation that should be used in web-based applications or any application that requires
  * HTTP connectivity (SOAP, http remoting, etc).

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/RedirectView.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/RedirectView.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/RedirectView.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/RedirectView.java Wed Mar 11 05:40:38 2009
@@ -20,7 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.util.JavaEnvironment;
+import org.apache.ki.util.JavaEnvironment;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/WebRememberMeManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/WebRememberMeManager.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/WebRememberMeManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/WebRememberMeManager.java Wed Mar 11 05:40:38 2009
@@ -20,8 +20,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.codec.Base64;
-import org.ki.mgt.AbstractRememberMeManager;
+import org.apache.ki.codec.Base64;
+import org.apache.ki.mgt.AbstractRememberMeManager;
+
 import org.ki.web.attr.CookieAttribute;
 import org.ki.web.attr.WebAttribute;
 import org.ki.web.servlet.JSecurityHttpServletRequest;
@@ -29,12 +30,13 @@
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+
 /**
  * Remembers a Subject's identity by using a {@link WebAttribute WebAttribute} instance to retain
  * the identity value between web requests.
  *
  * <p>This class's default <code>WebAttribute</code> instance is a {@link CookieAttribute CookieAttribute}, storing
- * the Subject's {@link org.ki.subject.Subject#getPrincipals principals} in a <code>Cookie</code>.  Note that
+ * the Subject's {@link org.apache.ki.subject.Subject#getPrincipals principals} in a <code>Cookie</code>.  Note that
  * because this class subclasses the <code>AbstractRememberMeManager</code> which already provides serialization and
  * encryption logic, this class utilizes both for added security before setting the cookie value.</p>
  *

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/WebSubjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/WebSubjectFactory.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/WebSubjectFactory.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/WebSubjectFactory.java Wed Mar 11 05:40:38 2009
@@ -18,18 +18,20 @@
  */
 package org.ki.web;
 
-import org.ki.mgt.DefaultSubjectFactory;
-import org.ki.mgt.SecurityManager;
-import org.ki.mgt.SessionSubjectBinder;
-import org.ki.session.Session;
-import org.ki.subject.PrincipalCollection;
-import org.ki.subject.Subject;
+import org.apache.ki.mgt.*;
+import org.apache.ki.mgt.SecurityManager;
+import org.apache.ki.mgt.SessionSubjectBinder;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.PrincipalCollection;
+
+import org.apache.ki.subject.Subject;
 import org.ki.web.session.WebSessionManager;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import java.net.InetAddress;
 
+
 /**
  * @author Les Hazlewood
  * @since 1.0
@@ -48,7 +50,7 @@
         super(securityManager);
     }
 
-    public WebSubjectFactory(SecurityManager securityManager, WebSessionManager webSessionManager) {
+    public WebSubjectFactory(org.apache.ki.mgt.SecurityManager securityManager, WebSessionManager webSessionManager) {
         super(securityManager);
         setWebSessionManager(webSessionManager);
     }

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/WebUtils.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/WebUtils.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/WebUtils.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/WebUtils.java Wed Mar 11 05:40:38 2009
@@ -20,11 +20,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.SecurityUtils;
-import org.ki.session.Session;
-import org.ki.subject.Subject;
-import org.ki.util.StringUtils;
-import org.ki.util.ThreadContext;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.ThreadContext;
+
+import org.apache.ki.util.StringUtils;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -67,7 +68,7 @@
     public static final String SERVLET_RESPONSE_KEY = ServletResponse.class.getName() + "_JSECURITY_THREAD_CONTEXT_KEY";
 
     /**
-     * {@link Session Session} key used to save a request and later restore it, for example when redirecting to a
+     * {@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";
@@ -342,7 +343,7 @@
      * from the thread.  To remove it, one must call {@link #unbindServletRequest() unbindServletRequest} instead.
      *
      * @return the ServletRequest bound to the thread.  Never returns null.
-     * @throws IllegalStateException if no servlet request is bound in the {@link ThreadContext ThreadContext}.
+     * @throws IllegalStateException if no servlet request is bound in the {@link org.apache.ki.util.ThreadContext ThreadContext}.
      */
     public static ServletRequest getRequiredServletRequest() throws IllegalStateException {
         ServletRequest request = getServletRequest();

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/attr/AbstractWebAttribute.java Wed Mar 11 05:40:38 2009
@@ -20,8 +20,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.JSecurityException;
-import org.ki.util.ClassUtils;
+import org.apache.ki.JSecurityException;
+import org.apache.ki.util.ClassUtils;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/attr/CookieAttribute.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/attr/CookieAttribute.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/attr/CookieAttribute.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/attr/CookieAttribute.java Wed Mar 11 05:40:38 2009
@@ -20,7 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.util.StringUtils;
+import org.apache.ki.util.StringUtils;
 import static org.ki.web.WebUtils.toHttp;
 
 import javax.servlet.ServletRequest;

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/config/IniWebConfiguration.java Wed Mar 11 05:40:38 2009
@@ -23,10 +23,11 @@
 import org.ki.config.ConfigurationException;
 import org.ki.config.IniConfiguration;
 import org.ki.config.ReflectionBuilder;
-import org.ki.mgt.RealmSecurityManager;
-import org.ki.util.AntPathMatcher;
-import org.ki.util.PatternMatcher;
-import static org.ki.util.StringUtils.split;
+import org.apache.ki.mgt.RealmSecurityManager;
+import org.apache.ki.util.AntPathMatcher;
+import org.apache.ki.util.PatternMatcher;
+
+import static org.apache.ki.util.StringUtils.split;
 import org.ki.web.DefaultWebSecurityManager;
 import org.ki.web.WebUtils;
 import org.ki.web.filter.PathConfigProcessor;
@@ -42,6 +43,7 @@
 import javax.servlet.*;
 import java.util.*;
 
+
 /**
  * A <code>WebConfiguration</code> that supports configuration via the
  * <a href="http://en.wikipedia.org/wiki/INI_file">.ini format</a>.
@@ -71,7 +73,7 @@
     /**
      * Returns the <code>PatternMatcher</code> used when determining if an incoming request's path
      * matches a configured filter chain path in the <code>[urls]</code> section.  Unless overridden, the
-     * default implementation is an {@link org.ki.util.AntPathMatcher AntPathMatcher}.
+     * default implementation is an {@link org.apache.ki.util.AntPathMatcher AntPathMatcher}.
      *
      * @return the <code>PatternMatcher</code> used when determining if an incoming request's path
      *         matches a configured filter chain path in the <code>[urls]</code> section.
@@ -84,7 +86,7 @@
     /**
      * Sets the <code>PatternMatcher</code> used when determining if an incoming request's path
      * matches a configured filter chain path in the <code>[urls]</code> section.  Unless overridden, the
-     * default implementation is an {@link org.ki.util.AntPathMatcher AntPathMatcher}.
+     * default implementation is an {@link org.apache.ki.util.AntPathMatcher AntPathMatcher}.
      *
      * @param pathMatcher the <code>PatternMatcher</code> used when determining if an incoming request's path
      *                    matches a configured filter chain path in the <code>[urls]</code> section.
@@ -182,7 +184,7 @@
      * <code>false</code> otherwise.
      * <p/>
      * Simply delegates to
-     * <b><code>{@link #getPathMatcher() getPathMatcher()}.{@link org.ki.util.PatternMatcher#matches(String, String) matches(pattern,path)}</code></b>,
+     * <b><code>{@link #getPathMatcher() getPathMatcher()}.{@link org.apache.ki.util.PatternMatcher#matches(String, String) matches(pattern,path)}</code></b>,
      * but can be overridden by subclasses for custom matching behavior.
      *
      * @param pattern the pattern to match against

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/AccessControlFilter.java Wed Mar 11 05:40:38 2009
@@ -18,8 +18,9 @@
  */
 package org.ki.web.filter;
 
-import org.ki.SecurityUtils;
-import org.ki.subject.Subject;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.subject.Subject;
+
 import org.ki.web.WebUtils;
 
 import javax.servlet.ServletRequest;
@@ -89,7 +90,7 @@
      * Convenience method that acquires the Subject associated with the request.
      * <p/>
      * The default implementation simply returns
-     * {@link org.ki.SecurityUtils#getSubject() SecurityUtils.getSubject()}.
+     * {@link org.apache.ki.SecurityUtils#getSubject() SecurityUtils.getSubject()}.
      *
      * @param request  the incoming <code>ServletRequest</code>
      * @param response the outgoing <code>ServletResponse</code>

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/PathMatchingFilter.java Wed Mar 11 05:40:38 2009
@@ -20,9 +20,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.util.AntPathMatcher;
-import org.ki.util.PatternMatcher;
-import static org.ki.util.StringUtils.split;
+import org.apache.ki.util.AntPathMatcher;
+import org.apache.ki.util.PatternMatcher;
+import static org.apache.ki.util.StringUtils.split;
 import org.ki.web.WebUtils;
 import org.ki.web.servlet.AdviceFilter;
 

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticatingFilter.java Wed Mar 11 05:40:38 2009
@@ -18,10 +18,11 @@
  */
 package org.ki.web.filter.authc;
 
-import org.ki.authc.AuthenticationException;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authc.UsernamePasswordToken;
-import org.ki.subject.Subject;
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.UsernamePasswordToken;
+
+import org.apache.ki.subject.Subject;
 import org.ki.web.WebUtils;
 
 import javax.servlet.ServletRequest;

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/AuthenticationFilter.java Wed Mar 11 05:40:38 2009
@@ -18,7 +18,7 @@
  */
 package org.ki.web.filter.authc;
 
-import org.ki.subject.Subject;
+import org.apache.ki.subject.Subject;
 import org.ki.web.SavedRequest;
 import org.ki.web.WebUtils;
 import org.ki.web.filter.AccessControlFilter;
@@ -65,7 +65,7 @@
      * <p/>
      * The default implementation {@link #getSubject(javax.servlet.ServletRequest, javax.servlet.ServletResponse) acquires}
      * the currently executing Subject and then returns
-     * {@link org.ki.subject.Subject#isAuthenticated() subject.isAuthenticated()};
+     * {@link org.apache.ki.subject.Subject#isAuthenticated() subject.isAuthenticated()};
      *
      * @return true if the subject is authenticated; false if the subject is unauthenticated
      */

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/BasicHttpAuthenticationFilter.java Wed Mar 11 05:40:38 2009
@@ -20,8 +20,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.authc.AuthenticationToken;
-import org.ki.codec.Base64;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.codec.Base64;
+
 import org.ki.web.WebUtils;
 
 import javax.servlet.ServletRequest;
@@ -29,8 +30,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+
 /**
- * Requires the requesting user to be {@link org.ki.subject.Subject#isAuthenticated() authenticated} for the
+ * Requires the requesting user to be {@link org.apache.ki.subject.Subject#isAuthenticated() authenticated} for the
  * request to continue, and if they're not, forces the user to login via the HTTP Basic protocol-specific challenge.
  * Upon successful login, they're allowed to continue on to the requested resource/url.
  *
@@ -53,7 +55,7 @@
  *
  * <p>The {@link #onAccessDenied(javax.servlet.ServletRequest, javax.servlet.ServletResponse)} method will
  * only be called if the subject making the request is not
- * {@link org.ki.subject.Subject#isAuthenticated() authenticated} </p>
+ * {@link org.apache.ki.subject.Subject#isAuthenticated() authenticated} </p>
  *
  * @author Allan Ditzel
  * @author Les Hazlewood

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/FormAuthenticationFilter.java Wed Mar 11 05:40:38 2009
@@ -20,16 +20,18 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.authc.AuthenticationException;
-import org.ki.authc.AuthenticationToken;
-import org.ki.authc.UsernamePasswordToken;
-import org.ki.subject.Subject;
+import org.apache.ki.authc.AuthenticationException;
+import org.apache.ki.authc.AuthenticationToken;
+import org.apache.ki.authc.UsernamePasswordToken;
+import org.apache.ki.subject.Subject;
+
 import org.ki.web.WebUtils;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
+
 /**
  * Requires the requesting user to be authenticated for the request to continue, and if they are not, forces the user
  * to login via by redirecting them to the {@link #setLoginUrl(String) loginUrl} you configure.
@@ -37,7 +39,7 @@
  * <p>This filter constructs a {@link UsernamePasswordToken UsernamePasswordToken} with the values found in
  * {@link #setUsernameParam(String) username}, {@link #setPasswordParam(String) password},
  * and {@link #setRememberMeParam(String) rememberMe} request parameters.  It then calls
- * {@link org.ki.subject.Subject#login(org.ki.authc.AuthenticationToken) Subject.login(usernamePasswordToken)},
+ * {@link org.apache.ki.subject.Subject#login(org.apache.ki.authc.AuthenticationToken) Subject.login(usernamePasswordToken)},
  * effectively automatically performing a login attempt.  Note that the login attempt will only occur when the
  * {@link #isLoginSubmission(javax.servlet.ServletRequest, javax.servlet.ServletResponse) isLoginSubmission(request,response)}
  * is <code>true</code>, which by default occurs when the request is for the {@link #setLoginUrl(String) loginUrl} and

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/PassThruAuthenticationFilter.java Wed Mar 11 05:40:38 2009
@@ -30,12 +30,12 @@
  * on a login submission (by default an HTTP POST to the login URL), the <code>FormAuthenticationFilter</code> filter
  * attempts to automatically authenticate the user by passing the <code>username</code> and <code>password</code>
  * request parameter values to
- * {@link org.ki.subject.Subject#login(org.ki.authc.AuthenticationToken) Subject.login(usernamePasswordToken)}
+ * {@link org.apache.ki.subject.Subject#login(org.apache.ki.authc.AuthenticationToken) Subject.login(usernamePasswordToken)}
  * directly.
  * <p/>
  * Conversely, this controller always passes all requests to the {@link #setLoginUrl loginUrl} through, both GETs and
  * POSTs.  This is useful in cases where the developer wants to write their own login behavior, which should include a
- * call to {@link org.ki.subject.Subject#login(org.ki.authc.AuthenticationToken) Subject.login(AuthenticationToken)}
+ * call to {@link org.apache.ki.subject.Subject#login(org.apache.ki.authc.AuthenticationToken) Subject.login(AuthenticationToken)}
  * at some point.  For example,  if the developer has their own custom MVC login controller or validator,
  * this <code>PassThruAuthenticationFilter</code> may be appropriate.
  *

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authc/UserFilter.java Wed Mar 11 05:40:38 2009
@@ -18,7 +18,7 @@
  */
 package org.ki.web.filter.authc;
 
-import org.ki.subject.Subject;
+import org.apache.ki.subject.Subject;
 import org.ki.web.filter.AccessControlFilter;
 
 import javax.servlet.ServletRequest;

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/AuthorizationFilter.java Wed Mar 11 05:40:38 2009
@@ -18,8 +18,8 @@
  */
 package org.ki.web.filter.authz;
 
-import org.ki.subject.Subject;
-import org.ki.util.StringUtils;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.StringUtils;
 import org.ki.web.WebUtils;
 import org.ki.web.filter.AccessControlFilter;
 

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/PermissionsAuthorizationFilter.java Wed Mar 11 05:40:38 2009
@@ -18,7 +18,7 @@
  */
 package org.ki.web.filter.authz;
 
-import org.ki.subject.Subject;
+import org.apache.ki.subject.Subject;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/filter/authz/RolesAuthorizationFilter.java Wed Mar 11 05:40:38 2009
@@ -18,14 +18,15 @@
  */
 package org.ki.web.filter.authz;
 
-import org.ki.subject.Subject;
-import org.ki.util.CollectionUtils;
+import org.apache.ki.subject.Subject;
+import org.apache.ki.util.CollectionUtils;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import java.io.IOException;
 import java.util.Set;
 
+
 /**
  * Filter that allows access if the current user has the roles specified by the mapped value, or denies access
  * if the user does not have all of the roles specified.

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityFilter.java Wed Mar 11 05:40:38 2009
@@ -23,11 +23,13 @@
 import org.apache.commons.logging.LogFactory;
 import org.ki.config.Configuration;
 import org.ki.config.ConfigurationException;
-import org.ki.mgt.SecurityManager;
-import org.ki.util.ClassUtils;
-import org.ki.util.LifecycleUtils;
-import static org.ki.util.StringUtils.clean;
-import org.ki.util.ThreadContext;
+import org.apache.ki.mgt.SecurityManager;
+import org.apache.ki.util.ClassUtils;
+import org.apache.ki.util.LifecycleUtils;
+import org.apache.ki.util.ThreadContext;
+
+import static org.apache.ki.util.StringUtils.clean;
+
 import org.ki.web.DefaultWebSecurityManager;
 import org.ki.web.WebUtils;
 import org.ki.web.config.IniWebConfiguration;
@@ -40,6 +42,7 @@
 import java.io.IOException;
 import java.net.InetAddress;
 
+
 /**
  * Main ServletFilter that configures and enables all JSecurity functions within a web application.
  * <p/>
@@ -211,7 +214,7 @@
         return securityManager;
     }
 
-    protected void setSecurityManager(SecurityManager sm) {
+    protected void setSecurityManager(org.apache.ki.mgt.SecurityManager sm) {
         this.securityManager = sm;
     }
 

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpServletRequest.java Wed Mar 11 05:40:38 2009
@@ -18,9 +18,9 @@
  */
 package org.ki.web.servlet;
 
-import org.ki.SecurityUtils;
-import org.ki.session.Session;
-import org.ki.subject.Subject;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.session.Session;
+import org.apache.ki.subject.Subject;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -28,6 +28,7 @@
 import javax.servlet.http.HttpSession;
 import java.security.Principal;
 
+
 /**
  * TODO class JavaDoc
  *

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/JSecurityHttpSession.java Wed Mar 11 05:40:38 2009
@@ -18,14 +18,15 @@
  */
 package org.ki.web.servlet;
 
-import org.ki.session.InvalidSessionException;
-import org.ki.session.Session;
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.Session;
 import org.ki.web.session.WebSession;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.*;
 import java.util.*;
 
+
 /**
  * Wrapper class that uses a JSecurity session under the hood for all session operations instead of the
  * Servlet Container's session mechanism.  This is preferred in heterogeneous client environments where the Session

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java Wed Mar 11 05:40:38 2009
@@ -20,11 +20,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.util.Nameable;
+import org.apache.ki.util.Nameable;
 
 import javax.servlet.*;
 import java.io.IOException;
 
+
 /**
  * Filter base class that guarantees to be just executed once per request,
  * on any servlet container. It provides a {@link #doFilterInternal}

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java Wed Mar 11 05:40:38 2009
@@ -20,11 +20,13 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.authz.AuthorizationException;
-import org.ki.authz.HostUnauthorizedException;
-import org.ki.session.InvalidSessionException;
-import org.ki.session.Session;
-import org.ki.session.mgt.DefaultSessionManager;
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.HostUnauthorizedException;
+import org.apache.ki.session.mgt.DefaultSessionManager;
+
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.Session;
+
 import org.ki.web.WebUtils;
 import org.ki.web.attr.CookieAttribute;
 import org.ki.web.attr.RequestParamAttribute;
@@ -37,6 +39,7 @@
 import java.io.Serializable;
 import java.net.InetAddress;
 
+
 /**
  * Web-application capable <tt>SessionManager</tt> implementation.
  *
@@ -247,13 +250,14 @@
      * @param request  incoming servlet request
      * @param response outgoing servlet response
      * @return the Session associated with the incoming request or <tt>null</tt> if one does not exist.
-     * @throws org.ki.session.InvalidSessionException
+     * @throws org.apache.ki.session.InvalidSessionException
      *          if the associated Session has expired prior to invoking this method.
-     * @throws org.ki.authz.AuthorizationException
+     * @throws org.apache.ki.authz.AuthorizationException
      *          if the caller is not authorized to access the session associated with the request.
      */
     public final Session getSession(ServletRequest request, ServletResponse response)
-            throws InvalidSessionException, AuthorizationException {
+            throws InvalidSessionException, AuthorizationException
+    {
 
         Session session;
         try {

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java Wed Mar 11 05:40:38 2009
@@ -18,11 +18,13 @@
  */
 package org.ki.web.session;
 
-import org.ki.authz.AuthorizationException;
-import org.ki.authz.HostUnauthorizedException;
-import org.ki.session.InvalidSessionException;
-import org.ki.session.Session;
-import org.ki.session.mgt.AbstractSessionManager;
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.HostUnauthorizedException;
+import org.apache.ki.session.mgt.AbstractSessionManager;
+import org.apache.ki.session.Session;
+
+import org.apache.ki.session.InvalidSessionException;
+
 import org.ki.web.WebUtils;
 
 import javax.servlet.ServletRequest;
@@ -32,6 +34,7 @@
 import java.io.Serializable;
 import java.net.InetAddress;
 
+
 /**
  * SessionManager implementation providing Session implementations that are merely wrappers for the
  * Servlet container's HttpSession.

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java Wed Mar 11 05:40:38 2009
@@ -18,8 +18,9 @@
  */
 package org.ki.web.session;
 
-import org.ki.session.InvalidSessionException;
-import org.ki.session.Session;
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.Session;
+
 import org.ki.web.servlet.JSecurityHttpSession;
 
 import javax.servlet.http.HttpSession;

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java Wed Mar 11 05:40:38 2009
@@ -18,12 +18,13 @@
  */
 package org.ki.web.session;
 
-import org.ki.session.Session;
-import org.ki.session.mgt.SessionManager;
+import org.apache.ki.session.Session;
+import org.apache.ki.session.mgt.SessionManager;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+
 /**
  * A <code>WebSessionManager</code> is a <code>SessionManager</code> that has the ability to obtain
  * {@link Session Session}s based on a {@link ServletRequest ServletRequest}/{@link ServletResponse ServletResponse}

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java Wed Mar 11 05:40:38 2009
@@ -18,7 +18,8 @@
  */
 package org.ki.web.tags;
 
-import org.ki.subject.Subject;
+import org.apache.ki.subject.Subject;
+
 
 /**
  * Displays body content if the current user has any of the roles specified.

Modified: incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java Wed Mar 11 05:40:38 2009
@@ -20,8 +20,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.ki.SecurityUtils;
-import org.ki.subject.Subject;
+import org.apache.ki.SecurityUtils;
+import org.apache.ki.subject.Subject;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;

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=752380&r1=752379&r2=752380&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 05:40:38 2009
@@ -18,7 +18,7 @@
  */
 package org.ki.web;
 
-import org.ki.util.ThreadContext;
+import org.apache.ki.util.ThreadContext;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/jsecurity/trunk/web/test/org/ki/web/WebRememberMeManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/test/org/ki/web/WebRememberMeManagerTest.java?rev=752380&r1=752379&r2=752380&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/test/org/ki/web/WebRememberMeManagerTest.java (original)
+++ incubator/jsecurity/trunk/web/test/org/ki/web/WebRememberMeManagerTest.java Wed Mar 11 05:40:38 2009
@@ -19,11 +19,13 @@
 package org.ki.web;
 
 import static org.easymock.EasyMock.*;
-import org.ki.authc.AuthenticationInfo;
-import org.ki.authc.SimpleAuthenticationInfo;
-import org.ki.authc.UsernamePasswordToken;
-import org.ki.subject.PrincipalCollection;
-import org.ki.subject.SimplePrincipalCollection;
+import org.apache.ki.authc.AuthenticationInfo;
+import org.apache.ki.authc.SimpleAuthenticationInfo;
+import org.apache.ki.authc.UsernamePasswordToken;
+import org.apache.ki.subject.PrincipalCollection;
+
+import org.apache.ki.subject.SimplePrincipalCollection;
+
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 



Mime
View raw message