[Bedework-commit] dumprestore r405 - in trunk/src/org/bedework/dumprestore: dump dump/dumpling restore

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-22 13:27:38 -0500 (Tue, 22 Feb 2011)
New Revision: 405

Modified:
   trunk/src/org/bedework/dumprestore/dump/DumpIntf.java
   trunk/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java
   trunk/src/org/bedework/dumprestore/restore/IndexerMap.java
Log:
Changes to introduce bwxml project - all xml schemas now located in this project built separately.

Other projects with a dependency now build this project.

Also fixed a few java warnings that surfaced from the noise.

Added an updateall action to bw

Modified: trunk/src/org/bedework/dumprestore/dump/DumpIntf.java
===================================================================
--- trunk/src/org/bedework/dumprestore/dump/DumpIntf.java	2011-02-14 20:59:03 UTC (rev 404)
+++ trunk/src/org/bedework/dumprestore/dump/DumpIntf.java	2011-02-22 18:27:38 UTC (rev 405)
@@ -26,8 +26,18 @@
 package org.bedework.dumprestore.dump;
 
 import org.bedework.calfacade.BwCalendar;
+import org.bedework.calfacade.BwCategory;
+import org.bedework.calfacade.BwContact;
 import org.bedework.calfacade.BwEvent;
 import org.bedework.calfacade.BwEventAnnotation;
+import org.bedework.calfacade.BwFilterDef;
+import org.bedework.calfacade.BwLocation;
+import org.bedework.calfacade.BwSystem;
+import org.bedework.calfacade.BwUser;
+import org.bedework.calfacade.svc.BwAdminGroup;
+import org.bedework.calfacade.svc.BwAuthUser;
+import org.bedework.calfacade.svc.BwCalSuite;
+import org.bedework.calfacade.svc.prefs.BwPreferences;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -93,7 +103,7 @@
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getAdminGroups() throws Throwable;
+  public Iterator<BwAdminGroup> getAdminGroups() throws Throwable;
 
   /** Will return an Iterator returning AuthUser objects. Preferences will
    * be attached - user objects will also be attached.
@@ -101,14 +111,14 @@
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getAuthUsers() throws Throwable;
+  public Iterator<BwAuthUser> getAuthUsers() throws Throwable;
 
   /** Will return an Iterator returning the top level BwCalendar objects.
    *
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getCalendars() throws Throwable;
+  public Iterator<BwCalendar> getCalendars() throws Throwable;
 
   /**
    * @param val
@@ -122,14 +132,14 @@
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getCalSuites() throws Throwable;
+  public Iterator<BwCalSuite> getCalSuites() throws Throwable;
 
   /** Will return an Iterator returning Category objects.
    *
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getCategories() throws Throwable;
+  public Iterator<BwCategory> getCategories() throws Throwable;
 
   /** Will return an Iterator returning BwEvent objects.
    * All relevent objects, categories, locations, sponsors, creators will
@@ -156,35 +166,35 @@
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getFilters() throws Throwable;
+  public Iterator<BwFilterDef> getFilters() throws Throwable;
 
   /** Will return an Iterator returning Location objects.
    *
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getLocations() throws Throwable;
+  public Iterator<BwLocation> getLocations() throws Throwable;
 
   /** Will return an Iterator returning BwPreferences objects.
    *
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getPreferences() throws Throwable;
+  public Iterator<BwPreferences> getPreferences() throws Throwable;
 
   /** Will return an Iterator returning BwContact objects.
    *
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getContacts() throws Throwable;
+  public Iterator<BwContact> getContacts() throws Throwable;
 
   /** Will return an Iterator returning system parameter objects.
    *
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getSyspars() throws Throwable;
+  public Iterator<BwSystem> getSyspars() throws Throwable;
 
   /** Will return an Iterator returning User objects.
    * Subscriptions will be included
@@ -192,7 +202,7 @@
    * @return Iterator over entities
    * @throws Throwable
    */
-  public Iterator getUsers() throws Throwable;
+  public Iterator<BwUser> getUsers() throws Throwable;
 
   /** Will return an Iterator returning view objects.
    *

Modified: trunk/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java
===================================================================
--- trunk/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java	2011-02-14 20:59:03 UTC (rev 404)
+++ trunk/src/org/bedework/dumprestore/dump/dumpling/DumpAll.java	2011-02-22 18:27:38 UTC (rev 405)
@@ -57,14 +57,15 @@
    *
    * @param globals
    */
-  public DumpAll(DumpGlobals globals) {
+  public DumpAll(final DumpGlobals globals) {
     super(globals, new QName(dumpTag), -1);
   }
 
   /* (non-Javadoc)
    * @see org.bedework.dumprestore.dump.dumpling.Dumpling#dumpSection(java.util.Iterator)
    */
-  public void dumpSection(Iterator it) throws Throwable {
+  @Override
+  public void dumpSection(final Iterator it) throws Throwable {
     tagStart(sectionTag);
     globals.xml.property(new QName(majorVersionTag),
                          String.valueOf(BwVersion.bedeworkMajorVersion));
@@ -150,7 +151,7 @@
     open();
     new Dumpling<BwAdminGroup>(globals,
                                new QName(sectionAdminGroups),
-                              globals.filters).dumpSection(globals.di.getAdminGroups());
+                               globals.filters).dumpSection(globals.di.getAdminGroups());
     close();
 
     open();

Modified: trunk/src/org/bedework/dumprestore/restore/IndexerMap.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/IndexerMap.java	2011-02-14 20:59:03 UTC (rev 404)
+++ trunk/src/org/bedework/dumprestore/restore/IndexerMap.java	2011-02-22 18:27:38 UTC (rev 405)
@@ -43,22 +43,19 @@
 
   private static class Indexer {
     BwIndexer idx;
-    int batchCt;
+    //int batchCt;
   }
 
   private HashMap<String, Indexer> map = new HashMap<String, Indexer>();
-  private boolean debug;
   private BwSystem syspars;
 
   /** Constructor.
    *
    * @param syspars
-   * @param debug
    */
   public IndexerMap(final BwSystem syspars) {
     super();
     this.syspars = syspars;
-    debug = debug;
   }
 
   /**