Changeset 568

Timestamp:

06/09/06 16:50:37

Author:

douglm

Message:

Change processing of the onlyusers restore option and add use to the dump/restore script

Files:

• trunk/calendar3/deployment/dumprestore/shellscr/resources/dumpres.sh (modified) (1 diff)
• trunk/calendar3/dumprestore/build.xml (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/HibRestore.java (modified) (20 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/OnlyUsersMap.java (added)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreGlobals.java (modified) (1 diff)

trunk/calendar3/deployment/dumprestore/shellscr/resources/dumpres.sh

@@ -23 +23 @@
-    echo $RESTORECMD -appname $APPNAME -f $2 $3 $4 $5 $6 $7 $8 $9
-    $RESTORECMD -appname $APPNAME -f $2 $3 $4 $5 $6 $7 $8 $9
+    ;;
+  restore-for-quickstart)
+    echo $RESTORECMD -appname $APPNAME -onlyusers "public-user,caladmin,douglm,agrp_*" -f $2 $3 $4 $5 $6 $7 $8 $9
+    $RESTORECMD -appname $APPNAME -onlyusers "public-user,caladmin,douglm,agrp_*" -f $2 $3 $4 $5 $6 $7 $8 $9
-    ;;
-  backup)

trunk/calendar3/dumprestore/build.xml

@@ -103 +103 @@
-          description="Run bedework db restore app to initialise db">
-    <property name="org.bedework.onlyusers"
-cct,agrp_arc,agrp_Admissions,agrp_HSS,agrp_IACS,agrp_Arch,agrp_OoC,agrp_MANE,agrp_health,agrp_ccc,agrp_hr,agrp_physics,agrp_advance,agrp_provost,agrp_empac,agrp_it,agrp_soe,agrp_lally,agrp_CogSci,agrp_alum,agrp_parking,agrp_Athletics,agrp_construct,agrp_union,agrp_Library,agrp_chemistry,agrp_ItOps,agrp_Arts,agrp_President,agrp_facilities,agrp_CDC,agrp_fye,agrp_ECSE,agrp_NetTel,agrp_Math,agrp_dses,agrp_compsci,agrp_Economics,agrp_govrel,agrp_CHME,agrp_Bookstore,agrp_mse,agrp_Diversity,agrp_OriginsOfLife,agrp_doso,agrp_CEE,agrp_SoS,agrp_CreditUnion,agrp_ResLife,agrp_Purchasing,agrp_LRC,agrp_STS,agrp_ComputerStore,agrp_catering,agrp_CIUE,agrp_Biology,agrp_PublicSafety,agrp_UnionClubs,agrp_cpfd,agrp_FYS,agrp_SRFS,agrp_EES,agrp_ALAC,agrp_SCOREC,agrp_CFES,agrp_CATS,agrp_LLC,agrp_Archer,agrp_OMSA,agrp_Nanotech,agrp_BioMed,agrp_CBIS
+*
-    <antcall target="restoredb" inheritrefs="true" />
-  </target>

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/HibRestore.java

@@ -182 +182 @@
-   */
-  public void restoreUser(BwUser o) throws Throwable {
-
-
+
-      return;
-    }
@@ -206 +205 @@
-   */
-  public void restoreUserInfo(BwUserInfo o) throws Throwable {
-
-
+
-      return;
-    }
@@ -219 +217 @@
-
-  public void restoreTimezone(BwTimeZone o) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -253 +251 @@
-    }
-
-
-
-
-
+
+
-    }
-
@@ -272 +268 @@
-      BwPrincipal pr = (BwPrincipal)it.next();
-
-
-
-
+
-        continue;
-      }
@@ -306 +300 @@
-   */
-  public void restoreAuthUser(BwAuthUser o) throws Throwable {
-
-
+
-      return;
-    }
@@ -326 +319 @@
-   */
-  public void restoreEvent(BwEvent o) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -339 +332 @@
-   */
-  public void update(BwEvent o) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -354 +347 @@
-   */
-  public void restoreCategory(BwCategory o) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -376 +369 @@
-   */
-  public Integer restoreLocation(BwLocation o) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return null;
-    }
@@ -405 +398 @@
-
-  public Integer restoreSponsor(BwSponsor o) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return null;
-    }
@@ -453 +446 @@
-
-  public void restoreUserPrefs(BwPreferences o) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -485 +478 @@
-
-  public void restoreAlarm(BwAlarm o) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -497 +490 @@
-
-  public void update(BwUser user) throws Throwable {
-
-
+
-      return;
-    }
@@ -554 +546 @@
-   */
-  public void restoreCalendars(BwCalendar o) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -579 +571 @@
-
-  public void saveRootCalendar(BwCalendar val) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -600 +592 @@
-   */
-  public void addCalendar(BwCalendar o) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -623 +615 @@
-
-  private void restoreCalendars(BwCalendar val, Connection conn) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -649 +641 @@
-   */
-  private void restoreCalendar(BwCalendar val, Connection conn) throws Throwable {
-checkOnlyUser
+globals.onlyUsersMap.check
-      return;
-    }
@@ -779 +771 @@
-  }*/
-
-  private boolean checkOnlyUser(BwOwnedDbentity ent) {
-    if (!globals.onlyUsers) {
-      return true;
-    }
-
-    if (globals.onlyUsersMap.get(ent.getOwner().getAccount()) == null) {
-      return false;
-    }
-
-    return true;
-  }
-
-  private boolean checkOnlyUser(BwShareableDbentity ent) {
-    if (!globals.onlyUsers) {
-      return true;
-    }
-
-    if (globals.onlyUsersMap.get(ent.getOwner().getAccount()) == null) {
-      return false;
-    }
-
-    if (globals.onlyUsersMap.get(ent.getCreator().getAccount()) == null) {
-      ent.setCreator(ent.getOwner());
-    }
-
-    return true;
-  }
-
-  private String boolVal(boolean val) {
-    if (val) {

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java

@@ -323 +323 @@
-          // means ignore this par
-        } else {
- = true
+Map.setOnlyUsers(true)
-          String[] users = args[i].split(",");
-          for (int oui = 0; oui < users.length; oui++) {
-
-
+
+
+
+
-          }
-        }

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreGlobals.java

@@ -223 +223 @@
-  public int alarms;
-
-
-
-
-
-
-
-
+
+
-
-  // 3.0