xlawrence 2005/01/12 17:32:20 CET
Modified files:
src/java/org/jahia/suite/calendar/framework LockEvent.java
Storable.java
src/java/org/jahia/suite/calendar/framework/message
GetGUIDRequest.java
Log:
Updated framework files to match uwCal implementation
Revision Changes Path
1.3 +20 -0
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/LockEvent.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/LockEvent.java.diff?r1=1.2&r2=1.3&f=h
1.4 +1 -2
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/Storable.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/Storable.java.diff?r1=1.3&r2=1.4&f=h
1.5 +9 -0
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetGUIDRequest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetGUIDRequest.java.diff?r1=1.4&r2=1.5&f=h
Index: LockEvent.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/LockEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LockEvent.java 17 Dec 2004 15:46:59 -0000 1.2
+++ LockEvent.java 12 Jan 2005 16:32:19 -0000 1.3
@@ -38,6 +38,7 @@
package org.jahia.suite.calendar.framework;
import org.jahia.suite.calendar.framework.model.SyncEvent;
import org.jahia.suite.calendar.framework.model.SyncOperation;
+import org.jahia.suite.calendar.framework.model.GUID;
/**
* <p>This interface defines methods for locking and unlocking a calendar
event.
@@ -83,6 +84,15 @@
public SyncEvent[] getLockedEvents(String calendarID) throws
SyncException;
/**
+ * Method that will generate and return a new GUID from the backen
calendar
+ * server. A new GUID is needed when a client application sends a new
+ * SyncEvent that does not allready exist in the calendar server.
+ * @throws SyncException If something goes wrong
+ * @return The new GUID in a GUID object
+ */
+ public GUID getNewEventID(String calendarID) throws SyncException;
+
+ /**
* Unlocks and updates previously locked events allowing other
operations
* to read or modify these events.
* @param calendarID The sync session ID of the given events. This ID is
@@ -92,4 +102,14 @@
*/
public void unlockAndUpdateEvents(String calendarID,
SyncOperation[] operations) throws SyncException;
+
+ /**
+ *
+ */
+ public void beginSynch(String calendarID) throws SyncException;
+
+ /**
+ *
+ */
+ public void endSynch(String calendarID) throws SyncException;
}
Index: Storable.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/Storable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Storable.java 21 Dec 2004 14:31:03 -0000 1.3
+++ Storable.java 12 Jan 2005 16:32:19 -0000 1.4
@@ -54,11 +54,10 @@
* This methods returns all the events of a particular user's calendar.
* It is typically called before a synchronization in order to get all
the
* events taking place in the actual synchronization process.
- * @param calendarID The unique ID of a celandar
* @return An array of SyncEvents
* @throws SyncException If something goes wrong
*/
- public SyncEvent[] getAllEvents(String calendarID) throws SyncException;
+ public SyncEvent[] getAllEvents() throws SyncException;
/**
* This method should be called once a synchronization of a particular
Index: GetGUIDRequest.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetGUIDRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GetGUIDRequest.java 23 Nov 2004 10:30:17 -0000 1.4
+++ GetGUIDRequest.java 12 Jan 2005 16:32:19 -0000 1.5
@@ -47,6 +47,7 @@
public class GetGUIDRequest extends AbstractRequest implements Request {
public static final String TYPE = "GetGUIDRequest";
+ private String calendarID;
// disable default constructor
private GetGUIDRequest() {}
@@ -132,4 +133,12 @@
return false;
}
}
+
+ public String getCalendarID() {
+ return calendarID;
+ }
+
+ public void setCalendarID(String calendarID) {
+ this.calendarID = calendarID;
+ }
}
