Changeset 261

Show
Ignore:
Timestamp:
03/06/06 13:34:14
Author:
douglm
Message:

import of ics files works again in personal client.

Upgraded ical4j to current cvs level (+ small fix)
Fixed bug in Events so that organizers get saved correctly
Use preferred calendar for import if none specified.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/bldfiles/defjars.properties

    r237 r261  
    5555 
    5656#      ical4j.jar           Used for icalendar translation. 
    57 ical4j.jar.name=ical4j-0.9.18.jar 
     57ical4j.jar.name=ical4j-0.9.18x.jar 
    5858ical4j.jar=${org.bedework.default.lib}/${ical4j.jar.name} 
    5959 

  • trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Events.java

    r213 r261  
    328328    if (ct.intValue() > 0) { 
    329329      throw new CalFacadeException(CalFacadeException.duplicateGuid); 
     330    } 
     331     
     332    if (val.getOrganizer() != null) { 
     333      sess.saveOrUpdate(val.getOrganizer()); 
    330334    } 
    331335 

  • trunk/calendar3/dumprestore/build.xml

    r260 r261  
    279279      <jvmarg value="-mx128m" /> 
    280280      <jvmarg value="-ms128m" /> 
     281      <!-- 
    281282      <jvmarg value="-Xrunyjpagent:cpu=times,onexit=cpu" /> 
     283      --> 
    282284      <!-- 
    283285      <arg value="-Djava.endorsed.dir=${org.bedework.default.lib}/endorsed"/>--> 

  • trunk/calendar3/icalendar/src/org/bedework/icalendar/IcalTranslator.java

    r207 r261  
    6565import net.fortuna.ical4j.data.CalendarParserImpl; 
    6666import net.fortuna.ical4j.data.ParserException; 
    67 import net.fortuna.ical4j.data.UnfoldingReader; 
     67//import net.fortuna.ical4j.data.UnfoldingReader; 
    6868import net.fortuna.ical4j.model.Calendar; 
    6969import net.fortuna.ical4j.model.component.VEvent; 
    …… 
    273273      CalendarBuilder bldr = new CalendarBuilder(new CalendarParserImpl()); 
    274274 
    275       return fromIcal(cal, bldr.build(new UnfoldingReader(new StringReader(val)))); 
     275      //return fromIcal(cal, bldr.build(new UnfoldingReader(new StringReader(val)))); 
     276      return fromIcal(cal, bldr.build(new StringReader(val), true)); 
    276277    } catch (ParserException pe) { 
    277278      if (debug) { 
    …… 
    295296  public Collection fromIcal(BwCalendar cal, Reader rdr) throws CalFacadeException { 
    296297    try { 
    297       System.setProperty("ical4j.unfolding.relaxed", "true"); 
     298      //System.setProperty("ical4j.unfolding.relaxed", "true"); 
    298299      CalendarBuilder bldr = new CalendarBuilder(new CalendarParserImpl()); 
    299300 
    300       return fromIcal(cal, bldr.build(new UnfoldingReader(rdr))); 
     301      //return fromIcal(cal, bldr.build(new UnfoldingReader(rdr))); 
     302      return fromIcal(cal, bldr.build(rdr, true)); 
    301303    } catch (ParserException pe) { 
    302304      if (debug) { 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/misc/UploadAction.java

    r207 r261  
    100100 
    101101    if (cal == null) { 
    102       form.getErr().emit("org.bedework.client.error.missingcalendar"); 
    103       return null; 
     102      if (getPublicAdmin(form)) { 
     103        // Must specify a calendar for public events 
     104        form.getErr().emit("org.bedework.client.error.missingcalendar"); 
     105        return "retry"; 
     106      } 
     107       
     108      // Use preferred calendar 
     109      cal = svci.getPreferredCalendar(); 
    104110    } 
    105111 
    …… 
    114120 
    115121    if ((fileName == null) || (fileName.length() == 0)) { 
    116       return null; 
     122      return "retry"; 
    117123    } 
    118124