Changeset 312

Show
Ignore:
Timestamp:
03/30/06 23:03:34
Author:
douglm
Message:

A number of webclient changes

1. Move events related jsp into docs/event
2. Split out common/short/detailed/all event fields
3. Emit more xml, organizer and attendees
4. Add taglib component to webcommon and add tag to emit tagged xml

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/bldfiles/buildwar.xml

    r310 r312  
    315315      </fileset> 
    316316    </copy> 
     317    <copy todir="${app.dest.webinf}/tlds" > 
     318      <fileset dir="${org.bedework.default.lib}/tlds"> 
     319        <include name="*"/> 
     320      </fileset> 
     321    </copy> 
    317322 
    318323    <antcall target="add.xalan" inheritRefs="true" /> 
    …… 
    324329      </fileset> 
    325330    </copy> 
     331    <copy todir="${app.dest.lib}" file="${servlet.jsp.jar}"/> 
    326332  </target> 
    327333 

  • trunk/calendar3/bldfiles/defjars.properties

    r310 r312  
    1010#                           supplied by your servlet container. 
    1111servlet.jar=${org.bedework.default.lib}/servletapi-2.4.jar 
     12 
     13servlet.jsp.jar=${org.bedework.default.lib}/servlet.jsp.jar 
    1214 
    1315ant.jar=${org.bedework.default.lib}/ant-1.6.5.jar 

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/BwOrganizer.java

    r2 r312  
    127127  } 
    128128 
    129   /** Set the dir 
     129  /** Set the dir (directory url for lookup) 
    130130   * 
    131131   *  @param  val   String dir 

  • trunk/calendar3/webclient/war/WEB-INF/publicweb.xml

    r293 r312  
    156156      <taglib-location>/WEB-INF/tlds/struts-template.tld</taglib-location> 
    157157    </taglib> 
     158 
     159    <taglib> 
     160      <taglib-uri>bedework</taglib-uri> 
     161      <taglib-location>/WEB-INF/tlds/bedework.tld</taglib-location> 
     162    </taglib> 
    158163  </jsp-config> 
    159164 

  • trunk/calendar3/webclient/war/WEB-INF/struts-config.xml

    r298 r312  
    8282               scope="session" 
    8383               validate="false"> 
    84       <forward name="success" path="/docs/eventMore.jsp" /> 
     84      <forward name="success" path="/docs/event/eventMore.jsp" /> 
    8585    </action> 
    8686 
    …… 
    9090               scope="session" 
    9191               validate="false"> 
    92       <forward name="success" path="/docs/addEvent.jsp" /> 
     92      <forward name="success" path="/docs/event/addEvent.jsp" /> 
    9393    </action> 
    9494 
    …… 
    9898               scope="session" 
    9999               validate="false"> 
    100       <forward name="success" path="/docs/editEvent.jsp" /> 
     100      <forward name="success" path="/docs/event/editEvent.jsp" /> 
    101101    </action> 
    102102 

  • trunk/calendar3/webclient/war/WEB-INF/userweb.xml

    r293 r312  
    155155      <taglib-uri>struts-template</taglib-uri> 
    156156      <taglib-location>/WEB-INF/tlds/struts-template.tld</taglib-location> 
     157    </taglib> 
     158 
     159    <taglib> 
     160      <taglib-uri>bedework</taglib-uri> 
     161      <taglib-location>/WEB-INF/tlds/bedework.tld</taglib-location> 
    157162    </taglib> 
    158163  </jsp-config> 

  • trunk/calendar3/webclient/war/docs/event/addEvent.jsp

    r310 r312  
    1212 
    1313<page>addEvent</page> 
    14 <%@ include file="addEventForm.jsp" %> 
     14<%@ include file="event/addEventForm.jsp" %> 
    1515 
    1616<% 

  • trunk/calendar3/webclient/war/docs/event/emitEvent.jsp

    r310 r312  
    11<%@ taglib uri='struts-bean' prefix='bean' %> 
    22<%@ taglib uri='struts-logic' prefix='logic' %> 
     3<%@ taglib uri='bedework' prefix='bw' %> 
    34 
    45<bean:define id="eventFmt" name="eventFormatter" scope="request" /> 
    56<bean:define id="eventInfo" name="eventFmt" property="eventInfo" /> 
    67<bean:define id="event" name="eventFmt" property="event" /> 
    7 <%-- Output a single event --%> 
     8<%-- Output a single event. This page handles fields common to all views --%> 
    89  <event> 
    910    <logic:present  name="eventInfo" property="subscription"> 
    …… 
    3536    <id><bean:write name="event" property="id"/></id><%-- 
    3637      Value: integer - event id --%> 
    37     <guid><bean:write name="event" property="guid"/></guid> 
    38     <logic:present  name="event" property="recurrence.recurrenceId"> 
    39       <recurrenceId><bean:write name="event" property="recurrence.recurrenceId"/></recurrenceId> 
    40     </logic:present> 
    41     <logic:notPresent  name="event" property="recurrence.recurrenceId"> 
    42       <recurrenceId></recurrenceId> 
    43     </logic:notPresent> 
    44     <summary><bean:write name="event" property="summary"/></summary><%-- 
    45     <summary><bean:write name="event" property="summary"/></summary><%-- 
     38    <bw:emitText name="event" property="guid" /> 
     39    <bw:emitText name="event" property="recurrence.recurrenceId" tagName="recurrenceId" /> 
     40    <bw:emitText name="event" property="summary" /><%-- 
    4641      Value: string - short description, typically used for the event title  --%> 
    47     <link><bean:write name="event" property="link"/></link><%-- 
     42    <bw:emitText name="event" property="link"/><%-- 
    4843      Value: URI - link associated with the event --%> 
    4944    <public><bean:write name="event" property="publick"/></public> 
    …… 
    7974      </calendar> 
    8075    </logic:notPresent> 
    81     <logic:present  name="event" property="location"> 
    82       <bean:define id="location" name="event" property="location"/> 
    83       <location> 
    84         <id><bean:write name="location" property="id"/></id><%-- 
    85             Value: integer - location id --%> 
    86         <address><bean:write name="location" property="address"/></address><%-- 
    87           Value: string - physical address of the location --%> 
    88         <link><bean:write name="location" property="link"/></link><%-- 
    89             Value: URI - link to a web address for the location --%> 
    90         <logic:present name="detailView" scope="request"><%-- 
    91           Only output these attributes if we are in detailed mode... --%> 
    92           <subaddress><bean:write name="location" property="subaddress"/></subaddress><%-- 
    93             Value: string - more address information --%> 
    94           <creator><bean:write name="location" property="creator.account"/></creator><%-- 
    95             Value: string - location creator id --%> 
    96         </logic:present> 
    97       </location> 
     76    <bw:emitText name="event" property="status" /><%-- Status 
     77          Value: string, only one of CONFIRMED, TENTATIVE, or CANCELLED --%> 
     78    <logic:notPresent name="detailView" scope="request"><%-- look for short form --%> 
     79      <logic:notPresent name="allView" scope="request"> 
     80        <jsp:include page="event/emitEventShort.jsp"/> 
     81      </logic:notPresent> 
     82    </logic:notPresent> 
     83 
     84    <logic:present name="detailView" scope="request"> 
     85      <jsp:include page="event/emitEventDetail.jsp"/> 
    9886    </logic:present> 
    99     <logic:notPresent  name="event" property="location"> 
    100       <location> 
    101         <address></address> 
    102         <logic:present name="detailView" scope="request"><%-- 
    103           Only output these attributes if we are in detailed mode... --%> 
    104           <id></id><%-- 
    105             Value: integer - location id --%> 
    106           <subaddress></subaddress><%-- 
    107             Value: string - more address information --%> 
    108           <link></link><%-- 
    109             Value: URI - link to a web address for the location --%> 
    110           <creator></creator><%-- 
    111             Value: string - location creator id --%> 
    112         </logic:present> 
    113       </location> 
    114     </logic:notPresent> 
    115     <categories> 
    116       <logic:present name="event" property="categories"> 
    117         <logic:iterate id="category" name="event" property="categories"> 
    118           <category> 
    119             <id><bean:write name="category" property="id"/></id><%-- 
    120               Value: integer - category id --%> 
    121             <value><bean:write name="category" property="word"/></value><%-- 
    122               Value: string - the category value --%> 
    123             <logic:present name="detailView" scope="request"><%-- 
    124               Only output these attributes if we are in detailed mode... --%> 
    125               <description><bean:write name="category" property="description"/></description><%-- 
    126                 Value: string - long description of category --%> 
    127               <creator><bean:write name="category" property="creator.account"/></creator><%-- 
    128                 Value: string - category creator id --%> 
    129             </logic:present> 
    130           </category> 
    131         </logic:iterate> 
    132       </logic:present> 
    133     </categories><%-- 
    134           Value: string, only one of CONFIRMED, TENTATIVE, or CANCELLED --%> 
    135     <status><bean:write name="event" property="status" /></status> 
    136     <logic:present name="detailView" scope="request"><%-- 
    137       Only output these attributes if we are in detailed mode... --%> 
    138       <description><bean:write name="event" property="description"/></description><%-- 
    139           Value: string - long description of the event.  Limited to 500 characters. --%> 
    140       <cost><bean:write name="event" property="cost"/></cost><%-- 
    141           Value: string - cost information --%> 
    142       <sequence><bean:write name="event" property="sequence"/></sequence><%-- 
    143           RFC sequence number for the event --%> 
    14487 
    145       <logic:present name="event" property="sponsor"> 
    146         <bean:define id="sponsor" name="event" property="sponsor"/> 
    147         <sponsor> 
    148           <id><bean:write name="sponsor" property="id"/></id><%-- 
    149             Value: integer - sponsor id --%> 
    150           <name><bean:write name="sponsor" property="name"/></name><%-- 
    151             Value: string - sponsor's name --%> 
    152           <phone><bean:write name="sponsor" property="phone"/></phone><%-- 
    153             Value (example): x7777 - sponsor's phone number --%> 
    154           <email><bean:write name="sponsor" property="email"/></email><%-- 
    155             Value (example): nobody@nowhere.edu - sponsor's email address --%> 
    156           <link><bean:write name="sponsor" property="link"/></link><%-- 
    157             Value: URI - link to sponsor web page --%> 
    158         </sponsor> 
    159       </logic:present> 
     88    <logic:present name="allView" scope="request"> 
     89      <jsp:include page="event/emitEventDetail.jsp"/> 
     90      <jsp:include page="event/emitEventAll.jsp"/> 
    16091    </logic:present> 
    16192  </event> 

  • trunk/calendar3/webclient/war/docs/event/eventMore.jsp

    r310 r312  
    88  <page>event</page> 
    99  <%-- Wrapper for a single event (emitEvent.jsp) --%> 
    10     <bean:define id="detailView" value="true" toScope="request"/> 
     10    <bean:define id="allView" value="true" toScope="request"/> 
    1111    <bean:define id="eventFormatter" 
    1212                 name="calForm" 
    …… 
    1414                 toScope="request"/> 
    1515 
    16     <jsp:include page="emitEvent.jsp"/> 
     16    <%@ include file="event/emitEvent.jsp" %> 
    1717<% 
    1818} catch (Throwable t) { 

  • trunk/calendar3/webclient/war/docs/main.jsp

    r292 r312  
    5757                            <bean:define id="eventFormatter" name="eventFmt" 
    5858                                         toScope="request" /> 
    59                             <jsp:include page="emitEvent.jsp" /> 
     59                            <jsp:include page="event/emitEvent.jsp" /> 
    6060                          </logic:iterate> 
    6161                        </logic:notEmpty> 

  • trunk/calendar3/webcommon/build.xml

    r2 r312  
    3131    <path id="compile.classpath"> 
    3232      <pathelement location="${servlet.jar}"/> 
     33      <pathelement location="${servlet.jsp.jar}"/> 
    3334      <pathelement location="${struts.jar}"/> 
    3435      <pathelement location="${log4j.jar}"/>