Changeset 270

Show
Ignore:
Timestamp:
03/09/06 10:08:02
Author:
douglm
Message:

Further jboss deployment fixes - add virtual host property

Small fix to IcalTranslator? to flag relaxed line end stuff for all parsing.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/bldfiles/buildwar.xml

    r269 r270  
    380380      <filterset refid="property.filters" /> 
    381381    </copy> 
     382    <antcall target="jboss-virtual-host" inheritRefs="true" /> 
     383  </target> 
     384 
     385  <target name="jboss-virtual-host" if="org.bedework.global.virtual.host"> 
     386    <replace file="${app.dest.webinf}/jboss-web.xml"> 
     387      <replacetoken><![CDATA[<!-- Virtual host -->]]></replacetoken> 
     388      <replacevalue><![CDATA[<virtual-host>@VIRTUAL-HOST@</virtual-host>> 
     389      ]]> 
     390      </replacevalue> 
     391    </replace> 
     392    <replace file="${app.dest.webinf}/jboss-web.xml"> 
     393      <replacefilter token="@VIRTUAL-HOST@" value="${org.bedework.global.virtual.host}"/> 
     394    </replace> 
    382395  </target> 
    383396 

  • trunk/calendar3/caldav/war/WEB-INF/jboss-web.xml

    r268 r270  
    22 
    33<jboss-web> 
     4  <!-- Virtual host --> 
     5 
    46  <security-domain>java:/jaas/@SECURITY-DOMAIN@</security-domain> 
    57  <resource-ref> 

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

    r261 r270  
    359359      CalendarBuilder bldr = new CalendarBuilder(new CalendarParserImpl()); 
    360360 
    361       return bldr.build(new StringReader(val)); 
     361      return bldr.build(new StringReader(val), true); 
    362362    } catch (Throwable t) { 
    363363      throw new CalFacadeException(t); 
    …… 
    379379      CalendarBuilder bldr = new CalendarBuilder(new CalendarParserImpl()); 
    380380 
    381       Calendar cal = bldr.build(new StringReader(val)); 
     381      Calendar cal = bldr.build(new StringReader(val), true); 
    382382      Vector evs = new Vector(); 
    383383 

  • trunk/calendar3/webadmin/war/WEB-INF/jboss-web.xml

    r268 r270  
    22 
    33<jboss-web> 
     4  <!-- Virtual host --> 
     5 
    46  <security-domain>java:/jaas/@SECURITY-DOMAIN@</security-domain> 
    57  <resource-ref> 

  • trunk/calendar3/webclient/war/WEB-INF/jboss-web.xml

    r269 r270  
    22 
    33<jboss-web> 
     4  <!-- Virtual host --> 
     5 
    46  <security-domain>java:/jaas/rpiLdap</security-domain> 
    57  <resource-ref>