You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/01/26 17:59:41 UTC
svn commit: r1063798 - in
/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication:
AbstractAuthenticatedWebSession.java AuthenticatedWebApplication.java
AuthenticatedWebSession.java
Author: ivaynberg
Date: Wed Jan 26 16:59:40 2011
New Revision: 1063798
URL: http://svn.apache.org/viewvc?rev=1063798&view=rev
Log:
WICKET-3388 Incorrect casts to AuthenticatedWebSession in AuthenticatedWebApplication class
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AbstractAuthenticatedWebSession.java
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AuthenticatedWebApplication.java
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AuthenticatedWebSession.java
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AbstractAuthenticatedWebSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AbstractAuthenticatedWebSession.java?rev=1063798&r1=1063797&r2=1063798&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AbstractAuthenticatedWebSession.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AbstractAuthenticatedWebSession.java Wed Jan 26 16:59:40 2011
@@ -23,8 +23,8 @@ import org.apache.wicket.request.Request
/**
- * Authenticated web session. Subclasses must provide a method that gets a User object, a method
- * that gets User authentication status and a method that returns the Roles for current User.
+ * Authenticated web session. Subclasses must provide a method that gets User authentication status
+ * and a method that returns the Roles for current User.
*
* @author Jonathan Locke
* @author Leonid Bogdanov
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AuthenticatedWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AuthenticatedWebApplication.java?rev=1063798&r1=1063797&r2=1063798&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AuthenticatedWebApplication.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AuthenticatedWebApplication.java Wed Jan 26 16:59:40 2011
@@ -75,7 +75,7 @@ public abstract class AuthenticatedWebAp
*/
public final boolean hasAnyRole(final Roles roles)
{
- final Roles sessionRoles = AuthenticatedWebSession.get().getRoles();
+ final Roles sessionRoles = AbstractAuthenticatedWebSession.get().getRoles();
return (sessionRoles != null) && sessionRoles.hasAnyRole(roles);
}
@@ -88,7 +88,7 @@ public abstract class AuthenticatedWebAp
// component is a page, but it's not the sign in page
if (component instanceof Page)
{
- if (!AuthenticatedWebSession.get().isSignedIn())
+ if (!AbstractAuthenticatedWebSession.get().isSignedIn())
{
// Redirect to intercept page to let the user sign in
restartResponseAtSignInPage();
Modified: wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AuthenticatedWebSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AuthenticatedWebSession.java?rev=1063798&r1=1063797&r2=1063798&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AuthenticatedWebSession.java (original)
+++ wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/AuthenticatedWebSession.java Wed Jan 26 16:59:40 2011
@@ -17,7 +17,6 @@
package org.apache.wicket.authroles.authentication;
import org.apache.wicket.Session;
-import org.apache.wicket.authroles.authorization.strategies.role.Roles;
import org.apache.wicket.request.Request;
@@ -54,12 +53,6 @@ public abstract class AuthenticatedWebSe
}
/**
- * {@inheritDoc}
- */
- @Override
- public abstract Roles getRoles();
-
- /**
* Try to logon the user. It'll call {@link #authenticate(String, String)} to do the real work
* and that is what you need to subclass to provide your own authentication mechanism.
*