Changeset 569

Timestamp:

06/09/06 17:01:31

Author:

douglm

Message:

Dump preferred calendars.
Add a couple of elements to help in restore to 3.1

Files:

• branches/REL-3.0/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpAuthUsers.java (modified) (3 diffs)
• branches/REL-3.0/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/Dumpling.java (modified) (1 diff)
• branches/REL-3.0/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java (modified) (1 diff)

branches/REL-3.0/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpAuthUsers.java

@@ -29 +29 @@
-package org.bedework.dumprestore.dump.dumpling;
-
+import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwCategory;
-import org.bedework.calfacade.BwLocation;
@@ -35 +36 @@
-import org.bedework.calfacade.svc.BwAuthUserPrefs;
-import org.bedework.dumprestore.dump.DumpGlobals;
-
-
-
-import java.util.Iterator;
@@ -129 +128 @@
-        tagEnd("preferredSponsors");
-      }
+
+      s = aup.getPreferredCalendars();
+      if ((s != null) && (s.size() > 0)) {
+        tagStart("preferredCalendars");
+
+        Iterator si = s.iterator();
+
+        while (si.hasNext()) {
+          BwCalendar p = (BwCalendar)si.next();
+
+          taggedVal("preferredCalendar", p.getPath());
+        }
+
+        tagEnd("preferredCalendars");
+      }
-    }
-

branches/REL-3.0/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/Dumpling.java

@@ -196 +196 @@
-
-    taggedEntityId("calendar", entity.getCalendar());
+
+    /* For 3.1 conversion */
+    if (entity.getCalendar() != null) {
+      taggedVal("calendar-path", entity.getCalendar().getPath());
+    }
-  }
-

branches/REL-3.0/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java

@@ -179 +179 @@
-    }
-
+    if (name.equals("calendar-path")) {
+      /* Ignore - a 3.1 tag */
+      return true;
+    }
+
-    return false;
-  }