Changeset 634

Show
Ignore:
Timestamp:
06/22/06 17:04:03
Author:
johnsa
Message:

fixups tol url rewriting in web clients

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/calendar3/deployment/webuser/uportal2/resources/demoskins/default/default/default.xsl

    r629 r634  
    7272        <xsl:variable name="initEvent" select="/bedework/urlPrefixes/initEvent"/> 
    7373        <xsl:variable name="addEvent" select="/bedework/urlPrefixes/addEvent"/> 
    74         <xsl:variable name="addEventUsingPage"><xsl:value-of select="/bedework/urlPrefixes/addEventUsingPage" disable-output-escaping="yes"/></xsl:variable
    75         <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete"/> 
    76         <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess"/> 
    77         <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent"/> 
     74        <xsl:variable name="addEventUsingPage" select="/bedework/urlPrefixes/addEventUsingPage"/
     75        <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete/a/@href"/> 
     76        <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess/a/@href"/> 
     77        <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent/a/@href"/> 
    7878        <xsl:variable name="editEvent" select="/bedework/urlPrefixes/editEvent"/> 
    7979        <xsl:variable name="delEvent" select="/bedework/urlPrefixes/delEvent"/> 
     
    9090        <xsl:variable name="initUpload" select="/bedework/urlPrefixes/initUpload"/> 
    9191        <xsl:variable name="upload" select="/bedework/urlPrefixes/upload"/> 
    92         <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch"/> 
    93         <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess"/> 
     92        <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch/a/@href"/> 
     93        <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess/a/@href"/> 
    9494        <!-- calendars --> 
    9595        <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/> 
    96         <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch"/><!-- used --> 
    97         <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions"/><!-- used --> 
    98         <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd"/><!-- used --> 
    99         <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete"/> 
    100         <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay"/> 
    101         <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate"/><!-- used --> 
    102         <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update"/><!-- used --> 
    103         <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess"/> 
     96        <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch/a/@href"/><!-- used --> 
     97        <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions/a/@href"/><!-- used --> 
     98        <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd/a/@href"/><!-- used --> 
     99        <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete/a/@href"/> 
     100        <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay/a/@href"/> 
     101        <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate/a/@href"/><!-- used --> 
     102        <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update/a/@href"/><!-- used --> 
     103        <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess/a/@href"/> 
    104104        <!-- subscriptions --> 
    105         <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch"/> 
    106         <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate"/> 
    107         <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri"/> 
    108         <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri"/> 
    109         <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd"/> 
    110         <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe"/> 
     105        <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/> 
     106        <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/> 
     107        <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri/a/@href"/> 
     108        <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri/a/@href"/> 
     109        <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/> 
     110        <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/> 
    111111        <!-- preferences --> 
    112         <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate"/> 
    113         <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update"/> 
     112        <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate/a/@href"/> 
     113        <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update/a/@href"/> 
    114114 
    115115        <!-- URL of the web application - includes web context 
  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r629 r634  
    7272        <xsl:variable name="initEvent" select="/bedework/urlPrefixes/initEvent"/> 
    7373        <xsl:variable name="addEvent" select="/bedework/urlPrefixes/addEvent"/> 
    74         <xsl:variable name="addEventUsingPage"><xsl:value-of select="/bedework/urlPrefixes/addEventUsingPage" disable-output-escaping="yes"/></xsl:variable
    75         <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete"/> 
    76         <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess"/> 
    77         <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent"/> 
     74        <xsl:variable name="addEventUsingPage" select="/bedework/urlPrefixes/addEventUsingPage"/
     75        <xsl:variable name="event-addEventRefComplete" select="/bedework/urlPrefixes/event/addEventRefComplete/a/@href"/> 
     76        <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess/a/@href"/> 
     77        <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent/a/@href"/> 
    7878        <xsl:variable name="editEvent" select="/bedework/urlPrefixes/editEvent"/> 
    7979        <xsl:variable name="delEvent" select="/bedework/urlPrefixes/delEvent"/> 
     
    9090        <xsl:variable name="initUpload" select="/bedework/urlPrefixes/initUpload"/> 
    9191        <xsl:variable name="upload" select="/bedework/urlPrefixes/upload"/> 
    92         <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch"/> 
    93         <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess"/> 
     92        <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch/a/@href"/> 
     93        <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess/a/@href"/> 
    9494        <!-- calendars --> 
    9595        <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/> 
    96         <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch"/><!-- used --> 
    97         <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions"/><!-- used --> 
    98         <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd"/><!-- used --> 
    99         <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete"/> 
    100         <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay"/> 
    101         <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate"/><!-- used --> 
    102         <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update"/><!-- used --> 
    103         <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess"/> 
     96        <xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch/a/@href"/><!-- used --> 
     97        <xsl:variable name="calendar-fetchDescriptions" select="/bedework/urlPrefixes/calendar/fetchDescriptions/a/@href"/><!-- used --> 
     98        <xsl:variable name="calendar-initAdd" select="/bedework/urlPrefixes/calendar/initAdd/a/@href"/><!-- used --> 
     99        <xsl:variable name="calendar-delete" select="/bedework/urlPrefixes/calendar/delete/a/@href"/> 
     100        <xsl:variable name="calendar-fetchForDisplay" select="/bedework/urlPrefixes/calendar/fetchForDisplay/a/@href"/> 
     101        <xsl:variable name="calendar-fetchForUpdate" select="/bedework/urlPrefixes/calendar/fetchForUpdate/a/@href"/><!-- used --> 
     102        <xsl:variable name="calendar-update" select="/bedework/urlPrefixes/calendar/update/a/@href"/><!-- used --> 
     103        <xsl:variable name="calendar-setAccess" select="/bedework/urlPrefixes/calendar/setAccess/a/@href"/> 
    104104        <!-- subscriptions --> 
    105         <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch"/> 
    106         <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate"/> 
    107         <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri"/> 
    108         <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri"/> 
    109         <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd"/> 
    110         <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe"/> 
     105        <xsl:variable name="subscriptions-fetch" select="/bedework/urlPrefixes/subscriptions/fetch/a/@href"/> 
     106        <xsl:variable name="subscriptions-fetchForUpdate" select="/bedework/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/> 
     107        <xsl:variable name="subscriptions-addSubByUri" select="/bedework/urlPrefixes/subscriptions/addSubByUri/a/@href"/> 
     108        <xsl:variable name="subscriptions-subscribeByUri" select="/bedework/urlPrefixes/subscriptions/subscribeByUri/a/@href"/> 
     109        <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/> 
     110        <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/> 
    111111        <!-- preferences --> 
    112         <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate"/> 
    113         <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update"/> 
     112        <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate/a/@href"/> 
     113        <xsl:variable name="prefs-update" select="/bedework/urlPrefixes/prefs/update/a/@href"/> 
    114114 
    115115        <!-- URL of the web application - includes web context 
  • trunk/calendar3/webclient/war/docs/header.jsp

    r630 r634  
    120120 
    121121    <%-- action urls --%> 
    122     <setup><genurl:rewrite action="setup.do?b=de"/></setup> 
    123     <setSelection><genurl:rewrite action="setSelection.do?b=de"/></setSelection> 
    124     <setViewPeriod><genurl:rewrite action="setViewPeriod.do?b=de"/></setViewPeriod> 
    125     <eventView><genurl:rewrite action="eventView.do?b=de"/></eventView> 
    126     <mailEvent><genurl:rewrite action="mailEvent.do?b=de"/></mailEvent> 
    127     <showPage><genurl:rewrite action="showPage.do?b=de"/></showPage> 
    128  
    129     <export><genurl:rewrite action="export.do?b=de"/></export> 
    130     <stats><genurl:rewrite action="stats.do?b=de"/></stats> 
     122    <setup><genurl:rewrite action="setup.do"/></setup> 
     123    <setSelection><genurl:rewrite action="setSelection.do"/></setSelection> 
     124    <setViewPeriod><genurl:rewrite action="setViewPeriod.do"/></setViewPeriod> 
     125    <eventView><genurl:rewrite action="eventView.do"/></eventView> 
     126    <mailEvent><genurl:rewrite action="mailEvent.do"/></mailEvent> 
     127    <showPage><genurl:rewrite action="showPage.do"/></showPage> 
     128 
     129    <export><genurl:rewrite action="export.do"/></export> 
     130    <stats><genurl:rewrite action="stats.do?be=d"/></stats> 
    131131 
    132132    <fetchPublicCalendars><genurl:rewrite action="fetchPublicCalendars"/></fetchPublicCalendars> 
     
    135135    <!-- The following URLs are used only in the personal client --> 
    136136    <logic:equal name="calForm" property="guest" value="false"> 
    137       <initEvent><genurl:rewrite action="initEvent.do?b=de"/></initEvent> 
    138       <addEvent><genurl:rewrite action="addEvent.do?b=de"/></addEvent> 
    139       <addEventUsingPage><genurl:rewrite action="addEventUsingPage.do?b=de"/></addEventUsingPage> 
    140       <editEvent><genurl:rewrite action="editEvent.do?b=de"/></editEvent> 
    141       <delEvent><genurl:rewrite action="delEvent.do?b=de"/></delEvent> 
     137      <initEvent><genurl:rewrite action="initEvent.do"/></initEvent> 
     138      <addEvent><genurl:rewrite action="addEvent.do"/></addEvent> 
     139      <addEventUsingPage><genurl:rewrite action="addEventUsingPage.do"/></addEventUsingPage> 
     140      <editEvent><genurl:rewrite action="editEvent.do"/></editEvent> 
     141      <delEvent><genurl:rewrite action="delEvent.do"/></delEvent> 
    142142      <event> 
    143         <setAccess><genurl:rewrite action="event/setAccess.do?b=de"/></setAccess> 
    144         <addEventRefComplete><genurl:rewrite action="event/addEventRefComplete.do?b=de"/></addEventRefComplete> 
    145         <selectCalForEvent><genurl:rewrite action="event/selectCalForEvent.do?b=de"/></selectCalForEvent> 
     143        <setAccess><genurl:link page="/event/setAccess.do?b=de"/></setAccess> 
     144        <addEventRefComplete><genurl:link page="/event/addEventRefComplete.do?b=de"/></addEventRefComplete> 
     145        <selectCalForEvent><genurl:link page="/event/selectCalForEvent.do?b=de"/></selectCalForEvent> 
    146146      </event> 
    147147 
    148148      <freeBusy> 
    149         <fetch><genurl:rewrite action="freeBusy/getFreeBusy.do?b=de"/></fetch> 
    150         <setAccess><genurl:rewrite action="freeBusy/setAccess.do?b=de"/></setAccess> 
     149        <fetch><genurl:link page="/freeBusy/getFreeBusy.do?b=de"/></fetch> 
     150        <setAccess><genurl:link page="/freeBusy/setAccess.do?b=de"/></setAccess> 
    151151      </freeBusy> 
    152152 
    153153      <calendar> 
    154         <fetch><genurl:rewrite action="calendar/showUpdateList.rdo?b=de"/></fetch><!-- keep --> 
    155         <fetchDescriptions><genurl:rewrite action="calendar/showDescriptionList.rdo?b=de"/></fetchDescriptions><!-- keep --> 
    156         <initAdd><genurl:rewrite action="calendar/initAdd.do?b=de"/></initAdd><!-- keep --> 
    157         <delete><genurl:rewrite action="calendar/delete.do?b=de"/></delete> 
    158         <fetchForDisplay><genurl:rewrite action="calendar/fetchForDisplay.do?b=de"/></fetchForDisplay> 
    159         <fetchForUpdate><genurl:rewrite action="calendar/fetchForUpdate.do?b=de"/></fetchForUpdate><!-- keep --> 
    160         <update><genurl:rewrite action="calendar/update.do?b=de"/></update><!-- keep --> 
    161         <setAccess><genurl:rewrite action="calendar/setAccess.do?b=de"/></setAccess> 
     154        <fetch><genurl:link page="/calendar/showUpdateList.rdo?b=de"/></fetch><!-- keep --> 
     155        <fetchDescriptions><genurl:link page="/calendar/showDescriptionList.rdo?b=de"/></fetchDescriptions><!-- keep --> 
     156        <initAdd><genurl:link page="/calendar/initAdd.do?b=de"/></initAdd><!-- keep --> 
     157        <delete><genurl:link page="/calendar/delete.do?b=de"/></delete> 
     158        <fetchForDisplay><genurl:link page="/calendar/fetchForDisplay.do?b=de"/></fetchForDisplay> 
     159        <fetchForUpdate><genurl:link page="/calendar/fetchForUpdate.do?b=de"/></fetchForUpdate><!-- keep --> 
     160        <update><genurl:link page="/calendar/update.do?b=de"/></update><!-- keep --> 
     161        <setAccess><genurl:link page="/calendar/setAccess.do?b=de"/></setAccess> 
    162162      </calendar> 
    163163 
    164164      <subscriptions> <!-- only those listed are used here (no need to clean up) --> 
    165         <fetch><genurl:rewrite action="subs/fetch.do?b=de"/></fetch> 
    166         <fetchForUpdate><genurl:rewrite action="subs/fetchForUpdate.do?b=de"/></fetchForUpdate> 
    167         <addSubByUri><genurl:rewrite action="subs/showAddByUriForm.rdo?b=de"/></addSubByUri> 
    168         <subscribeByUri><genurl:rewrite action="subs/subscribeByUri.do?b=de"/></subscribeByUri> 
    169         <initAdd><genurl:rewrite action="subs/initAdd.do?b=de"/></initAdd> 
    170         <subscribe><genurl:rewrite action="subs/subscribe.do?b=de"/></subscribe> 
     165        <fetch><genurl:link page="/subs/fetch.do?b=de"/></fetch> 
     166        <fetchForUpdate><genurl:link page="/subs/fetchForUpdate.do?b=de"/></fetchForUpdate> 
     167        <addSubByUri><genurl:link page="/subs/showAddByUriForm.rdo?b=de"/></addSubByUri> 
     168        <subscribeByUri><genurl:link page="/subs/subscribeByUri.do?b=de"/></subscribeByUri> 
     169        <initAdd><genurl:link page="/subs/initAdd.do?b=de"/></initAdd> 
     170        <subscribe><genurl:link page="/subs/subscribe.do?b=de"/></subscribe> 
    171171      </subscriptions> 
    172172 
    173       <manageLocations><genurl:rewrite action="manageLocations.do?b=de"/></manageLocations> 
    174       <addLocation><genurl:rewrite action="addLocation.do?b=de"/></addLocation> 
    175       <editLocation><genurl:rewrite action="editLoc.do?b=de"/></editLocation> 
    176       <delLocation><genurl:rewrite action="delLocation.do?b=de"/></delLocation> 
     173      <manageLocations><genurl:rewrite action="manageLocations.do"/></manageLocations> 
     174      <addLocation><genurl:rewrite action="addLocation.do"/></addLocation> 
     175      <editLocation><genurl:rewrite action="editLoc.do"/></editLocation> 
     176      <delLocation><genurl:rewrite action="delLocation.do"/></delLocation> 
    177177 
    178178      <prefs> 
    179         <fetchForUpdate><genurl:rewrite action="prefs/fetchForUpdate.do?b=de"/></fetchForUpdate> 
    180         <update><genurl:rewrite action="prefs/update.do?b=de"/></update> 
     179        <fetchForUpdate><genurl:link page="/prefs/fetchForUpdate.do?b=de"/></fetchForUpdate> 
     180        <update><genurl:link page="/prefs/update.do?b=de"/></update> 
    181181      </prefs> 
    182182 
    183       <initEventAlarm><genurl:rewrite action="initEventAlarm.do?b=de"/></initEventAlarm> 
    184       <setAlarm><genurl:rewrite action="setAlarm.do?b=de"/></setAlarm> 
    185       <addEventRef><genurl:rewrite action="addEventRef.do?b=de"/></addEventRef> 
    186       <upload><genurl:rewrite action="upload.do?b=de"/></upload> 
     183      <initEventAlarm><genurl:rewrite action="initEventAlarm.do"/></initEventAlarm> 
     184      <setAlarm><genurl:rewrite action="setAlarm.do"/></setAlarm> 
     185      <addEventRef><genurl:rewrite action="addEventRef.do"/></addEventRef> 
     186      <upload><genurl:rewrite action="upload.do"/></upload> 
    187187    </logic:equal> 
    188188  </urlPrefixes>