[Bedework-commit] r534 - in trunk/calendar3/dumprestore/src/org/bedework/dumprestore: . dump dump/dumpling restore restore/rules

svnadmin at bedework.org svnadmin at bedework.org
Mon Jun 5 15:39:08 EDT 2006


Author: douglm
Date: 2006-06-05 15:39:07 -0400 (Mon, 05 Jun 2006)
New Revision: 534

Added:
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalSuites.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalSuiteFieldRule.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalSuiteRule.java
Modified:
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/Defs.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpIntf.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/HibDump.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/HibRestore.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreIntf.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityRule.java
   trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/RestoreRuleSet.java
Log:
Dump/restore of calendar suite entities

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/Defs.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/Defs.java	2006-06-05 14:54:12 UTC (rev 533)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/Defs.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -121,6 +121,8 @@
   public static final String sectionUserPrefs = "user-preferences";
   /** */
   public static final String sectionDbLastmods = "dblastmods";
+  /** */
+  public static final String sectionCalSuites = "cal-suites";
 
   /* ====================================================================
    *                      Tag names for each object
@@ -184,6 +186,8 @@
   /** */
   public static final String objectUserPrefs = "user-prefs";
   /** */
+  public static final String objectCalSuite = "cal-suite";
+  /** */
   public static final String objectDbLastmod = "dblastmod";
 }
 

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpIntf.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpIntf.java	2006-06-05 14:54:12 UTC (rev 533)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpIntf.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -61,6 +61,7 @@
  * <li>BwEventAnnotation</li>
  * <li>BwAdminGroup</li>
  * <li>BwPreferences + BwSubscription + BwView</li>
+ * <li>BwCalSuite</li>
  *
  * <li>BwFilter</li>
  * <li>BwRecurrenceInstance</li>
@@ -123,6 +124,13 @@
    */
   public Iterator getCalendars() throws Throwable;
 
+  /** Will return an Iterator returning BwCalSuite objects.
+   *
+   * @return Iterator over entities
+   * @throws Throwable
+   */
+  public Iterator getCalSuites() throws Throwable;
+
   /** Will return an Iterator returning Category objects.
    *
    * @return Iterator over entities

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/HibDump.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/HibDump.java	2006-06-05 14:54:12 UTC (rev 533)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/HibDump.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -42,6 +42,7 @@
 import org.bedework.calfacade.CalFacadeException;
 import org.bedework.calfacade.filter.BwFilter;
 import org.bedework.calfacade.svc.BwAdminGroup;
+import org.bedework.calfacade.svc.BwCalSuite;
 import org.bedework.calfacade.svc.BwPreferences;
 import org.bedework.calfacade.svc.BwSubscription;
 import org.bedework.calfacade.svc.BwView;
@@ -130,6 +131,10 @@
     return sess.getList().iterator();
   }
 
+  public Iterator getCalSuites() throws Throwable {
+    return getObjects(BwCalSuite.class.getName());
+  }
+
   public Iterator getCategories() throws Throwable {
     return getObjects(BwCategory.class.getName());
   }

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java	2006-06-05 14:54:12 UTC (rev 533)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -142,6 +142,11 @@
     new DumpUserPrefs(globals).dumpSection(di.getPreferences());
     di.close();
 
+    info("Dumping calendar suites.");
+    di.open();
+    new DumpCalSuites(globals).dumpSection(di.getCalSuites());
+    di.close();
+
     /*
     info("Dumping lastmods.");
     di.open();

Added: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalSuites.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalSuites.java	                        (rev 0)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalSuites.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -0,0 +1,77 @@
+/*
+ Copyright (c) 2000-2005 University of Washington.  All rights reserved.
+
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+
+   The above copyright notice and this permission notice appear in
+   all copies and supporting documentation;
+
+   The name, identifiers, and trademarks of the University of Washington
+   are not used in advertising or publicity without the express prior
+   written permission of the University of Washington;
+
+   Recipients acknowledge that this distribution is made available as a
+   research courtesy, "as is", potentially with defects, without
+   any obligation on the part of the University of Washington to
+   provide support, services, or repair;
+
+   THE UNIVERSITY OF WASHINGTON DISCLAIMS ALL WARRANTIES, EXPRESS OR
+   IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION
+   ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE UNIVERSITY OF
+   WASHINGTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+   DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+   PROFITS, WHETHER IN AN ACTION OF CONTRACT, TORT (INCLUDING
+   NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF OR IN CONNECTION WITH
+   THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+package org.bedework.dumprestore.dump.dumpling;
+
+import org.bedework.calfacade.svc.BwCalSuite;
+import org.bedework.dumprestore.dump.DumpGlobals;
+
+import java.util.Iterator;
+
+/** Helper classes for the calendar data dump utility.
+ *
+ * @author Mike Douglass   douglm at rpi.edu
+ * @version 1.0
+ */
+public class DumpCalSuites extends Dumpling {
+  /** Constructor
+   *
+   * @param globals
+   */
+  public DumpCalSuites(DumpGlobals globals) {
+    super(globals);
+  }
+
+  /* (non-Javadoc)
+   * @see org.bedework.dumprestore.dump.dumpling.Dumpling#dumpSection(java.util.Iterator)
+   */
+  public void dumpSection(Iterator it) throws Throwable {
+    tagStart(sectionCalSuites);
+
+    while (it.hasNext()) {
+      BwCalSuite cs = (BwCalSuite)it.next();
+
+      dumpCalSuite(cs);
+    }
+
+    tagEnd(sectionCalSuites);
+  }
+
+  private void dumpCalSuite(BwCalSuite cs) throws Throwable {
+    tagStart(objectCalSuite);
+
+    shareableEntityTags(cs);
+
+    taggedVal("name", cs.getName());
+    taggedVal("group", cs.getGroup().getAccount());
+    taggedVal("root-calendar", cs.getRootCalendar().getPath());
+
+    tagEnd(objectCalSuite);
+  }
+}
+

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java	2006-06-05 14:54:12 UTC (rev 533)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -63,8 +63,15 @@
       tagStart(sectionEvents);
     }
 
