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

[svnadmin at bedework.org]

Author: douglm
Date: 2008-07-07 10:29:10 -0400 (Mon, 07 Jul 2008)
New Revision: 215

Modified:
   trunk/src/org/bedework/dumprestore/dump/dumpling/DumpCalendars.java
   trunk/src/org/bedework/dumprestore/restore/rules/CalendarFieldRule.java
Log:
Changes to avoid source of StaleStateExceptions from hibernate.

Move collection lastmod out of the BwCalendar class into a separate table and class BwLastMod (and BwCollectionLastmod.

Update touchCalendar to only update the lastmod object.


Modified: trunk/src/org/bedework/dumprestore/dump/dumpling/DumpCalendars.java
===================================================================
--- trunk/src/org/bedework/dumprestore/dump/dumpling/DumpCalendars.java	2008-07-02 17:32:47 UTC (rev 214)
+++ trunk/src/org/bedework/dumprestore/dump/dumpling/DumpCalendars.java	2008-07-07 14:29:10 UTC (rev 215)
@@ -81,8 +81,8 @@
     taggedVal("mailListId", val.getMailListId());
     taggedVal("calType", val.getCalType());
     taggedVal("created", val.getCreated());
-    taggedVal("lastmod", val.getLastmod());
-    taggedVal("sequence", val.getSequence());
+    taggedVal("lastmod", val.getLastmod().getTimestamp());
+    taggedVal("sequence", val.getLastmod().getSequence());
 
     tagEnd(objectCalendar);
 

Modified: trunk/src/org/bedework/dumprestore/restore/rules/CalendarFieldRule.java
===================================================================
--- trunk/src/org/bedework/dumprestore/restore/rules/CalendarFieldRule.java	2008-07-02 17:32:47 UTC (rev 214)
+++ trunk/src/org/bedework/dumprestore/restore/rules/CalendarFieldRule.java	2008-07-07 14:29:10 UTC (rev 215)
@@ -87,9 +87,9 @@
     } else if (name.equals("created")) {
       ent.setCreated(stringFld());
     } else if (name.equals("lastmod")) {
-      ent.setLastmod(stringFld());
+      ent.getLastmod().setTimestamp(stringFld());
     } else if (name.equals("sequence")) {
-      ent.setSequence(intFld());
+      ent.getLastmod().setSequence(intFld());
 
     } else if (name.equals("calendarCollection")) {  // pre 3.5
     } else {