svn commit: r785886 - in /incubator/shiro/trunk: samples/spring-hibernate/src/main/webapp/WEB-INF/ web/src/main/java/org/apache/shiro/web/ web/src/main/java/org/apache/shiro/web/filter/authc/ web/src/test/java/org/apache/shiro/web/

[ad...@apache.org]

Author: adc
Date: Thu Jun 18 03:30:38 2009
New Revision: 785886

URL: http://svn.apache.org/viewvc?rev=785886&view=rev
Log:
Ki to Shiro rename

Modified:
    incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
    incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java
    incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/FormAuthenticationFilter.java
    incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/DefaultWebSecurityManagerTest.java

Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml?rev=785886&r1=785885&r2=785886&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml Thu Jun 18 03:30:38 2009
@@ -86,7 +86,7 @@
          ========================================================= -->
 
     <!-- Shiro's main business-tier object for web-enabled applications
-         (use org.kifaultSecurityManager instead when there is no web environment)-->
+         (use org.apache.shiro.web.DefaultWebSecurityManager instead when there is no web environment)-->
     <bean id="securityManager" class="org.apache.shiro.web.DefaultWebSecurityManager">
         <!-- Single realm app (realm configured next, below).  If you have multiple realms, use the 'realms'
       property instead. -->

Modified: incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java?rev=785886&r1=785885&r2=785886&view=diff
==============================================================================
--- incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java (original)
+++ incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/WebUtils.java Thu Jun 18 03:30:38 2009
@@ -64,14 +64,14 @@
             "Make sure WebUtils.bind() is being called. (typically called by ShiroFilter)  " +
                     "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() + "_KI_THREAD_CONTEXT_KEY";
-    public static final String SERVLET_RESPONSE_KEY = ServletResponse.class.getName() + "_KI_THREAD_CONTEXT_KEY";
+    public static final String SERVLET_REQUEST_KEY = ServletRequest.class.getName() + "_SHIRO_THREAD_CONTEXT_KEY";
+    public static final String SERVLET_RESPONSE_KEY = ServletResponse.class.getName() + "_SHIRO_THREAD_CONTEXT_KEY";
 
     /**
      * {@link org.apache.shiro.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>kiSavedRequest</code>.
+     * requested page after login, equal to <code>shiroSavedRequest</code>.
      */
-    public static final String SAVED_REQUEST_KEY = "kiSavedRequest";
+    public static final String SAVED_REQUEST_KEY = "shiroSavedRequest";
 
 
     /**

Modified: incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/FormAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/FormAuthenticationFilter.java?rev=785886&r1=785885&r2=785886&view=diff
==============================================================================
--- incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/FormAuthenticationFilter.java (original)
+++ incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/FormAuthenticationFilter.java Thu Jun 18 03:30:38 2009
@@ -63,7 +63,7 @@
 
     //TODO - complete JavaDoc
 
-    public static final String DEFAULT_ERROR_KEY_ATTRIBUTE_NAME = "kiLoginFailure";
+    public static final String DEFAULT_ERROR_KEY_ATTRIBUTE_NAME = "shiroLoginFailure";
 
     public static final String DEFAULT_USERNAME_PARAM = "username";
     public static final String DEFAULT_PASSWORD_PARAM = "password";

Modified: incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/DefaultWebSecurityManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/DefaultWebSecurityManagerTest.java?rev=785886&r1=785885&r2=785886&view=diff
==============================================================================
--- incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/DefaultWebSecurityManagerTest.java (original)
+++ incubator/shiro/trunk/web/src/test/java/org/apache/shiro/web/DefaultWebSecurityManagerTest.java Thu Jun 18 03:30:38 2009
@@ -46,7 +46,7 @@
     }
 
     @Test
-    public void kiSessionModeInit() {
+    public void shiroSessionModeInit() {
         sm.setSessionMode(DefaultWebSecurityManager.KI_SESSION_MODE);
     }