You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/09/11 17:00:24 UTC

svn commit: r442237 - in /maven/shared/trunk/maven-user: maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ maven-user-controller/src/main/resources/localization/ maven-user-controller/src/main/resources/org/apache/maven/user/...

Author: carlos
Date: Mon Sep 11 08:00:22 2006
New Revision: 442237

URL: http://svn.apache.org/viewvc?view=rev&rev=442237
Log:
Add user group actions

Added:
    maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java   (with props)
    maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java   (with props)
    maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java   (with props)
    maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/
    maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/delete.jsp   (with props)
    maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/edit.jsp   (with props)
    maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/list.jsp   (with props)
Modified:
    maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java
    maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/localization/MavenUser.properties
    maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/org/apache/maven/user/webapp/xwork.xml

Added: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java?view=auto&rev=442237
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java (added)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java Mon Sep 11 08:00:22 2006
@@ -0,0 +1,74 @@
+package org.apache.maven.user.controller.action;
+
+/*
+ * Copyright 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.
+ */
+
+import org.apache.maven.user.model.UserManager;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
+/**
+ * @author Henry Isidro
+ * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="deleteUsergroup" 
+ */
+public class DeleteUserGroupAction
+    extends PlexusActionSupport
+{
+    /**
+     * @plexus.requirement
+     */
+    private UserManager userManager;
+
+    private int id;
+
+    private String name;
+
+    public String execute()
+        throws Exception
+    {
+        userManager.removeUserGroup( id );
+
+        return SUCCESS;
+    }
+
+    public String doDelete()
+    {
+        return "delete";
+    }
+
+    public int getId()
+    {
+        return id;
+    }
+
+    public void setId( int id )
+    {
+        this.id = id;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName( String name )
+    {
+        this.name = name;
+    }
+}

Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserGroupAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java?view=diff&rev=442237&r1=442236&r2=442237
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java Mon Sep 11 08:00:22 2006
@@ -187,6 +187,7 @@
         user = userManager.getMyUser();
         username = user.getUsername();
         email = user.getEmail();
+        permissions = user.getGroup().getPermissions();
     
         return INPUT;
     }

