Changeset 1170

Show
Ignore:
Timestamp:
12/18/06 22:11:58
Author:
douglm
Message:

Little functional change here.

Created definitions for all error codes generated by the web code.
Created new errors.xsl common to all web apps
Copy dojo code into new common web directory for inclusion by web apps.
Copy new errors.xsl into same directory.

Delete all old errors.xsl

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/configs/democal.properties

    r1105 r1170  
    4343org.bedework.global.public.calendar.uri=/cal 
    4444org.bedework.global.personal.calendar.uri=/ucal 
     45 
     46# This is where we copy common xsl and javascript for inclusion by xsl and generated 
     47# content. 
     48org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common 
    4549 
    4650# 

  • trunk/deployment/resources/build.xml

    r1164 r1170  
    1010    <dirname property="common.resources.dir" file="${ant.file}"/> 
    1111 
    12     <property name="common.resources.dest.dir" 
     12    <property name="app.common.resources.dest.dir" 
    1313              location="${org.bedework.deploy.app.sou}" /> 
    1414 
    1515    <property name="org.bedework.use.dojo" value="true" /> 
    1616 
    17     <!-- Flag as struts --> 
    18     <property name="org.bedework.strutsapp" value="true" /> 
    19  
    20     <!-- 
    21     <property name="app.web.xml" 
    22               value="${app.sou.dir}/war/WEB-INF/web.xml" /> 
    23               --> 
    24  
    2517    <!-- This should be in the config stuff --> 
    2618    <property name="propval.directory.browsing.disallowed" 
    2719              value="${app.directory.browsing.disallowed}" /> 
    28  
    29     <property name="propval.app.guestmode" value="true" /> 
    30  
    31     <property name="app.resources.dir" 
    32               location="${this.dir}/resources" /> 
    3320  </target> 
    3421 
    3522  <!-- ================================================================= 
    36        The "deploy" target first builds a configured component then copies 
    37        all required files to the appropriate servlet container directories. 
    38  
    39        Currently this only works for the quickstart distribution. 
    40        For example, it does not handle deploying into jboss and copying 
    41        resource files (images, stylesheets) to external locations. 
     23       The "deploy" target is called by applications which need common 
     24       resources copied into their own directory structure. 
    4225       ================================================================= --> 
    4326 
    4427  <target name="deploy" depends="init" > 
     28  </target> 
     29 
     30  <!-- ================================================================= 
     31       The "deploy.common" target is called once to create a common web 
     32       accessible directory 
     33       ================================================================= --> 
     34 
     35  <target name="deploy.common" depends="init" > 
     36    <property name="cmn.destdir" 
     37              location="${org.bedework.appserver.dir}/${org.bedework.global.common.deploydir}"/> 
    4538    <if> 
    4639      <isset property="org.bedework.use.dojo" /> 
    4740      <then> 
    4841        <!-- Add dojo --> 
    49         <copy todir="${common.resources.dest.dir}/javascript/dojo"> 
     42        <copy todir="${cmn.destdir}/javascript/dojo"> 
    5043          <fileset dir="${common.resources.dir}/javascript/${dojo.dir}" /> 
    5144        </copy> 
    5245      </then> 
    5346    </if> 
     47 
     48    <copy todir="${cmn.destdir}"> 
     49      <fileset dir="${common.resources.dir}/xsl" /> 
     50    </copy> 
    5451  </target> 
    5552</project> 

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

    r1105 r1170  
    1212 
    1313  <target name="deploy" depends="init,build.configured" > 
     14    <!-- Deploy common resources --> 
     15    <ant antfile="${org.bedework.common.resources}/build.xml" 
     16         inheritrefs="true" target="deploy.common" /> 
    1417  </target> 
    1518 

  • trunk/deployment/webadmin/portlet/resources/default/default/default.xsl

    r1105 r1170  
    4141 
    4242  <!-- DEFINE INCLUDES --> 
    43   <xsl:include href="errors.xsl"/> 
     43  <xsl:include href="/bedework-common/default/default/errors.xsl"/> 
    4444  <xsl:include href="messages.xsl"/> 
    4545 

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

    r1164 r1170  
    4848    <ant antfile="${org.bedework.common.resources}/build.xml" 
    4949         inheritrefs="true" target="deploy" > 
    50       <property name="common.resources.dest.dir" 
     50      <property name="app.common.resources.dest.dir" 
    5151                location="${org.bedework.appserver.dir}/${propval.app.resources.dir}/resources" /> 
    5252    </ant> 

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

    r1161 r1170  
    4141 
    4242  <!-- DEFINE INCLUDES --> 
    43   <xsl:include href="errors.xsl"/> 
     43  <xsl:include href="/bedework-common/default/default/errors.xsl"/> 
    4444  <xsl:include href="messages.xsl"/> 
    4545 

  • trunk/deployment/webpublic/portlet/resources/demoskins/MainCampus/default/default/default.xsl

    r952 r1170  
    6666 
    6767  <!-- DEFINE INCLUDES --> 
    68   <xsl:include href="errors.xsl"/> 
     68  <xsl:include href="/bedework-common/default/default/errors.xsl"/> 
    6969 
    7070  <!-- DEFINE GLOBAL CONSTANTS --> 

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

    r1164 r1170  
    5858    <ant antfile="${org.bedework.common.resources}/build.xml" 
    5959         inheritrefs="true" target="deploy" > 
    60       <property name="common.resources.dest.dir" 
     60      <property name="app.common.resources.dest.dir" 
    6161                location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}/resources" /> 
    6262    </ant> 

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

    r1169 r1170  
    5252 
    5353  <!-- DEFINE INCLUDES --> 
    54   <xsl:include href="errors.xsl"/> 
     54  <xsl:include href="/bedework-common/default/default/errors.xsl"/> 
    5555 
    5656  <!-- DEFINE GLOBAL CONSTANTS --> 
    …… 
    119119        <!-- load javascript --> 
    120120        <xsl:if test="/bedework/page='calendarList'"> 
    121           <script type="text/javascript" src="{$resourcesRoot}/resources/javascript/dojo/dojo.js"/> 
     121          <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js"/> 
    122122          <script type="text/javascript" src="{$resourcesRoot}/resources/javascript/bedework.js"/> 
    123123        </xsl:if> 

  • trunk/deployment/webuser/portlet/resources/demoskins/default/default/default.xsl

    r952 r1170  
    3939 
    4040  <!-- DEFINE INCLUDES --> 
    41   <xsl:include href="errors.xsl"/> 
     41  <xsl:include href="/bedework-common/default/default/errors.xsl"/> 
    4242  <xsl:include href="messages.xsl"/> 
    4343 

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

    r1164 r1170  
    5454    <ant antfile="${org.bedework.common.resources}/build.xml" 
    5555         inheritrefs="true" target="deploy" > 
    56       <property name="common.resources.dest.dir" 
     56      <property name="app.common.resources.dest.dir" 
    5757                location="${org.bedework.appserver.dir}/${propval.app.resources.dir}/resources" /> 
    5858    </ant> 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1163 r1170  
    3939 
    4040  <!-- DEFINE INCLUDES --> 
    41   <xsl:include href="errors.xsl"/> 
     41  <xsl:include href="/bedework-common/default/default/errors.xsl"/> 
    4242  <xsl:include href="messages.xsl"/> 
    4343