From f079ef8f1dd89a5e26fea952dc4cab2855abe14b Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jmcconnell@apache.org>
Date: Wed, 13 Sep 2006 17:04:17 +0000
Subject: [PATCH] intern work on making user.jsp support user management for
 other people, keeping it simple for eventual integration with a more complete
 plexus user management

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@443023 13f79535-47bb-0310-9956-ffa450edef68
---
 .../web/action/admin/NewUserAction.java       |  5 +-
 .../action/admin/UserManagementAction.java    | 23 ++++++---
 .../resources/META-INF/plexus/application.xml | 50 +++++++++++++------
 archiva-webapp/src/main/resources/xwork.xml   |  2 +-
 .../webapp/WEB-INF/jsp/decorators/default.jsp |  2 +-
 .../src/main/webapp/WEB-INF/jsp/findUser.jsp  |  4 +-
 .../src/main/webapp/WEB-INF/jsp/user.jsp      | 10 ++--
 .../main/webapp/WEB-INF/jsp/userDetails.jsp   |  4 +-
 8 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java
index 8f0e70614..0f930e4c9 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java
@@ -73,7 +73,8 @@ public class NewUserAction
         {
             return INPUT;
         }
-
+        
+/*
         // TODO: use commons-validator for these fields.
 
         if ( StringUtils.isEmpty( username ) )
@@ -97,6 +98,8 @@ public class NewUserAction
         {
             addActionError( "Passwords do not match." );
         }
+        
+        */
 
         UserManager um = securitySystem.getUserManager();
 
diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java
index f5faaa4f5..7e796c59d 100644
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java
@@ -79,8 +79,15 @@ public class UserManagementAction
     {
         try
         {
-            user = userManager.findUser( username );                 
-            return SUCCESS;
+            if ( username == null )
+            {
+                return INPUT;
+            }
+            else
+            {
+                user = userManager.findUser( username );
+                return SUCCESS;
+            }
         }
         catch ( UserNotFoundException ne )
         {
@@ -97,11 +104,13 @@ public class UserManagementAction
     public String display()
         throws Exception
     {
-        if ( principal == null )
-        {
-            addActionError( "a principal is required for this operation" );
-            return ERROR;
-        }
+
+        user = userManager.findUser( username );
+
+        principal = user.getPrincipal().toString();
+        fullName = user.getFullName();
+        email = user.getEmail();
+        locked = user.isLocked();
 
         // for displaying the potential repositories to be displayed, remove the global resource
         // from the list
diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index e5cb475e6..592f8210d 100644
--- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -36,30 +36,48 @@
           </appender>
         </appenders>
         <levels>
-          <level>
-            <hierarchy>org.codehaus.plexus.mailsender.MailSender</hierarchy>
-            <level>INFO</level>
-          </level>
-          <level>
-            <hierarchy>org.apache.jasper</hierarchy>
-            <level>INFO</level>
-          </level>
-          <level>
-            <hierarchy>com.opensymphony.xwork</hierarchy>
-            <level>INFO</level>
-          </level>
-          <level>
-            <hierarchy>com.opensymphony.webwork</hierarchy>
-            <level>INFO</level>
-          </level>
+          <!-- Help identify bugs during testing -->
           <level>
             <hierarchy>org.apache.maven</hierarchy>
             <level>DEBUG</level>
           </level>
           <level>
             <hierarchy>org.codehaus.plexus.security</hierarchy>
+            <level>DEBUG</level>
+          </level>
+          <!-- squelch noisy objects (for now) -->
+          <level>
+            <hierarchy>org.codehaus.plexus.mailsender.MailSender</hierarchy>
             <level>INFO</level>
           </level>
+          <level>
+            <hierarchy>org.quartz</hierarchy>
+            <level>INFO</level>
+         </level>
+          <level>
+            <hierarchy>org.apache.jasper</hierarchy>
+            <level>INFO</level>
+          </level>
+          <level>
+           <hierarchy>com.opensymphony.xwork</hierarchy>
+           <level>INFO</level>
+          </level>
+          <level>
+            <hierarchy>com.opensymphony.webwork</hierarchy>
+            <level>INFO</level>
+          </level>
+          <level>
+            <hierarchy>org.codehaus.plexus.PlexusContainer</hierarchy>
+            <level>INFO</level>
+          </level>
+          <level>
+            <hierarchy>JPOX</hierarchy>
+            <level>WARN</level>
+          </level>
+          <level>
+            <hierarchy>freemarker</hierarchy>
+            <level>WARN</level>
+          </level>
         </levels>
       </configuration>
     </component>
diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml
index 75cc49a8d..52ba0b7b2 100644
--- a/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-webapp/src/main/resources/xwork.xml
@@ -259,7 +259,7 @@
 
     <!-- plexus security actions -->
 
-    <action name="userDetails" class="userManagement" method="save">
+    <action name="userDetails" class="userManagement" method="display">
       <result name="success">/WEB-INF/jsp/userDetails.jsp</result>
     </action>
 
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index 3616e319b..b792d0493 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
@@ -69,7 +69,7 @@
     <ww:else>
       <ww:url id="logoutUrl" action="logout" namespace="/" includeParams="none"/>
       <ww:url id="manageUserUrl" action="user" namespace="/admin">
-        <ww:param name="principal">${sessionScope.SecuritySessionUser.principal}</ww:param>
+        <ww:param name="username">${sessionScope.SecuritySessionUser.username}</ww:param>
       </ww:url>
 
       Welcome, <b>${sessionScope.SecuritySessionUser.username}</b> -
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/findUser.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/findUser.jsp
index 716f89c8c..067693e15 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/findUser.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/findUser.jsp
@@ -28,9 +28,9 @@
 
     <div id="contentArea">
       <div id="searchBox">
-        <ww:form action="userDetails">
+        <ww:form action="userManagement" method="post" namespace="/admin">
           <p>
-            <ww:textfield label="Find a user" name="user"/>
+            <ww:textfield label="Find a user" name="username"/>
             <ww:submit value="Search"/>
           </p>
         </ww:form>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp
index dfddf98d0..2f240ec96 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp
@@ -18,7 +18,7 @@
 <%@ taglib prefix="pss" uri="plexusSecuritySystem" %>
 <html>
 <head>
-  <title>User Management - Find a User</title>
+  <title>User Management</title>
   <ww:head />
 </head>
 
@@ -41,11 +41,11 @@
           <tr class="a">
             <th>Username</th>
 
-            <td>${sessionScope.SecuritySessionUser.username}</td>
+            <td>${username}</td>
           </tr>
           <tr class="b">
             <th>Email</th>
-            <td>${sessionScope.SecuritySessionUser.email}</td>
+            <td>${email}</td>
           </tr>
         </table>
 
@@ -61,7 +61,7 @@
               <td>
                 <pss:ifAuthorized permission="remove-roles">
                   <ww:url id="removeAssignedRoleUrl" action="removeRoleFromUser">
-                    <ww:param name="principal">${sessionScope.SecuritySessionUser.principal}</ww:param>
+                    <ww:param name="principal">${username}</ww:param>
                     <ww:param name="roleName">${role.name}</ww:param>
                   </ww:url>
                   <ww:a href="%{removeAssignedRoleUrl}">Delete</ww:a>
@@ -82,7 +82,7 @@
                 </td>
                 <td>
                   <ww:url id="addRoleUrl" action="assignRoleToUser">
-                    <ww:param name="principal">${sessionScope.SecuritySessionUser.principal}</ww:param>
+                    <ww:param name="principal">${username}</ww:param>
                     <ww:param name="roleName">${role.name}</ww:param>
                   </ww:url>
                   <ww:a href="%{addRoleUrl}">Add</ww:a>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/userDetails.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/userDetails.jsp
index 55e18742a..25063c811 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/userDetails.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/userDetails.jsp
@@ -17,7 +17,7 @@
 <%@ taglib prefix="ww" uri="/webwork" %>
 <html>
 <head>
-  <title>User Management - Find a User</title>
+  <title>User Management - User Details</title>
   <ww:head />
 </head>
 
@@ -29,7 +29,7 @@
 
         </div>
 
-        <h2>Modify User Details</h2>
+        <h2>Modify User Details - ${username}</h2>
 
         <ww:form action="userDetails" method="post">
           <ww:textfield label="Full Name" name="fullName"/>