Author: jmcconnell
Date: Wed Sep 13 10:04:17 2006
New Revision: 443023
URL: http://svn.apache.org/viewvc?view=rev&rev=443023
Log:
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
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/findUser.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/userDetails.jsp
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java?view=diff&rev=443023&r1=443022&r2=443023
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/NewUserAction.java
Wed Sep 13 10:04:17 2006
@@ -73,7 +73,8 @@
{
return INPUT;
}
-
+
+/*
// TODO: use commons-validator for these fields.
if ( StringUtils.isEmpty( username ) )
@@ -97,6 +98,8 @@
{
addActionError( "Passwords do not match." );
}
+
+ */
UserManager um = securitySystem.getUserManager();
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java?view=diff&rev=443023&r1=443022&r2=443023
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java
Wed Sep 13 10:04:17 2006
@@ -79,8 +79,15 @@
{
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 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
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=443023&r1=443022&r2=443023
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Wed Sep 13 10:04:17 2006
@@ -36,29 +36,47 @@
</appender>
</appenders>
<levels>
+ <!-- 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>
+ <hierarchy>com.opensymphony.xwork</hierarchy>
+ <level>INFO</level>
</level>
<level>
<hierarchy>com.opensymphony.webwork</hierarchy>
<level>INFO</level>
</level>
<level>
- <hierarchy>org.apache.maven</hierarchy>
- <level>DEBUG</level>
+ <hierarchy>org.codehaus.plexus.PlexusContainer</hierarchy>
+ <level>INFO</level>
</level>
<level>
- <hierarchy>org.codehaus.plexus.security</hierarchy>
- <level>INFO</level>
+ <hierarchy>JPOX</hierarchy>
+ <level>WARN</level>
+ </level>
+ <level>
+ <hierarchy>freemarker</hierarchy>
+ <level>WARN</level>
</level>
</levels>
</configuration>
Modified: maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=443023&r1=443022&r2=443023
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml Wed Sep 13
10:04:17 2006
@@ -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>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?view=diff&rev=443023&r1=443022&r2=443023
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Wed Sep 13 10:04:17 2006
@@ -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> -
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/findUser.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/findUser.jsp?view=diff&rev=443023&r1=443022&r2=443023
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/findUser.jsp
(original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/findUser.jsp
Wed Sep 13 10:04:17 2006
@@ -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>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp?view=diff&rev=443023&r1=443022&r2=443023
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp
(original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/user.jsp Wed
Sep 13 10:04:17 2006
@@ -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>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/userDetails.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/userDetails.jsp?view=diff&rev=443023&r1=443022&r2=443023
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/userDetails.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/userDetails.jsp
Wed Sep 13 10:04:17 2006
@@ -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"/>
