Changeset 534
- Timestamp:
- 06/05/06 15:39:07
- Files:
-
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/Defs.java (modified) (2 diffs)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpIntf.java (modified) (2 diffs)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/HibDump.java (modified) (2 diffs)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java (modified) (1 diff)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpCalSuites.java (added)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java (modified) (1 diff)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/HibRestore.java (modified) (4 diffs)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreIntf.java (modified) (3 diffs)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalSuiteFieldRule.java (added)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalSuiteRule.java (added)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java (modified) (2 diffs)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityRule.java (modified) (2 diffs)
- trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/RestoreRuleSet.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/dumprestore/src/org/bedework/dumprestore/Defs.java
r218 r534 122 122 /** */ 123 123 public static final String sectionDbLastmods = "dblastmods"; 124 /** */ 125 public static final String sectionCalSuites = "cal-suites"; 124 126 125 127 /* ==================================================================== … … 185 187 public static final String objectUserPrefs = "user-prefs"; 186 188 /** */ 189 public static final String objectCalSuite = "cal-suite"; 190 /** */ 187 191 public static final String objectDbLastmod = "dblastmod"; 188 192 } trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpIntf.java
r218 r534 62 62 * <li>BwAdminGroup</li> 63 63 * <li>BwPreferences + BwSubscription + BwView</li> 64 * <li>BwCalSuite</li> 64 65 * 65 66 * <li>BwFilter</li> … … 124 125 public Iterator getCalendars() throws Throwable; 125 126 127 /** Will return an Iterator returning BwCalSuite objects. 128 * 129 * @return Iterator over entities 130 * @throws Throwable 131 */ 132 public Iterator getCalSuites() throws Throwable; 133 126 134 /** Will return an Iterator returning Category objects. 127 135 * trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/HibDump.java
r241 r534 43 43 import org.bedework.calfacade.filter.BwFilter; 44 44 import org.bedework.calfacade.svc.BwAdminGroup; 45 import org.bedework.calfacade.svc.BwCalSuite; 45 46 import org.bedework.calfacade.svc.BwPreferences; 46 47 import org.bedework.calfacade.svc.BwSubscription; … … 131 132 } 132 133 134 public Iterator getCalSuites() throws Throwable { 135 return getObjects(BwCalSuite.class.getName()); 136 } 137 133 138 public Iterator getCategories() throws Throwable { 134 139 return getObjects(BwCategory.class.getName()); trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java
r243 r534 143 143 di.close(); 144 144 145 info("Dumping calendar suites."); 146 di.open(); 147 new DumpCalSuites(globals).dumpSection(di.getCalSuites()); 148 di.close(); 149 145 150 /* 146 151 info("Dumping lastmods."); trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java
r463 r534 64 64 } 65 65 66 long ct = 0; 67 66 68 while (it.hasNext()) { 67 69 dumpEvent((BwEvent)it.next()); 70 ct++; 71 72 if ((ct % 100) == 0) { 73 info(" ... " + ct); 74 } 68 75 } 69 76 trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/HibRestore.java
r463 r534 75 75 import org.bedework.calfacade.svc.BwAdminGroupEntry; 76 76 import org.bedework.calfacade.svc.BwAuthUser; 77 import org.bedework.calfacade.svc.BwCalSuite; 77 78 import org.bedework.calfacade.svc.BwPreferences; 78 79 import org.bedework.calfacade.svc.BwSubscription; … … 292 293 } 293 294 295 public BwAdminGroup getAdminGroup(String name) throws Throwable { 296 openHibSess(); 297 298 Query q = hibSess.createQuery("from org.bedework.calfacade.svc.BwAdminGroup ag" + 299 " where ag.name=:name"); 300 q.setString("name", name); 301 return (BwAdminGroup)q.uniqueResult(); 302 } 303 294 304 /* (non-Javadoc) 295 305 * @see org.bedework.dumprestore.restore.RestoreIntf#restoreAuthUser(org.bedework.calfacade.svc.BwAuthUser) … … 321 331 322 332 openHibSess(); 323 324 333 hibSave(o); 325 326 334 closeHibSess(); 327 335 } … … 356 364 closeSess(); 357 365 } 366 367 public void restoreCalSuite(BwCalSuite o) throws Throwable { 368 openHibSess(); 369 hibSave(o); 370 closeHibSess(); 371 } 372 358 373 359 374 /* (non-Javadoc) trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreIntf.java
r463 r534 69 69 import org.bedework.calfacade.svc.BwAdminGroup; 70 70 import org.bedework.calfacade.svc.BwAuthUser; 71 import org.bedework.calfacade.svc.BwCalSuite; 71 72 import org.bedework.calfacade.svc.BwPreferences; 72 73 import org.bedework.dumprestore.BwDbLastmod; … … 153 154 public void restoreAdminGroup(BwAdminGroup o) throws Throwable; 154 155 156 /** Get an admin group given it's name. 157 * 158 * @param name String name of the group 159 * @return BwAdminGroup 160 * @throws Throwable 161 */ 162 public BwAdminGroup getAdminGroup(String name) throws Throwable; 163 155 164 /** Restore an auth user and preferences 156 165 * … … 180 189 */ 181 190 public void restoreCategory(BwCategory o) throws Throwable; 191 192 /** Restore calendar suite 193 * 194 * @param o Object to restore 195 * @throws Throwable 196 */ 197 public void restoreCalSuite(BwCalSuite o) throws Throwable; 182 198 183 199 /** Restore location trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java
r464 r534 68 68 import org.bedework.calfacade.base.BwShareableDbentity; 69 69 import org.bedework.calfacade.filter.BwFilter; 70 import org.bedework.calfacade.svc.BwAdminGroup; 70 71 import org.bedework.dumprestore.restore.RestoreGlobals; 71 72 … … 419 420 } 420 421 422 protected BwAdminGroup adminGroupFld() throws Exception { 423 if (fldval == null) { 424 throw new Exception("No value for " + tagName); 425 } 426 427 try { 428 return globals.rintf.getAdminGroup(fldval); 429 } catch (Throwable t) { 430 if (t instanceof Exception) { 431 throw (Exception)t; 432 } 433 throw new Exception(t); 434 } 435 } 436 421 437 protected BwCalendar calendarFld() throws Exception { 422 438 if (fldval == null) { trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/EntityRule.java
r463 r534 78 78 import org.bedework.calfacade.svc.BwAdminGroup; 79 79 import org.bedework.calfacade.svc.BwAuthUser; 80 import org.bedework.calfacade.svc.BwCalSuite; 80 81 import org.bedework.calfacade.svc.BwPreferences; 81 82 import org.bedework.dumprestore.BwDbLastmod; … … 112 113 classes.put("timezone", BwTimeZone.class.getName()); 113 114 classes.put("calendar", BwCalendar.class.getName()); 115 classes.put("cal-suite", BwCalSuite.class.getName()); 114 116 classes.put("location", BwLocation.class.getName()); 115 117 classes.put("sponsor", BwSponsor.class.getName()); trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/RestoreRuleSet.java
r464 r534 92 92 d.addRule("caldata/calendars/calendar/*", new CalendarFieldRule(globals)); 93 93 94 d.addRule("caldata/cal-suites/cal-suite", new CalSuiteRule(globals)); 95 d.addRule("caldata/cal-suites/cal-suite/*", new CalSuiteFieldRule(globals)); 96 94 97 d.addRule("caldata/locations/location", new LocationRule(globals)); 95 98 d.addRule("caldata/locations/location/*", new LocationFieldRule(globals));
