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 sm...@apache.org on 2007/12/08 10:31:02 UTC
svn commit: r602368 -
/portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java
Author: smilek
Date: Sat Dec 8 01:31:02 2007
New Revision: 602368
URL: http://svn.apache.org/viewvc?rev=602368&view=rev
Log:
The following revision comments are from branches/JETSPEED-2.1.3 revisions which were not individually checked-in to trunk
=== ---------------------------------------------------------------- ===
[ from branches/JETSPEED-2.1.3 r595431 ] | smilek | 2007-11-15 13:21:24 -0700 (Thu, 15 Nov 2007) | 1 line
major improvements to desktop page editor (UI, config options, flow, no action layouts); support for create-new-page-on-edit
=== ---------------------------------------------------------------- ===
Modified:
portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java
Modified: portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java?rev=602368&r1=602367&r2=602368&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java Sat Dec 8 01:31:02 2007
@@ -18,17 +18,27 @@
import java.security.Principal;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
import java.util.prefs.Preferences;
+import javax.security.auth.Subject;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.administration.PortalConfiguration;
import org.apache.jetspeed.ajax.AJAXException;
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
+import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.security.RolePrincipal;
import org.apache.jetspeed.security.User;
import org.apache.jetspeed.security.UserManager;
+import org.apache.jetspeed.security.impl.RolePrincipalImpl;
/**
* Retrieve user information of the current user
@@ -51,9 +61,9 @@
public GetUserInformationAction(String template,
String errorTemplate,
UserManager um,
- RolesSecurityBehavior securityBehavior)
+ RolesSecurityBehavior rolesSecurityBehavior)
{
- super(template, errorTemplate, um, securityBehavior);
+ super(template, errorTemplate, um, rolesSecurityBehavior);
}
public boolean run(RequestContext requestContext, Map resultMap)
@@ -84,8 +94,19 @@
}
resultMap.put(USERINFO, prefsSet);
+ List roles = new ArrayList();
+ Subject userSubject = user.getSubject();
+ if ( userSubject != null )
+ {
+ Iterator rolesIter = userSubject.getPrincipals( RolePrincipalImpl.class ).iterator();
+ while ( rolesIter.hasNext() )
+ {
+ RolePrincipal role = (RolePrincipal)rolesIter.next();
+ roles.add( role.getName() );
+ }
+ }
+ resultMap.put( ROLES, roles);
}
-
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org