[Bedework-commit] webapps r369 - in trunk:
appcommon/src/org/bedework/appcommon
webadmin/src/org/bedework/webadmin/admingroup
webcommon/src/org/bedework/webcommon
webcommon/src/org/bedework/webcommon/access
webcommon/src/org/bedework/webcommon/calsuite
webcommon/src/org/bedework/webcommon/event
webcommon/src/org/bedework/webcommon/misc
webcommon/src/org/bedework/webcommon/schedule
svnadmin at bedework.org
svnadmin at bedework.org
Mon May 14 15:47:50 EDT 2007
Author: douglm
Date: 2007-05-14 15:47:48 -0400 (Mon, 14 May 2007)
New Revision: 369
Modified:
trunk/appcommon/src/org/bedework/appcommon/AccessXmlUtil.java
trunk/webadmin/src/org/bedework/webadmin/admingroup/PEDeleteAGAction.java
trunk/webadmin/src/org/bedework/webadmin/admingroup/PEFetchAGAction.java
trunk/webadmin/src/org/bedework/webadmin/admingroup/PEUpdateAGAction.java
trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java
trunk/webcommon/src/org/bedework/webcommon/BwWebUtil.java
trunk/webcommon/src/org/bedework/webcommon/access/AccessAction.java
trunk/webcommon/src/org/bedework/webcommon/calsuite/AddCalSuiteAction.java
trunk/webcommon/src/org/bedework/webcommon/event/AttendeeAction.java
trunk/webcommon/src/org/bedework/webcommon/event/SetAlarmAction.java
trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java
trunk/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java
Log:
Mostly caldav related code:
Move much of the code related to mapping principal hierarchies to directory information into the directory interface.
AbstractDirImpl is an abstract implementation of the Directories interface and handles much of the mapping.
Moved definition of principal hierarchy roots out of the system information into the directory configuration.
Also added values to identify more types of account, e.g. resources, locations, tickets.
Some changes to property handling in caldav
Modified: trunk/appcommon/src/org/bedework/appcommon/AccessXmlUtil.java
===================================================================
--- trunk/appcommon/src/org/bedework/appcommon/AccessXmlUtil.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/appcommon/src/org/bedework/appcommon/AccessXmlUtil.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -105,21 +105,16 @@
this.svci = svci;
}
- public String makeUserHref(String id) throws AccessException {
+ /* (non-Javadoc)
+ * @see edu.rpi.cmt.access.AccessXmlUtil.HrefBuilder#makeHref(java.lang.String, int)
+ */
+ public String makeHref(String id, int whoType) throws AccessException {
try {
- return tagUtil.filter(svci.getSyspars().getUserPrincipalRoot() + "/" + id);
+ return tagUtil.filter(svci.getDirectories().makePrincipalUri(id, whoType));
} catch (Throwable t) {
throw new AccessException(t);
}
}
-
- public String makeGroupHref(String id) throws AccessException {
- try {
- return tagUtil.filter(svci.getSyspars().getGroupPrincipalRoot() + "/" + id);
- } catch (Throwable t) {
- throw new AccessException(t);
- }
- }
}
/** Acls use tags in the webdav and caldav namespace.
Modified: trunk/webadmin/src/org/bedework/webadmin/admingroup/PEDeleteAGAction.java
===================================================================
--- trunk/webadmin/src/org/bedework/webadmin/admingroup/PEDeleteAGAction.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webadmin/src/org/bedework/webadmin/admingroup/PEDeleteAGAction.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -83,7 +83,7 @@
return forwardNoAccess;
}
- Directories adgrps = form.fetchSvci().getGroups();
+ Directories adgrps = form.fetchSvci().getDirectories();
form.assignChoosingGroup(false); // reset
BwAdminGroup updgrp = form.getUpdAdminGroup();
Modified: trunk/webadmin/src/org/bedework/webadmin/admingroup/PEFetchAGAction.java
===================================================================
--- trunk/webadmin/src/org/bedework/webadmin/admingroup/PEFetchAGAction.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webadmin/src/org/bedework/webadmin/admingroup/PEFetchAGAction.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -82,7 +82,7 @@
return forwardNoAccess;
}
- Directories adgrps = form.fetchSvci().getAdminGroups();
+ Directories adgrps = form.fetchSvci().getAdminDirectories();
form.assignChoosingGroup(false); // reset
/** User requested an admin group from the list or by entering the name.
Modified: trunk/webadmin/src/org/bedework/webadmin/admingroup/PEUpdateAGAction.java
===================================================================
--- trunk/webadmin/src/org/bedework/webadmin/admingroup/PEUpdateAGAction.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webadmin/src/org/bedework/webadmin/admingroup/PEUpdateAGAction.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -109,7 +109,7 @@
CalSvcI svci = form.fetchSvci();
- Directories adgrps = svci.getGroups();
+ Directories adgrps = svci.getDirectories();
form.assignChoosingGroup(false); // reset
boolean add = form.getAddingAdmingroup();
Modified: trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -1582,7 +1582,7 @@
CalSvcI svci = form.fetchSvci();
try {
- Directories adgrps = svci.getGroups();
+ Directories adgrps = svci.getDirectories();
if (form.retrieveChoosingGroup()) {
/** This should be the response to presenting a list of groups.
@@ -1942,7 +1942,7 @@
protected BwAttendee findAttendee(CalSvcI svc,
BwEvent ev,
BwUser cu) throws CalFacadeException {
- return findAttendee(ev, svc.userToCaladdr(cu.getAccount()));
+ return findAttendee(ev, svc.getDirectories().userToCaladdr(cu.getAccount()));
}
/** Find an attendee entry for the given uri (calendar address).
Modified: trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -1005,7 +1005,7 @@
*/
public boolean getAdminGroupMaintOK() {
try {
- return fetchSvci().getAdminGroups().getGroupMaintOK();
+ return fetchSvci().getAdminDirectories().getGroupMaintOK();
} catch (Throwable t) {
err.emit(t);
return false;
@@ -1017,7 +1017,7 @@
*/
public Collection getAdminGroups() {
try {
- return fetchSvci().getAdminGroups().getAll(showAgMembers);
+ return fetchSvci().getAdminDirectories().getAll(showAgMembers);
} catch (Throwable t) {
err.emit(t);
return new ArrayList();
Modified: trunk/webcommon/src/org/bedework/webcommon/BwWebUtil.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwWebUtil.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webcommon/src/org/bedework/webcommon/BwWebUtil.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -307,7 +307,7 @@
*/
public static boolean validateUserHref(CalSvcI svci,
String href) throws CalFacadeException {
- String account = svci.caladdrToUser(href);
+ String account = svci.getDirectories().caladdrToUser(href);
if (account == null) {
return true; // External user.
Modified: trunk/webcommon/src/org/bedework/webcommon/access/AccessAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/access/AccessAction.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webcommon/src/org/bedework/webcommon/access/AccessAction.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -250,6 +250,18 @@
} else if (whoTypeStr.equals("group")) {
pars.who.setWhoType(Ace.whoTypeGroup);
needWho = true;
+ } else if (whoTypeStr.equals("resource")) {
+ pars.who.setWhoType(Ace.whoTypeResource);
+ needWho = true;
+ } else if (whoTypeStr.equals("venue")) {
+ pars.who.setWhoType(Ace.whoTypeVenue);
+ needWho = true;
+ } else if (whoTypeStr.equals("ticket")) {
+ pars.who.setWhoType(Ace.whoTypeTicket);
+ needWho = true;
+ } else if (whoTypeStr.equals("host")) {
+ pars.who.setWhoType(Ace.whoTypeHost);
+ needWho = true;
} else if (whoTypeStr.equals("auth")) {
pars.who.setWhoType(Ace.whoTypeAuthenticated);
} else if (whoTypeStr.equals("unauth")) {
Modified: trunk/webcommon/src/org/bedework/webcommon/calsuite/AddCalSuiteAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/calsuite/AddCalSuiteAction.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webcommon/src/org/bedework/webcommon/calsuite/AddCalSuiteAction.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -83,7 +83,7 @@
return forwardNotAdded;
}
- BwAdminGroup agrp = (BwAdminGroup)svc.getAdminGroups().findGroup(groupName);
+ BwAdminGroup agrp = (BwAdminGroup)svc.getAdminDirectories().findGroup(groupName);
if (agrp == null) {
form.getErr().emit(ClientError.unknownGroup, groupName);
Modified: trunk/webcommon/src/org/bedework/webcommon/event/AttendeeAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/AttendeeAction.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webcommon/src/org/bedework/webcommon/event/AttendeeAction.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -99,7 +99,7 @@
}
if (isAccount) {
- uri = svc.userToCaladdr(uri);
+ uri = svc.getDirectories().userToCaladdr(uri);
}
boolean delete = request.notNull("delete");
Modified: trunk/webcommon/src/org/bedework/webcommon/event/SetAlarmAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/SetAlarmAction.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webcommon/src/org/bedework/webcommon/event/SetAlarmAction.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -141,7 +141,7 @@
BwAttendee att = new BwAttendee();
- att.setAttendeeUri(svci.userToCaladdr(recipient));
+ att.setAttendeeUri(svci.getDirectories().userToCaladdr(recipient));
alarm.addAttendee(att);
Modified: trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -487,7 +487,7 @@
// Ensure we have an organizer and originator
BwOrganizer org = ev.getOrganizer();
- ev.setOriginator(svci.userToCaladdr(svci.getUser().getAccount()));
+ ev.setOriginator(svci.getDirectories().userToCaladdr(svci.getUser().getAccount()));
if (org == null) {
org = new BwOrganizer();
Modified: trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -159,7 +159,7 @@
*/
BwEvent ev = (BwEvent)ei.getEvent().clone();
- String recip = svci.userToCaladdr(svci.getUser().getAccount());
+ String recip = svci.getDirectories().userToCaladdr(svci.getUser().getAccount());
ev.addRecipient(recip);
BwOrganizer org = ev.getOrganizer();
Modified: trunk/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java 2007-05-10 18:29:00 UTC (rev 368)
+++ trunk/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java 2007-05-14 19:47:48 UTC (rev 369)
@@ -159,7 +159,7 @@
outEv.setRecipients(new TreeSet<String>());
outEv.addRecipient(outEv.getOriginator());
- outEv.setOriginator(svc.userToCaladdr(cu.getAccount()));
+ outEv.setOriginator(svc.getDirectories().userToCaladdr(cu.getAccount()));
outEv.updateDtstamp();
if (delegate != null) {
@@ -192,7 +192,7 @@
// outEv is the reply
outEv.setScheduleMethod(Icalendar.methodTypeReply);
- String dcalAddr = svc.userToCaladdr(delegate);
+ String dcalAddr = svc.getDirectories().userToCaladdr(delegate);
att.setParticipationStatus(BwAttendee.partstatdelegated);
att.setDelegatedTo(dcalAddr);
More information about the Bedework-commit
mailing list