[Bedework-commit] dumprestore r226 - in
trunk/src/org/bedework/dumprestore: dump/dumpling restore/rules
svnadmin at bedework.org
svnadmin at bedework.org
Thu Aug 28 10:49:31 EDT 2008
Author: douglm
Date: 2008-08-28 10:49:30 -0400 (Thu, 28 Aug 2008)
New Revision: 226
Removed:
trunk/src/org/bedework/dumprestore/dump/dumpling/DumpUsers.java
Modified:
trunk/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java
trunk/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java
trunk/src/org/bedework/dumprestore/dump/dumpling/Dumpling.java
trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java
Log:
New dump code for users
Modified: trunk/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java
===================================================================
--- trunk/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java 2008-08-27 19:43:06 UTC (rev 225)
+++ trunk/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java 2008-08-28 14:49:30 UTC (rev 226)
@@ -30,6 +30,7 @@
import org.bedework.calfacade.BwSystem;
import org.bedework.calfacade.BwTimeZone;
+import org.bedework.calfacade.BwUser;
import org.bedework.dumprestore.dump.DumpGlobals;
import java.util.Iterator;
@@ -65,7 +66,9 @@
info("Dumping users.");
open();
- new DumpUsers(globals).dumpSection(globals.di.getUsers());
+ new Dumpling<BwUser>(globals,
+ new QName(sectionUsers),
+ globals.users).dumpSection(globals.di.getUsers());
close();
info("Dumping timezones.");
Modified: trunk/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java
===================================================================
--- trunk/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java 2008-08-27 19:43:06 UTC (rev 225)
+++ trunk/src/org/bedework/dumprestore/dump/dumpling/DumpEvents.java 2008-08-28 14:49:30 UTC (rev 226)
@@ -82,11 +82,11 @@
EventInfo ei = (EventInfo)it.next();
dumpEvent(ei);
+ globals.counts[countIndex]++;
+
if ((globals.counts[countIndex] % 100) == 0) {
info(" ... " + globals.counts[countIndex]);
}
-
- globals.counts[countIndex]++;
}
tagEnd(sectionTag);
Deleted: trunk/src/org/bedework/dumprestore/dump/dumpling/DumpUsers.java
===================================================================
--- trunk/src/org/bedework/dumprestore/dump/dumpling/DumpUsers.java 2008-08-27 19:43:06 UTC (rev 225)
+++ trunk/src/org/bedework/dumprestore/dump/dumpling/DumpUsers.java 2008-08-28 14:49:30 UTC (rev 226)
@@ -1,78 +0,0 @@
-/*
- 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.BwUser;
-import org.bedework.dumprestore.dump.DumpGlobals;
-
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-/** Helper classes for the calendar data dump utility.
- *
- * @author Mike Douglass
- * @version 1.0
- */
-public class DumpUsers extends Dumpling {
- /** Constructor
- *
- * @param globals
- */
- public DumpUsers(DumpGlobals globals) {
- super(globals, new QName(sectionUsers), globals.users);
- }
-
- /* (non-Javadoc)
- * @see org.bedework.dumprestore.dump.dumpling.Dumpling#dumpSection(java.util.Iterator)
- */
- public void dumpSection(Iterator it) throws Throwable {
- tagStart(sectionTag);
-
- while (it.hasNext()) {
- BwUser u = (BwUser)it.next();
-
- dumpUser(u);
-
- globals.counts[countIndex]++;
- }
-
- tagEnd(sectionTag);
- }
-
- private void dumpUser(BwUser u) throws Throwable {
- tagStart(objectUser);
-
- principalTags(u);
- taggedVal("instanceOwner", u.getInstanceOwner());
- taggedVal("quota", u.getQuota());
-
- tagEnd(objectUser);
- }
-}
Modified: trunk/src/org/bedework/dumprestore/dump/dumpling/Dumpling.java
===================================================================
--- trunk/src/org/bedework/dumprestore/dump/dumpling/Dumpling.java 2008-08-27 19:43:06 UTC (rev 225)
+++ trunk/src/org/bedework/dumprestore/dump/dumpling/Dumpling.java 2008-08-28 14:49:30 UTC (rev 226)
@@ -122,6 +122,10 @@
d.dump(globals.xml, DumpType.def);
globals.counts[countIndex]++;
+
+ if ((globals.counts[countIndex] % 100) == 0) {
+ info(" ... " + globals.counts[countIndex]);
+ }
}
tagEnd(sectionTag);
Modified: trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java 2008-08-27 19:43:06 UTC (rev 225)
+++ trunk/src/org/bedework/dumprestore/restore/rules/EntityFieldRule.java 2008-08-28 14:49:30 UTC (rev 226)
@@ -147,21 +147,36 @@
return true;
}
- if (name.equals("category-access")) {
+ if (name.equals("category-access")) { // PRE3.5
entity.setCategoryAccess(stringFld());
return true;
}
- if (name.equals("location-access")) {
+ if (name.equals("location-access")) { // PRE3.5
entity.setLocationAccess(stringFld());
return true;
}
- if (name.equals("contact-access")) {
+ if (name.equals("contact-access")) { // PRE3.5
entity.setContactAccess(stringFld());
return true;
}
+ if (name.equals("categoryAccess")) {
+ entity.setCategoryAccess(stringFld());
+ return true;
+ }
+
+ if (name.equals("locationAccess")) {
+ entity.setLocationAccess(stringFld());
+ return true;
+ }
+
+ if (name.equals("contactAccess")) {
+ entity.setContactAccess(stringFld());
+ return true;
+ }
+
return false;
}
More information about the Bedework-commit
mailing list