[Bedework-commit] calendarapi r260 - in trunk: calsvc/src/org/bedework/calsvc mail/src/org/bedework/mail

[svnadmin at bedework.org]

Author: douglm
Date: 2007-04-10 22:57:42 -0400 (Tue, 10 Apr 2007)
New Revision: 260

Modified:
   trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
   trunk/mail/src/org/bedework/mail/DummyMailer.java
Log:
Couple of scheduling fixes.

Modified: trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-04-10 18:13:52 UTC (rev 259)
+++ trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-04-11 02:57:42 UTC (rev 260)
@@ -2370,7 +2370,7 @@
       }
 
       if (externalRcs != null) {
-        addToOutBox(event, outBox);
+        addToOutBox(event, outBox, externalRcs);
       }
 
       return sr;
@@ -2436,7 +2436,7 @@
       }
 
       if (externalRcs != null) {
-        addToOutBox(event, outBox);
+        addToOutBox(event, outBox, externalRcs);
       }
 
       return sr;
@@ -2604,10 +2604,12 @@
    *                   Private Scheduling
    * ==================================================================== */
 
-  private void addToOutBox(BwEvent event, BwCalendar outBox) throws CalFacadeException {
+  private void addToOutBox(BwEvent event, BwCalendar outBox,
+                           Collection<String> externalRcs) throws CalFacadeException {
     // We have external recipients. Put in the outbox for mailing
     event = (BwEvent)event.clone();
     event.setScheduleState(BwEvent.scheduleStateNotProcessed);
+    event.setRecipients(externalRcs);
     /* Make up a unique name for the event. */
     event.setName("Out-" + CalFacadeUtil.getUid() + ".ics");
 
@@ -2648,8 +2650,11 @@
       try {
         getMailer().mailEntity(cal, orig, recipients,
                                ev.getSummary());
+        /* Save sent messages somewhere - keep in outbox?
         ev.setScheduleState(BwEvent.scheduleStateExternalDone);
         updateEvent(ev, ei.getOverrideProxies(), null);
+        */
+        deleteEvent(ev, true);
       } catch (CalFacadeException cfe) {
         // Should count the exceptions and discard after a number of retries.
         error(cfe);
@@ -2709,7 +2714,7 @@
 
       if (ui.status == ScheduleRecipientResult.scheduleDeferred) {
         if (externalRcs == null) {
-          externalRcs = new ArrayList<String>();
+          externalRcs = new TreeSet<String>();
         }
 
         externalRcs.add(recip);

Modified: trunk/mail/src/org/bedework/mail/DummyMailer.java
===================================================================
--- trunk/mail/src/org/bedework/mail/DummyMailer.java	2007-04-10 18:13:52 UTC (rev 259)
+++ trunk/mail/src/org/bedework/mail/DummyMailer.java	2007-04-11 02:57:42 UTC (rev 260)
@@ -62,6 +62,7 @@
 import net.fortuna.ical4j.model.Calendar;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 
 import org.apache.log4j.Logger;
@@ -83,7 +84,8 @@
                          String originator,
                          Collection<String>recipients,
                          String subject) throws CalFacadeException {
-    debugMsg("mailEntity called with " + cal);
+    debugMsg("mailEntity called with " + Arrays.toString(recipients.toArray()));
+    debugMsg(cal.toString());
   }
 
   public void addList(BwCalendar cal) throws CalFacadeException {