Added: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java?view=auto&rev=442237
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java (added)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java Mon Sep 11 08:00:22 2006
@@ -0,0 +1,317 @@
+package org.apache.maven.user.controller.action;
+
+/*
+ * Copyright 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.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.maven.user.model.PasswordRuleViolationException;
+import org.apache.maven.user.model.PasswordRuleViolations;
+import org.apache.maven.user.model.Permission;
+import org.apache.maven.user.model.User;
+import org.apache.maven.user.model.UserGroup;
+import org.apache.maven.user.model.UserManager;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
+import com.opensymphony.webwork.interceptor.ServletRequestAware;
+
+/**
+ * @author Henry Isidro
+ * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="editUsergroup"
+ *   instantiation-strategy="per-lookup"
+ */
+public class EditUserGroupAction
+    extends PlexusActionSupport
+    implements ServletRequestAware
+{
+
+    private static final long serialVersionUID = 8143169847676423348L;
+
+    /**
+     * @plexus.requirement
+     */
+    private UserManager userManager;
+
+    private UserGroup userGroup;
+
+    private List staticPermissions;
+
+    private List availablePermissions;
+
+    private Permission staticPermission;
+
+    private Permission permission;
+
+    private String permissionName;
+
+    private boolean addMode = false;
+    
+    private int id;
+
+    private String name;
+
+    private String description;
+
+    private List permissions;
+
+    private HttpServletRequest request;
+
+    public String execute()
+        throws Exception
+    {
+        if ( name.indexOf( "," ) != -1 )
+        {
+            name = name.substring( 0, name.indexOf( "," ) );
+        }
+        if ( description.indexOf( "," ) != -1 )
+        {
+            description = description.substring( 0, description.indexOf( "," ) );
+        }
+        
+        if ( addMode )
+        {
+            userGroup = new UserGroup();
+            
+            userGroup.setName( name );
+            userGroup.setDescription( description );
+
+            userManager.addUserGroup( userGroup );    
+        }
+        else
+        {
+            userGroup = userManager.getUserGroup( id );
+            userGroup.setName( name );
+            userGroup.setDescription( description );
+            permissions = (List) request.getSession().getAttribute( "permissions" );
+            userGroup.setPermissions( permissions );
+            userManager.updateUserGroup( userGroup );
+        }
+
+        request.getSession().removeAttribute( "addMode" );
+        request.getSession().removeAttribute( "id" );
+        request.getSession().removeAttribute( "name" );
+        request.getSession().removeAttribute( "description" );
+        request.getSession().removeAttribute( "permissions" );
+
+        return SUCCESS;
+    }
+
+    public String doAdd()
+        throws Exception
+    {
+        addMode = true;
+        return INPUT;
+    }
+
+    public String doEdit()
+        throws Exception
+    {
+        addMode = false;
+        userGroup = userManager.getUserGroup( id );
+        // password = user.getPassword(); don't access the password
+        name = userGroup.getName();
+        description = userGroup.getDescription();
+        permissions = userGroup.getPermissions();
+        if ( permissions.size() == 1 )
+        {
+            permissionName = ( (Permission) permissions.get( 0 ) ).getName();
+        }
+
+        return INPUT;
+    }
+
+    public String doGetAvailablePermissions()
+        throws Exception
+    {
+        int i, j;
+        availablePermissions = new ArrayList();
+        staticPermissions = userManager.getPermissions();
+        permissions = (List) request.getSession().getAttribute( "permissions" );
+        if ( permissions == null || permissions.size() == 0 )
+        {
+            availablePermissions.addAll( staticPermissions );
+        }
+        else
+        {
+            for ( i = 0; i < staticPermissions.size(); i++ )
+            {
+                staticPermission = (Permission) staticPermissions.get( i );
+                for ( j = 0; j < permissions.size(); j++ )
+                {
+                    permission = (Permission) permissions.get( j );
+                    if ( permission.getName().equalsIgnoreCase( staticPermission.getName() ) )
+                    {
+                        break;
+                    }
+                }
+                if ( j >= permissions.size() )
+                {
+                    availablePermissions.add( staticPermission );
+                }
+            }
+        }
+
+        request.getSession().setAttribute( "addMode", Boolean.valueOf( addMode ) );
+        request.getSession().setAttribute( "id", Integer.toString( id ) );
+        request.getSession().setAttribute( "name", name );
+        request.getSession().setAttribute( "description", description );
+        
+
+        return "permissions";
+    }
+
+    public String doAddPermission()
+        throws Exception
+    {
+        staticPermissions = userManager.getPermissions();
+        int i, j;
+        for ( i = 0; i < staticPermissions.size(); i++ )
+        {
+            permission = (Permission) staticPermissions.get( i );
+            if ( permission.getName().equalsIgnoreCase( permissionName ) )
+            {
+                permissions = (List) request.getSession().getAttribute( "permissions" );
+                if ( permissions == null )
+                {
+                    permissions = new ArrayList();
+                    permissions.add( permission );
+                }
+                else
+                {
+                    for ( j = 0; j < permissions.size(); j++ )
+                    {
+                        Permission permission = (Permission) permissions.get( j );
+                        if ( permission.getName().equalsIgnoreCase( permissionName ) )
+                        {
+                            break;
+                        }
+                    }
+                    if ( j >= permissions.size() )
+                    {
+                        permissions.add( permission );
+                    }
+                }
+                if ( permissions.size() == 1 )
+                {
+                    permissionName = ( (Permission) permissions.get( 0 ) ).getName();
+                }
+                break;
+            }
+        }
+
+        addMode = ( (Boolean) request.getSession().getAttribute( "addMode" ) ).booleanValue();
+        id = Integer.parseInt( (String) request.getSession().getAttribute( "id" ) );
+        name = (String) request.getSession().getAttribute( "name" );
+        description = (String) request.getSession().getAttribute( "description" );
+
+        return INPUT;
+    }
+
+    public String doDeletePermission()
+        throws Exception
+    {
+        int i = 0;
+        permissions = (List) request.getSession().getAttribute( "permissions" );
+        for ( ; i < permissions.size(); i++ )
+        {
+            permission = (Permission) permissions.get( i );
+            if ( permission.getName().equalsIgnoreCase( permissionName ) )
+            {
+                permissions.remove( i );
+                break;
+            }
+            if ( permissions.size() == 1 )
+            {
+                permissionName = ( (Permission) permissions.get( 0 ) ).getName();
+            }
+        }
+
+        return INPUT;
+    }
+
+    public List getAvailablePermissions()
+    {
+        return availablePermissions;
+    }
+
+    public String getPermissionName()
+    {
+        return permissionName;
+    }
+
+    public void setPermissionName( String permissionName )
+    {
+        this.permissionName = permissionName;
+    }
+
+    public boolean isAddMode()
+    {
+        return addMode;
+    }
+
+    public void setAddMode( boolean addMode )
+    {
+        this.addMode = addMode;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName( String name )
+    {
+        this.name = name;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setDescription( String description )
+    {
+        this.description = description;
+    }
+
+    public List getPermissions()
+    {
+        return this.permissions;
+    }
+
+    public void setServletRequest( HttpServletRequest request )
+    {
+        this.request = request;
+    }
+
+    public int getId()
+    {
+        return id;
+    }
+
+    public void setId( int id )
+    {
+        this.id = id;
+    }
+}

Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserGroupAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java?view=auto&rev=442237
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java (added)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java Mon Sep 11 08:00:22 2006
@@ -0,0 +1,57 @@
+package org.apache.maven.user.controller.action;
+
+/*
+ * Copyright 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.
+ */
+
+import java.util.Collection;
+
+import org.apache.maven.user.model.UserManager;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
+/**
+ * @author Henry Isidro
+ * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="listUsergroups"
+ */
+public class ListUserGroupsAction
+    extends PlexusActionSupport
+{
+
+    private static final long serialVersionUID = 5279820976671267899L;
+
+    /**
+     * @plexus.requirement
+     */
+    private UserManager userManager;
+
+    private Collection usergroups;
+
+    public String execute()
+    {
+        usergroups = userManager.getUserGroups();
+
+        return SUCCESS;
+    }
+
+    public Collection getUsergroups()
+    {
+        return usergroups;
+    }
+
+}

Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/ListUserGroupsAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/localization/MavenUser.properties
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/localization/MavenUser.properties?view=diff&rev=442237&r1=442236&r2=442237
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/localization/MavenUser.properties (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/localization/MavenUser.properties Mon Sep 11 08:00:22 2006
@@ -52,6 +52,23 @@
 role.rolename = Roles
 
 # ----------------------------------------------------------------------
+# Page: Add/Edit/DeleteUsergroups
+# ----------------------------------------------------------------------
+
+usergroup.name = User group Name
+usergroup.description = Description
+usergroups.page.title = User groups
+usergroups.section.title = User groups list
+usergroup.add.page.title = Add User group
+usergroup.add.section.title = Add User group
+usergroup.edit.page.title = Edit User group
+usergroup.edit.section.title = Edit User group
+usergroup.edit.account = Edit user group info
+usergroup.delete.page.title = Delete User group
+usergroup.delete.section.title = Delete User group
+usergroup.delete.confirmation.message = Are you sure you want to delete the user group "{0}"?
+
+# ----------------------------------------------------------------------
 # Page: Change User Password
 # ----------------------------------------------------------------------
 user.change.password.page.title = Continuum - Change User Password

Modified: maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/org/apache/maven/user/webapp/xwork.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/org/apache/maven/user/webapp/xwork.xml?view=diff&rev=442237&r1=442236&r2=442237
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/org/apache/maven/user/webapp/xwork.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/resources/org/apache/maven/user/webapp/xwork.xml Mon Sep 11 08:00:22 2006
@@ -27,6 +27,21 @@
       <result name="input">/user/edit.jsp</result>
       <result name="success" type="chain">list</result>
     </action>
+    
+    <action name="editGroup" class="editUsergroup">
+      <result name="input">/user/groups/edit.jsp</result>
+      <result name="permissions">/user/addRole.jsp</result>
+      <result name="success" type="chain">list</result>
+    </action>
+    
+    <action name="deleteGroup" class="deleteUsergroup">
+      <result name="delete">/user/groups/delete.jsp</result>
+      <result name="success" type="chain">list</result>
+    </action>
+    
+    <action name="listGroups" class="listUsergroups">
+      <result name="success">/user/groups/list.jsp</result>
+    </action>
 
   </package>
 </xwork>

Added: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/delete.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/delete.jsp?view=auto&rev=442237
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/delete.jsp (added)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/delete.jsp Mon Sep 11 08:00:22 2006
@@ -0,0 +1,28 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<html>
+  <ww:i18n name="localization.MavenUser">
+    <head>
+      <title><ww:text name="usergroup.delete.page.title"/></title>
+    </head>
+    <body>
+      <div id="axial" class="h3">
+        <h3><ww:text name="usergroup.delete.section.title"/></h3>
+        <div class="warningmessage">
+          <p>
+            <strong>
+              <ww:text name="usergroup.delete.confirmation.message">
+                <ww:param><ww:property value="name"/></ww:param>
+              </ww:text>
+            </strong>
+          </p>
+        </div>
+        <div class="functnbar3">
+          <ww:form action="deleteGroup.action" method="post">
+            <ww:hidden name="id"/>
+            <ww:submit value="%{getText('delete')}"/> <!-- todo: change to submit/cancel button -->
+          </ww:form>
+        </div>
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/delete.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/delete.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/edit.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/edit.jsp?view=auto&rev=442237
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/edit.jsp (added)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/edit.jsp Mon Sep 11 08:00:22 2006
@@ -0,0 +1,87 @@
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
+<%@ taglib uri="http://acegisecurity.org/authz" prefix="authz" %>
+<script>
+  function getData() {
+    var addMode_field = document.getElementById('addMode_field');
+    var id_field = document.getElementById('id_field');
+    var name_field = document.getElementById('name_field');
+    var description_field = document.getElementById('description_field');
+
+    var addMode = document.getElementById('addMode');
+    var id = document.getElementById('id');
+    var name = document.getElementById('name');
+    var description = document.getElementById('description');
+
+    addMode.value = addMode_field.value;
+    id.value = id_field.value;
+    name.value = name_field.value;
+    description.value = description_field.value;
+  }
+</script>
+<html>
+  <ww:i18n name="localization.MavenUser">
+    <head>
+      <ww:if test="addMode == true">
+        <title><ww:text name="usergroup.add.page.title"/></title>
+      </ww:if>
+      <ww:else>
+        <title><ww:text name="usergroup.edit.page.title"/></title>
+      </ww:else>
+    </head>
+    <body>
+      <div id="axial" class="h3">
+        <ww:if test="addMode == true">
+          <h3><ww:text name="usergroup.add.section.title"/></h3>
+        </ww:if>
+        <ww:else>
+          <h3><ww:text name="usergroup.edit.section.title"/></h3>
+        </ww:else>
+        <div class="axial">
+          <ww:include value="userForm.jsp">
+            <ww:param name="addMode" value="${addMode}"/>
+          </ww:include>
+        <authz:authorize ifAnyGranted="ROLE_admin,ROLE_manageUsers">
+        <ww:if test="addMode == false">
+          <div id="h3">
+            <h3><ww:text name="role.section.title"/></h3>
+            <ww:set name="permissions" value="permissions" scope="session"/>
+              <table>
+                <tr>
+                  <td><ww:text name="role.rolename"/></td>
+                  <td>&nbsp;</td>
+                </tr>
+                <ww:iterator value="permissions">
+                <tr>
+                  <td><ww:property value="name"/></td>
+                  <td>
+                    <ww:form action="editGroup!doDeletePermission.action" method="post">
+                      <ww:hidden id="addMode" name="addMode"/>
+                      <ww:hidden id="id" name="id"/>
+                      <ww:hidden id="name" name="name"/>
+                      <ww:hidden id="description" name="description"/>
+                      <input type="hidden" name="permissionName" value="<ww:property value="name"/>">
+                      <ww:submit onclick="getData()" value="%{getText('delete')}"/>
+                    </ww:form>
+                  </td>
+                </tr>
+                </ww:iterator>
+              </table>
+            </div>
+          <div id="h3">
+            <ww:form action="editGroup!doGetAvailablePermissions.action" method="post">
+              <ww:hidden id="addMode" name="addMode"/>
+              <ww:hidden id="id" name="id"/>
+              <ww:hidden id="name" name="name"/>
+              <ww:hidden id="description" name="description"/>
+              <ww:submit onclick="getData()" value="%{getText('add')}"/>
+            </ww:form>
+          </div>
+        </ww:if>
+        </authz:authorize>
+        </div>
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/edit.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/list.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/list.jsp?view=auto&rev=442237
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/list.jsp (added)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/list.jsp Mon Sep 11 08:00:22 2006
@@ -0,0 +1,48 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
+<html>
+  <ww:i18n name="localization.MavenUser">
+    <head>
+      <title><ww:text name="users.page.title"/></title>
+    </head>
+    <body>
+      <div id="h3">
+        <h3><ww:text name="usergroups.section.title"/></h3>
+        <ww:set name="usergroups" value="usergroups" scope="request"/>
+        <ec:table items="usergroups"
+                  var="usergroup"
+                  showExports="false"
+                  showPagination="false"
+                  showStatusBar="false"
+                  filterable="false">
+          <ec:row>
+            <ec:column property="name" title="usergroup.name"/>
+            <ec:column property="description" title="usergroup.description"/>
+            <ec:column property="actions" title="&nbsp;">
+
+              <c:url var="editUrl" value="/user/groups/editGroup!doEdit.action">
+                <c:param name="id" value="${usergroup.id}"/>
+                <c:param name="name" value="${usergroup.name}"/>
+              </c:url>
+
+              <a href="<c:out value='${editUrl}'/>"><ww:text name="edit"/></a>
+
+              <c:url var="deleteUrl" value="/user/groups/deleteGroup!doDelete.action">
+                <c:param name="id" value="${usergroup.id}"/>
+                <c:param name="name" value="${usergroup.name}"/>
+              </c:url>
+
+              <a href="<c:out value='${deleteUrl}'/>"><ww:text name="delete"/></a>
+            </ec:column>
+          </ec:row>
+        </ec:table>
+      </div>
+      <div class="functnbar3">
+        <ww:form action="editGroup!doAdd.action" method="post">
+          <ww:submit value="%{getText('add')}"/>
+        </ww:form>
+    </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/list.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/groups/list.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"