xlawrence 2004/12/22 13:54:10 CET
Modified files:
src/java/org/jahia/suite/calendar/sync4jModule
CalendarSyncSource.java
src/java/org/jahia/suite/calendar/syncClients
CalendarFileManager.java
ICalendarSyncSource.java
Log:
Improved log messages
Revision Changes Path
1.10 +3 -3
uwcal_JSR168/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java.diff?r1=1.9&r2=1.10&f=h
1.9 +1 -2
uwcal_JSR168/src/java/org/jahia/suite/calendar/syncClients/CalendarFileManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/syncClients/CalendarFileManager.java.diff?r1=1.8&r2=1.9&f=h
1.11 +1 -1
uwcal_JSR168/src/java/org/jahia/suite/calendar/syncClients/ICalendarSyncSource.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/syncClients/ICalendarSyncSource.java.diff?r1=1.10&r2=1.11&f=h
Index: CalendarSyncSource.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/sync4jModule/CalendarSyncSource.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CalendarSyncSource.java 17 Dec 2004 15:47:00 -0000 1.9
+++ CalendarSyncSource.java 22 Dec 2004 12:54:10 -0000 1.10
@@ -97,8 +97,8 @@
*/
public void beginSync(java.security.Principal principal, int syncMode)
throws SyncSourceException {
+ log.info("beginSync: "+principal+": "+syncMode);
cm = new CalendarManager(this);
- log.debug("beginSync: "+principal+": "+syncMode);
}
/**
@@ -107,8 +107,8 @@
*/
public void endSync(java.security.Principal principal)
throws SyncSourceException {
- log.debug("endSync(" + principal + ")");
cm.updateCalendar();
+ log.info("endSync(" + principal + ")");
}
/**
@@ -401,7 +401,7 @@
userName = ((Sync4jPrincipal)principal).getUsername();
deviceID = ((Sync4jPrincipal)principal).getDeviceId();
}
- log.debug("Gathering calendar data for: "+userName+"-"+deviceID);
+ log.info("Gathering calendar data for: "+userName+"-"+deviceID);
if (since == null) {
cm.loadCalendar(userName, deviceID,
new Timestamp(System.currentTimeMillis()));
Index: CalendarFileManager.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/syncClients/CalendarFileManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CalendarFileManager.java 22 Dec 2004 11:00:35 -0000 1.8
+++ CalendarFileManager.java 22 Dec 2004 12:54:10 -0000 1.9
@@ -116,7 +116,6 @@
// Get the calendar properties
final String props = cal.getProperties().toString();
- log.debug(props);
if (props.length() > 1) {
items.add(props.substring(0, props.length()-1));
}
@@ -126,7 +125,6 @@
while (ite.hasNext()) {
Component c = (Component)ite.next();
String event = c.toString();
- log.debug(event);
items.add(event.substring(0, event.length()-1));
}
@@ -205,6 +203,7 @@
*/
public void writeCalendarItems(String fileName, String items) throws
FileNotFoundException, IOException, ValidationException, ParserException
{
+ log.debug("Writing calendar items...");
final String utfItems = new String(items.getBytes());
BufferedReader reader = new BufferedReader(new
StringReader(utfItems));
Index: ICalendarSyncSource.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/syncClients/ICalendarSyncSource.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ICalendarSyncSource.java 20 Dec 2004 16:31:16 -0000 1.10
+++ ICalendarSyncSource.java 22 Dec 2004 12:54:10 -0000 1.11
@@ -182,7 +182,6 @@
* @see SyncSource
*/
public void commitSync() throws SyncException {
- log.debug("commitSync()");
try {
Enumeration en = syncDatabase.keys();
@@ -198,6 +197,7 @@
}
storeSyncDatabase();
+ log.debug("commitSync()");
} catch (IOException e) {
throw new SyncException(e.getMessage(), e);
}
