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

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-14 10:21:12 -0500 (Mon, 14 Feb 2011)
New Revision: 401

Modified:
   trunk/src/org/bedework/dumprestore/dump/Dump.java
   trunk/src/org/bedework/dumprestore/restore/Restore.java
   trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java
   trunk/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java
Log:
Further changes to the build. Attempt to catch changed libraries and force a rebuild.

Also use outofdate to suppress running of apt when sources have not changed.

Minor but widespread change to remove debug parameter from a number of classes. For those debugging now depends on log4j level.

Modified: trunk/src/org/bedework/dumprestore/dump/Dump.java
===================================================================
--- trunk/src/org/bedework/dumprestore/dump/Dump.java	2011-01-10 20:12:36 UTC (rev 400)
+++ trunk/src/org/bedework/dumprestore/dump/Dump.java	2011-02-14 15:21:12 UTC (rev 401)
@@ -187,7 +187,7 @@
       throw new Exception("Invalid args");
     }
 
-    globals.init((DumpRestoreConfig)CalOptionsFactory.getOptions(false).getAppProperty(appName));
+    globals.init((DumpRestoreConfig)CalOptionsFactory.getOptions().getAppProperty(appName));
   }
 
   protected Logger getLog() {

Modified: trunk/src/org/bedework/dumprestore/restore/Restore.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/Restore.java	2011-01-10 20:12:36 UTC (rev 400)
+++ trunk/src/org/bedework/dumprestore/restore/Restore.java	2011-02-14 15:21:12 UTC (rev 401)
@@ -432,7 +432,7 @@
       throw new Exception("Invalid args");
     }
 
-    OptionsI opts = CalOptionsFactory.getOptions(false);
+    OptionsI opts = CalOptionsFactory.getOptions();
 
     globals.init((DumpRestoreConfig)opts.getAppProperty(appName));
     if (initSyspars || globals.config.getInitSyspars()) {

Modified: trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java	2011-01-10 20:12:36 UTC (rev 400)
+++ trunk/src/org/bedework/dumprestore/restore/RestoreGlobals.java	2011-02-14 15:21:12 UTC (rev 401)
@@ -452,7 +452,7 @@
       return;
     }
 
-    String tzserverUri = CalOptionsFactory.getOptions(false).
+    String tzserverUri = CalOptionsFactory.getOptions().
                      getGlobalStringProperty("timezonesUri");
 
     if (tzserverUri == null) {
@@ -710,7 +710,7 @@
       return;
     }
 
-    SystemRoots sysRoots = (SystemRoots)CalOptionsFactory.getOptions(false).getGlobalProperty("systemRoots");
+    SystemRoots sysRoots = (SystemRoots)CalOptionsFactory.getOptions().getGlobalProperty("systemRoots");
 
     principalRoot = setRoot(sysRoots.getPrincipalRoot());
     userPrincipalRoot = setRoot(sysRoots.getUserPrincipalRoot());

Modified: trunk/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java	2011-01-10 20:12:36 UTC (rev 400)
+++ trunk/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java	2011-02-14 15:21:12 UTC (rev 401)
@@ -356,7 +356,7 @@
     cal.setPath(path);
 
     if (adminGroupPrefix == null) {
-      adminGroupPrefix = CalOptionsFactory.getOptions(false).getGlobalStringProperty("adminGroupsIdPrefix");
+      adminGroupPrefix = CalOptionsFactory.getOptions().getGlobalStringProperty("adminGroupsIdPrefix");
 
       if (adminGroupPrefix == null) {
         error("Unable to retrieve property admingroupsidprefix");