taylor 2004/09/17 16:26:21
Modified: applications/pam/src/java/org/apache/jetspeed/portlets/security
UserBrowserPortlet.java UserDetailsPortlet.java
applications/pam/src/java/org/apache/jetspeed/portlets/security/resources
SecurityResources_en.properties
SecurityResources.properties
applications/pam/src/java/org/apache/jetspeed/portlets/security/users
JetspeedUserBean.java
Log:
Cleanup of User Admin portlet, basic tabbing functionality working
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.3 +1 -2
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/UserBrowserPortlet.java
Index: UserBrowserPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/UserBrowserPortlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserBrowserPortlet.java 17 Sep 2004 18:40:34 -0000 1.2
+++ UserBrowserPortlet.java 17 Sep 2004 23:26:20 -0000 1.3
@@ -120,7 +120,6 @@
String domain = child.getDomain();
if(domain.equals(USER_DETAIL_DOMAIN))
{
- System.out.println("SELECTED NODE = " + selectedNode);
if (selectedNode != null)
{
actionRequest.getPortletSession().setAttribute(
1.3 +7 -12
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/UserDetailsPortlet.java
Index: UserDetailsPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/UserDetailsPortlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserDetailsPortlet.java 17 Sep 2004 18:40:34 -0000 1.2
+++ UserDetailsPortlet.java 17 Sep 2004 23:26:20 -0000 1.3
@@ -28,7 +28,6 @@
import org.apache.jetspeed.portlet.ServletPortlet;
import org.apache.jetspeed.portlets.pam.PortletApplicationResources;
-import org.apache.jetspeed.portlets.pam.beans.PortletApplicationBean;
import org.apache.jetspeed.portlets.pam.beans.TabBean;
import org.apache.jetspeed.portlets.security.users.JetspeedUserBean;
import org.apache.jetspeed.security.User;
@@ -44,12 +43,8 @@
*/
public class UserDetailsPortlet extends ServletPortlet
{
- private static final String PORTLET_ACTION = "portlet_action";
private final String VIEW_USER = "user";
- private static final String PORTLET_APP_ACTION_PREFIX = "portlet_app.";
- private static final String PORTLET_ACTION_PREFIX = "portlet.";
-
private UserManager manager;
private LinkedHashMap userTabMap = new LinkedHashMap();
@@ -66,10 +61,11 @@
TabBean tb1 = new TabBean("user_attributes");
TabBean tb2 = new TabBean("user_security");
+ TabBean tb3 = new TabBean("user_profile");
userTabMap.put(tb1.getId(), tb1);
userTabMap.put(tb2.getId(), tb2);
-
+ userTabMap.put(tb3.getId(), tb3);
}
public void doView(RenderRequest request, RenderResponse response)
@@ -94,7 +90,8 @@
// Tabs
request.setAttribute("tabs", userTabMap.values());
- TabBean selectedTab = (TabBean)
request.getPortletSession().getAttribute(PortletApplicationResources.REQUEST_SELECT_TAB,
PortletSession.APPLICATION_SCOPE);
+ TabBean selectedTab =
+ (TabBean)
request.getPortletSession().getAttribute(PortletApplicationResources.REQUEST_SELECT_TAB);
if(selectedTab == null)
{
selectedTab = (TabBean) userTabMap.values().iterator().next();
@@ -110,7 +107,6 @@
throws PortletException, IOException
{
String selectedTab =
actionRequest.getParameter(PortletApplicationResources.REQUEST_SELECT_TAB);
- System.out.println("SELECTED TAB = " + selectedTab);
if (selectedTab != null)
{
TabBean tab = (TabBean) userTabMap.get(selectedTab);
@@ -118,9 +114,8 @@
{
actionRequest.getPortletSession().setAttribute(
PortletApplicationResources.REQUEST_SELECT_TAB, tab);
- }
- }
-
+ }
+ }
}
private User lookupUser(String userName)
1.2 +4 -3
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_en.properties
Index: SecurityResources_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources_en.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityResources_en.properties 17 Sep 2004 18:40:34 -0000 1.1
+++ SecurityResources_en.properties 17 Sep 2004 23:26:20 -0000 1.2
@@ -16,10 +16,11 @@
#
## User Information Tabs
-pam.details.tabs.user_attributes=User Attributes
+pam.details.tabs.user_attributes=Attributes
pam.details.tabs.user_security=Security
+pam.details.tabs.user_profile=Profile
tree.security.root=Jetspeed Security
tree.user.root=Users
-user.principal.name=Principal
\ No newline at end of file
+user.principal.name=Principal
1.3 +3 -2
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources.properties
Index: SecurityResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/resources/SecurityResources.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityResources.properties 17 Sep 2004 18:40:34 -0000 1.2
+++ SecurityResources.properties 17 Sep 2004 23:26:20 -0000 1.3
@@ -16,8 +16,9 @@
#
## User Information Tabs
-pam.details.tabs.user_attributes=User Attributes
+pam.details.tabs.user_attributes=Attributes
pam.details.tabs.user_security=Security
+pam.details.tabs.user_profile=Profile
tree.security.root=Jetspeed Security
tree.user.root=Users
1.2 +1 -2
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/users/JetspeedUserBean.java
Index: JetspeedUserBean.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/security/users/JetspeedUserBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedUserBean.java 17 Sep 2004 18:40:34 -0000 1.1
+++ JetspeedUserBean.java 17 Sep 2004 23:26:21 -0000 1.2
@@ -38,7 +38,6 @@
Principal userPrincipal = createPrincipal(user.getSubject(),
UserPrincipal.class);
this.principal = userPrincipal.getName();
- System.out.println("principal = " + principal);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