+    long ct = 0;
+
     while (it.hasNext()) {
       dumpEvent((BwEvent)it.next());
+      ct++;
+
+      if ((ct % 100) == 0) {
+        info("        ... " + ct);
+      }
     }
 
     if (annotations) {

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/HibRestore.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/HibRestore.java	2006-06-05 14:54:12 UTC (rev 533)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/HibRestore.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -74,6 +74,7 @@
 import org.bedework.calfacade.svc.BwAdminGroup;
 import org.bedework.calfacade.svc.BwAdminGroupEntry;
 import org.bedework.calfacade.svc.BwAuthUser;
+import org.bedework.calfacade.svc.BwCalSuite;
 import org.bedework.calfacade.svc.BwPreferences;
 import org.bedework.calfacade.svc.BwSubscription;
 import org.bedework.calfacade.svc.BwView;
@@ -291,6 +292,15 @@
     }
   }
 
+  public BwAdminGroup getAdminGroup(String name) throws Throwable {
+    openHibSess();
+
+    Query q = hibSess.createQuery("from org.bedework.calfacade.svc.BwAdminGroup ag" +
+        " where ag.name=:name");
+    q.setString("name", name);
+    return (BwAdminGroup)q.uniqueResult();
+  }
+
   /* (non-Javadoc)
    * @see org.bedework.dumprestore.restore.RestoreIntf#restoreAuthUser(org.bedework.calfacade.svc.BwAuthUser)
    */
@@ -320,9 +330,7 @@
     }
 
     openHibSess();
-
     hibSave(o);
-
     closeHibSess();
   }
 
@@ -356,6 +364,13 @@
     closeSess();
   }
 
+  public void restoreCalSuite(BwCalSuite o) throws Throwable {
+    openHibSess();
+    hibSave(o);
+    closeHibSess();
+  }
+
+
   /* (non-Javadoc)
    * @see org.bedework.dumprestore.restore.RestoreIntf#restoreLocation(org.bedework.calfacade.BwLocation)
    */

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreIntf.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreIntf.java	2006-06-05 14:54:12 UTC (rev 533)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreIntf.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -68,6 +68,7 @@
 import org.bedework.calfacade.filter.BwFilter;
 import org.bedework.calfacade.svc.BwAdminGroup;
 import org.bedework.calfacade.svc.BwAuthUser;
+import org.bedework.calfacade.svc.BwCalSuite;
 import org.bedework.calfacade.svc.BwPreferences;
 import org.bedework.dumprestore.BwDbLastmod;
 
@@ -152,6 +153,14 @@
    */
   public void restoreAdminGroup(BwAdminGroup o) throws Throwable;
 
+  /** Get an admin group given it's name.
+   *
+   * @param name     String name of the group
+   * @return BwAdminGroup
+   * @throws Throwable
+   */
+  public BwAdminGroup getAdminGroup(String name) throws Throwable;
+
   /** Restore an auth user and preferences
    *
    * @param o   Object to restore with id set
@@ -180,6 +189,13 @@
    */
   public void restoreCategory(BwCategory o) throws Throwable;
 
