You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/05/24 09:48:37 UTC
svn commit: r178135 - in /lenya/trunk/src:
java/org/apache/lenya/cms/ac/usecases/AccessControl.java
webapp/lenya/usecases/tab/ac/ac.jx
Author: andreas
Date: Tue May 24 00:48:36 2005
New Revision: 178135
URL: http://svn.apache.org/viewcvs?rev=178135&view=rev
Log:
added credential forms to AC usecase view
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java
lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java?rev=178135&r1=178134&r2=178135&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java Tue May 24 00:48:36 2005
@@ -16,6 +16,8 @@
*/
package org.apache.lenya.cms.ac.usecases;
+import java.util.Arrays;
+
import org.apache.cocoon.ProcessingException;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentIdentityMap;
@@ -25,9 +27,12 @@
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Accreditable;
import org.apache.lenya.ac.AccreditableManager;
+import org.apache.lenya.ac.Group;
+import org.apache.lenya.ac.IPRange;
import org.apache.lenya.ac.Item;
import org.apache.lenya.ac.Policy;
import org.apache.lenya.ac.Role;
+import org.apache.lenya.ac.User;
import org.apache.lenya.ac.impl.DefaultAccessController;
import org.apache.lenya.ac.impl.DefaultPolicy;
import org.apache.lenya.ac.impl.InheritingPolicyManager;
@@ -78,15 +83,43 @@
setParameter(SSL, Boolean.toString(isSSLProtected()));
setParameter(ANCESTOR_SSL, Boolean.toString(isAncestorSSLProtected()));
+
+ User[] users = getUserManager().getUsers();
+ String[] userIds = new String[users.length];
+ for (int i = 0; i < users.length; i++) {
+ userIds[i] = users[i].getId();
+ }
+ Arrays.sort(userIds);
+ setParameter("users", userIds);
+
+ Group[] groups = getGroupManager().getGroups();
+ String[] groupIds = new String[groups.length];
+ for (int i = 0; i < groups.length; i++) {
+ groupIds[i] = groups[i].getId();
+ }
+ Arrays.sort(groupIds);
+ setParameter("groups", groupIds);
+
+ IPRange[] ipRanges = getIpRangeManager().getIPRanges();
+ String[] ipRangeIds = new String[ipRanges.length];
+ for (int i = 0; i < ipRanges.length; i++) {
+ ipRangeIds[i] = ipRanges[i].getId();
+ }
+ Arrays.sort(ipRangeIds);
+ setParameter("ipRanges", ipRangeIds);
+
Role[] roles = getRoleManager().getRoles();
String visitorRole = "";
+ String[] roleIds = new String[roles.length];
for (int i = 0; i < roles.length; i++) {
+ roleIds[i] = roles[i].getId();
if (roles[i].getId().equals("visit")) {
visitorRole = roles[i].getId();
}
}
-
+ Arrays.sort(roleIds);
+ setParameter("roles", roleIds);
setParameter("visitorRole", visitorRole);
//FIXME expects the component manager
Modified: lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx?rev=178135&r1=178134&r2=178135&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/ac/ac.jx Tue May 24 00:48:36 2005
@@ -22,10 +22,10 @@
<jx:import uri="tab/head.jx"/>
<page:body>
- <!--
<jx:import uri="tab/sitetree.jx"/>
- -->
<jx:import uri="tab/tabs.jx"/>
+
+ <jx:set var="area" value="${usecase.getParameter('document').getArea()}"/>
<div id="contentblock1" class="lenya-tab-sitetree">
<table class="lenya-table-noborder">
<tr>
@@ -40,35 +40,90 @@
<th colspan="2">
<i18n:text>Access Object</i18n:text>
</th>
- <th colspan="2">
- <jx:if test="${usecase.getParameter('document').getArea().equals('authoring')}">
+ <th>
+ <jx:if test="${area.equals('authoring')}">
<i18n:text>Role</i18n:text>
- </jx:if> </th>
+ </jx:if> 
+ </th>
+ <th/>
</tr>
- <!--
<tr>
- <jx:call-template name="form-add-credential">
- <jx:with-param name="larea" select="@area"/>
- <jx:with-param name="type">user</jx:with-param>
- <jx:with-param name="title">User</jx:with-param>
- </jx:call-template>
+
+ <form method="get">
+ <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
+ <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+ <td><i18n:text>User</i18n:text></td>
+ <td>
+ <select name="user" class="lenya-form-element-narrow">
+ <jx:forEach var="user" items="${usecase.getParameter('users')}">
+ <option value="${user}"><jx:out value="${user}"/></option>
+ </jx:forEach>
+ </select>
+ </td>
+ <td>
+ <select name="userRole" class="lenya-form-element-narrow">
+ <jx:forEach var="role" items="${usecase.getParameter('roles')}">
+ <option value="${role}"><jx:out value="${role}"/></option>
+ </jx:forEach>
+ </select>
+ </td>
+ <td>
+ <input i18n:attr="value" type="submit" name="add_credential_user" value="Add"/>
+ </td>
+ </form>
+
</tr>
<tr>
- <jx:call-template name="form-add-credential">
- <jx:with-param name="larea" select="@area"/>
- <jx:with-param name="type">group</jx:with-param>
- <jx:with-param name="title">Group</jx:with-param>
- </jx:call-template>
+ <form method="get">
+ <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
+ <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+ <td><i18n:text>Group</i18n:text></td>
+ <td>
+ <select name="group" class="lenya-form-element-narrow">
+ <jx:forEach var="group" items="${usecase.getParameter('groups')}">
+ <option value="${group}"><jx:out value="${group}"/></option>
+ </jx:forEach>
+ </select>
+ </td>
+ <td>
+ <select name="groupRole" class="lenya-form-element-narrow">
+ <jx:forEach var="role" items="${usecase.getParameter('roles')}">
+ <option value="${role}"><jx:out value="${role}"/></option>
+ </jx:forEach>
+ </select>
+ </td>
+ <td>
+ <input i18n:attr="value" type="submit" name="add_credential_group" value="Add"/>
+ </td>
+ </form>
</tr>
- <jx:if test="@area = 'live'">
+ <jx:if test="${area.equals('live')}">
<tr>
- <jx:call-template name="form-add-credential">
- <jx:with-param name="larea" select="@area"/>
- <jx:with-param name="type">iprange</jx:with-param>
- <jx:with-param name="title">IP Range</jx:with-param>
- </jx:call-template>
+ <form method="get">
+ <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
+ <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
+ <td><i18n:text>IP Range</i18n:text></td>
+ <td>
+ <select name="ipRange" class="lenya-form-element-narrow">
+ <jx:forEach var="ipRange" items="${usecase.getParameter('ipRanges')}">
+ <option value="${ipRange}"><jx:out value="${ipRange}"/></option>
+ </jx:forEach>
+ </select>
+ </td>
+ <td>
+ <select name="ipRangeRole" class="lenya-form-element-narrow">
+ <jx:forEach var="role" items="${usecase.getParameter('roles')}">
+ <option value="${role}"><jx:out value="${role}"/></option>
+ </jx:forEach>
+ </select>
+ </td>
+ <td>
+ <input i18n:attr="value" type="submit" name="add_credential_ipRange" value="Add"/>
+ </td>
+ </form>
</tr>
</jx:if>
+ <!--
<jx:apply-templates select="lenya-info:credential">
<jx:with-param name="larea" select="@area"/>
</jx:apply-templates>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org