You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2008/09/01 18:05:34 UTC
svn commit: r691008 - in
/portals/jetspeed-2/portal/branches/security-refactoring:
components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/
components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/
component...
Author: woonsan
Date: Mon Sep 1 09:05:33 2008
New Revision: 691008
URL: http://svn.apache.org/viewvc?rev=691008&view=rev
Log:
Flattening the Principal API.
Modified the existing classes to implement new interfaces.
Manager components, tools and test cases should be refined more.
Removed:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserSubjectPrincipalImpl.java
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/Group.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/Role.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/User.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/UserSubjectPrincipal.java
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java Mon Sep 1 09:05:33 2008
@@ -263,15 +263,9 @@
}
}
-
- protected Principal getUserPrincipal(User user)
- {
- return SecurityHelper.getPrincipal(user.getSubject(),UserPrincipal.class);
- }
-
- protected List getUserRoles(User user)
+ protected List getUserRoles(Subject subject)
{
- return SecurityHelper.getPrincipals(user.getSubject(),RolePrincipal.class);
+ return SecurityHelper.getPrincipals(subject,RolePrincipal.class);
}
/**
@@ -282,8 +276,8 @@
protected void commitPrincipals(Subject subject, User user)
{
// add user specific portal user name and roles
- subject.getPrincipals().add(getUserPrincipal(user));
- subject.getPrincipals().addAll(getUserRoles(user));
+ subject.getPrincipals().add((Principal) user);
+ subject.getPrincipals().addAll(getUserRoles(subject));
// add portal user role: used in web.xml authorization to
// detect authenticated portal users
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupImpl.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupImpl.java Mon Sep 1 09:05:33 2008
@@ -16,63 +16,20 @@
*/
package org.apache.jetspeed.security.impl;
-import java.security.Principal;
import org.apache.jetspeed.security.Group;
-import org.apache.jetspeed.security.attributes.SecurityAttributes;
/**
- * <p>Represents a security 'group' made of a {@link org.apache.jetspeed.security.GroupPrincipal} and security attributes.</p>
- * <p>Modified 2008-08-05 - DST - decoupled java preferences</p>
- * @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
+ * <p>Represents a security 'group' extending BaseJetspeedPrincipal.</p>
+ * @version $Id
*/
-public class GroupImpl implements Group
+public class GroupImpl extends BaseJetspeedPrincipal implements Group
{
- private Principal groupPrincipal;
- private SecurityAttributes attributes;
-
+ private static final long serialVersionUID = 5484179899807809619L;
+
/**
* <p>Default constructor.</p>
*/
public GroupImpl()
{
}
-
- /**
- * <p>{@link Group} constructor given a group principal and security attributes.</p>
- * @param groupPrincipal The group principal.
- * @param attributes The security attributes.
- */
- public GroupImpl(Principal groupPrincipal, SecurityAttributes attributes)
- {
- this.groupPrincipal = groupPrincipal;
- this.attributes = attributes;
- }
-
- /**
- * @see org.apache.jetspeed.security.Group#getPrincipal()
- */
- public Principal getPrincipal()
- {
- return this.groupPrincipal;
- }
-
- /**
- * @see org.apache.jetspeed.security.Group#setPrincipal(java.security.Principal)
- */
- public void setPrincipal(Principal groupPrincipal)
- {
- this.groupPrincipal = groupPrincipal;
- }
-
-
- public SecurityAttributes getAttributes()
- {
- return this.attributes;
- }
-
- public void setAttributes(SecurityAttributes attributes)
- {
- this.attributes = attributes;
- }
-
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleImpl.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleImpl.java Mon Sep 1 09:05:33 2008
@@ -16,20 +16,16 @@
*/
package org.apache.jetspeed.security.impl;
-import java.security.Principal;
import org.apache.jetspeed.security.Role;
-import org.apache.jetspeed.security.attributes.SecurityAttributes;
/**
- * <p>Represents a security 'role' made of a {@link org.apache.jetspeed.security.RolePrincipal} and security attributes.</p>
- * <p>Modified 2008-08-05 - DST - decoupled java preferences</p>
- * @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
+ * <p>Represents a security 'role' extending BaseJetspeedPrincipal.</p>
+ * @version $Id
*/
-public class RoleImpl implements Role
+public class RoleImpl extends BaseJetspeedPrincipal implements Role
{
- private Principal rolePrincipal;
- private SecurityAttributes attributes;
-
+ private static final long serialVersionUID = 5484179899807809619L;
+
/**
* <p>Default constructor.</p>
*/
@@ -37,42 +33,4 @@
{
}
- /**
- * <p>{@link Role} constructor given a role principal and its security attributes.</p>
- * @param rolePrincipal The role principal.
- * @param attributes The security attributes.
- */
- public RoleImpl(Principal rolePrincipal, SecurityAttributes attributes)
- {
- this.rolePrincipal = rolePrincipal;
- this.attributes = attributes;
- }
-
-
- /**
- * @see org.apache.jetspeed.security.Role#getPrincipal()
- */
- public Principal getPrincipal()
- {
- return this.rolePrincipal;
- }
-
- /**
- * @see org.apache.jetspeed.security.Role#setPrincipal(java.security.Principal)
- */
- public void setPrincipal(Principal rolePrincipal)
- {
- this.rolePrincipal = rolePrincipal;
- }
-
- public SecurityAttributes getAttributes()
- {
- return this.attributes;
- }
-
- public void setAttributes(SecurityAttributes attributes)
- {
- this.attributes = attributes;
- }
-
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserImpl.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserImpl.java Mon Sep 1 09:05:33 2008
@@ -16,85 +16,36 @@
*/
package org.apache.jetspeed.security.impl;
-import java.util.HashMap;
-import java.util.Map;
-
import javax.security.auth.Subject;
-import org.apache.jetspeed.security.SecurityHelper;
import org.apache.jetspeed.security.User;
-import org.apache.jetspeed.security.UserPrincipal;
-import org.apache.jetspeed.security.attributes.SecurityAttribute;
-import org.apache.jetspeed.security.attributes.SecurityAttributes;
+import org.apache.jetspeed.security.UserSubjectPrincipal;
/**
- * <p>Represents a security 'user' made of a {@link org.apache.jetspeed.security.RolePrincipal} and security attributes.</p>
- * <p>Modified 2008-08-05 - DST - decoupled java preferences</p>
- * @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
+ * <p>Represents a security 'user' extending BaseJetspeedPrincipal.</p>
+ * @version $Id
*/
-public class UserImpl implements User
+public class UserImpl extends BaseJetspeedPrincipal implements User, UserSubjectPrincipal
{
- private Subject subject;
- private SecurityAttributes attributes;
+ private static final long serialVersionUID = 5484179899807809619L;
+ private Subject subject;
+
/**
* <p>Default constructor.</p>
*/
public UserImpl()
{
}
-
- /**
- * <p>{@link User} constructor given a subject and security attributes.</p>
- * @param subject The subject.
- * @param attributes The security attributes
- */
- public UserImpl(Subject subject, SecurityAttributes attributes)
- {
- this.subject = subject;
- this.attributes = attributes;
- }
- /**
- * @see org.apache.jetspeed.security.User#getSubject()
- */
public Subject getSubject()
{
- return subject;
+ return this.subject;
}
- /**
- * @see org.apache.jetspeed.security.User#setSubject(javax.security.auth.Subject)
- */
public void setSubject(Subject subject)
{
this.subject = subject;
}
-
- public SecurityAttributes getAttributes()
- {
- return this.attributes;
- }
-
- public void setAttributes(SecurityAttributes attributes)
- {
- this.attributes = attributes;
- }
-
- public Map<String, String> getUserAttributes()
- {
- Map<String, String> userInfo = new HashMap<String, String>();
- for (String key : this.attributes.getAttributes().keySet())
- {
- SecurityAttribute attr = this.attributes.getAttributes().get(key);
- if (attr.getType().equals(SecurityAttributes.USER_INFORMATION))
- userInfo.put(attr.getName(), attr.getValue());
- }
- return userInfo;
- }
-
- public UserPrincipal getUserPrincipal()
- {
- return (UserPrincipal) SecurityHelper.getBestPrincipal(subject, UserPrincipal.class);
- }
+
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ext/JBossLoginModule.java Mon Sep 1 09:05:33 2008
@@ -97,8 +97,8 @@
protected void commitPrincipals(Subject subject, User user)
{
// add UserPrincipal to subject
- subject.getPrincipals().add(getUserPrincipal(user));
- JBossGroup roles = new JBossGroup("Roles", getUserRoles(user));
+ subject.getPrincipals().add((Principal) user);
+ JBossGroup roles = new JBossGroup("Roles", getUserRoles(subject));
roles.addMember(new RolePrincipalImpl(portalUserRole));
subject.getPrincipals().add(roles);
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java Mon Sep 1 09:05:33 2008
@@ -175,17 +175,17 @@
Collection<User> users = this.ums.getUsers("");
for (User user : users)
{
- ums.removeUser(user.getUserPrincipal().getName());
+ ums.removeUser(user.getName());
}
Collection<Role> roles = this.rms.getRoles("");
for (Role role : roles)
{
- rms.removeRole(role.getPrincipal().getName());
+ rms.removeRole(role.getName());
}
Collection<Group> groups = this.gms.getGroups("");
for (Group group : groups)
{
- gms.removeGroup(group.getPrincipal().getName());
+ gms.removeGroup(group.getName());
}
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java Mon Sep 1 09:05:33 2008
@@ -172,11 +172,11 @@
}
for (Group group : groupManager.getGroups(""))
{
- groupManager.removeGroup(group.getPrincipal().getName());
+ groupManager.removeGroup(group.getName());
}
for (Role role : roleManager.getRoles(""))
{
- roleManager.removeRole(role.getPrincipal().getName());
+ roleManager.removeRole(role.getName());
}
}
catch (Exception e)
@@ -203,7 +203,7 @@
if (!(groupManager.groupExists(name)))
groupManager.addGroup(name);
Group group = groupManager.getGroup(name);
- refs.groupMap.put(name, group.getPrincipal());
+ refs.groupMap.put(name, (Principal) group);
}
catch (Exception e)
{
@@ -222,7 +222,7 @@
if (!(roleManager.roleExists(name)))
roleManager.addRole(name);
Role role = roleManager.getRole(name);
- refs.roleMap.put(name, role.getPrincipal());
+ refs.roleMap.put(name, (Principal) role);
}
catch (Exception e)
{
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/Group.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/Group.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/Group.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/Group.java Mon Sep 1 09:05:33 2008
@@ -16,39 +16,10 @@
*/
package org.apache.jetspeed.security;
-import java.security.Principal;
-
-import org.apache.jetspeed.security.attributes.SecurityAttributes;
-
/**
- * <p>A group made of a {@link GroupPrincipal} and the group {@link Preferences}.</p>
- * @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
+ * <p>Group simply extending JetspeedPrincipal interface.</p>
+ * @version $Id
*/
-public interface Group
+public interface Group extends JetspeedPrincipal
{
- /**
- * <p>Getter for the group {@link Principal}.</p>
- * @return The {@link GroupPrincipal}.
- */
- Principal getPrincipal();
-
- /**
- * <p>Setter for the group {@link Principal}.</p>
- * @param groupPrincipal The {@link Principal}.
- */
- void setPrincipal(Principal groupPrincipal);
-
- /**
- * <p>Getter providing access to the
- * group security attributes.</p>
- * @return The security attributes for a group
- */
- SecurityAttributes getAttributes();
-
- /**
- * <p>Setter providing access to the
- * group security attributes.</p>
- * @param attributes The security attributes for a group
- */
- void setAttributes(SecurityAttributes attributes);
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/Role.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/Role.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/Role.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/Role.java Mon Sep 1 09:05:33 2008
@@ -16,39 +16,10 @@
*/
package org.apache.jetspeed.security;
-import java.security.Principal;
-
-import org.apache.jetspeed.security.attributes.SecurityAttributes;
-
/**
- * <p>A role made of a {@link RolePrincipal} and the role security attributes</p>
- * @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
+ * <p>Role simply extending JetspeedPrincipal interface.</p>
+ * @version $Id
*/
-public interface Role
+public interface Role extends JetspeedPrincipal
{
- /**
- * <p>Getter for the role {@link Principal}.</p>
- * @return The {@link Principal}.
- */
- Principal getPrincipal();
-
- /**
- * <p>Setter for the role {@link RolePrincipal}.</p>
- * @param rolePrincipal The {@link Principal}.
- */
- void setPrincipal(Principal rolePrincipal);
-
- /**
- * <p>Getter providing access to the
- * group security attributes.</p>
- * @return The security attributes for a group
- */
- SecurityAttributes getAttributes();
-
- /**
- * <p>Setter providing access to the
- * group security attributes.</p>
- * @param attributes The security attributes for a group
- */
- void setAttributes(SecurityAttributes attributes);
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/User.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/User.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/User.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/User.java Mon Sep 1 09:05:33 2008
@@ -16,68 +16,10 @@
*/
package org.apache.jetspeed.security;
-import java.util.Map;
-import java.util.prefs.Preferences;
-
-import javax.security.auth.Subject;
-
-import org.apache.jetspeed.security.attributes.SecurityAttributes;
-
/**
- * <p>A user made of a {@link Subject} and the user {@link Preferences}.</p>
- * @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
+ * <p>User simply extending JetspeedPrincipal interface.</p>
+ * @version $Id
*/
-public interface User
+public interface User extends JetspeedPrincipal
{
- /**
- * <p>
- * The default user attributes property set.
- * </p>
- */
- final static String USER_INFO_PROPERTY_SET = "userinfo";
-
- /**
- * the subsite path for a given user stored as a user attribute
- */
- final static String USER_INFO_SUBSITE = "subsite";
-
- /**
- * <p>Getter for the user {@link Subject} populated with the
- * application principals.</p>
- * @return The {@link Subject}.
- */
- Subject getSubject();
-
- /**
- * <p>Setter for the user {@link Subject} populated with the
- * application principals.</p>
- * @param subject The {@link Subject}.
- */
- void setSubject(Subject subject);
-
- /**
- * <p>Getter providing access to the
- * user security attributes.</p>
- * @return The security attributes for a user
- */
- SecurityAttributes getAttributes();
-
- /**
- * <p>Setter providing access to the
- * user security attributes.</p>
- * @param attributes The security attributes for a user
- */
- void setAttributes(SecurityAttributes attributes);
-
- /**
- * Get the Portlet API User Attributes for a given user
- * @return a READ ONLY set of user attributes for a given user
- */
- Map<String, String> getUserAttributes();
-
- /**
- * Get the best user principal for this user
- * @return a user principal
- */
- UserPrincipal getUserPrincipal();
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/UserSubjectPrincipal.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/UserSubjectPrincipal.java?rev=691008&r1=691007&r2=691008&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/UserSubjectPrincipal.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/UserSubjectPrincipal.java Mon Sep 1 09:05:33 2008
@@ -23,7 +23,7 @@
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id: UserPrincipal.java 187022 2004-07-16 19:31:24Z weaver $
*/
-public interface UserSubjectPrincipal extends UserPrincipal
+public interface UserSubjectPrincipal extends User
{
Subject getSubject();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org