+  /** Restore calendar suite
+   *
+   * @param o   Object to restore
+   * @throws Throwable
+   */
+  public void restoreCalSuite(BwCalSuite o) throws Throwable;
+
   /** Restore location
    *
    * @param o   Object to restore with id set

Added: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalSuiteFieldRule.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalSuiteFieldRule.java	                        (rev 0)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalSuiteFieldRule.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -0,0 +1,85 @@
+/*
+ Copyright (c) 2000-2005 University of Washington.  All rights reserved.
+
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+
+   The above copyright notice and this permission notice appear in
+   all copies and supporting documentation;
+
+   The name, identifiers, and trademarks of the University of Washington
+   are not used in advertising or publicity without the express prior
+   written permission of the University of Washington;
+
+   Recipients acknowledge that this distribution is made available as a
+   research courtesy, "as is", potentially with defects, without
+   any obligation on the part of the University of Washington to
+   provide support, services, or repair;
+
+   THE UNIVERSITY OF WASHINGTON DISCLAIMS ALL WARRANTIES, EXPRESS OR
+   IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION
+   ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE UNIVERSITY OF
+   WASHINGTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+   DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+   PROFITS, WHETHER IN AN ACTION OF CONTRACT, TORT (INCLUDING
+   NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF OR IN CONNECTION WITH
+   THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+/* **********************************************************************
+    Copyright 2005 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+
+    Redistribution and use of this distribution in source and binary forms,
+    with or without modification, are permitted provided that:
+       The above copyright notice and this permission notice appear in all
+        copies and supporting documentation;
+
+        The name, identifiers, and trademarks of Rensselaer Polytechnic
+        Institute are not used in advertising or publicity without the
+        express prior written permission of Rensselaer Polytechnic Institute;
+
+    DISCLAIMER: The software is distributed" AS IS" without any express or
+    implied warranty, including but not limited to, any implied warranties
+    of merchantability or fitness for a particular purpose or any warrant)'
+    of non-infringement of any current or pending patent rights. The authors
+    of the software make no representations about the suitability of this
+    software for any particular purpose. The entire risk as to the quality
+    and performance of the software is with the user. Should the software
+    prove defective, the user assumes the cost of all necessary servicing,
+    repair or correction. In particular, neither Rensselaer Polytechnic
+    Institute, nor the authors of the software are liable for any indirect,
+    special, consequential, or incidental damages related to the software,
+    to the maximum extent the law permits.
+*/
+package org.bedework.dumprestore.restore.rules;
+
+import org.bedework.calfacade.svc.BwCalSuite;
+import org.bedework.dumprestore.restore.RestoreGlobals;
+
+/**
+ * @author Mike Douglass   douglm at rpi.edu
+ * @version 1.0
+ */
+public class CalSuiteFieldRule extends EntityFieldRule {
+  CalSuiteFieldRule(RestoreGlobals globals) {
+    super(globals);
+  }
+
+  public void field(String name) throws Exception {
+    BwCalSuite ent = (BwCalSuite)top();
+
+    if (shareableEntityTags(ent, name)) {
+      return;
+    }
+
+    if (name.equals("name")) {
+      ent.setName(stringFld());
+    } else if (name.equals("group")) {
+      ent.setGroup(adminGroupFld());
+    } else if (name.equals("root-calendar")) {
+      ent.setRootCalendar(calendarFld());
+    } else {
+      unknownTag(name);
+    }
+  }
+}

