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 08:02:25 UTC
svn commit: r752394 [2/2] - in /incubator/jsecurity/trunk: ./
samples/spring-hibernate/web/WEB-INF/ samples/spring/webroot/WEB-INF/
samples/web/webroot/WEB-INF/ support/spring/src/org/apache/ki/spring/
support/spring/test/org/ki/spring/ web/src/org/apa...
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/OncePerRequestFilter.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/OncePerRequestFilter.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/OncePerRequestFilter.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/OncePerRequestFilter.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/OncePerRequestFilter.java Wed Mar 11 07:02:21 2009
@@ -16,14 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.servlet;
+package org.apache.ki.web.servlet;
+
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ki.util.Nameable;
-import javax.servlet.*;
-import java.io.IOException;
+import org.apache.ki.util.Nameable;
/**
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/ProxiedFilterChain.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ProxiedFilterChain.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/ProxiedFilterChain.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/ProxiedFilterChain.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ProxiedFilterChain.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ProxiedFilterChain.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/ProxiedFilterChain.java Wed Mar 11 07:02:21 2009
@@ -16,14 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.servlet;
+package org.apache.ki.web.servlet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.*;
import java.io.IOException;
import java.util.List;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* @author Les Hazlewood
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/ServletContextSupport.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ServletContextSupport.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/ServletContextSupport.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/ServletContextSupport.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ServletContextSupport.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/servlet/ServletContextSupport.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/servlet/ServletContextSupport.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.servlet;
+package org.apache.ki.web.servlet;
import javax.servlet.ServletContext;
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/DefaultWebSessionManager.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/DefaultWebSessionManager.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/DefaultWebSessionManager.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/DefaultWebSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/DefaultWebSessionManager.java Wed Mar 11 07:02:21 2009
@@ -16,28 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.session;
+package org.apache.ki.web.session;
+
+import java.io.Serializable;
+import java.net.InetAddress;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
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;
-import org.ki.web.attr.WebAttribute;
-import org.ki.web.servlet.JSecurityHttpServletRequest;
-import org.ki.web.servlet.JSecurityHttpSession;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import java.io.Serializable;
-import java.net.InetAddress;
+import org.apache.ki.session.mgt.DefaultSessionManager;
+import org.apache.ki.web.WebUtils;
+import org.apache.ki.web.attr.CookieAttribute;
+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.JSecurityHttpSession;
/**
@@ -206,13 +205,13 @@
WebAttribute<Serializable> cookieSessionIdAttribute = getSessionIdCookieAttribute();
Serializable id = cookieSessionIdAttribute.retrieveValue(request, response);
if (id != null) {
- request.setAttribute(JSecurityHttpServletRequest.REFERENCED_SESSION_ID_SOURCE,
- JSecurityHttpServletRequest.COOKIE_SESSION_ID_SOURCE);
+ request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID_SOURCE,
+ KiHttpServletRequest.COOKIE_SESSION_ID_SOURCE);
} else {
id = getSessionIdRequestParamAttribute().retrieveValue(request, response);
if (id != null) {
- request.setAttribute(JSecurityHttpServletRequest.REFERENCED_SESSION_ID_SOURCE,
- JSecurityHttpServletRequest.URL_SESSION_ID_SOURCE);
+ request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID_SOURCE,
+ KiHttpServletRequest.URL_SESSION_ID_SOURCE);
}
}
return id;
@@ -227,8 +226,8 @@
protected Serializable start(ServletRequest request, ServletResponse response, InetAddress inetAddress) {
Serializable sessionId = super.start(inetAddress);
storeSessionId(sessionId, request, response);
- request.removeAttribute(JSecurityHttpServletRequest.REFERENCED_SESSION_ID_SOURCE);
- request.setAttribute(JSecurityHttpServletRequest.REFERENCED_SESSION_IS_NEW, Boolean.TRUE);
+ request.removeAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID_SOURCE);
+ request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_IS_NEW, Boolean.TRUE);
return sessionId;
}
@@ -282,7 +281,7 @@
Serializable sessionId = retrieveSessionId(request, response);
if (sessionId != null) {
- request.setAttribute(JSecurityHttpServletRequest.REFERENCED_SESSION_ID, sessionId);
+ request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID, sessionId);
session = super.retrieveSession(sessionId);
if (isValidateRequestOrigin()) {
if (log.isDebugEnabled()) {
@@ -291,7 +290,7 @@
validateSessionOrigin(request, session);
}
if (session != null) {
- request.setAttribute(JSecurityHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, Boolean.TRUE);
+ request.setAttribute(KiHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, Boolean.TRUE);
}
} else {
if (log.isTraceEnabled()) {
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/ServletContainerSessionManager.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/ServletContainerSessionManager.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/ServletContainerSessionManager.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/ServletContainerSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/ServletContainerSessionManager.java Wed Mar 11 07:02:21 2009
@@ -16,23 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.session;
-
-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;
+package org.apache.ki.web.session;
+import java.io.Serializable;
+import java.net.InetAddress;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import java.io.Serializable;
-import java.net.InetAddress;
+
+import org.apache.ki.authz.AuthorizationException;
+import org.apache.ki.authz.HostUnauthorizedException;
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.Session;
+import org.apache.ki.session.mgt.AbstractSessionManager;
+import org.apache.ki.web.WebUtils;
/**
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSession.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSession.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSession.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSession.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSession.java Wed Mar 11 07:02:21 2009
@@ -16,20 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.session;
+package org.apache.ki.web.session;
-import org.apache.ki.session.InvalidSessionException;
-import org.apache.ki.session.Session;
-
-import org.ki.web.servlet.JSecurityHttpSession;
-
-import javax.servlet.http.HttpSession;
import java.io.Serializable;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.Enumeration;
+import javax.servlet.http.HttpSession;
+
+import org.apache.ki.session.InvalidSessionException;
+import org.apache.ki.session.Session;
+import org.apache.ki.web.servlet.JSecurityHttpSession;
/**
* TODO class JavaDoc
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSessionManager.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSessionManager.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSessionManager.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/session/WebSessionManager.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/session/WebSessionManager.java Wed Mar 11 07:02:21 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.session;
-
-import org.apache.ki.session.Session;
-import org.apache.ki.session.mgt.SessionManager;
+package org.apache.ki.web.session;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import org.apache.ki.session.Session;
+import org.apache.ki.session.mgt.SessionManager;
+
/**
* A <code>WebSessionManager</code> is a <code>SessionManager</code> that has the ability to obtain
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/AuthenticatedTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/AuthenticatedTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/AuthenticatedTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/AuthenticatedTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/AuthenticatedTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/AuthenticatedTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/AuthenticatedTag.java Wed Mar 11 07:02:21 2009
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
* JSP tag that renders the tag body only if the current user has executed a <b>successful</b> authentication attempt
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/GuestTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/GuestTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/GuestTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/GuestTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/GuestTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/GuestTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/GuestTag.java Wed Mar 11 07:02:21 2009
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
* JSP tag that renders the tag body if the current user <em>is not</em> known to the system, either because they
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasAnyRolesTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasAnyRolesTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasAnyRolesTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasAnyRolesTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasAnyRolesTag.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
import org.apache.ki.subject.Subject;
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasPermissionTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasPermissionTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasPermissionTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasPermissionTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasPermissionTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasPermissionTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasPermissionTag.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
/**
* @author Les Hazlewood
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasPermissionTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasPermissionTag.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasRoleTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasRoleTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasRoleTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasRoleTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasRoleTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/HasRoleTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasRoleTag.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
/**
* @author Les Hazlewood
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasRoleTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/HasRoleTag.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksPermissionTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksPermissionTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksPermissionTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksPermissionTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksPermissionTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksPermissionTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksPermissionTag.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
/**
* @author Les Hazlewood
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksPermissionTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksPermissionTag.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksRoleTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksRoleTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksRoleTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksRoleTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksRoleTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/LacksRoleTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksRoleTag.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
/**
* @author Les Hazlewood
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksRoleTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/LacksRoleTag.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/NotAuthenticatedTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/NotAuthenticatedTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/NotAuthenticatedTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/NotAuthenticatedTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/NotAuthenticatedTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/NotAuthenticatedTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/NotAuthenticatedTag.java Wed Mar 11 07:02:21 2009
@@ -16,19 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
* JSP tag that renders the tag body only if the current user has <em>not</em> executed a successful authentication
* attempt <em>during their current session</em>.
*
- * <p>The logically opposite tag of this one is the {@link AuthenticatedTag}.
+ * <p>The logically opposite tag of this one is the {@link org.apache.ki.web.tags.AuthenticatedTag}.
*
* @author Jeremy Haile
* @since 0.2
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PermissionTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/PermissionTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PermissionTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PermissionTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/PermissionTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/PermissionTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PermissionTag.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PermissionTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PermissionTag.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PrincipalTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/PrincipalTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PrincipalTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PrincipalTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/PrincipalTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/PrincipalTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/PrincipalTag.java Wed Mar 11 07:02:21 2009
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.io.IOException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* <p>Tag used to print out the String value of a user's default principal,
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/RoleTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/RoleTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/RoleTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/RoleTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/RoleTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/RoleTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/RoleTag.java Wed Mar 11 07:02:21 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/RoleTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/RoleTag.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/SecureTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/SecureTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/SecureTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/SecureTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/SecureTag.java Wed Mar 11 07:02:21 2009
@@ -16,16 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.ki.SecurityUtils;
import org.apache.ki.subject.Subject;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
/**
* @author Les Hazlewood
* @since 0.1
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/SecureTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/SecureTag.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/UserTag.java (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/UserTag.java)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/UserTag.java?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/UserTag.java&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/UserTag.java&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/UserTag.java (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/UserTag.java Wed Mar 11 07:02:21 2009
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.ki.web.tags;
+package org.apache.ki.web.tags;
+
+import javax.servlet.jsp.JspException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
* JSP tag that renders the tag body if the current user known to the system, either from a successful login attempt
@@ -34,7 +34,7 @@
* guarantees that the current user has logged in <em>during their current session</em>, proving they really are
* who they say they are.
*
- * <p>The logically opposite tag of this one is the {@link GuestTag}.
+ * <p>The logically opposite tag of this one is the {@link org.apache.ki.web.tags.GuestTag}.
*
* @author Les Hazlewood
* @since 0.9
@@ -51,13 +51,13 @@
log.trace("Subject has known identity (aka 'principal'). " +
"Tag body will be evaluated.");
}
- return TagSupport.EVAL_BODY_INCLUDE;
+ return EVAL_BODY_INCLUDE;
} else {
if (log.isTraceEnabled()) {
log.trace("Subject does not exist or have a known identity (aka 'principal'). " +
"Tag body will not be evaluated.");
}
- return TagSupport.SKIP_BODY;
+ return SKIP_BODY;
}
}
Copied: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/jsecurity.tld (from r752391, incubator/jsecurity/trunk/web/src/org/ki/web/tags/jsecurity.tld)
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/jsecurity.tld?p2=incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/jsecurity.tld&p1=incubator/jsecurity/trunk/web/src/org/ki/web/tags/jsecurity.tld&r1=752391&r2=752394&rev=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/tags/jsecurity.tld (original)
+++ incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/jsecurity.tld Wed Mar 11 07:02:21 2009
@@ -34,7 +34,7 @@
<tag>
<name>hasPermission</name>
- <tag-class>org.ki.web.tags.HasPermissionTag</tag-class>
+ <tag-class>org.apache.ki.web.tags.HasPermissionTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current Subject (user)
'has' (implies) the specified permission (i.e the user has the specified ability).
@@ -48,7 +48,7 @@
<tag>
<name>lacksPermission</name>
- <tag-class>org.ki.web.tags.LacksPermissionTag</tag-class>
+ <tag-class>org.apache.ki.web.tags.LacksPermissionTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current Subject (user) does
NOT have (not imply) the specified permission (i.e. the user lacks the specified ability)
@@ -62,7 +62,7 @@
<tag>
<name>hasRole</name>
- <tag-class>org.ki.web.tags.HasRoleTag</tag-class>
+ <tag-class>org.apache.ki.web.tags.HasRoleTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current user has the specified role.</description>
<attribute>
@@ -75,7 +75,7 @@
<tag>
<name>hasAnyRoles</name>
- <tag-class>org.ki.web.tags.HasAnyRolesTag</tag-class>
+ <tag-class>org.apache.ki.web.tags.HasAnyRolesTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current user has one of the specified roles from a
comma-separated list of role names.
@@ -89,7 +89,7 @@
<tag>
<name>lacksRole</name>
- <tag-class>org.ki.web.tags.LacksRoleTag</tag-class>
+ <tag-class>org.apache.ki.web.tags.LacksRoleTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current user does NOT have the specified role
(i.e. they explicitly lack the specified role)
@@ -103,7 +103,7 @@
<tag>
<name>authenticated</name>
- <tag-class>org.ki.web.tags.AuthenticatedTag</tag-class>
+ <tag-class>org.apache.ki.web.tags.AuthenticatedTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current user has successfully authenticated
_during their current session_. It is more restrictive than the 'user' tag.
@@ -113,7 +113,7 @@
<tag>
<name>notAuthenticated</name>
- <tag-class>org.ki.web.tags.NotAuthenticatedTag</tag-class>
+ <tag-class>org.apache.ki.web.tags.NotAuthenticatedTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current user has NOT succesfully authenticated
_during their current session_. It is logically opposite to the 'authenticated' tag.
@@ -122,7 +122,7 @@
<tag>
<name>user</name>
- <tag-class>org.ki.web.tags.UserTag</tag-class>
+ <tag-class>org.apache.ki.web.tags.UserTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current Subject has a known identity, either
from a previous login or from 'RememberMe' services. Note that this is semantically different
@@ -133,7 +133,7 @@
<tag>
<name>guest</name>
- <tag-class>org.ki.web.tags.GuestTag</tag-class>
+ <tag-class>org.apache.ki.web.tags.GuestTag</tag-class>
<body-content>JSP</body-content>
<description>Displays body content only if the current Subject IS NOT known to the system, either
because they have not logged in or they have no corresponding 'RememberMe' identity. It is logically
@@ -143,7 +143,7 @@
<tag>
<name>principal</name>
- <tag-class>org.ki.web.tags.PrincipalTag</tag-class>
+ <tag-class>org.apache.ki.web.tags.PrincipalTag</tag-class>
<body-content>JSP</body-content>
<description>Displays the user's principal or a property of the user's principal.</description>
<attribute>
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/jsecurity.tld
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/jsecurity/trunk/web/src/org/apache/ki/web/tags/jsecurity.tld
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/jsecurity/trunk/web/src/org/ki/web/attr/package-info.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/src/org/ki/web/attr/package-info.java?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/src/org/ki/web/attr/package-info.java (original)
+++ incubator/jsecurity/trunk/web/src/org/ki/web/attr/package-info.java Wed Mar 11 07:02:21 2009
@@ -17,7 +17,7 @@
* under the License.
*/
/**
- * Supporting implementation of JSecurity's concept of a {@link org.ki.web.attr.WebAttribute WebAttribute}, a
+ * Supporting implementation of JSecurity's concept of a {@link org.apache.ki.web.attr.WebAttribute WebAttribute}, a
* component that can save and recall an object beyond transient requests.
*/
package org.ki.web.attr;
\ No newline at end of file
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=752394&r1=752393&r2=752394&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 07:02:21 2009
@@ -18,11 +18,13 @@
*/
package org.ki.web;
-import org.apache.ki.util.ThreadContext;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.ki.util.ThreadContext;
+import org.apache.ki.web.DefaultWebSecurityManager;
+
/**
* @author Les Hazlewood
* @since 0.9
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=752394&r1=752393&r2=752394&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 07:02:21 2009
@@ -18,20 +18,21 @@
*/
package org.ki.web;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import static org.easymock.EasyMock.*;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
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;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.apache.ki.web.WebRememberMeManager;
+import org.apache.ki.web.WebUtils;
/**
* TODO - class javadoc
Modified: incubator/jsecurity/trunk/web/test/org/ki/web/attr/CookieAttributeTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/test/org/ki/web/attr/CookieAttributeTest.java?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/test/org/ki/web/attr/CookieAttributeTest.java (original)
+++ incubator/jsecurity/trunk/web/test/org/ki/web/attr/CookieAttributeTest.java Wed Mar 11 07:02:21 2009
@@ -18,15 +18,18 @@
*/
package org.ki.web.attr;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import junit.framework.TestCase;
import static org.easymock.EasyMock.*;
import org.easymock.IArgumentMatcher;
import org.junit.Before;
import org.junit.Test;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.apache.ki.web.attr.CookieAttribute;
+
/**
* @author Les Hazlewood
Modified: incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java?rev=752394&r1=752393&r2=752394&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java (original)
+++ incubator/jsecurity/trunk/web/test/org/ki/web/servlet/JSecurityFilterTest.java Wed Mar 11 07:02:21 2009
@@ -18,11 +18,14 @@
*/
package org.ki.web.servlet;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+
import static org.easymock.EasyMock.*;
import org.junit.Test;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
+import org.apache.ki.web.servlet.JSecurityFilter;
+
/**
* @author Les Hazlewood