[Bedework-commit] dumprestore r248 - in trunk/src/org/bedework/dumprestore: dump restore restore/rules

[svnadmin at bedework.org]

Author: douglm
Date: 2008-11-14 01:39:24 -0500 (Fri, 14 Nov 2008)
New Revision: 248

Modified:
   trunk/src/org/bedework/dumprestore/dump/Dump.java
   trunk/src/org/bedework/dumprestore/restore/Restore.java
   trunk/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java
Log:
1. Move options classes into rpiutil to make them availabkle to other packages.

2. Make changes to the WebDAV classes to facilitate building of extra WebDAV based services (such as CardDAV)

Modified: trunk/src/org/bedework/dumprestore/dump/Dump.java
===================================================================
--- trunk/src/org/bedework/dumprestore/dump/Dump.java	2008-11-13 04:55:21 UTC (rev 247)
+++ trunk/src/org/bedework/dumprestore/dump/Dump.java	2008-11-14 06:39:24 UTC (rev 248)
@@ -46,11 +46,6 @@
 public class Dump implements Defs {
   private transient Logger log;
 
-  /* Properties can be supplied via the command line or via a the properties
-   * file with the prefix propertyPrefix + appName + "."
-   */
-  private String appPrefix = "org.bedework.app.";
-
   private String appName;
 
   /* Runtime arg -f Where we dump to.
@@ -149,7 +144,7 @@
       throw new Exception("Invalid args");
     }
 
-    globals.init((DumpRestoreConfig)CalOptionsFactory.getOptions(appPrefix, false).getAppProperty(appName));
+    globals.init((DumpRestoreConfig)CalOptionsFactory.getOptions(false).getAppProperty(appName));
   }
 
   protected Logger getLog() {

Modified: trunk/src/org/bedework/dumprestore/restore/Restore.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/Restore.java	2008-11-13 04:55:21 UTC (rev 247)
+++ trunk/src/org/bedework/dumprestore/restore/Restore.java	2008-11-14 06:39:24 UTC (rev 248)
@@ -28,10 +28,11 @@
 import org.bedework.calfacade.configs.DumpRestoreConfig;
 import org.bedework.calfacade.BwSystem;
 import org.bedework.calfacade.env.CalOptionsFactory;
-import org.bedework.calfacade.env.CalOptionsI;
 import org.bedework.dumprestore.Defs;
 import org.bedework.dumprestore.restore.rules.RestoreRuleSet;
 
+import edu.rpi.sss.util.OptionsI;
+
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 
@@ -49,11 +50,6 @@
 public class Restore implements Defs {
   private transient Logger log;
 
-  /* Properties can be supplied via the command line or via a the properties
-   * file with the prefix propertyPrefix + appName + "."
-   */
-  private String appPrefix = "org.bedework.app.";
-
   private String appName;
 
   /* File we restore from */
@@ -230,7 +226,7 @@
       throw new Exception("Invalid args");
     }
 
-    CalOptionsI opts = CalOptionsFactory.getOptions(appPrefix, false);
+    OptionsI opts = CalOptionsFactory.getOptions(false);
 
     globals.init((DumpRestoreConfig)opts.getAppProperty(appName));
     if (initSyspars ||

Modified: trunk/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java	2008-11-13 04:55:21 UTC (rev 247)
+++ trunk/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java	2008-11-14 06:39:24 UTC (rev 248)
@@ -353,8 +353,7 @@
     cal.setPath(path);
 
     if (adminGroupPrefix == null) {
-      adminGroupPrefix = CalOptionsFactory.getOptions(null,
-                                                      false).getGlobalStringProperty("adminGroupsIdPrefix");
+      adminGroupPrefix = CalOptionsFactory.getOptions(false).getGlobalStringProperty("adminGroupsIdPrefix");
 
       if (adminGroupPrefix == null) {
         error("Unable to retrieve property admingroupsidprefix");