[Bedework-commit] calendarapi r817 - in trunk/calFacade/src/org/bedework/calfacade: . svc/prefs

[svnadmin at bedework.org]

Author: douglm
Date: 2009-02-24 11:50:02 -0500 (Tue, 24 Feb 2009)
New Revision: 817

Modified:
   trunk/calFacade/src/org/bedework/calfacade/BwEvent.java
   trunk/calFacade/src/org/bedework/calfacade/BwEventAnnotation.java
   trunk/calFacade/src/org/bedework/calfacade/BwEventObj.java
   trunk/calFacade/src/org/bedework/calfacade/svc/prefs/BwPreferences.java
Log:
Fixes so that the xml dump process runs to completion without errors.

Further jsp fixes for the submit client.

Modified: trunk/calFacade/src/org/bedework/calfacade/BwEvent.java
===================================================================
--- trunk/calFacade/src/org/bedework/calfacade/BwEvent.java	2009-02-24 15:02:56 UTC (rev 816)
+++ trunk/calFacade/src/org/bedework/calfacade/BwEvent.java	2009-02-24 16:50:02 UTC (rev 817)
@@ -304,8 +304,8 @@
  *  @version 1.0
  */
 @Wrapper(quotas = true)
- at Dump(elementName="event", keyFields={"calendar", "uid", "recurrenceId"},
-      firstFields = {"owner"})
+ at Dump(elementName="event", keyFields={"colPath", "uid", "recurrenceId"},
+      firstFields = {"ownerHref"})
 public class BwEvent extends BwShareableContainedDbentity<BwEvent>
         implements EventEntity {
   /** This enum is used by annotations to index into a String containing T/F

Modified: trunk/calFacade/src/org/bedework/calfacade/BwEventAnnotation.java
===================================================================
--- trunk/calFacade/src/org/bedework/calfacade/BwEventAnnotation.java	2009-02-24 15:02:56 UTC (rev 816)
+++ trunk/calFacade/src/org/bedework/calfacade/BwEventAnnotation.java	2009-02-24 16:50:02 UTC (rev 817)
@@ -60,8 +60,8 @@
  *  @author Mike Douglass
  *  @version 1.0
  */
- at Dump(elementName="event", keyFields={"calendar", "uid", "recurrenceId"},
-      firstFields = {"owner"})
+ at Dump(elementName="event", keyFields={"colPath", "uid", "recurrenceId"},
+      firstFields = {"ownerHref"})
 public class BwEventAnnotation extends BwEvent {
   /** The event this one annotates. (which may itself be an annotation)
    */

Modified: trunk/calFacade/src/org/bedework/calfacade/BwEventObj.java
===================================================================
--- trunk/calFacade/src/org/bedework/calfacade/BwEventObj.java	2009-02-24 15:02:56 UTC (rev 816)
+++ trunk/calFacade/src/org/bedework/calfacade/BwEventObj.java	2009-02-24 16:50:02 UTC (rev 817)
@@ -64,8 +64,8 @@
  *
  *  @version 1.0
  */
- at Dump(elementName="event", keyFields={"calendar", "uid", "recurrenceId"},
-      firstFields = {"owner"})
+ at Dump(elementName="event", keyFields={"colPath", "uid", "recurrenceId"},
+      firstFields = {"ownerHref"})
 public class BwEventObj extends BwEvent implements ScheduleMethods {
 
   /** Constructor

Modified: trunk/calFacade/src/org/bedework/calfacade/svc/prefs/BwPreferences.java
===================================================================
--- trunk/calFacade/src/org/bedework/calfacade/svc/prefs/BwPreferences.java	2009-02-24 15:02:56 UTC (rev 816)
+++ trunk/calFacade/src/org/bedework/calfacade/svc/prefs/BwPreferences.java	2009-02-24 16:50:02 UTC (rev 817)
@@ -43,7 +43,7 @@
  *  @author Mike Douglass douglm rpi.edu
  *  @version 1.0
  */
- at Dump(elementName="preferences", keyFields={"owner"}, firstFields={"owner"})
+ at Dump(elementName="preferences", keyFields={"ownerHref"}, firstFields={"ownerHref"})
 public class BwPreferences extends BwOwnedDbentity implements PropertiesEntity {
   /** Collection of BwView
    */