Changeset 1164

Show
Ignore:
Timestamp:
12/16/06 23:21:07
Author:
douglm
Message:

Add dojo to deployment process

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildwar.xml

    r1105 r1164  
    100100    <!-- Add modifed login pages --> 
    101101    <copy todir="${app.dest.docs}/login" failonerror="false" > 
    102       <fileset dir="${app.root.dir}/resources/login" /> 
     102      <fileset dir="${org.bedework.common.resources}/login" /> 
    103103      <filterset> 
    104104        <filter token="DISPLAY-NAME" value="${propval.app.display.name}"/> 

  • trunk/build/libjars.properties

    r1105 r1164  
    22# Library jar files 
    33# 
     4 
     5dojo.dir=dojo-0.4.1-ajax 
    46 
    57servlet.jar=${org.bedework.default.lib}/servletapi-2.4.jar 

  • trunk/deployment/build.xml

    r1134 r1164  
    2828<project name="deploy.bedework" default="init"> 
    2929  <property name="base.name" value="deployment"/> 
     30    <!-- Load the location of the libraries --> 
     31    <property file="${org.bedework.project.bedework}/build/libjars.properties" /> 
    3032 
    3133  <target name="init" > 
    …… 
    5860    <!-- set this for the war builds --> 
    5961    <dirname property="app.root.dir" file="${ant.file}"/> 
     62 
     63    <!-- Common resources directory --> 
     64    <property name="org.bedework.common.resources" 
     65              location="${app.root.dir}/resources" /> 
     66 
    6067 
    6168    <!-- ==================== config properties ========================= 

  • trunk/deployment/webadmin/webapp/build.xml

    r1105 r1164  
    1616 
    1717    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
     18 
     19    <property name="org.bedework.use.dojo" value="true" /> 
    1820 
    1921    <!-- Flag as struts --> 
    …… 
    4345    </copy> 
    4446 
     47    <!-- Deploy common resources --> 
     48    <ant antfile="${org.bedework.common.resources}/build.xml" 
     49         inheritrefs="true" target="deploy" > 
     50      <property name="common.resources.dest.dir" 
     51                location="${org.bedework.appserver.dir}/${propval.app.resources.dir}/resources" /> 
     52    </ant> 
     53 
    4554    <echo message="***************************************************************" /> 
    4655    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    …… 
    5766    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    5867 
    59     <antcall target="deploy.for.portal" inheritRefs="true" /> 
    60   </target> 
    61  
    62   <target name="deploy.for.portal" if="org.bedework.global.portal.platform" > 
    63     <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml" 
    64          inheritrefs="true" target="deploy" /> 
     68    <if> 
     69      <isset property="org.bedework.global.portal.platform" /> 
     70      <then> 
     71        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml" 
     72             inheritrefs="true" target="deploy" /> 
     73      </then> 
     74    </if> 
    6575  </target> 
    6676 

  • trunk/deployment/webadmin/webapp/resources/default/default/errors.xsl

    r1148 r1164  
    173173      </xsl:when> 
    174174      <xsl:when test="id='edu.rpi.sss.util.error.exc'"> 
    175         <p>Utility package error: <em><xsl:value-of select="param"/></em></p> 
     175        <p>An exception occurred: <em><xsl:value-of select="param"/></em></p> 
    176176      </xsl:when> 
    177177      <xsl:otherwise> 

  • trunk/deployment/webconfig/webapp/build.xml

    r997 r1164  
    1616 
    1717    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
     18 
     19    <property name="org.bedework.use.dojo" value="true" /> 
    1820 
    1921    <!-- Flag as struts --> 

  • trunk/deployment/webpublic/webapp/build.xml

    r1105 r1164  
    1616 
    1717    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
     18 
     19    <property name="org.bedework.use.dojo" value="true" /> 
    1820 
    1921    <!-- Flag as struts --> 
    …… 
    5355    </copy> 
    5456 
     57    <!-- Deploy common resources --> 
     58    <ant antfile="${org.bedework.common.resources}/build.xml" 
     59         inheritrefs="true" target="deploy" > 
     60      <property name="common.resources.dest.dir" 
     61                location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}/resources" /> 
     62    </ant> 
     63 
    5564    <echo message="***************************************************************" /> 
    5665    <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    …… 
    6877    <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" /> 
    6978 
    70     <antcall target="deploy.for.portal" inheritRefs="true" /> 
    71   </target> 
    72  
    73   <target name="deploy.for.portal" if="org.bedework.global.portal.platform" > 
    74     <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml" 
    75          inheritrefs="true" target="deploy" /> 
     79    <if> 
     80      <isset property="org.bedework.global.portal.platform" /> 
     81      <then> 
     82        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml" 
     83             inheritrefs="true" target="deploy" /> 
     84      </then> 
     85    </if> 
    7686  </target> 
    7787 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/errors.xsl

    r952 r1164  
    33  <xsl:template match="error"> 
    44    <xsl:choose> 
    5       <xsl:when test="id='edu.rpi.sss.util.error.exc'"> 
    6           An exception occurred:<br/> 
    7           <em><xsl:value-of select="param"/></em> 
    8       </xsl:when> 
    95      <xsl:when test="id='org.bedework.client.error.nosuchevent'"> 
    106          Event does not exist:<br/><em><xsl:value-of select="param"/></em> 
    …… 
    1915          The request cannot be processed: missing subscription ID. 
    2016      </xsl:when> 
    21       <xsl:when test="id='org.bedework.client.error.unknowncalendar'"> 
     17      <xsl:when test="id='org.bedework.client.error.nosuchcalendar'"> 
    2218          Unknown calendar 
    2319      </xsl:when> 
    …… 
    3329            = <xsl:value-of select="param"/> 
    3430        </xsl:if> 
     31      <xsl:when test="id='edu.rpi.sss.util.error.exc'"> 
     32        An exception occurred: <em><xsl:value-of select="param"/></em> 
     33      </xsl:when> 
    3534      </xsl:otherwise> 
    3635    </xsl:choose> 

  • trunk/deployment/webuser/webapp/build.xml

    r1105 r1164  
    1616 
    1717    <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" /> 
     18 
     19    <property name="org.bedework.use.dojo" value="true" /> 
    1820 
    1921    <!-- Flag as struts --> 
    …… 
    4850      <fileset dir="${app.resources.dir}/demoskins" /> 
    4951    </copy> 
     52 
     53    <!-- Deploy common resources --> 
     54    <ant antfile="${org.bedework.common.resources}/build.xml" 
     55         inheritrefs="true" target="deploy" > 
     56      <property name="common.resources.dest.dir" 
     57                location="${org.bedework.appserver.dir}/${propval.app.resources.dir}/resources" /> 
     58    </ant> 
    5059 
    5160    <echo message="***************************************************************" />