Changeset 1024

Show
Ignore:
Timestamp:
09/28/06 15:12:29
Author:
douglm
Message:

More fixes triggered by interop.

Alarms are (re)enabled.

Changed default tzid for freebusy aggregator

Change to schema - added table...

create table event_alarms (eventid integer not null, id integer not null, primary key (eventid, id))

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/quickstart-build.xml

    r997 r1024  
    327327      <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/> 
    328328      <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/--> 
     329      <jvmarg value="-Djava.net.preferIPv4Stack=true"/> 
     330      <arg value="start"/> 
     331    </java> 
     332  </target> 
     333 
     334  <target name="tomcatstart-large" depends="run.init" 
     335          description="starts a large memory version of the tomcat server"> 
     336    <echo message="Starting Tomcat from ${org.bedework.appserver.dir}"/> 
     337    <java fork="true" dir="${basedir}" 
     338          classname="org.apache.catalina.startup.Bootstrap"> 
     339      <classpath> 
     340        <pathelement path="${org.bedework.appserver.dir}/bin/bootstrap.jar"/> 
     341      </classpath> 
     342      <sysproperty key="catalina.home" value="${org.bedework.appserver.dir}"/> 
     343      <!--jvmarg value="-Dcatalina.home=${tomcat.dir}"/--> 
     344      <jvmarg value="-Xms128m" /> 
     345      <jvmarg value="-Xmx630m" /> 
    329346      <jvmarg value="-Djava.net.preferIPv4Stack=true"/> 
    330347      <arg value="start"/> 

  • trunk/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r1023 r1024  
    4848       web server over https to avoid mixed content errors, e.g., 
    4949  <xsl:variable name="resourcesRoot">https://mywebserver.edu/myresourcesdir</xsl:variable> 
     50  <xsl:variable name="resourcesRoot" select="/bedework-fbaggregator/approot"/> 
    5051    --> 
    51   <xsl:variable name="resourcesRoot" select="/bedework-fbaggregator/approot"/> 
     52  <xsl:variable name="resourcesRoot">http://bedework.org:8585/fbagg.MainCampus</xsl:variable> 
    5253 
    5354  <!-- URL of the XSL template directory --> 
    …… 
    8384 
    8485  <!-- Other generally useful global variables--> 
    85   <xsl:variable name="currentTimezone">America/New_York</xsl:variable><!-- for now just set it --> 
     86  <xsl:variable name="currentTimezone">America/Los_Angeles</xsl:variable><!-- for now just set it --> 
    8687  <!--<xsl:variable name="prevdate" select="/bedework-fbaggregator/previousdate"/> 
    8788  <xsl:variable name="nextdate" select="/bedework-fbaggregator/nextdate"/>