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 2003/11/13 17:19:23 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/content/admin/common access-control.js
andreas 2003/11/13 08:19:23
Modified: src/webapp/lenya/content/admin/groups members.xsp
overview.xsp groups.xsp group-admin.js
src/webapp/lenya/content/admin/ipranges iprange-admin.js
groups.xsp overview.xsp ipranges.xsp
src/webapp/lenya/content/admin/users overview.xsp users.xsp
groups.xsp user-admin.js
src/webapp/lenya/content/admin/common access-control.js
Log:
refactoring access control package structure
Revision Changes Path
1.3 +4 -4 cocoon-lenya/src/webapp/lenya/content/admin/groups/members.xsp
Index: members.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/groups/members.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- members.xsp 29 Sep 2003 09:09:16 -0000 1.2
+++ members.xsp 13 Nov 2003 16:19:22 -0000 1.3
@@ -7,10 +7,10 @@
>
<xsp:structure>
- <xsp:include>org.apache.lenya.cms.ac.Group</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Item</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.User</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Machine</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Group</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Item</xsp:include>
+ <xsp:include>org.apache.lenya.ac.User</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Machine</xsp:include>
</xsp:structure>
<page>
1.3 +6 -6 cocoon-lenya/src/webapp/lenya/content/admin/groups/overview.xsp
Index: overview.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/groups/overview.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- overview.xsp 22 Jul 2003 17:06:41 -0000 1.2
+++ overview.xsp 13 Nov 2003 16:19:22 -0000 1.3
@@ -11,12 +11,12 @@
<xsp:structure>
<xsp:include>org.apache.avalon.framework.parameters.ParameterException</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Group</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Groupable</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.GroupManager</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Item</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Machine</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.User</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Group</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Groupable</xsp:include>
+ <xsp:include>org.apache.lenya.ac.GroupManager</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Item</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Machine</xsp:include>
+ <xsp:include>org.apache.lenya.ac.User</xsp:include>
<xsp:include>java.io.File</xsp:include>
<xsp:include>java.util.*</xsp:include>
</xsp:structure>
1.4 +5 -5 cocoon-lenya/src/webapp/lenya/content/admin/groups/groups.xsp
Index: groups.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/groups/groups.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- groups.xsp 22 Jul 2003 17:06:41 -0000 1.3
+++ groups.xsp 13 Nov 2003 16:19:22 -0000 1.4
@@ -9,9 +9,8 @@
>
<xsp:structure>
- <xsp:include>org.apache.lenya.cms.ac.Group</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.GroupManager</xsp:include>
- <xsp:include>java.util.Iterator</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Group</xsp:include>
+ <xsp:include>org.apache.lenya.ac.GroupManager</xsp:include>
</xsp:structure>
<page>
@@ -19,8 +18,9 @@
<xsp:logic>
GroupManager groupManager = (GroupManager)
<input:get-attribute module="access-control" name="group-manager" as="object"/>;
- for (Iterator groups = groupManager.getGroups(); groups.hasNext();) {
- Group group = (Group) groups.next();
+ Group[] groups = groupManager.getGroups();
+ for (int i = 0; i < groups.length; i++) {
+ Group group = groups[i];
</xsp:logic>
<group>
1.9 +8 -9 cocoon-lenya/src/webapp/lenya/content/admin/groups/group-admin.js
Index: group-admin.js
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/groups/group-admin.js,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- group-admin.js 3 Oct 2003 10:52:09 -0000 1.8
+++ group-admin.js 13 Nov 2003 16:19:22 -0000 1.9
@@ -66,19 +66,18 @@
for (var i = 0; i < memberArray.length; i++) {
var member = memberArray[i];
- if (member instanceof Packages.org.apache.lenya.cms.ac.User) {
+ if (member instanceof Packages.org.apache.lenya.ac.User) {
groupUsers.add(member);
}
- if (member instanceof Packages.org.apache.lenya.cms.ac.Machine) {
+ if (member instanceof Packages.org.apache.lenya.ac.Machine) {
groupMachines.add(machine);
}
}
- var userIterator = userManager.getUsers();
- while (userIterator.hasNext()) {
- var user = userIterator.next();
- if (!groupUsers.contains(user)) {
- otherUsers.add(user);
+ var users = userManager.getUsers();
+ for (var i = 0; i < users.length; i++) {
+ if (!groupUsers.contains(users[i])) {
+ otherUsers.add(users[i]);
}
}
@@ -169,12 +168,12 @@
if (existingGroup != null) {
message = "This group already exists.";
}
- else if (!Packages.org.apache.lenya.cms.ac.AbstractItem.isValidId(groupId)) {
+ else if (!Packages.org.apache.lenya.ac.impl.AbstractItem.isValidId(groupId)) {
message = "This is not a valid group ID.";
}
else {
var configDir = groupManager.getConfigurationDirectory();
- var group = new Packages.org.apache.lenya.cms.ac.FileGroup(configDir, groupId);
+ var group = new Packages.org.apache.lenya.ac.file.FileGroup(configDir, groupId);
group.setName(name);
group.setDescription(description);
group.save();
1.7 +7 -8 cocoon-lenya/src/webapp/lenya/content/admin/ipranges/iprange-admin.js
Index: iprange-admin.js
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/ipranges/iprange-admin.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iprange-admin.js 3 Oct 2003 10:52:09 -0000 1.6
+++ iprange-admin.js 13 Nov 2003 16:19:22 -0000 1.7
@@ -60,7 +60,7 @@
var ipRangeManager = getAccreditableManager().getIPRangeManager();
var range;
if (newRange == true) {
- range = new Packages.org.apache.lenya.cms.ac.FileIPRange();
+ range = new Packages.org.apache.lenya.ac.file.FileIPRange();
}
else {
range = ipRangeManager.getIPRange(iprangeId);
@@ -151,12 +151,12 @@
message = "This IP range already exists.";
ok = false;
}
- else if (!Packages.org.apache.lenya.cms.ac.AbstractItem.isValidId(iprangeId)) {
+ else if (!Packages.org.apache.lenya.ac.impl.AbstractItem.isValidId(iprangeId)) {
message = "This is not a valid IP range ID. [" + iprangeId + "]";
ok = false;
}
else {
- range = new Packages.org.apache.lenya.cms.ac.FileIPRange(
+ range = new Packages.org.apache.lenya.ac.file.FileIPRange(
ipRangeManager.getConfigurationDirectory(), iprangeId);
ipRangeManager.add(range);
}
@@ -245,12 +245,11 @@
var rangeGroupArray = range.getGroups();
var rangeGroups = new java.util.ArrayList(java.util.Arrays.asList(rangeGroupArray));
- var iterator = getAccreditableManager().getGroupManager().getGroups();
+ var groupArray = getAccreditableManager().getGroupManager().getGroups();
var groups = new java.util.ArrayList();
- while (iterator.hasNext()) {
- var group = iterator.next();
- if (!rangeGroups.contains(group)) {
- groups.add(group);
+ for (var i = 0; i < groupArray.length; i++) {
+ if (!rangeGroups.contains(groupArray[i])) {
+ groups.add(groupArray[i]);
}
}
1.2 +1 -1 cocoon-lenya/src/webapp/lenya/content/admin/ipranges/groups.xsp
Index: groups.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/ipranges/groups.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- groups.xsp 22 Jul 2003 17:06:41 -0000 1.1
+++ groups.xsp 13 Nov 2003 16:19:22 -0000 1.2
@@ -7,7 +7,7 @@
>
<xsp:structure>
- <xsp:include>org.apache.lenya.cms.ac.Group</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Group</xsp:include>
</xsp:structure>
<page>
1.3 +3 -3 cocoon-lenya/src/webapp/lenya/content/admin/ipranges/overview.xsp
Index: overview.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/ipranges/overview.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- overview.xsp 23 Jul 2003 19:25:52 -0000 1.2
+++ overview.xsp 13 Nov 2003 16:19:22 -0000 1.3
@@ -11,9 +11,9 @@
<xsp:structure>
<xsp:include>org.apache.avalon.framework.parameters.ParameterException</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.IPRangeManager</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.IPRange</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Group</xsp:include>
+ <xsp:include>org.apache.lenya.ac.IPRangeManager</xsp:include>
+ <xsp:include>org.apache.lenya.ac.IPRange</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Group</xsp:include>
<xsp:include>java.io.File</xsp:include>
<xsp:include>java.util.Arrays</xsp:include>
<xsp:include>java.util.Iterator</xsp:include>
1.2 +6 -7 cocoon-lenya/src/webapp/lenya/content/admin/ipranges/ipranges.xsp
Index: ipranges.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/ipranges/ipranges.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipranges.xsp 22 Jul 2003 17:06:41 -0000 1.1
+++ ipranges.xsp 13 Nov 2003 16:19:22 -0000 1.2
@@ -9,11 +9,9 @@
>
<xsp:structure>
- <xsp:include>org.apache.lenya.cms.ac.IPRangeManager</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.IPRange</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Group</xsp:include>
- <xsp:include>java.io.File</xsp:include>
- <xsp:include>java.util.Iterator</xsp:include>
+ <xsp:include>org.apache.lenya.ac.IPRangeManager</xsp:include>
+ <xsp:include>org.apache.lenya.ac.IPRange</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Group</xsp:include>
</xsp:structure>
<page>
@@ -21,8 +19,9 @@
<xsp:logic>
IPRangeManager manager = (IPRangeManager)
<input:get-attribute module="access-control" name="iprange-manager" as="object"/>;
- for (Iterator ranges = manager.getIPRanges(); ranges.hasNext();) {
- IPRange range = (IPRange) ranges.next();
+ IPRange[] ranges = manager.getIPRanges();
+ for (int rangeIndex = 0; rangeIndex < ranges.length; rangeIndex++) {
+ IPRange range = ranges[rangeIndex];
</xsp:logic>
<iprange>
1.6 +4 -4 cocoon-lenya/src/webapp/lenya/content/admin/users/overview.xsp
Index: overview.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/users/overview.xsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- overview.xsp 19 Sep 2003 09:29:37 -0000 1.5
+++ overview.xsp 13 Nov 2003 16:19:22 -0000 1.6
@@ -11,10 +11,10 @@
<xsp:structure>
<xsp:include>org.apache.avalon.framework.parameters.ParameterException</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.UserManager</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.User</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.LDAPUser</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Group</xsp:include>
+ <xsp:include>org.apache.lenya.ac.UserManager</xsp:include>
+ <xsp:include>org.apache.lenya.ac.User</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Group</xsp:include>
+ <xsp:include>org.apache.lenya.ac.ldap.LDAPUser</xsp:include>
<xsp:include>java.io.File</xsp:include>
<xsp:include>java.util.Arrays</xsp:include>
<xsp:include>java.util.Iterator</xsp:include>
1.3 +6 -5 cocoon-lenya/src/webapp/lenya/content/admin/users/users.xsp
Index: users.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/users/users.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- users.xsp 22 Jul 2003 17:06:40 -0000 1.2
+++ users.xsp 13 Nov 2003 16:19:22 -0000 1.3
@@ -9,9 +9,9 @@
>
<xsp:structure>
- <xsp:include>org.apache.lenya.cms.ac.UserManager</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.User</xsp:include>
- <xsp:include>org.apache.lenya.cms.ac.Group</xsp:include>
+ <xsp:include>org.apache.lenya.ac.UserManager</xsp:include>
+ <xsp:include>org.apache.lenya.ac.User</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Group</xsp:include>
<xsp:include>java.io.File</xsp:include>
<xsp:include>java.util.Iterator</xsp:include>
</xsp:structure>
@@ -21,8 +21,9 @@
<xsp:logic>
UserManager userManager = (UserManager)
<input:get-attribute module="access-control" name="user-manager" as="object"/>;
- for (Iterator users = userManager.getUsers(); users.hasNext();) {
- User user = (User) users.next();
+ User[] users = userManager.getUsers();
+ for (int userIndex = 0; userIndex < users.length; userIndex++) {
+ User user = users[userIndex];
</xsp:logic>
<user>
1.3 +1 -1 cocoon-lenya/src/webapp/lenya/content/admin/users/groups.xsp
Index: groups.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/users/groups.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- groups.xsp 8 Jul 2003 16:12:13 -0000 1.2
+++ groups.xsp 13 Nov 2003 16:19:22 -0000 1.3
@@ -7,7 +7,7 @@
>
<xsp:structure>
- <xsp:include>org.apache.lenya.cms.ac.Group</xsp:include>
+ <xsp:include>org.apache.lenya.ac.Group</xsp:include>
</xsp:structure>
<page>
1.29 +40 -36 cocoon-lenya/src/webapp/lenya/content/admin/users/user-admin.js
Index: user-admin.js
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/users/user-admin.js,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- user-admin.js 27 Oct 2003 18:12:58 -0000 1.28
+++ user-admin.js 13 Nov 2003 16:19:22 -0000 1.29
@@ -8,7 +8,7 @@
try {
var user = getAccreditableManager().getUserManager().getUser(userId);
- var fullName = user.getFullName();
+ var fullName = user.getName();
var email = user.getEmail();
var description = user.getDescription();
@@ -37,7 +37,7 @@
if (cocoon.request.get("submit")) {
fullName = cocoon.request.get("fullname");
- user.setFullName(fullName);
+ user.setName(fullName);
email = cocoon.request.get("email");
user.setEmail(email);
description = cocoon.request.get("description");
@@ -138,14 +138,8 @@
var userGroupArray = user.getGroups();
var userGroups = new java.util.ArrayList(java.util.Arrays.asList(userGroupArray));
- var iterator = getAccreditableManager().getGroupManager().getGroups();
- var groups = new java.util.ArrayList();
- while (iterator.hasNext()) {
- var group = iterator.next();
- if (!userGroups.contains(group)) {
- groups.add(group);
- }
- }
+ var groupArray = getAccreditableManager().getGroupManager().getGroups();
+ var groups = new java.util.ArrayList(java.util.Arrays.asList(groupArray));
while (true) {
cocoon.sendPageAndWait("users/" + userId + "/groups.xml", {
@@ -215,7 +209,7 @@
messages.add("This user already exists.");
}
- if (!Packages.org.apache.lenya.cms.ac.AbstractItem.isValidId(userId)) {
+ if (!Packages.org.apache.lenya.ac.impl.AbstractItem.isValidId(userId)) {
messages.add("This is not a valid user ID.");
}
@@ -226,7 +220,7 @@
if (ldap) {
/*
configDir = new Packages.java.io.File(configDir);
- var ldapUser = new Packages.org.apache.lenya.cms.ac.LDAPUser(configDir);
+ var ldapUser = new Packages.org.apache.lenya.ac.ldap.LDAPUser(configDir);
if (!ldapUser.existsUser(ldapId)) {
messages.add("This LDAP user ID does not exist.");
}
@@ -310,10 +304,10 @@
if (messages.isEmpty()) {
var user;
if (ldap) {
- user = new Packages.org.apache.lenya.cms.ac.LDAPUser(configDir, userId, email, ldapId);
+ user = new Packages.org.apache.lenya.ac.ldap.LDAPUser(configDir, userId, email, ldapId);
}
else {
- user = new Packages.org.apache.lenya.cms.ac.FileUser(configDir, userId, fullName, email, "");
+ user = new Packages.org.apache.lenya.ac.file.FileUser(configDir, userId, fullName, email, "");
user.setName(fullName);
user.setPassword(password);
}
@@ -337,35 +331,45 @@
function user_delete_user() {
resolve();
- try {
+ var userId = cocoon.request.get("user-id");
+ var user;
+
+ try {
var userManager = getAccreditableManager().getUserManager();
- var userId = cocoon.request.get("user-id");
- var user = userManager.getUser(userId);
- var name = user.getName();
- var showPage = true;
+ user = userManager.getUser(userId);
+ }
+ finally {
+ release();
+ }
- while (showPage) {
- cocoon.sendPageAndWait("users/confirm-delete-common.xml", {
- "id" : userId,
- "name" : name,
- "type" : user
- });
+ var name = user.getName();
+ var showPage = true;
+
+ while (showPage) {
+ cocoon.sendPageAndWait("users/confirm-delete-common.xml", {
+ "id" : userId,
+ "name" : name,
+ "type" : user
+ });
- if (cocoon.request.get("cancel")) {
- break;
- }
+ if (cocoon.request.get("cancel")) {
+ break;
+ }
- if (cocoon.request.get("submit")) {
+ if (cocoon.request.get("submit")) {
+ resolve();
+ try {
+ var userManager = getAccreditableManager().getUserManager();
userManager.remove(user);
- user['delete']();
- showPage = false;
}
+ finally {
+ release();
+ }
+ user['delete']();
+ showPage = false;
}
+ }
- cocoon.sendPage("redirect.html", { "url" : "../users.html" });
- }
- finally {
- release();
- }
+ cocoon.sendPage("redirect.html", { "url" : "../users.html" });
}
1.3 +10 -4 cocoon-lenya/src/webapp/lenya/content/admin/common/access-control.js
Index: access-control.js
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/common/access-control.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- access-control.js 3 Oct 2003 10:52:09 -0000 1.2
+++ access-control.js 13 Nov 2003 16:19:23 -0000 1.3
@@ -6,12 +6,18 @@
var accreditableManager;
var selector;
var resolver;
+var requestUrl;
+var contextPath;
function resolve() {
- selector = cocoon.getComponent("org.apache.lenya.cms.ac2.AccessControllerResolverSelector");
- resolver = selector.select(Packages.org.apache.lenya.cms.ac2.AccessControllerResolver.DEFAULT_RESOLVER);
- var requestUrl = cocoon.parameters["requestUri"];
- var contextPath = cocoon.parameters["contextPath"];
+ selector = cocoon.getComponent("org.apache.lenya.ac.AccessControllerResolverSelector");
+ resolver = selector.select(Packages.org.apache.lenya.ac.AccessControllerResolver.DEFAULT_RESOLVER);
+ if (!requestUrl) {
+ requestUrl = cocoon.parameters["requestUri"];
+ }
+ if (!contextPath) {
+ contextPath = cocoon.parameters["contextPath"];
+ }
var webappUrl = Packages.org.apache.lenya.util.ServletHelper.getWebappURI(contextPath, requestUrl);
var accessController = resolver.resolveAccessController(webappUrl);
accreditableManager = accessController.getAccreditableManager();
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org