Changeset 1391

Show
Ignore:
Timestamp:
05/22/07 15:40:46
Author:
douglm
Message:

More scheduling changes.

Tidy up error handling.
Rename autoresponder.
Add dtstamp to organzer and to schema
Move handling of replies into Scheduling class

Minor changes to comments in CalSvcDb?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/xsl/default/default/errors.xsl

    r1377 r1391  
    227227      </xsl:when> 
    228228 
    229       <xsl:when test="id='org.bedework.validation.error.invalid.scheddata'"> 
    230         Error: bad scheduling data (0 or more than one object? 
    231       </xsl:when> 
    232       <xsl:when test="id='org.bedework.validation.error.invalid.schedmethod'"> 
    233         Error: bad value for recurrence until: <em><xsl:value-of select="param"/></em> 
    234       </xsl:when> 
    235       <xsl:when test="id='org.bedework.validation.error.invalid.schedmethod'"> 
     229      <!-- Scheduling error codes are defined in CalfacadeException --> 
     230 
     231      <xsl:when test="id='org.bedework.error.scheduling.attendeeaccessdisallowed'"> 
     232         Error: Access is disallowed to any attendee. 
     233      </xsl:when> 
     234 
     235      <xsl:when test="id='org.bedework.error.scheduling.badttendees'"> 
     236         Error: Attendee bad 
     237      </xsl:when> 
     238 
     239      <xsl:when test="id='org.bedework.error.scheduling.badmethod'"> 
    236240        Error: bad scheduling method (should be request or publish). 
    237241      </xsl:when> 
    238       <xsl:when test="id='org.bedework.validation.error.invalid.schedpartstatus'"> 
    239         Error: bad scheduling part status 
    240       </xsl:when> 
    241       <xsl:when test="id='org.bedework.validation.error.invalid.schedreplymethod'"> 
    242         Error: bad scheduling method (should be reply). 
    243       </xsl:when> 
    244       <xsl:when test="id='org.bedework.validation.error.invalid.schedrequestmethod'"> 
    245         Error: bad scheduling method (should be request). 
    246       </xsl:when> 
    247       <xsl:when test="id='org.bedework.validation.error.invalid.schedrespondmethod'"> 
    248         Error: bad scheduling method (should be COUNTER, REFRESH, REPLY). 
    249       </xsl:when> 
     242 
     243      <xsl:when test="id='org.bedework.error.scheduling.badresponsemethod'"> 
     244        Error: bad scheduling method for response (should be request or publish). 
     245      </xsl:when> 
     246 
     247      <xsl:when test="id='org.bedework.error.scheduling.badsourcecalendar'"> 
     248         Error: event is not in inbox 
     249      </xsl:when> 
     250 
     251      <xsl:when test="id='org.bedework.error.scheduling.duplicateuid'"> 
     252         Error: Duplicate uid found in the target calendar 
     253      </xsl:when> 
     254 
     255      <xsl:when test="id='org.bedework.error.scheduling.expectoneattendee'"> 
     256         Error: Expected exactly one attendee for reply 
     257      </xsl:when> 
     258 
     259      <xsl:when test="id='org.bedework.error.scheduling.invalidpartstatus'"> 
     260        Error: bad scheduling participation status 
     261      </xsl:when> 
     262 
     263      <xsl:when test="id='org.bedework.error.scheduling.multipleevents'"> 
     264         Error: Multiple events were found in the target calendar 
     265      </xsl:when> 
     266 
     267      <xsl:when test="id='org.bedework.error.scheduling.noattendees'"> 
     268         Error: Entity required attendees but had none. 
     269      </xsl:when> 
     270 
     271      <xsl:when test="id='org.bedework.error.scheduling.noOriginator'"> 
     272         Error: Entity required originator but had none. 
     273      </xsl:when> 
     274 
     275      <xsl:when test="id='org.bedework.error.scheduling.norecipients'"> 
     276         Error: Entity required recipients but had none. 
     277      </xsl:when> 
     278 
     279      <xsl:when test="id='org.bedework.error.scheduling.unknownattendee'"> 
     280         Error: Attendee for reply not in event. 
     281      </xsl:when> 
     282 
     283      <xsl:when test="id='org.bedework.error.scheduling.unknownevent'"> 
     284        Error: Unknown event - organizer possibly deleted it? 
     285      </xsl:when> 
     286 
     287      <!--         End of scheduling            --> 
    250288 
    251289      <xsl:when test="id='org.bedework.validation.error.invalid.status'">