xlawrence 2005/01/07 14:25:28 CET
Modified files:
calClient/src/java/org/jahia/suite/calendar/calServer
UwCalConnector.java
calClient/src/java/org/jahia/suite/calendar/test
DummyCalendarServer.java
src/java/org/jahia/suite/calendar/test
RequestResponseTest.java
syncClient/src/java/org/jahia/suite/calendar/syncClients
SyncClientFrame.java
Log:
Updated files according to GUID revision
Revision Changes Path
1.2 +4 -6
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.1&r2=1.2&f=h
1.2 +1 -1
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.1&r2=1.2&f=h
1.5 +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.4&r2=1.5&f=h
1.2 +2 -0
uwcal_JSR168/syncClient/src/java/org/jahia/suite/calendar/syncClients/SyncClientFrame.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/syncClient/src/java/org/jahia/suite/calendar/syncClients/SyncClientFrame.java.diff?r1=1.1&r2=1.2&f=h
Index: UwCalConnector.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/UwCalConnector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UwCalConnector.java 5 Jan 2005 10:02:56 -0000 1.1
+++ UwCalConnector.java 7 Jan 2005 13:25:27 -0000 1.2
@@ -106,10 +106,10 @@
final String eventString = new
String(temp.getEvent().getContent());
final VEvent vEvent = getVEventFromString(eventString);
if (SyncOperation.ADD.equals(type) ||
SyncOperation.MODIFY.equals(type)) {
- calServer.updateEvent(vEvent);
+ calServer.updateEvent(vEvent, temp.getEvent().getKey());
} else if (SyncOperation.DELETE.equals(type)) {
- calServer.deleteEvent(vEvent);
+ calServer.deleteEvent(vEvent, temp.getEvent().getKey());
} else {
throw new SyncException("Unknown operation type: "+type);
@@ -126,11 +126,9 @@
*/
public GUID getNewGUID() throws SyncException {
try {
- // format: eventId - name @ host
String guid = calServer.getNewGuid();
- int eventId = Integer.parseInt(guid.substring(0,
guid.lastIndexOf('-')-1));
- String hostName = guid.substring(guid.lastIndexOf('-')+1);
- return new GUID(hostName, eventId);
+ return new GUID(guid);
+
} catch (Exception e) {
throw new SyncException(e.getMessage(), e);
}
Index: DummyCalendarServer.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/test/DummyCalendarServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DummyCalendarServer.java 5 Jan 2005 10:02:57 -0000 1.1
+++ DummyCalendarServer.java 7 Jan 2005 13:25:27 -0000 1.2
@@ -230,7 +230,7 @@
} else if (msg instanceof GetGUIDRequest) {
log.info("GetGUIDRequest");
GetGUIDRequest req = (GetGUIDRequest)msg;
- GUID newGUID = new GUID("key_", new Integer(newID()).intValue());
+ GUID newGUID = new GUID("key:" + newID());
GetGUIDRequestResponse resp = (GetGUIDRequestResponse)
req.makeResponse(new Integer(newID()).intValue(), newGUID);
agent.sendResponse(resp, req);
Index: RequestResponseTest.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/test/RequestResponseTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestResponseTest.java 4 Jan 2005 14:24:26 -0000 1.4
+++ RequestResponseTest.java 7 Jan 2005 13:25:28 -0000 1.5
@@ -97,7 +97,7 @@
GetGUIDRequest req3 = new GetGUIDRequest(15);
log.info(req3);
log.info("Here is a corresponding response");
- Response resp3 = req3.makeResponse(21, new GUID("localhost",
126578));
+ Response resp3 = req3.makeResponse(21, new
GUID("localhost:126578"));
log.info(resp3);
} catch (Exception e) {
Index: SyncClientFrame.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/syncClient/src/java/org/jahia/suite/calendar/syncClients/SyncClientFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SyncClientFrame.java 5 Jan 2005 10:03:40 -0000 1.1
+++ SyncClientFrame.java 7 Jan 2005 13:25:28 -0000 1.2
@@ -725,12 +725,14 @@
final String msg = "The data is not in the correct format !";
showError(msg);
log("Error: "+ msg);
+ log("Cause: "+ e.getMessage());
log("\nSynchronization FAILED !");
} catch (ValidationException e) {
final String msg = "The data is not valid (not iCalendar
compliant) !";
showError(msg);
log("Error: "+ msg);
+ log("Cause: "+ e.getMessage());
log("\nSynchronization FAILED !");
} catch (Exception e) {
