xlawrence 2005/01/18 15:07:10 CET
Modified files:
calClient/src/java/org/jahia/suite/calendar/calServer
PersistentStore.java
SyncEventID.java
UwCalConnector.java
calClient/src/java/org/jahia/suite/calendar/test
DummyCalendarServer.java
SyncEventDialog.java
TransactionManagerTest.java
calClient/webapp/uiclient/src/java/org/jahia/suite/calendar/webApp/uiclient
DelEventAction.java
EditEventAction.java
src/java/org/jahia/suite/calendar/framework/model
Calendar.java
SyncEvent.java
src/java/org/jahia/suite/calendar/test CalendarModelTest.java
RequestResponseTest.java
syncServer/src/java/org/jahia/suite/calendar/syncServer
CalendarManager.java
syncServer/src/java/org/jahia/suite/calendar/test
CalendarSourceTest.java
Log:
All SyncEvents have now a GUID as key
Revision Changes Path
1.3 +3 -2
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/PersistentStore.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/PersistentStore.java.diff?r1=1.2&r2=1.3&f=h
1.2 +20 -5
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/SyncEventID.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/SyncEventID.java.diff?r1=1.1&r2=1.2&f=h
1.8 +2 -2
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnector.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnector.java.diff?r1=1.7&r2=1.8&f=h
1.3 +8 -8
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/test/DummyCalendarServer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/test/DummyCalendarServer.java.diff?r1=1.2&r2=1.3&f=h
1.2 +2 -1
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/test/SyncEventDialog.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/test/SyncEventDialog.java.diff?r1=1.1&r2=1.2&f=h
1.4 +3 -2
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/test/TransactionManagerTest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/test/TransactionManagerTest.java.diff?r1=1.3&r2=1.4&f=h
1.3 +2 -1
uwcal_JSR168/calClient/webapp/uiclient/src/java/org/jahia/suite/calendar/webApp/uiclient/DelEventAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/java/org/jahia/suite/calendar/webApp/uiclient/DelEventAction.java.diff?r1=1.2&r2=1.3&f=h
1.3 +2 -1
uwcal_JSR168/calClient/webapp/uiclient/src/java/org/jahia/suite/calendar/webApp/uiclient/EditEventAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/java/org/jahia/suite/calendar/webApp/uiclient/EditEventAction.java.diff?r1=1.2&r2=1.3&f=h
1.6 +3 -3
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/Calendar.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/Calendar.java.diff?r1=1.5&r2=1.6&f=h
1.5 +3 -3
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/SyncEvent.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/SyncEvent.java.diff?r1=1.4&r2=1.5&f=h
1.5 +7 -6
uwcal_JSR168/src/java/org/jahia/suite/calendar/test/CalendarModelTest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/test/CalendarModelTest.java.diff?r1=1.4&r2=1.5&f=h
1.6 +1 -1
uwcal_JSR168/src/java/org/jahia/suite/calendar/test/RequestResponseTest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/test/RequestResponseTest.java.diff?r1=1.5&r2=1.6&f=h
1.4 +1 -1
uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java.diff?r1=1.3&r2=1.4&f=h
1.2 +4 -3
uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/test/CalendarSourceTest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/test/CalendarSourceTest.java.diff?r1=1.1&r2=1.2&f=h
Index: PersistentStore.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/PersistentStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistentStore.java 14 Jan 2005 14:36:28 -0000 1.2
+++ PersistentStore.java 18 Jan 2005 14:07:08 -0000 1.3
@@ -39,6 +39,7 @@
import org.jahia.suite.calendar.framework.SyncException;
import org.jahia.suite.calendar.framework.model.SyncEvent;
+import org.jahia.suite.calendar.framework.model.GUID;
import org.jahia.suite.calendar.util.HibernateUtil;
import net.sf.hibernate.HibernateException;
@@ -121,7 +122,7 @@
try {
tx = session.beginTransaction();
SyncEventID eventID = new SyncEventID();
- eventID.setEventID(event.getKey());
+ eventID.setEventID(event.getKey().getKey());
if (calendarID != null) {
eventID.setCalendarID(calendarID);
@@ -213,7 +214,7 @@
try {
tx = session.beginTransaction();
SyncEventID eventID = new SyncEventID();
- eventID.setEventID(event.getKey());
+ eventID.setEventID(event.getKey().getKey());
if (calendarID != null) {
eventID.setCalendarID(calendarID);
Index: SyncEventID.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/SyncEventID.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SyncEventID.java 11 Jan 2005 09:50:26 -0000 1.1
+++ SyncEventID.java 18 Jan 2005 14:07:08 -0000 1.2
@@ -52,20 +52,35 @@
/** Creates a new instance of SyncEventID */
public SyncEventID() {
}
-
+
public String getEventID() {
return eventID;
}
-
+
public void setEventID(String eventID) {
this.eventID = eventID;
- }
-
+ }
+
public String getCalendarID() {
return calendarID;
}
-
+
public void setCalendarID(String calendarID) {
this.calendarID = calendarID;
}
+
+ public boolean equals(Object o) {
+ try {
+ SyncEventID tmp = (SyncEventID)o;
+ if (tmp.getCalendarID().equals(this.calendarID) &&
+ tmp.getEventID().equals(this.eventID))
+ return true;
+ else {
+ return false;
+ }
+
+ } catch (Throwable t) {
+ return false;
+ }
+ }
}
Index: UwCalConnector.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UwCalConnector.java 17 Jan 2005 14:50:01 -0000 1.7
+++ UwCalConnector.java 18 Jan 2005 14:07:08 -0000 1.8
@@ -118,7 +118,7 @@
log.debug("uwCal: found "+c.size()+ " items");
for (int i=0; i < c.size(); i++) {
IcalSynchState event = (IcalSynchState)it.next();
- res[i] = new SyncEvent(event.getGuid(),
+ res[i] = new SyncEvent(new GUID(event.getGuid()),
event.getVevent().toString().getBytes(),
toFrameworkStateValue(event.getSynchState()));
}
@@ -147,7 +147,7 @@
String type = temp.getType();
final String eventString = new
String(temp.getEvent().getContent());
final VEvent vEvent = getVEventFromString(eventString);
- final String key = temp.getEvent().getKey();
+ final String key = temp.getEvent().getKey().getKey();
if (SyncOperation.ADD.equals(type) ||
SyncOperation.MODIFY.equals(type)) {
log.debug("Event: "+key+ ": "+type);
calServer.updateEvent(vEvent, key);
Index: DummyCalendarServer.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/test/DummyCalendarServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DummyCalendarServer.java 7 Jan 2005 13:25:27 -0000 1.2
+++ DummyCalendarServer.java 18 Jan 2005 14:07:08 -0000 1.3
@@ -141,10 +141,10 @@
final String data0 = fill();
try {
SyncEvent[] events = new SyncEvent[4];
- events[0] = new SyncEvent("key0", data0.getBytes(),
SyncEvent.UNKNOWN);
- events[1] = new SyncEvent("key1", data1.getBytes(),
SyncEvent.UNKNOWN);
- events[2] = new SyncEvent("key2", data2.getBytes(),
SyncEvent.UNKNOWN);
- events[3] = new SyncEvent("key3", data3.getBytes(),
SyncEvent.UNKNOWN);
+ events[0] = new SyncEvent(new GUID("key0"), data0.getBytes(),
SyncEvent.UNKNOWN);
+ events[1] = new SyncEvent(new GUID("key1"), data1.getBytes(),
SyncEvent.UNKNOWN);
+ events[2] = new SyncEvent(new GUID("key2"), data2.getBytes(),
SyncEvent.UNKNOWN);
+ events[3] = new SyncEvent(new GUID("key3"), data3.getBytes(),
SyncEvent.UNKNOWN);
calendar = new Calendar(events);
respID = 4;
} catch (Exception e) {
@@ -183,20 +183,20 @@
for (int i=0; i<ops.length; i++) {
SyncOperation op = ops[i];
if (op.getType().equals(SyncOperation.ADD)) {
- String key = op.getEvent().getKey();
+ String key = op.getEvent().getKey().getKey();
if (key == null) throw new NullPointerException();
log.info("ADD: "+key);
calendar.addEvent(op.getEvent());
gui.addItem(key);
} else if (op.getType().equals(SyncOperation.MODIFY)) {
- String key = op.getEvent().getKey();
+ String key = op.getEvent().getKey().getKey();
if (key == null) throw new NullPointerException();
log.info("MODIFY: "+key);
calendar.replaceEvent(op.getEvent());
} else if (op.getType().equals(SyncOperation.DELETE)) {
- String key = op.getEvent().getKey();
+ String key = op.getEvent().getKey().getKey();
if (key == null) throw new NullPointerException();
log.info("DELETE: "+key);
calendar.removeEvent(key);
@@ -210,7 +210,7 @@
for (int i=0; i<calendar.getEvents().length; i++) {
if (calendar.getEvents()[i].getState() ==
SyncEvent.DELETED) {
- String key = (calendar.getEvents()[i]).getKey();
+ String key =
(calendar.getEvents()[i]).getKey().getKey();
calendar.removeEvent(calendar.getEvents()[i]);
gui.removeItem(key);
Index: SyncEventDialog.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/test/SyncEventDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SyncEventDialog.java 5 Jan 2005 10:02:57 -0000 1.1
+++ SyncEventDialog.java 18 Jan 2005 14:07:08 -0000 1.2
@@ -37,6 +37,7 @@
package org.jahia.suite.calendar.test;
+import org.jahia.suite.calendar.framework.model.GUID;
import org.jahia.suite.calendar.framework.model.SyncEvent;
import org.jahia.suite.calendar.util.StateValueConverter;
@@ -148,7 +149,7 @@
}
if (value.toString().equals(okText)) {
- SyncEvent event = new SyncEvent(keyField.getText(),
+ SyncEvent event = new SyncEvent(new GUID(keyField.getText()),
content.getText().getBytes(),
StateValueConverter.toUWCalInt((String)stateSelecter.getSelectedItem()));
Index: TransactionManagerTest.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/test/TransactionManagerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransactionManagerTest.java 17 Jan 2005 14:50:01 -0000 1.3
+++ TransactionManagerTest.java 18 Jan 2005 14:07:08 -0000 1.4
@@ -38,6 +38,7 @@
package org.jahia.suite.calendar.test;
import org.jahia.suite.calendar.calServer.SyncManagerImpl;
import org.jahia.suite.calendar.framework.model.SyncEvent;
+import org.jahia.suite.calendar.framework.model.GUID;
import org.jahia.suite.calendar.framework.SyncManager;
import org.apache.log4j.Logger;
@@ -104,12 +105,12 @@
else
eventId = 2;
log.info("Thread "+id+" requesting lock for event "+eventId);
- tm.getLock(new SyncEvent(new Integer(eventId).toString(),
+ tm.getLock(new SyncEvent(new GUID(Integer.toString(eventId)),
"test".getBytes(), SyncEvent.UNKNOWN));
log.info("Thread "+id+" obtained lock for event "+eventId);
sleep(4000);
log.info("Thread "+id+" releasing lock for event "+eventId);
- tm.unlock(new SyncEvent(new Integer(eventId).toString(),
+ tm.unlock(new SyncEvent(new GUID(Integer.toString(eventId)),
"test".getBytes(), SyncEvent.UNKNOWN));
} catch (Exception e) {
e.printStackTrace();
Index: DelEventAction.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/java/org/jahia/suite/calendar/webApp/uiclient/DelEventAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DelEventAction.java 17 Jan 2005 14:50:01 -0000 1.2
+++ DelEventAction.java 18 Jan 2005 14:07:08 -0000 1.3
@@ -40,6 +40,7 @@
import edu.rpi.cct.uwcal.webclient.UWCalActionForm;
import org.jahia.suite.calendar.framework.model.SyncEvent;
+import org.jahia.suite.calendar.framework.model.GUID;
import org.jahia.suite.calendar.framework.SyncException;
import org.jahia.suite.calendar.framework.SyncManager;
@@ -90,7 +91,7 @@
/* First, we need to check that a concurrent access to the edited
* Event is not being accessed by another process */
int eventId = form.getEventId();
- event = new SyncEvent(new Integer(eventId).toString(),
+ event = new SyncEvent(new GUID(Integer.toString(eventId)),
"".getBytes(), SyncEvent.DELETED);
manager.getLock(event);
Index: EditEventAction.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/java/org/jahia/suite/calendar/webApp/uiclient/EditEventAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EditEventAction.java 17 Jan 2005 14:50:01 -0000 1.2
+++ EditEventAction.java 18 Jan 2005 14:07:08 -0000 1.3
@@ -43,6 +43,7 @@
import javax.servlet.http.HttpServletRequest;
import org.jahia.suite.calendar.framework.model.SyncEvent;
+import org.jahia.suite.calendar.framework.model.GUID;
import org.jahia.suite.calendar.framework.SyncException;
import org.jahia.suite.calendar.framework.SyncManager;
@@ -100,7 +101,7 @@
/* First, we need to check that a concurrent access to the edited
* Event is not being accessed by another process */
EventVO temp = form.getEditEvent();
- event = new SyncEvent(new Integer(temp.getId()).toString(),
+ event = new SyncEvent(new GUID(Integer.toString(temp.getId())),
temp.toString().getBytes(), SyncEvent.MODIFIED);
manager.getLock(event);
Index: Calendar.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/Calendar.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Calendar.java 13 Dec 2004 14:47:13 -0000 1.5
+++ Calendar.java 18 Jan 2005 14:07:09 -0000 1.6
@@ -101,7 +101,7 @@
* @param event The event to replace
*/
public void replaceEvent(SyncEvent event) {
- final String key = event.getKey();
+ final String key = event.getKey().getKey();
for (int i=0; i<events.length; i++) {
if (events[i].getKey().equals(key)) {
events[i] = event;
@@ -115,7 +115,7 @@
*/
public void removeEvent(SyncEvent event) {
Vector v = new Vector();
- final String key = event.getKey();
+ final String key = event.getKey().getKey();
for (int i=0; i<events.length; i++) {
if (!events[i].getKey().equals(key)) {
@@ -131,7 +131,7 @@
* @param key The key of the event to remove
*/
public void removeEvent(String key) {
- SyncEvent event = new SyncEvent(key, null, -1);
+ SyncEvent event = new SyncEvent(new GUID(key), null, -1);
removeEvent(event);
}
Index: SyncEvent.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/SyncEvent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SyncEvent.java 8 Dec 2004 16:03:27 -0000 1.4
+++ SyncEvent.java 18 Jan 2005 14:07:09 -0000 1.5
@@ -51,7 +51,7 @@
public static final int MODIFIED = 3;
public static final int DELETED = 4;
- private final String key;
+ private final GUID key;
private byte[] content;
private int state;
@@ -66,7 +66,7 @@
* @param content The data of the SyncEvent
* @param state The state of the SyncEvent
*/
- public SyncEvent(String key, byte[] content, int state) {
+ public SyncEvent(GUID key, byte[] content, int state) {
this.key = key;
this.content = content;
this.state = state;
@@ -92,7 +92,7 @@
* Getter for property key.
* @return Value of property key.
*/
- public String getKey() {
+ public GUID getKey() {
return key;
}
Index: CalendarModelTest.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/test/CalendarModelTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CalendarModelTest.java 4 Jan 2005 14:24:26 -0000 1.4
+++ CalendarModelTest.java 18 Jan 2005 14:07:09 -0000 1.5
@@ -39,6 +39,7 @@
import org.jahia.suite.calendar.framework.model.Calendar;
import org.jahia.suite.calendar.framework.model.SyncEvent;
+import org.jahia.suite.calendar.framework.model.GUID;
import org.jahia.suite.calendar.framework.model.SyncOperation;
import org.apache.log4j.Logger;
@@ -59,21 +60,21 @@
*/
public static void main(String[] args) {
SyncEvent[] events = new SyncEvent[1];
- events[0] = new SyncEvent("1", "first event".getBytes(),
+ events[0] = new SyncEvent(new GUID("1"), "first event".getBytes(),
SyncEvent.DELETED);
Calendar cal = new Calendar(events);
log.info(cal);
- cal.addEvent(new SyncEvent("2", "second event".getBytes(),
+ cal.addEvent(new SyncEvent(new GUID("2"), "second event".getBytes(),
SyncEvent.NEW));
- cal.addEvent(new SyncEvent("3", "third event".getBytes(),
+ cal.addEvent(new SyncEvent(new GUID("3"), "third event".getBytes(),
SyncEvent.SYNCHRONIZED));
- cal.addEvent(new SyncEvent("4", "fourth event".getBytes(),
+ cal.addEvent(new SyncEvent(new GUID("4"), "fourth event".getBytes(),
SyncEvent.UNKNOWN));
log.info(cal);
- cal.replaceEvent(new SyncEvent("3", "third event
modified".getBytes(),
+ cal.replaceEvent(new SyncEvent(new GUID("3"), "third event
modified".getBytes(),
SyncEvent.MODIFIED));
log.info(cal);
- cal.removeEvent(new SyncEvent("5", null, SyncEvent.DELETED));
+ cal.removeEvent(new SyncEvent(new GUID("5"), null,
SyncEvent.DELETED));
log.info(cal);
}
}
Index: RequestResponseTest.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/test/RequestResponseTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestResponseTest.java 7 Jan 2005 13:25:28 -0000 1.5
+++ RequestResponseTest.java 18 Jan 2005 14:07:09 -0000 1.6
@@ -75,7 +75,7 @@
"DTSTART;TZID=Australia/Sydney;VALUE=DATE:20041225\n"+
"SUMMARY:Christmas Day\n"+
"END:VEVENT";
- SyncEvent e1 = new SyncEvent("key1", data.getBytes(), 'n');
+ SyncEvent e1 = new SyncEvent(new GUID("key1"), data.getBytes(),
'n');
events[0] = e1;
Calendar cal = new Calendar(events);
Index: CalendarManager.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/syncServer/CalendarManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CalendarManager.java 13 Jan 2005 14:54:48 -0000 1.3
+++ CalendarManager.java 18 Jan 2005 14:07:09 -0000 1.4
@@ -387,7 +387,7 @@
Iterator ite = items.iterator();
while (ite.hasNext()) {
SyncItem item = (SyncItem)ite.next();
- SyncEvent ev = new SyncEvent(item.getKey().getKeyAsString(),
+ SyncEvent ev = new SyncEvent(new
GUID(item.getKey().getKeyAsString()),
(byte[])item.getProperty(SyncItem.PROPERTY_BINARY_CONTENT).getValue(),
StateValueConverter.toUWCal(item.getState()));
SyncOperation op = new SyncOperation(operationType, ev);
Index: CalendarSourceTest.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncServer/src/java/org/jahia/suite/calendar/test/CalendarSourceTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CalendarSourceTest.java 5 Jan 2005 10:04:26 -0000 1.1
+++ CalendarSourceTest.java 18 Jan 2005 14:07:10 -0000 1.2
@@ -37,6 +37,7 @@
package org.jahia.suite.calendar.test;
import org.jahia.suite.calendar.framework.model.SyncEvent;
+import org.jahia.suite.calendar.framework.model.GUID;
import org.jahia.suite.calendar.framework.model.SyncOperation;
import org.jahia.suite.calendar.framework.model.Calendar;
@@ -73,9 +74,9 @@
"SUMMARY:Christmas Day\n"+
"END:VEVENT";
- static SyncEvent e1 = new SyncEvent("key1", data.getBytes(),
SyncEvent.MODIFIED);
- static SyncEvent e2 = new SyncEvent("key2", data.getBytes(),
SyncEvent.MODIFIED);
- static SyncEvent e3 = new SyncEvent("key3", data.getBytes(),
SyncEvent.DELETED);
+ static SyncEvent e1 = new SyncEvent(new GUID("key1"), data.getBytes(),
SyncEvent.MODIFIED);
+ static SyncEvent e2 = new SyncEvent(new GUID("key2"), data.getBytes(),
SyncEvent.MODIFIED);
+ static SyncEvent e3 = new SyncEvent(new GUID("key3"), data.getBytes(),
SyncEvent.DELETED);
/**
* Start the test