Added: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalSuiteRule.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalSuiteRule.java	                        (rev 0)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalSuiteRule.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -0,0 +1,86 @@
+/*
+ Copyright (c) 2000-2005 University of Washington.  All rights reserved.
+
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+
+   The above copyright notice and this permission notice appear in
+   all copies and supporting documentation;
+
+   The name, identifiers, and trademarks of the University of Washington
+   are not used in advertising or publicity without the express prior
+   written permission of the University of Washington;
+
+   Recipients acknowledge that this distribution is made available as a
+   research courtesy, "as is", potentially with defects, without
+   any obligation on the part of the University of Washington to
+   provide support, services, or repair;
+
+   THE UNIVERSITY OF WASHINGTON DISCLAIMS ALL WARRANTIES, EXPRESS OR
+   IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION
+   ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE UNIVERSITY OF
+   WASHINGTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+   DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+   PROFITS, WHETHER IN AN ACTION OF CONTRACT, TORT (INCLUDING
+   NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF OR IN CONNECTION WITH
+   THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+/* **********************************************************************
+    Copyright 2005 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+
+    Redistribution and use of this distribution in source and binary forms,
+    with or without modification, are permitted provided that:
+       The above copyright notice and this permission notice appear in all
+        copies and supporting documentation;
+
+        The name, identifiers, and trademarks of Rensselaer Polytechnic
+        Institute are not used in advertising or publicity without the
+        express prior written permission of Rensselaer Polytechnic Institute;
+
+    DISCLAIMER: The software is distributed" AS IS" without any express or
+    implied warranty, including but not limited to, any implied warranties
+    of merchantability or fitness for a particular purpose or any warrant)'
+    of non-infringement of any current or pending patent rights. The authors
+    of the software make no representations about the suitability of this
+    software for any particular purpose. The entire risk as to the quality
+    and performance of the software is with the user. Should the software
+    prove defective, the user assumes the cost of all necessary servicing,
+    repair or correction. In particular, neither Rensselaer Polytechnic
+    Institute, nor the authors of the software are liable for any indirect,
+    special, consequential, or incidental damages related to the software,
+    to the maximum extent the law permits.
+*/
+package org.bedework.dumprestore.restore.rules;
+
+import org.bedework.calfacade.svc.BwCalSuite;
+import org.bedework.dumprestore.restore.RestoreGlobals;
+
+/**
+ * @author Mike Douglass   douglm at rpi.edu
+ * @version 1.0
+ */
+public class CalSuiteRule extends EntityRule {
+  /** Constructor
+   *
+   * @param globals
+   */
+  public CalSuiteRule(RestoreGlobals globals) {
+    super(globals);
+  }
+
+  public void end(String ns, String name) throws Exception {
+    BwCalSuite entity = (BwCalSuite)pop();
+    globals.calendars++;
+
+    fixSharableEntity(entity, "CalSuite");
+
+    try {
+      if (globals.rintf != null) {
+        globals.rintf.restoreCalSuite(entity);
+      }
+    } catch (Throwable t) {
+      throw new Exception(t);
+    }
+  }
+}

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java	2006-06-05 14:54:12 UTC (rev 533)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -67,6 +67,7 @@
 import org.bedework.calfacade.base.BwShareableContainedDbentity;
 import org.bedework.calfacade.base.BwShareableDbentity;
 import org.bedework.calfacade.filter.BwFilter;
+import org.bedework.calfacade.svc.BwAdminGroup;
 import org.bedework.dumprestore.restore.RestoreGlobals;
 
 import java.sql.Timestamp;
@@ -418,6 +419,21 @@
     return category;
   }
 
+  protected BwAdminGroup adminGroupFld() throws Exception {
+    if (fldval == null) {
+      throw new Exception("No value for " + tagName);
+    }
+
+    try {
+      return globals.rintf.getAdminGroup(fldval);
+    } catch (Throwable t) {
+      if (t instanceof Exception) {
+        throw (Exception)t;
+      }
+      throw new Exception(t);
+    }
+  }
+
   protected BwCalendar calendarFld() throws Exception {
     if (fldval == null) {
       throw new Exception("No value for " + tagName);

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityRule.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityRule.java	2006-06-05 14:54:12 UTC (rev 533)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityRule.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -77,6 +77,7 @@
 import org.bedework.calfacade.filter.BwSponsorFilter;
 import org.bedework.calfacade.svc.BwAdminGroup;
 import org.bedework.calfacade.svc.BwAuthUser;
+import org.bedework.calfacade.svc.BwCalSuite;
 import org.bedework.calfacade.svc.BwPreferences;
 import org.bedework.dumprestore.BwDbLastmod;
 import org.bedework.dumprestore.restore.RestoreGlobals;
@@ -111,6 +112,7 @@
     classes.put("user", BwUser.class.getName());
     classes.put("timezone", BwTimeZone.class.getName());
     classes.put("calendar", BwCalendar.class.getName());
+    classes.put("cal-suite", BwCalSuite.class.getName());
     classes.put("location", BwLocation.class.getName());
     classes.put("sponsor", BwSponsor.class.getName());
     classes.put("organizer", BwOrganizer.class.getName());

Modified: trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/RestoreRuleSet.java
===================================================================
--- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/RestoreRuleSet.java	2006-06-05 14:54:12 UTC (rev 533)
+++ trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/RestoreRuleSet.java	2006-06-05 19:39:07 UTC (rev 534)
@@ -91,6 +91,9 @@
     d.addRule("caldata/calendars/calendar", new CalendarRule(globals));
     d.addRule("caldata/calendars/calendar/*", new CalendarFieldRule(globals));
 
+    d.addRule("caldata/cal-suites/cal-suite", new CalSuiteRule(globals));
+    d.addRule("caldata/cal-suites/cal-suite/*", new CalSuiteFieldRule(globals));
+
     d.addRule("caldata/locations/location", new LocationRule(globals));
     d.addRule("caldata/locations/location/*", new LocationFieldRule(globals));
 



More information about the Bedework-commit mailing list