Author: jmcconnell
Date: Tue Sep 12 12:44:24 2006
New Revision: 442680
URL: http://svn.apache.org/viewvc?view=rev&rev=442680
Log:
reworked login and register so flow is improved and its functional!
Added:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
(contents, props changed)
- copied, changed from r442672,
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/loginRegister.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
(with props)
Removed:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/loginRegister.jsp
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/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/user.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=442680&r1=442679&r2=442680
==============================================================================
---
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
Tue Sep 12 12:44:24 2006
@@ -63,6 +63,11 @@
public String createUser()
{
+ if ( username == null )
+ {
+ return INPUT;
+ }
+
// TODO: use commons-validator for these fields.
if ( StringUtils.isEmpty( username ) )
@@ -120,7 +125,7 @@
if ( hasActionErrors() )
{
- return ERROR;
+ return INPUT;
}
return SUCCESS;
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=442680&r1=442679&r2=442680
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml Tue Sep 12
12:44:24 2006
@@ -127,7 +127,8 @@
<!-- plexus security actions -->
<action name="login" class="plexusSecurityLogin" method="login">
- <result name="input">/WEB-INF/jsp/loginRegister.jsp</result>
+ <result name="input">/WEB-INF/jsp/login.jsp</result>
+ <result name="error">/WEB-INF/jsp/login.jsp</result>
<result name="success" type="redirect-action">browse</result>
</action>
@@ -136,7 +137,9 @@
</action>
<action name="register" class="newUser" method="createUser">
- <result name="success" type="redirect-action">login</result>
+ <result name="input">/WEB-INF/jsp/register.jsp</result>
+ <result name="success">/WEB-INF/jsp/register.jsp</result>
+ <result name="error">/WEB-INF/jsp/register.jsp</result>
</action>
</package>
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=442680&r1=442679&r2=442680
==============================================================================
---
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
Tue Sep 12 12:44:24 2006
@@ -60,9 +60,10 @@
<div id="breadcrumbs">
<div class="xleft">
<ww:url id="loginUrl" action="login" namespace="/" includeParams="none"/>
+ <ww:url id="registerUrl" action="register" namespace="/"
includeParams="none"/>
<ww:if test="${sessionScope.authStatus != true}">
- <ww:a href="%{loginUrl}">Login/Register</ww:a>
+ <ww:a href="%{loginUrl}">Login</ww:a> - <ww:a
href="%{registerUrl}">Register</ww:a>
</ww:if>
<ww:else>
Copied:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp (from
r442672,
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/loginRegister.jsp)
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp?view=diff&rev=442680&p1=maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/loginRegister.jsp&r1=442672&p2=maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp&r2=442680
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/loginRegister.jsp
(original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
Tue Sep 12 12:44:24 2006
@@ -34,6 +34,7 @@
<p>
<ww:actionmessage/>
+ <ww:actionerror/>
</p>
<h2>Login</h2>
@@ -65,66 +66,6 @@
</table>
</ww:form>
- <h2>Request an Account</h2>
- <ww:form action="register">
- <table class="bodyTable">
- <tr class="b">
- <th>
- Username
- </th>
- <td>
- <ww:textfield name="username" size="30"/>
- </td>
- </tr>
- <tr class="a">
- <th>
- Password
- </th>
- <td>
- <ww:password name="password" size="20"/>
-
- </td>
- </tr>
- <tr class="b">
- <th>
- Confirm Password
- </th>
- <td>
- <ww:password name="confirmPassword" size="20"/>
- </td>
-
- </tr>
- <tr class="a">
- <th>
- Full Name
- </th>
- <td>
- <ww:textfield name="fullName" size="30"/>
- </td>
- </tr>
-
- <tr class="b">
- <th>
- Email
- </th>
- <td>
- <ww:textfield name="email" size="50 "/>
- <br></br>
- <span style="font-size: x-small">(Only administrators will be
able to view this, and it will be used to
- send you information about your project)
- </span>
- </td>
-
- </tr>
- <tr class="a">
- <td></td>
- <td>
- <ww:submit value="Register"/>
- </td>
- </tr>
- </table>
- </ww:form>
-
</div>
</div>
Propchange:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp?view=auto&rev=442680
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
(added)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
Tue Sep 12 12:44:24 2006
@@ -0,0 +1,99 @@
+<%--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ --%>
+
+<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
+
+<html>
+<head>
+ <title>Registration Page</title>
+ <ww:head/>
+</head>
+
+<body>
+
+<div id="contentArea">
+ <div id="searchBox">
+ <p>
+ <ww:actionmessage/>
+ <ww:actionerror/>
+ </p>
+
+ <h2>Register for an Account</h2>
+ <ww:form action="register">
+ <table class="bodyTable">
+ <tr class="b">
+ <th>
+ Username
+ </th>
+ <td>
+ <ww:textfield name="username" size="30"/>
+ </td>
+ </tr>
+ <tr class="a">
+ <th>
+ Password
+ </th>
+ <td>
+ <ww:password name="password" size="20"/>
+ </td>
+ </tr>
+ <tr class="b">
+ <th>
+ Confirm Password
+ </th>
+ <td>
+ <ww:password name="confirmPassword" size="20"/>
+ </td>
+
+ </tr>
+ <tr class="a">
+ <th>
+ Full Name
+ </th>
+ <td>
+ <ww:textfield name="fullName" size="30"/>
+ </td>
+ </tr>
+
+ <tr class="b">
+ <th>
+ Email
+ </th>
+ <td>
+ <ww:textfield name="email" size="50 "/>
+ </td>
+ </tr>
+ <tr class="a">
+ <td></td>
+ <td>
+ <ww:submit value="Register"/>
+ </td>
+ </tr>
+ </table>
+ </ww:form>
+
+ </div>
+</div>
+
+
+<div class="clear">
+ <hr/>
+</div>
+
+</body>
+
+</html>
Propchange:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
------------------------------------------------------------------------------
svn:eol-style = native
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=442680&r1=442679&r2=442680
==============================================================================
--- 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 Tue
Sep 12 12:44:24 2006
@@ -85,19 +85,27 @@
<h2>Grant Roles</h2>
- <p>
-
- </p>
- <pss:ifAuthorized permission="grant-roles">
+ <pss:ifAuthorized permission="grant-roles">
+ <table class="bodyTable">
<ww:iterator id="role" value="availableRoles">
- <ww:url id="addRoleUrl" action="assignRoleToUser">
- <ww:param
name="principal">${sessionScope.SecuritySessionUser.principal}</ww:param>
- <ww:param name="roleName">${role.name}</ww:param>
- </ww:url>
- <ww:a href="%{addRoleUrl}">${role.name}</ww:a>
- <br/>
+
+ <tr class="a">
+ <td>
+ <em>${role.name}</em><br/>
+ </td>
+ <td>
+ <ww:url id="addRoleUrl" action="assignRoleToUser">
+ <ww:param
name="principal">${sessionScope.SecuritySessionUser.principal}</ww:param>
+ <ww:param name="roleName">${role.name}</ww:param>
+ </ww:url>
+ <ww:a href="%{addRoleUrl}">add</ww:a>
+ </td>
+ </tr>
</ww:iterator>
- </pss:ifAuthorized>
+ </table>
+ </pss:ifAuthorized>
+
+
<%--
<p>
This following screen needs have the various roles worked into it.
