Changeset 3104

Show
Ignore:
Timestamp:
01/02/11 01:26:11
Author:
douglm
Message:

Remove definition of property "base.name" from (almost) every build file. Was not used.
Stop defining, creating and copying to libapi. Wasn't in use.

Remove build directory from every project and use the build files in the main bedework project. improves consistency and maintainability. Also allowed some bugs to be fixed.

Allow setting of message level during build and set it at quiet. Allows error messages to be more obvious.

Create macro to handle the common property definitions. Reduces size and complexity of build files.

Add a build-jar macro. Removes need for build files for sub-modules. Partway through converting to use that.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.7/build.xml

    r2985 r3104  
    66--> 
    77 
    8 <project name="bedework.build" default="usage" basedir="."> 
     8<project name="bedework.build" default="init" basedir="."> 
    99  <property environment="env"/> 
    1010 
    …… 
    6262            location="${org.bedework.projects}/webdav" /> 
    6363 
    64   <import file="${org.bedework.project.bedework}/build/buildfilters.xml" /> 
    65   <import file="${org.bedework.project.bedework}/build/loadDeployConfig.xml"/> 
    66   <import file="${org.bedework.project.bedework}/build/dirTools.xml"/> 
     64  <property name="build.dir" location="${org.bedework.project.bedework}/build"/> 
     65   
     66  <property name="buildjar" location="${build.dir}/buildTools/buildjar.xml"/> 
     67  <property name="buildsh" location="${build.dir}/buildsh.xml"/> 
     68  <property name="buildwar" location="${build.dir}/buildwar.xml"/> 
     69 
     70  <import file="${build.dir}/buildTools/deftasks.xml"/> 
     71 
     72  <deftasks/> 
     73 
     74  <import file="${build.dir}/buildfilters.xml" /> 
     75  <import file="${build.dir}/loadDeployConfig.xml"/> 
     76  <import file="${build.dir}/dirTools.xml"/> 
    6777 
    6878  <target name="README" depends="init" 
    …… 
    101111    <property name="resources.dir" location="${bw.project.home}/resources"/> 
    102112    <property name="bin.home" location="${bw.project.home}/bin"/> 
    103  
    104     <property name="build.dir" location="${bw.project.home}/build"/> 
    105     <property name="buildjar" location="${build.dir}/buildTools/buildjar.xml"/> 
    106     <property name="buildsh" location="${build.dir}/buildsh.xml"/> 
    107     <property name="buildwar" location="${build.dir}/buildwar.xml"/> 
    108  
     113     
    109114    <property name="org.bedework.build.caldav" value="yes" /> 
    110115 
    …… 
    176181       ================================================================= --> 
    177182 
    178   <target name="build" depends="init.build,build.rpiutil,build.build, 
     183  <target name="build" depends="init.build,build.deployutil,build.rpiutil,build.build, 
    179184                                build.access,build.davutil, 
    180185                                build.webdav,build.caldav, 
    …… 
    183188                                build.bwtools,build.webapps,build.indexer, 
    184189                                build.dumprestore, 
    185                                 build.testsuite,build.deployutil" 
     190                                build.testsuite" 
    186191          description="builds the project"> 
    187192    <mkdir dir="${dist.home}/tools" /> 
    …… 
    663668      <property name="build.jar.file" location="${org.bedework.deployutil.jar}" /> 
    664669    </ant> 
     670     
     671    <copy todir="${build.dir}" file="${org.bedework.deployutil.jar}" /> 
    665672  </target> 
    666673 

  • releases/bedework-3.7/build/build.xml

    r2675 r3104  
    88 
    99<project name="bedework.build" default="build"> 
    10   <property name="base.name" value="build"/> 
    1110  <property name="lib.dir" location="${org.bedework.default.lib}"/> 
    1211 

  • releases/bedework-3.7/build/buildfilters.xml

    r3001 r3104  
    1212            value="${quickstart.dir}"/> 
    1313 
     14    <filter token="APPSERVER-DATA-DIR" 
     15            value="${org.bedework.data.dir}"/> 
     16         
    1417    <filter token="DATA_DIR" 
    1518            value="${org.bedework.data.dir}"/> 
    …… 
    5356    <filter token="LIFERAY-COMPANY-ID" 
    5457            value="${org.bedework.global.liferay.company-id}"/> 
     58 
     59    <filter token="JBOSS-CARDDB-DATASOURCE" 
     60            value="${org.bedework.global.jboss.carddb.datasource.jndiname}"/> 
    5561 
    5662    <filter token="JBOSS-DB-DATASOURCE" 

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

    r2973 r3104  
    2929              location="${app.dest.home}/classes" /> 
    3030    <property name="app.dest.properties" 
    31               location="${app.dest.classes}/properties/calendar" /> 
     31              location="${app.dest.classes}/properties/${org.bedework.deployment.name}" /> 
    3232    <property name="app.dest.data" 
    3333              location="${app.dest.home}/data" /> 
    …… 
    5151    <antcall target="addLibs" inheritRefs="true" /> 
    5252 
    53     <copy todir="${app.dest.classes}"> 
    54       <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" /> 
    55       <filterset refid="property.filters" /> 
    56     </copy> 
    57  
    58     <copy todir="${app.dest.classes}"> 
    59       <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" /> 
    60       <filterset refid="property.filters" /> 
    61     </copy> 
     53    <if> 
     54      <isset property="org.bedework.sou.hibernate.properties" /> 
     55      <then> 
     56        <if> 
     57          <istrue value="${org.bedework.build.debug}" /> 
     58          <then> 
     59            <echo message="************* Copy hib properties from ${org.bedework.sou.hibernate.properties}" /> 
     60          </then> 
     61        </if> 
     62        <copy todir="${app.dest.classes}"> 
     63          <fileset dir="${org.bedework.sou.hibernate.properties}/properties" /> 
     64          <filterset refid="property.filters" /> 
     65        </copy> 
     66     
     67        <copy todir="${app.dest.classes}"> 
     68          <fileset dir="${org.bedework.sou.hibernate.properties}/hbms" /> 
     69          <filterset refid="property.filters" /> 
     70        </copy> 
     71      </then> 
     72    </if> 
    6273 
    6374    <copy tofile="${app.dest.classes}/sysevents.properties" 
    …… 
    8192 
    8293    <copy tofile="${app.dest.properties}/options.xml" 
    83           file="${org.bedework.config.options}" > 
     94          file="${org.bedework.options.file}" > 
    8495      <filterset> 
    8596        <filter token="RPI-DEBUG" value="${app.debug.val}"/> 

  • releases/bedework-3.7/build/buildwar.xml

    r2876 r3104  
    3838 
    3939<project name="bedework.buildwar" default="build" > 
     40  <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
     41 
    4042  <import file="${build.dir}/buildfilters.xml" /> 
    4143 
    …… 
    6365      </else> 
    6466    </if> 
    65     <property name="app.dest.properties.old" 
    66               location="${app.dest.classes}/properties/calendar" /> 
    6767    <property name="app.dest.properties" 
    68               location="${app.dest.classes}/properties" /> 
     68              location="${app.dest.classes}/properties/${org.bedework.deployment.name}" /> 
    6969  </target> 
    7070 
    …… 
    108108 
    109109  <target name="build" depends="init"> 
    110     <echo message="**************************************************" /> 
    111     <echo message=" * Building war ${propval.app.war.name}"/> 
    112     <echo message="**************************************************" /> 
     110    <infoMsg message="* =========== Building war ${propval.app.war.name}" /> 
    113111 
    114112    <delete dir="${app.dest.war}" /> 
    115113 
    116     <!-- Add modifed login pages --> 
    117     <copy todir="${app.dest.docs}/login" failonerror="false" > 
    118       <fileset dir="${org.bedework.common.resources}/login" /> 
    119       <filterset> 
    120         <filter token="DISPLAY-NAME" value="${propval.app.display.name}"/> 
    121       </filterset> 
    122     </copy> 
     114    <if> 
     115      <available file="${app.sou.dir}/war/docs" type="dir" /> 
     116      <then> 
     117        <!-- Add modifed login pages --> 
     118        <copy todir="${app.dest.docs}/login" failonerror="false" > 
     119          <fileset dir="${org.bedework.common.resources}/login" /> 
     120          <filterset> 
     121            <filter token="DISPLAY-NAME" value="${propval.app.display.name}"/> 
     122          </filterset> 
     123        </copy> 
     124      </then> 
     125    </if> 
    123126 
    124127    <!-- =============================================================== 
    …… 
    164167 
    165168    <copy tofile="${app.dest.properties}/options.xml" 
    166           file="${org.bedework.config.options}" > 
     169          file="${org.bedework.options.file}" > 
    167170      <filterset> 
    168171        <filter token="RPI-DEBUG" value="${app.debug.val}"/> 
    …… 
    170173      <filterset refid="property.filters" /> 
    171174    </copy> 
    172  
    173     <!-- Temp do it again --> 
    174     <mkdir dir="${app.dest.properties.old}" /> 
    175  
    176     <copy tofile="${app.dest.properties.old}/options.xml" 
    177           file="${org.bedework.config.options}" > 
    178       <filterset> 
    179         <filter token="RPI-DEBUG" value="${app.debug.val}"/> 
    180       </filterset> 
    181       <filterset refid="property.filters" /> 
    182     </copy> 
    183  
    184         <!-- 
    185     <if> 
    186       <available file="${app.sou.dir}/war/WEB-INF/classes" type="dir" /> 
    187       <then> 
    188                     <copy todir="${app.dest.classes}"> 
    189                       <fileset dir="${app.sou.dir}/war/WEB-INF/classes" 
    190                                includes="*"/> 
    191                       <filterset refid="property.filters" /> 
    192                     </copy> 
    193       </then> 
    194     </if> 
    195     --> 
    196  
    197         <!-- Make our own servlet.properties file for struts applications 
    198     <copy tofile="${app.dest.classes}/servlet.properties" file="${app.sou.properties}"> 
    199       <filterset refid="property.filters" /> 
    200     </copy> 
    201     --> 
    202  
     175     
    203176    <copy tofile="${app.dest.classes}/sysevents.properties" 
    204177          file="${org.bedework.config.sysevents.properties}" /> 
    205178 
    206     <!-- =============================================================== 
    207          Add hibernate jars and property files from calendar api. 
    208          =============================================================== --> 
    209  
    210     <copy todir="${app.dest.classes}"> 
    211       <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" /> 
    212       <filterset refid="property.filters" /> 
    213     </copy> 
    214  
    215     <copy todir="${app.dest.classes}"> 
    216       <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" /> 
    217       <filterset refid="property.filters" /> 
    218     </copy> 
     179    <if> 
     180      <isset property="org.bedework.sou.classpath.properties" /> 
     181      <then> 
     182        <copy todir="${app.dest.classes}"> 
     183          <fileset dir="${org.bedework.sou.classpath.properties}" /> 
     184          <filterset refid="property.filters" /> 
     185        </copy> 
     186      </then> 
     187    </if> 
     188 
     189    <if> 
     190      <isset property="org.bedework.sou.hibernate.properties" /> 
     191      <then> 
     192        <!-- =========================================================== 
     193             Add hibernate config. 
     194             =========================================================== --> 
     195 
     196        <debugMsg message="************* Copy hib properties from ${org.bedework.sou.hibernate.properties}" /> 
     197 
     198        <copy todir="${app.dest.classes}"> 
     199          <fileset dir="${org.bedework.sou.hibernate.properties}/properties" /> 
     200          <filterset refid="property.filters" /> 
     201        </copy> 
     202     
     203        <copy todir="${app.dest.classes}"> 
     204          <fileset dir="${org.bedework.sou.hibernate.properties}/hbms" /> 
     205          <filterset refid="property.filters" /> 
     206        </copy> 
     207      </then> 
     208    </if> 
    219209 
    220210    <!-- Make a temp copy of the web.xml file --> 
    …… 
    249239    <!-- build the war file or directory --> 
    250240    <mkdir dir="${dist.home}" /> 
    251          
    252        <!-- may be there as a file or a directory --> 
     241 
     242    <!-- may be there as a file or a directory --> 
    253243    <delete file="${app.war.file}" /> 
    254244    <delete dir="${app.war.file}" /> 
    255245         
    256246    <if> 
    257        <or> 
    258                <not> 
     247      <or> 
     248        <not> 
    259249          <isset property="org.bedework.global.wars.zipped" /> 
    260                </not> 
    261                <istrue value="${org.bedework.global.wars.zipped}"/> 
     250        </not> 
     251        <istrue value="${org.bedework.global.wars.zipped}"/> 
    262252      </or> 
    263253      <then> 
    264       <!-- Build a zipped war file --> 
     254        <!-- Build a zipped war file --> 
    265255        <war warfile="${app.war.file}" 
    266256             webxml="${app.dest.web.xml}" 
    …… 
    284274 
    285275  <target name="struts-stuff" if="org.bedework.strutsapp"> 
    286        <!-- Make our own servlet.properties file for struts applications --> 
     276    <!-- Make our own servlet.properties file for struts applications --> 
    287277    <echo file="${app.dest.classes}/servlet.properties" ><![CDATA[# 
    288278# ======================================================================== 
    …… 
    346336                     value="${propval.app.default.contenttype}" /> 
    347337    </replace> 
    348         
     338       
    349339    <!-- Copy a dummy startup file into the war. --> 
    350340    <copy todir="${app.dest.war}"> 

  • releases/bedework-3.7/build/loadDeployConfig.xml

    r2053 r3104  
    88<project name="loadDeployConfig" basedir="." default=""> 
    99  <macrodef name="loadDeployConfig"> 
     10    <!--<attribute name="extra.options" default="${org.bedework.carddav.options}"/> --> 
    1011    <sequential> 
    1112      <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
    …… 
    1314      <property environment="env"/> 
    1415 
    15       <echo message="Load user properties from ${org.bedework.user.build.properties}" /> 
    16  
    1716      <!-- Load user property definition overrides --> 
    1817      <property file="${org.bedework.user.build.properties}" /> 
    1918 
    20       <!-- These should already be defined in the above file 
    21       <property name="org.bedework.config.properties" 
    22                 location="${org.bedework.config.base}/configs/democal.properties" /> 
    23       <property name="org.bedework.config.options" 
    24                 location="${org.bedework.config.base}/configs/democal.options.xml" /> 
    25                 --> 
    26  
    27       <echo message="==========================================================" /> 
    28       <echo message="Use config properties ${org.bedework.config.properties}" /> 
    29       <property file="${org.bedework.config.properties}" /> 
     19      <infoMsg message="==========================================================" /> 
     20      <infoMsg message="Loading user properties from ${org.bedework.user.build.properties}" /> 
     21      <infoMsg message="Use config properties ${org.bedework.config.properties}" /> 
     22      <infoMsg message="Runtime options from ${org.bedework.config.options}" /> 
     23      <infoMsg message="==========================================================" /> 
     24         
     25        <property file="${org.bedework.config.properties}" /> 
    3026 
    3127      <!-- Load the run time options and define some properties based on some 
    3228           of the values --> 
    3329 
     30      <!-- Load the general bedework options --> 
    3431      <xmlproperty file="${org.bedework.config.options}"/> 
    3532 
    36       <!-- Load the CardDAV options --> 
    37       <xmlproperty file="${org.bedework.carddav.options}"/> 
     33      <!-- Load the extra options  
     34      <xmlproperty file="@{extra.options}"/>--> 
    3835 
    3936      <if> 
    …… 
    4946                    value="${org.bedework.configurations.home}/.portal/common-resources" /> 
    5047 
    51           <echo message="******************* load from ${org.bedework.config.portal.home}/portal.properties" /> 
     48          <debugMsg message="******************* load from ${org.bedework.config.portal.home}/portal.properties" /> 
     49 
    5250          <property file="${org.bedework.config.portal.home}/portal.properties" /> 
    5351        </then> 
    5452        <else> 
    55           <echo message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" /> 
     53          <debugMsg message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" /> 
     54 
    5655          <property file="${org.bedework.configurations.home}/.platform/standalone.properties" /> 
    5756        </else> 

  • releases/bedework-3.7/build/platforms/jbossService.xml

    r3095 r3104  
    2121      </then> 
    2222      <else> 
     23        <mkdir dir="${app.dest.classes}"/> 
     24         
    2325        <echo file="${app.dest.classes}/hibernate.properties"> 
    2426hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    2527hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    2628         
    27 hibernate.connection.datasource=java:${org.bedework.global.jboss.db.datasource.jndiname} 
     29hibernate.connection.datasource=java:${org.bedework.jboss.datasource.jndiname} 
    2830 
    2931hibernate.bytecode.use_reflection_optimizer=false 
    …… 
    5254      <else> 
    5355        <!-- Library in sar file --> 
     56        <property name="app.dest.lib" 
     57                  location="${app.dest.webinf}/lib" /> 
     58         
    5459        <copy todir="${app.dest.lib}" > 
    5560          <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
    …… 
    6166          </not> 
    6267          <then> 
    63             <property name="app.dest.lib" 
    64                       location="${app.dest.webinf}/lib" /> 
    6568            <antcall target="copyLibs" inheritRefs="true" /> 
    6669          </then> 

  • releases/bedework-3.7/build/platforms/jbossWar.xml

    r2955 r3104  
    5050        <property name="app.dest.lib" 
    5151                  location="${app.dest.webinf}/lib" /> 
    52         <antcall target="copyLibs" inheritRefs="true" /> 
     52        <if> 
     53          <not> 
     54            <isset property="propval.app.no.defaultlibs" /> 
     55          </not> 
     56          <then> 
     57            <antcall target="copyLibs" inheritRefs="true" /> 
     58          </then> 
     59        </if> 
    5360      </then> 
    5461      <else> 
    …… 
    7178      </not> 
    7279      <then> 
    73         <echo message="***************************************************************" /> 
    74         <echo message="Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    75         <echo message="***************************************************************" /> 
     80        <infoMsg message="* =========== Deploying standalone app ${app.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" /> 
    7681 
    7782        <!-- copy the war file. --> 
    …… 
    9095 
    9196  <target name="deployEar"> 
     97    <if> 
     98      <equals arg1="${org.bedework.global.ear.zipped}" 
     99              arg2="yes" /> 
     100      <then> 
     101        <property name="org.bedework.ear.dir" 
     102                  location="${org.bedework.temp.dir}/${org.bedework.ear.name}" /> 
     103        <property name="org.bedework.ear.file" 
     104                  location="${org.bedework.temp.dir}/${org.bedework.ear.name}.ear" /> 
     105      </then> 
     106      <else> 
     107        <property name="org.bedework.ear.dir" 
     108                  location="${org.bedework.temp.dir}/${org.bedework.ear.name}.ear" /> 
     109      </else> 
     110    </if> 
     111 
     112    <delete dir="${org.bedework.ear.dir}" /> 
     113    <mkdir dir="${org.bedework.ear.dir}" /> 
     114 
     115    <property name="org.bedework.ear.properties.jar" 
     116              value="${org.bedework.ear.dir}/bw-ear-properties.jar"/> 
     117 
    92118    <!-- Common library in ear file --> 
    93119    <property name="app.dest.lib" 
    94120              location="${org.bedework.ear.dir}" /> 
    95     <antcall target="copyLibs" inheritRefs="true" /> 
    96  
    97         <!-- And the extra jars we preserved --> 
     121    <if> 
     122      <not> 
     123        <isset property="propval.app.no.defaultlibs" /> 
     124      </not> 
     125      <then> 
     126        <antcall target="copyLibs" inheritRefs="true" /> 
     127      </then> 
     128    </if> 
     129 
     130    <!-- And the extra jars we preserved --> 
    98131    <copy todir="${app.dest.lib}" > 
    99132      <fileset dir="${org.bedework.temp.ear.extrajars.dir}" /> 
    100133    </copy> 
    101134         
    102     <echo message="***************************************************************" /> 
    103     <echo message="Building ear file for jboss deployment" /> 
    104     <echo message="***************************************************************" /> 
     135    <infoMsg message="* =========== Building ear file ${org.bedework.ear.dir} for jboss deployment" /> 
    105136 
    106137    <jar jarfile="${org.bedework.ear.properties.jar}"> 
    …… 
    108139    </jar> 
    109140 
    110     <path id="app.xml.cp"> 
    111       <pathelement location="${org.bedework.deployutil.jar}"/> 
    112     </path> 
    113  
    114     <taskdef name="applicationXml" 
    115              classname="org.bedework.deployment.ApplicationXmlTask"> 
    116       <classpath refid="app.xml.cp"/> 
    117     </taskdef> 
    118  
    119     <echo message="outFile=${org.bedework.ear.dir}/META-INF/application.xml 
    120                     warDir=${org.bedework.temp.dir}/wars 
    121                     contexts=${org.bedework.global.context.roots}" /> 
    122  
     141    <debugMsg message="outFile=${org.bedework.ear.dir}/META-INF/application.xml 
     142                        warDir=${org.bedework.temp.dir}/wars 
     143                        contexts=${org.bedework.global.context.roots}" /> 
     144 
     145        <mkdir dir="${org.bedework.ear.dir}/META-INF" /> 
     146         
    123147    <applicationXml displayName="Bedework calendar suite" 
    124148                    outFile="${org.bedework.ear.dir}/META-INF/application.xml" 
    …… 
    129153      </fileset> 
    130154    </applicationXml> 
    131         
     155     
    132156    <echo file="${org.bedework.ear.dir}/META-INF/jboss-app.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> 
    133157<jboss-app> 
    …… 
    138162</jboss-app> 
    139163]]></echo> 
    140         
     164       
    141165    <replace file="${org.bedework.ear.dir}/META-INF/jboss-app.xml" 
    142                token="@EAR_NAME@"  
    143                value="${app.ear.file.name}"/> 
    144              
     166             token="@EAR_NAME@"  
     167             value="${app.ear.file.name}"/> 
     168 
     169    <if> 
     170      <and> 
     171        <isset property="ear.meta.dir" /> 
     172        <available file="${ear.meta.dir}" type="dir" /> 
     173      </and> 
     174      <then> 
     175        <copy todir="${org.bedework.ear.dir}/META-INF"> 
     176          <fileset dir="${ear.meta.dir}" /> 
     177          <filterset refid="property.filters" /> 
     178        </copy> 
     179      </then> 
     180    </if> 
     181           
    145182    <manifest file="${org.bedework.ear.dir}/META-INF/MANIFEST.MF" /> 
    146183 

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

    r3097 r3104  
    128128    <ant antfile="${bedework.build.file}" inheritrefs="true" 
    129129           target="build" /> 
    130     <tstamp prefix="endbuild" /> 
    131     <echo level="info" message="=================> Build finished at ${endbuild.TODAY}" /> 
     130 
     131    <tstamp> 
     132      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/> 
     133    </tstamp> 
     134 
     135    <echo message="* ============== finished at ${deploydebug.time}" /> 
    132136  </target> 
    133137 
    …… 
    136140    <ant antfile="${bedework.build.file}" inheritrefs="true" 
    137141           target="clean.build" /> 
     142 
     143    <tstamp> 
     144      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/> 
     145    </tstamp> 
     146 
     147    <echo message="* ============== finished at ${deploydebug.time}" /> 
    138148  </target> 
    139149 
    …… 
    159169    <ant antfile="${bedework.build.file}" inheritrefs="true" 
    160170           target="deploy" /> 
     171 
     172    <tstamp> 
     173      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/> 
     174    </tstamp> 
     175 
     176    <echo message="* ============== finished at ${deploydebug.time}" /> 
    161177  </target> 
    162178 
    …… 
    165181    <ant antfile="${bedework.build.file}" inheritrefs="true" 
    166182           target="deploy.debug" /> 
    167     <tstamp> 
    168       <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/> 
    169     </tstamp> 
    170  
    171     <echo level="info" message="=================> deploy.debug finished at ${deploydebug.time}" /> 
     183 
     184    <tstamp> 
     185      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/> 
     186    </tstamp> 
     187 
     188    <echo message="* ============== finished at ${deploydebug.time}" /> 
    172189  </target> 
    173190 
    …… 
    186203    <ant antfile="${bedework.build.file}" inheritrefs="true" 
    187204           target="quickstart-clean" /> 
     205 
     206    <tstamp> 
     207      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/> 
     208    </tstamp> 
     209 
     210    <echo message="* ============== finished at ${deploydebug.time}" /> 
    188211  </target> 
    189212 
    …… 
    192215    <ant antfile="${bedework.build.file}" inheritrefs="true" 
    193216           target="clean.deploy" /> 
     217 
     218    <tstamp> 
     219      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/> 
     220    </tstamp> 
     221 
     222    <echo message="* ============== finished at ${deploydebug.time}" /> 
    194223  </target> 
    195224 
    …… 
    198227    <ant antfile="${bedework.build.file}" inheritrefs="true" 
    199228           target="clean.deploy.debug" /> 
     229 
     230    <tstamp> 
     231      <format property="deploydebug.time" pattern="MM/dd/yyyy HH:mm:ss"/> 
     232    </tstamp> 
     233 
     234    <echo message="* ============== finished at ${deploydebug.time}" /> 
    200235  </target> 
    201236 

  • releases/bedework-3.7/build/quickstart/linux/bw

    r3099 r3104  
    1717ant_logger= 
    1818 
     19ant_loglevel="-quiet" 
     20bw_loglevel="" 
     21 
    1922echo "" 
    2023echo "  Bedework Calendar System" 
    …… 
    2528 
    2629usage() { 
    27   echo "  $PRG [CONFIG-SOURCE] [CONFIG] [PROJECT] [ -offline ] [ target ] " 
     30  echo "  $PRG [CONFIG-SOURCE] [CONFIG] [PROJECT] [ -offline ] [LOG_LEVEL] [ target ] " 
    2831  echo "  $PRG ACTION" 
    2932  echo "" 
    …… 
    4043  echo "" 
    4144  echo "   -offline     Build without attempting to retrieve library jars" 
     45  echo "" 
     46  echo "   LOG_LEVEL sets the level of logging and can be" 
     47  echo "      -log-silent   Nearly silent" 
     48  echo "      -log-quiet    The default" 
     49  echo "      -log-inform   A little more noisy" 
     50  echo "      -log-verbose  Noisier" 
     51  echo "      -ant-debug    Vast amounts of ant output" 
     52  echo "      -build-debug  Some bedework build debug output" 
     53  echo "" 
    4254  echo "   target       Ant target to execute" 
    4355  echo "" 
    …… 
    304316      shift 
    305317      ;; 
    306 # Projects 
     318# ----------------------- Log level        
     319    -log-silent) 
     320      ant_loglevel="-quiet" 
     321      bw_loglevel="-Dorg.bedework.build.silent=true" 
     322      shift 
     323      ;; 
     324    -log-quiet) 
     325      ant_loglevel="-quiet" 
     326      bw_loglevel="" 
     327      shift 
     328      ;; 
     329    -log-inform) 
     330      ant_loglevel="" 
     331      bw_loglevel="-Dorg.bedework.build.inform=true" 
     332      shift 
     333      ;; 
     334    -log-verbose) 
     335      ant_loglevel="-verbose" 
     336      bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true" 
     337      shift 
     338      ;; 
     339    -ant-debug) 
     340      ant_loglevel="-debug" 
     341      shift 
     342      ;; 
     343    -build-debug) 
     344      bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true -Dorg.bedework.build.debug=true " 
     345      shift 
     346      ;; 
     347# ------------------------Projects 
    307348    -carddav) 
    308349      carddav="yes" 
    …… 
    418459fi 
    419460 
    420 $JAVA_HOME/bin/java -classpath $CLASSPATH $ant_xmllogfile $offline -Dant.home=$ANT_HOME org.apache.tools.ant.launch.Launcher $BWCONFIG $ant_listener $ant_logger $* 
     461$JAVA_HOME/bin/java -classpath $CLASSPATH $ant_xmllogfile $offline -Dant.home=$ANT_HOME org.apache.tools.ant.launch.Launcher $BWCONFIG $ant_listener $ant_logger $ant_loglevel $bw_loglevel $* 

  • releases/bedework-3.7/config/build.xml

    r1953 r3104  
    88 
    99<project name="cal.config" default="init" > 
    10   <property name="base.name" value="config"/> 
    11  
    12   <!-- 
    13   <import file="${org.bedework.config.base}/build.pubcaldav.xml"/> 
    14   --> 
    15  
    1610  <target name="init"> 
    1711    <dirname property="this.dir" file="${ant.file}"/> 

  • releases/bedework-3.7/config/bwbuild/.platform/ear.properties

    r2872 r3104  
    1111org.bedework.ear.templib=${org.bedework.temp.dir}/earlib 
    1212 
    13 org.bedework.ear.dir=${org.bedework.temp.dir}/${org.bedework.global.ear.name} 
     13#org.bedework.ear.dir=${org.bedework.temp.dir}/${org.bedework.global.ear.name} 
    1414 
    1515org.bedework.ear.properties.dir=${org.bedework.temp.dir}/ear-properties 
    1616 
    17 org.bedework.ear.properties.jar=${org.bedework.ear.dir}/bw-ear-properties.jar 
     17#Sorg.bedework.ear.properties.jar=${org.bedework.ear.dir}/bw-ear-properties.jar 
    1818 

  • releases/bedework-3.7/config/bwbuild/jboss-h2/activemq-broker-config.xml

    r3095 r3104  
    8585              <queue physicalName="bedework.sysevents.monitor" /> 
    8686              <queue physicalName="bedework.crawler" /> 
    87               <filteredDestination selector="inbox = 'true' or scheduleEvent = 'true'" 
     87              <filteredDestination selector="inbox = 'true'" 
    8888                                   queue="bedework.scheduleIn"/> 
    8989              <filteredDestination selector="outbox = 'true'" 
    …… 
    101101      <policyMap> 
    102102        <policyEntries> 
    103           <policyEntry queue=">" producerFlowControl="false" 
    104             memoryLimit="64mb" /> 
     103          <policyEntry queue=">" memoryLimit="5mb" /> 
    105104          <policyEntry topic=">" memoryLimit="5mb"> 
    106105            <!-- 

  • releases/bedework-3.7/config/bwbuild/jboss-postgresql/build.properties

    r3059 r3104  
    33# 
    44# Configure a build of a demo calendar running on bedework.org. 
    5 # 
    6 # This file gives users the opportunity to override properties that will be 
    7 # defined later in the build process. 
    8 # The order of loading is: 
    9 #   <home-dir>/bedework.build.properties  (this file) 
    10 #   local.build.properties 
    11 #   <various other distributed properties> 
    12 # 
    13 # Therefore add individual developer overrrides to <home-dir>/bedework.build.properties 
    145# 
    156 
    …… 
    4233#org.bedework.exsynch.options=${env.BEDEWORK_CONFIG}/exsynch.options.xml 
    4334 
    44 # Enable/disable replacement of log4j config during deployment 
    45 org.bedework.deploy.log4j.config=no 
    46  

  • releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml

    r3060 r3104  
    606606 
    607607          <!-- Exchange sync callback. Comment out for no service --> 
    608           <exchangeWsPushURI>http://128.113.124.238:8080/exsynch/</exchangeWsPushURI> 
     608          <exchangeWsPushURI>http://128.113.124.164:8080/exsynch/</exchangeWsPushURI> 
    609609 
    610610          <!-- Path to keystore - comment out to use default -->           

  • releases/bedework-3.7/deployment/build.xml

    r2829 r3104  
    5656 
    5757<project name="deploy.bedework" default="init"> 
    58   <property name="base.name" value="deployment"/> 
    59  
    6058  <property name="org.bedework.temp.wars.home" 
    6159            location="${org.bedework.temp.dir}/wars" /> 
    …… 
    8987    <property name="app.debug.val" value="0" /> 
    9088 
    91     <!-- set this for the war builds --> 
     89    <!-- set these for the war builds --> 
    9290    <dirname property="app.root.dir" file="${ant.file}"/> 
     91     
     92    <property name="org.bedework.deployment.name" 
     93              value="bedework" /> 
     94     
     95    <property name="org.bedework.sou.hibernate.properties" 
     96              location="${org.bedework.project.calendarapi}/calCore/resources" /> 
     97     
     98    <property name="org.bedework.jboss.datasource.jndiname" 
     99              value="${org.bedework.global.jboss.db.datasource.jndiname}" /> 
     100     
     101    <property name="org.bedework.options.file" 
     102              value="${org.bedework.config.options}" /> 
    93103 
    94104    <!-- Common resources directory --> 
    …… 
    106116                  value="${org.bedework.global.ear.name}.ear" /> 
    107117 
    108         <if> 
    109           <equals arg1="${org.bedework.global.ear.zipped}" 
    110                   arg2="yes" /> 
    111           <then> 
    112             <property name="org.bedework.ear.dir" 
    113                       location="${dist.home}/${org.bedework.global.ear.name}" /> 
    114             <property name="org.bedework.ear.file" 
    115                       location="${dist.home}/${org.bedework.global.ear.name}.ear" /> 
    116           </then> 
    117           <else> 
    118             <property name="org.bedework.ear.dir" 
    119                       location="${dist.home}/${org.bedework.global.ear.name}.ear" /> 
    120           </else> 
    121         </if> 
     118        <property name="org.bedework.ear.name" 
     119                  value="${org.bedework.global.ear.name}" /> 
    122120 
    123121        <property name="org.bedework.ear.properties.dir" 
    124122                  location="${org.bedework.temp.dir}/ear-properties" /> 
    125  
    126         <property name="org.bedework.ear.properties.jar" 
    127                   location="${org.bedework.ear.dir}/bw-ear-properties.jar"/> 
    128  
    129         <delete dir="${org.bedework.ear.dir}" /> 
    130         <mkdir dir="${org.bedework.ear.dir}" /> 
    131123 
    132124        <delete dir="${org.bedework.ear.templib}" /> 
    …… 
    153145  </target> 
    154146 
     147                <!-- 
    155148  <target name="deftasks" depends="init"> 
    156149    <path id="app.xml.cp"> 
    …… 
    173166    </taskdef> 
    174167  </target> 
    175  
    176   <target name="build.configured" depends="deftasks" > 
     168  --> 
     169 
     170  <target name="build.configured" depends="init" > 
    177171    <!-- Clean up before we start --> 
    178172    <delete dir="${org.bedework.temp.wars.home}" /> 
    …… 
    196190       ================================================================= --> 
    197191 
    198   <target name="deploy" depends="deftasks" > 
     192  <target name="deploy" depends="init" > 
    199193    <!-- Clean up before we start --> 
    200194    <delete dir="${org.bedework.temp.wars.home}" /> 
    …… 
    271265    <property name="org.bedework.deploy.type.dir" 
    272266              location="${app.root.dir}/${org.bedework.deploy.name}/${propval.app.type}" /> 
    273     <echo message="*********************************** deploy directory is ${org.bedework.deploy.type.dir}" /> 
     267    <if> 
     268      <istrue value="${org.bedework.build.debug}" /> 
     269      <then> 
     270        <echo message="*************** deployment build directory is ${org.bedework.deploy.type.dir}" /> 
     271      </then> 
     272    </if> 
    274273 
    275274    <if> 
    …… 
    313312    <property name="org.bedework.deploy.type.dir" 
    314313              location="${app.root.dir}/${propval.app.type}" /> 
    315     <echo message="*********************************** deploy directory is ${org.bedework.deploy.type.dir}" /> 
     314    <if> 
     315      <istrue value="${org.bedework.build.debug}" /> 
     316      <then> 
     317        <echo message="*********************** deployment build directory is ${org.bedework.deploy.type.dir}" /> 
     318      </then> 
     319    </if> 
    316320 
    317321    <if> 

  • releases/bedework-3.7/deployment/publiccaldav/webapp/build.xml

    r2698 r3104  
    3333       The "deploy" target first builds a configured component then copies 
    3434       all required files to the appropriate servlet container directories. 
    35  
    36        Currently this only works for the quickstart distribution. 
    37        For example, it does not handle deploying into jboss and copying 
    38        resource files (images, stylesheets) to external locations. 
    3935       ================================================================= --> 
    4036 

  • releases/bedework-3.7/deployment/termination/build.xml

    r2829 r3104  
    66 
    77<project name="bwdeploy.termination" default="deploy" > 
    8   <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    9  
    10   <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}.xml" /> 
     8  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}-${org.bedework.deployment.name}.xml" /> 
    119 
    1210  <dirname property="this.dir" file="${ant.file}"/> 
     11 
     12  <!-- ensure has value --> 
     13  <property name="propval.app.cal.suite" value="" /> 
    1314 
    1415  <target name="init"> 
    …… 
    1617 
    1718  <target name="deploy" depends="init,build.configured" > 
    18     <!-- copy startup website that sends you to the applications --> 
    19     <property name="startup.website.dir" 
    20               location="${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/bedework" /> 
    21     <delete dir="${startup.website.dir}"/> 
    22     <mkdir dir="${startup.website.dir}"/> 
    23     <copy todir="${startup.website.dir}"> 
    24       <fileset dir="${app.root.dir}/resources/bedework"/> 
    25     </copy> 
    26  
    27     <!-- copy any jars required in the server lib (jdbc etc) --> 
    28     <if> 
    29       <available file="${org.bedework.global.ext.lib}/server" type="dir" /> 
    30       <then> 
    31         <copy todir="${appserver.lib.dir}" flatten="yes" > 
    32           <fileset dir="${org.bedework.global.ext.lib}/server"> 
    33             <include name="*.jar"/> 
    34           </fileset> 
    35         </copy> 
    36       </then> 
    37     </if> 
    38      
    39     <if> 
    40       <isset property="org.bedework.global.extra.jars" /> 
    41       <then> 
    42         <foreach list="${org.bedework.global.extra.jars}" 
    43                  target="copyToServer" 
    44                  param="org.bedework.extra.jar" 
    45                  inheritall="true" 
    46                  trim="true" /> 
    47       </then> 
    48     </if> 
    49  
    50     <if> 
    51       <available file="${java.tools.jar}" /> 
    52       <then> 
    53         <copy todir="${appserver.lib.dir}" file="${java.tools.jar}"/> 
    54       </then> 
    55     </if> 
    56          
    5719    <!-- Platform specific --> 
    5820    <antcall target="doPlatform" inheritRefs="true" /> 

  • releases/bedework-3.7/deployment/termination/webapp/build.xml

    r2698 r3104  
    22 
    33<!-- =================================================================== 
    4      Standalone apps terminations tasks. 
     4     terminations task. 
    55     =================================================================== --> 
    66 
    77<project name="bwdeploy.termination" default="deploy" > 
    8   <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    9  
    108  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    119 
     10  <import file="${build.dir}/buildfilters.xml" /> 
     11 
    1212  <dirname property="this.dir" file="${ant.file}"/> 
     13 
     14  <!-- ensure has value --> 
     15  <property name="propval.app.cal.suite" value="" /> 
    1316 
    1417  <target name="init"> 
    …… 
    1619 
    1720  <target name="deploy" depends="init,build.configured" > 
    18     <!-- Deploy common resources --> 
    19     <ant antfile="${org.bedework.common.resources}/build.xml" 
    20          inheritrefs="true" target="deploy" /> 
    21  
     21    <if> 
     22      <isset property="org.bedework.common.resources" /> 
     23      <then> 
     24        <!-- Deploy common resources --> 
     25        <ant antfile="${org.bedework.common.resources}/build.xml" 
     26             inheritrefs="true" target="deploy" /> 
     27      </then> 
     28    </if> 
     29     
    2230    <if> 
    2331      <isset property="org.bedework.global.build.ear" /> 

  • releases/bedework-3.7/deployment/webpublic/webapp/build.xml

    r2698 r3104  
    3737    <property name="app.resources.dir" 
    3838              location="${this.dir}/resources" /> 
    39         <echo message="app.resources.dir=${app.resources.dir}" /> 
    4039  </target> 
    4140 

  • releases/bedework-3.7/deployutil/build.xml

    r2625 r3104  
    88 
    99<project name="bedework.deployutil" default="build"> 
    10   <property name="base.name" value="deployutil"/> 
    1110  <property name="lib.dir" location="${org.bedework.default.lib}"/> 
    1211