Changeset 1935

Show
Ignore:
Timestamp:
10/28/08 22:58:10
Author:
douglm
Message:

Further changes to the build.

Delete (most of) the jar files from the lib directory - we are downloading them from bedework.org at build time.

Use a macro to load the deployment properties adn define some deployment proeprties based on the run time options.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildsh.xml

    r1919 r1935  
    1919 
    2020  <target name="init"> 
    21     <!-- Load the location of the libraries --> 
    22     <property file="${org.bedework.project.bedework}/build/libjars.properties" /> 
    23  
    2421    <!-- Destinations - where we build stuff --> 
    2522    <property name="app.dest.home" 
    …… 
    119116 
    120117    <!-- Include the quickstart jdbc driver --> 
    121     <copy todir="${app.dest.lib}" file="${appserver.jdbcdriver.jar}"/> 
     118    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hsqldb}"/> 
    122119 
    123120    <copy todir="${app.dest.classes}"> 
    …… 
    138135    <!-- Create the env.properties file --> 
    139136    <mkdir dir="${app.dest.properties}" /> 
    140  
    141     <copy tofile="${app.dest.properties}/env.properties" 
    142           file="${org.bedework.config.properties}" /> 
    143137 
    144138    <copy tofile="${app.dest.properties}/options.xml" 

  • trunk/build/buildwar.xml

    r1933 r1935  
    4646 
    4747  <target name="init.common"> 
    48     <!-- Load the location of the libraries --> 
    49     <property file="${org.bedework.project.bedework}/build/libjars.properties" /> 
    50  
    5148    <!-- Destinations - where we build an unwrapped war --> 
    5249    <property name="app.dest.war" 
    …… 
    368365      </not> 
    369366      <then> 
    370         <copy todir="${app.dest.lib}" file="${xalan.jar}"/> 
     367        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.xalan}"/> 
    371368      </then> 
    372369    </if> 

  • trunk/build/quickstart/build.xml

    r1917 r1935  
    2525    <echo message="${org.bedework.README}" /> 
    2626  </target> 
     27 
     28  <echo message="Load user properties from ${org.bedework.user.build.properties}" /> 
     29 
     30  <!-- Load user property definition overrides --> 
     31  <property file="${org.bedework.user.build.properties}" /> 
     32 
     33  <!-- This may have defined the config properties location. Load that now to get overrides 
     34  <property file="${org.bedework.config.properties}" />--> 
     35 
     36  <import file="${bedework.quickstart.basedir}/../loadDeployConfig.xml"/> 
    2737 
    2838  <target name="usage" depends="init" 
    …… 
    8595             file="${org.bedework.user.build.properties}" /> 
    8696 
    87     <echo message="Load user properties from ${org.bedework.user.build.properties}" /> 
    88  
    89     <!-- Load user property definition overrides --> 
    90     <property file="${org.bedework.user.build.properties}" /> 
    91  
    92     <!-- This may have defined the config properties location. Load that now to get overrides --> 
    93     <property file="${org.bedework.config.properties}" /> 
    94  
    95  
    9697    <!-- Unfortunately it sits on top of everything 
    9798    <splash imageurl="file://${org.bedework.project.bedework}/docs/icons/bedeworkLogo.gif"/> 
    …… 
    103104              location="${user.home}/bedework.build.properties" /> 
    104105 
     106    <property name="org.bedework.appserver.dir" 
     107              location="${org.bedework.project.bedework}/../apache-tomcat-5.5.17" /> 
     108 
     109    <property name="org.bedework.hsqldb.dir" 
     110              location="${org.bedework.project.bedework}/../hsqldb-1.7.3.3" /> 
     111 
    105112    <echo message="Load user properties from ${org.bedework.user.build.properties}" /> 
    106113 
    …… 
    108115    <property file="${org.bedework.user.build.properties}" /> 
    109116 
    110     <!-- ==================== config properties ========================= --> 
     117    <!-- ==================== config properties ========================= 
    111118    <property name="org.bedework.config.properties" 
    112119              location="${org.bedework.config.base}/configs/democal.properties" /> 
    …… 
    122129      </filterchain> 
    123130    </loadproperties> 
     131    --> 
    124132  </target> 
    125133 

  • trunk/build/quickstart/run-tomcat.xml

    r1914 r1935  
    1010 
    1111<project name="quickstart-run-tomcat" default="tomcatstart" basedir="."> 
    12   <!-- This target normally overriden by the importing build.xml --> 
     12  <!-- This target normally overridden by the importing build.xml --> 
    1313  <target name="run.init"> 
    1414    <property name="org.bedework.project.bedework" 

  • trunk/config/bwbuild/default/cal.options.xml

    r1933 r1935  
    55    <bedework> 
    66      <global> 
     7        <version>3.5</version> 
     8 
    79        <!-- This property is how the running system finds the system settings. 
    810             In theory we could have multiple settings with different names 

  • trunk/config/bwbuild/default/cal.properties

    r1933 r1935  
    1717# Global options 
    1818# 
    19 org.bedework.global.version=3.5 
    20  
    2119# Define the names of the applications we want to build 
    2220org.bedework.install.app.names=bwconfig,CalAdmin,EventSubmit,Events,SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres 
    …… 
    135133org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed 
    136134 
     135# Where we keep the dojo stuff in deployment/resources/javascript 
     136org.bedework.dojo.dir=dojo-0.4.1-ajax 
     137 
     138# A place to put jdbc drivers. This can be directed at any local directory 
     139org.bedework.jdbc.lib=${org.bedework.project.bedework}/lib/jdbc 
     140 
    137141# ------------------------------------------------------------------------ 
    138142# hsqldb defs 

  • trunk/config/bwbuild/jboss/democal.options.xml

    r1933 r1935  
    55    <bedework> 
    66      <global> 
     7        <version>3.5</version> 
     8 
    79        <!-- This property is how the running system finds the system settings. 
    810             In theory we could have multiple settings with different names 

  • trunk/config/bwbuild/jboss/democal.properties

    r1933 r1935  
    1717# Global options 
    1818# 
    19 org.bedework.global.version=3.4.1 
    20  
    2119# Define the names of the applications we want to build 
    2220org.bedework.install.app.names=bwconfig,CalAdmin,EventSubmit,Events,SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres 
    …… 
    126124# ------------------------------------------------------------------------ 
    127125# 
     126# 
     127# ------------------------------------------------------------------------ 
     128# directory defs 
     129# ------------------------------------------------------------------------ 
     130 
     131org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed 
     132 
     133# Where we keep the dojo stuff in deployment/resources/javascript 
     134org.bedework.dojo.dir=dojo-0.4.1-ajax 
     135 
     136# A place to put jdbc drivers. This can be directeed at any local directory 
     137org.bedework.jdbc.lib=${org.bedework.project.bedework}/lib/jdbc 
     138 
    128139# ------------------------------------------------------------------------ 
    129140# hsqldb defs 

  • trunk/config/configs/democal.options.xml

    r1933 r1935  
    55    <bedework> 
    66      <global> 
     7        <version>3.5</version> 
     8 
    79        <!-- This property is how the running system finds the system settings. 
    810             In theory we could have multiple settings with different names 

  • trunk/config/configs/democal.properties

    r1933 r1935  
    1616# Global options 
    1717# 
    18 org.bedework.global.version=3.5 
    1918 
    2019# Define the names of the applications we want to build 
    …… 
    133132org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed 
    134133 
     134# Where we keep the dojo stuff in deployment/resources/javascript 
     135org.bedework.dojo.dir=dojo-0.4.1-ajax 
     136 
     137# A place to put jdbc drivers. This can be directeed at any local directory 
     138org.bedework.jdbc.lib=${org.bedework.project.bedework}/lib/jdbc 
     139 
    135140# ------------------------------------------------------------------------ 
    136141# hsqldb defs 

  • trunk/deployment/appjars.xml

    r1933 r1935  
    303303      <getJar lib="${org.bedework.app.lib}" 
    304304              name="servletapi" version="2.4" /> 
     305 
     306      <getJar lib="${org.bedework.app.lib}" 
     307              name="xalan" version="2.6.0" /> 
     308      <getJar lib="${org.bedework.app.lib}" 
     309              name="hsqldb" version="1.7.3.3" /> 
    305310    </sequential> 
    306311 </macrodef> 

  • trunk/deployment/build.xml

    r1900 r1935  
    3939            location="${org.bedework.temp.dir}/extrajars" /> 
    4040 
    41   <!-- Load the location of the libraries --> 
    42   <property file="${org.bedework.project.bedework}/build/libjars.properties" /> 
    43  
    4441  <dirname property="this.build.dir" file="${ant.file}"/> 
    4542  <property name="bedework.deployment.base" location="this.build.dir" /> 
    …… 
    4946  <import file="${this.build.dir}/appjars.xml" /> 
    5047 
     48  <import file="${build.dir}/loadDeployConfig.xml"/> 
     49 
    5150  <target name="init" > 
    5251    <getAppJars /> 
    …… 
    5453    <property name="source.home" location="${this.build.dir}/src"/> 
    5554 
    56     <!-- Load default deploy properties 
    57     <property file="${this.build.dir}/deploy.properties"/> 
    58      --> 
    59  
    60     <!-- ==================== config properties ========================= --> 
     55    <loadDeployConfig /> 
     56 
     57    <!-- ==================== config properties ========================= 
    6158    <property name="org.bedework.config.properties" 
    6259              location="${org.bedework.config.base}/configs/democal.properties" /> 
    …… 
    6663    <echo message="==========================================================" /> 
    6764    <echo message="Use config properties ${org.bedework.config.properties}" /> 
    68     <loadproperties 
    69           srcFile="${org.bedework.config.properties}" > 
     65    <loadproperties srcFile="${org.bedework.config.properties}" > 
    7066      <filterchain> 
    7167        <expandproperties/> 
    7268      </filterchain> 
    7369    </loadproperties> 
     70--> 
    7471 
    7572    <!-- default to debug off --> 
    …… 
    9390      </then> 
    9491    </if> 
    95  
    96     <!-- ==================== config properties ========================= 
    97     <property name="org.bedework.config.properties" 
    98               location="${org.bedework.config.base}/configs/${org.bedework.clone.name}.properties" /> 
    99  
    100     <echo message="==========================================================" /> 
    101     <echo message="Use clone properties ${org.bedework.config.properties}" /> 
    102     <loadproperties 
    103           srcFile="${org.bedework.config.properties}" > 
    104       <filterchain> 
    105         <expandproperties/> 
    106       </filterchain> 
    107     </loadproperties> 
    108     --> 
    10992  </target> 
    11093 

  • trunk/deployment/resources/build.xml

    r1863 r1935  
    122122                <!-- Add dojo --> 
    123123                <copy todir="${cmn.destdir}/javascript/dojo"> 
    124                   <fileset dir="${common.resources.dir}/javascript/${dojo.dir}" /> 
     124                  <fileset dir="${common.resources.dir}/javascript/${org.bedework.dojo.dir}" /> 
    125125                </copy> 
    126126              </then>