Changeset 1806

Show
Ignore:
Timestamp:
04/03/08 16:49:18
Author:
douglm
Message:

Changes to allow a jboss quickstart

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.4.1/build/buildsh.xml

    r1429 r1806  
    112112 
    113113    <!-- Include the quickstart jdbc driver --> 
    114     <copy todir="${app.dest.lib}" file="${hsqldb.jdbcdriver.jar}"/> 
     114    <copy todir="${app.dest.lib}" file="${appserver.jdbcdriver.jar}"/> 
    115115 
    116116    <copy todir="${app.dest.classes}"> 

  • releases/bedework-3.4.1/build/quickstart-build.xml

    r1754 r1806  
    8383    <!-- Load user property definition overrides --> 
    8484    <property file="${org.bedework.user.build.properties}" /> 
     85 
     86    <!-- This may have defined the config properties location. Load that now to get overrides --> 
     87    <property file="${org.bedework.config.properties}" /> 
     88 
    8589 
    8690    <!-- Unfortunately it sits on top of everything 

  • releases/bedework-3.4.1/deployment/resources/build.xml

    r1193 r1806  
    105105      </then> 
    106106      <else> 
    107         <!-- Just copy into a common location --> 
    108         <property name="cmn.destdir" 
    109                   location="${org.bedework.appserver.dir}/${org.bedework.global.common.deploydir}"/> 
    110107        <if> 
    111           <isset property="org.bedework.use.dojo" /> 
     108          <not> 
     109            <isset property="org.bedework.global.noskins" /> 
     110          </not> 
    112111          <then> 
    113             <!-- Add dojo --> 
    114             <copy todir="${cmn.destdir}/javascript/dojo"> 
    115               <fileset dir="${common.resources.dir}/javascript/${dojo.dir}" /> 
     112            <!-- Just copy into a common location --> 
     113            <property name="cmn.destdir" 
     114                      location="${org.bedework.appserver.dir}/${org.bedework.global.common.deploydir}"/> 
     115            <if> 
     116              <isset property="org.bedework.use.dojo" /> 
     117              <then> 
     118                <!-- Add dojo --> 
     119                <copy todir="${cmn.destdir}/javascript/dojo"> 
     120                  <fileset dir="${common.resources.dir}/javascript/${dojo.dir}" /> 
     121                </copy> 
     122              </then> 
     123            </if> 
     124 
     125            <copy todir="${cmn.destdir}"> 
     126              <fileset dir="${common.resources.dir}/xsl" /> 
    116127            </copy> 
    117128          </then> 
    118129        </if> 
    119  
    120         <copy todir="${cmn.destdir}"> 
    121           <fileset dir="${common.resources.dir}/xsl" /> 
    122         </copy> 
    123130      </else> 
    124131    </if> 

  • releases/bedework-3.4.1/deployment/termination/jboss/build.xml

    r1764 r1806  
    99    <dirname property="this.dir" file="${ant.file}"/> 
    1010 
     11    <property name="app.ear.file.name" 
     12              value="${org.bedework.global.ear.name}.ear" /> 
    1113    <property name="app.ear.file" 
    12               location="${dist.home}/${org.bedework.global.ear.name}.ear" /> 
     14              location="${dist.home}/${app.ear.file.name}" /> 
    1315    <property name="app.resources.dir" 
    1416              location="${this.dir}/../webapp/resources" /> 
    …… 
    2527 
    2628    <property name="ear.dir" 
    27               location="${org.bedework.temp.dir}/ear" /> 
     29              location="${org.bedework.temp.dir}/${app.ear.file.name}" /> 
    2830 
    2931    <property name="properties.dir" 
    …… 
    8890    <zip destfile="${app.ear.file}" 
    8991         basedir="${ear.dir}"/> 
     92 
     93    <!-- Deploy common resources --> 
     94    <ant antfile="${org.bedework.common.resources}/build.xml" 
     95         inheritrefs="true" target="deploy" /> 
     96 
     97    <!-- copy the ear - at the moment copy the uncompressed. --> 
     98 
     99    <if> 
     100      <isset property="org.bedework.appserver.deploy.dir" /> 
     101      <then> 
     102        <delete dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
     103        <mkdir dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" /> 
     104        <copy todir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}"> 
     105          <fileset dir="${ear.dir}"/> 
     106        </copy> 
     107      </then> 
     108    </if> 
    90109  </target> 
    91110 

  • releases/bedework-3.4.1/deployment/webadmin/jboss/build.xml

    r952 r1806  
    2626    <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" /> 
    2727    <echo message="***************************************************************" /> 
     28    <if> 
     29      <not> 
     30        <isset property="org.bedework.global.noskins" /> 
     31      </not> 
     32      <then> 
     33        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
     34        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
     35          <fileset dir="${this.dir}/../webapp/resources" /> 
     36        </copy> 
     37      </then> 
     38    </if> 
    2839  </target> 
    2940 

  • releases/bedework-3.4.1/deployment/webadmin/webapp/build.xml

    r1443 r1806  
    4040 
    4141  <target name="deploy" depends="init,build.configured" > 
    42     <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
    43     <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
    44       <fileset dir="${app.resources.dir}" /> 
    45     </copy> 
     42    <if> 
     43      <not> 
     44        <isset property="org.bedework.global.noskins" /> 
     45      </not> 
     46      <then> 
     47        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
     48        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
     49          <fileset dir="${app.resources.dir}" /> 
     50        </copy> 
     51      </then> 
     52    </if> 
    4653 
    4754    <!-- Deploy common resources --> 

  • releases/bedework-3.4.1/deployment/webconfig/jboss/build.xml

    r952 r1806  
    2626    <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" /> 
    2727    <echo message="***************************************************************" /> 
     28    <if> 
     29      <not> 
     30        <isset property="org.bedework.global.noskins" /> 
     31      </not> 
     32      <then> 
     33        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
     34        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
     35          <fileset dir="${this.dir}/../webapp/resources" /> 
     36        </copy> 
     37      </then> 
     38    </if> 
    2839  </target> 
    2940 

  • releases/bedework-3.4.1/deployment/webconfig/webapp/build.xml

    r1164 r1806  
    4747 
    4848  <target name="deploy" depends="init,build.configured" > 
    49     <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
    50     <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
    51       <fileset dir="${app.resources.dir}" /> 
    52     </copy> 
     49    <if> 
     50      <not> 
     51        <isset property="org.bedework.global.noskins" /> 
     52      </not> 
     53      <then> 
     54        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
     55        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
     56          <fileset dir="${app.resources.dir}" /> 
     57        </copy> 
     58      </then> 
     59    </if> 
    5360 
    5461    <echo message="***************************************************************" /> 

  • releases/bedework-3.4.1/deployment/webpublic/jboss/build.xml

    r952 r1806  
    2626    <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" /> 
    2727    <echo message="***************************************************************" /> 
     28    <!-- First copy the resources into the server --> 
     29 
     30    <if> 
     31      <not> 
     32        <isset property="org.bedework.global.noskins" /> 
     33      </not> 
     34      <then> 
     35        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}" /> 
     36        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}"> 
     37          <fileset dir="${this.dir}/../webapp/resources/demoskins/${propval.app.cal.suite}" /> 
     38        </copy> 
     39      </then> 
     40    </if> 
    2841  </target> 
    2942 

  • releases/bedework-3.4.1/deployment/websubmit/jboss/build.xml

    r1580 r1806  
    2626    <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" /> 
    2727    <echo message="***************************************************************" /> 
     28    <!-- First copy the resources into the server --> 
     29 
     30    <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
     31    <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
     32      <fileset dir="${this.dir}/../webapp/resources/demoskins" /> 
     33    </copy> 
    2834  </target> 
    2935 

  • releases/bedework-3.4.1/deployment/websubmit/webapp/build.xml

    r1580 r1806  
    4646    <!-- First copy the resources into the server --> 
    4747 
    48     <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
    49     <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
    50       <fileset dir="${app.resources.dir}/demoskins" /> 
    51     </copy> 
     48    <if> 
     49      <not> 
     50        <isset property="org.bedework.global.noskins" /> 
     51      </not> 
     52      <then> 
     53        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
     54        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
     55          <fileset dir="${app.resources.dir}/demoskins" /> 
     56        </copy> 
     57      </then> 
     58    </if> 
    5259 
    5360    <!-- Deploy common resources --> 

  • releases/bedework-3.4.1/deployment/webuser/jboss/build.xml

    r952 r1806  
    2626    <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" /> 
    2727    <echo message="***************************************************************" /> 
     28 
     29    <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
     30    <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
     31      <fileset dir="${this.dir}/../webapp/resources/demoskins" /> 
     32    </copy> 
    2833  </target> 
    2934 

  • releases/bedework-3.4.1/deployment/webuser/webapp/build.xml

    r1443 r1806  
    4646    <!-- First copy the resources into the server --> 
    4747 
    48     <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
    49     <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
    50       <fileset dir="${app.resources.dir}/demoskins" /> 
    51     </copy> 
     48    <if> 
     49      <not> 
     50        <isset property="org.bedework.global.noskins" /> 
     51      </not> 
     52      <then> 
     53        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" /> 
     54        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}"> 
     55          <fileset dir="${app.resources.dir}/demoskins" /> 
     56        </copy> 
     57      </then> 
     58    </if> 
    5259 
    5360    <!-- Deploy common resources -->