Changeset 3460

Show
Ignore:
Timestamp:
01/17/12 11:00:48
Author:
douglm
Message:

Almost completely build changes - mostly elimination of the per-project build.properties file.

There is now a single properties file in the config which determines all the project versions - with the exception of deployutil.

This update also includes a new deployment task to collect jar references and license information. A small utility will generate a readable notice and references file for the quickstart and/or the site.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r3455 r3460  
    77 
    88<project name="bedework.build" default="deploy" basedir="."> 
     9  <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
     10 
    911  <property environment="env"/> 
     12 
     13  <dirname property="project.home" file="${ant.file}"/> 
     14 
     15  <property name="bedework.home" 
     16            location="${project.home}" /> 
    1017 
    1118  <!-- this project --> 
    …… 
    1320            location="${basedir}" /> 
    1421 
    15     <property name="org.bedework.libcache.dir" 
    16               location="${org.bedework.project.bedework}/libcache"/> 
    17  
    18   <property name="build.dir" location="${org.bedework.project.bedework}/build"/> 
    19    
    20   <property name="buildsh" location="${build.dir}/buildsh.xml"/> 
    21   <property name="buildwar" location="${build.dir}/buildwar.xml"/> 
    22  
    23   <!-- ========================= deployutil ================================ --> 
    24  
    25   <property name="org.bedework.default.lib" 
    26             location="${org.bedework.project.bedework}/lib" /> 
     22  <property name="build.dir" location="${bedework.home}/build"/> 
    2723 
    2824  <property name="bw.project.home" location="${org.bedework.project.bedework}"/> 
    2925 
    30   <property file="${bw.project.home}/build.properties" /> 
    31  
    32   <property name="project.version" value="${org.bedework.version}"/> 
    33    
    3426  <import file="${build.dir}/buildTools/deftasks.xml"/> 
    3527 
    3628  <deftasks/> 
     29 
     30  <projectDefs name="bedework main project" 
     31               version="${org.bedework.version}"  
     32               deployment-name="bedework" 
     33  /> 
    3734   
    3835  <var name="org.bedework.jars.built" value="0" /> 
    3936  <var name="org.bedework.jars.checked" value="0" /> 
    4037 
    41   <import file="${build.dir}/buildfilters.xml" /> 
    42   <import file="${build.dir}/loadDeployConfig.xml"/> 
    43   <import file="${build.dir}/dirTools.xml"/> 
     38  <target name="init" > 
     39    <projectInit/> 
     40 
     41    <!-- =============================================================== 
     42              This project builds nothing - it just assembles. 
     43         =============================================================== --> 
     44 
     45    <property name="org.bedework.config.base" 
     46              location="${org.bedework.project.bedework}/config" /> 
     47 
     48    <property name="org.bedework.deployment.base" 
     49              location="${org.bedework.project.bedework}/deployment" /> 
     50  </target> 
    4451 
    4552  <target name="README" depends="init" 
    …… 
    5562              srcFile="${org.bedework.project.bedework}/docs/README"/> 
    5663    <echo level="info" message="${org.bedework.README}" /> 
    57   </target> 
    58  
    59   <target name="init" > 
    60     <loadDeployConfig /> 
    61  
    62     <!-- =============================================================== 
    63               Default properties. 
    64          =============================================================== --> 
    65  
    66     <property name="project.name" value="${org.bedework.package.name}"/> 
    67  
    68     <property name="dist.home" location="${bw.project.home}/dist"/> 
    69     <property name="lib.dir" location="${bw.project.home}/lib"/> 
    70     <property name="resources.dir" location="${bw.project.home}/resources"/> 
    71     <property name="bin.home" location="${bw.project.home}/bin"/> 
    72  
    73     <mkdir dir="${dist.home}" /> 
    74  
    75     <mkdir dir="${bin.home}" /> 
    76  
    77     <property name="org.bedework.empty.dir" 
    78               location="${dist.home}/empty-dir" /> 
    79     <mkdir dir="${org.bedework.empty.dir}" /> 
    80  
    81     <fileset id="empty.fileset" dir="${org.bedework.empty.dir}" 
    82              excludes="*" /> 
    83  
    84     <!-- =============================================================== 
    85               This project builds nothing - it just assembles. 
    86          =============================================================== --> 
    87  
    88     <property name="org.bedework.temp.dir" 
    89               location="${dist.home}/temp" /> 
    90  
    91     <property name="org.bedework.ear.properties.dir" 
    92               location="${org.bedework.temp.dir}/ear-properties" /> 
    93  
    94     <property name="org.bedework.config.base" 
    95               location="${org.bedework.project.bedework}/config" /> 
    96  
    97     <property name="org.bedework.default.lib" 
    98               location="${org.bedework.project.bedework}/lib" /> 
    99  
    100     <property name="org.bedework.deployment.base" 
    101               location="${org.bedework.project.bedework}/deployment" /> 
    10264  </target> 
    10365 
    …… 
    12385       The "deploy" target deploys the applications 
    12486       ================================================================= --> 
     87   
     88  <target name="deploy-init" depends="init"> 
     89    <deployInit ear-name="bwcal" /> 
     90  </target> 
    12591 
    126   <target name="deploy" depends="build" 
     92  <target name="deploy" depends="build,deploy-init" 
    12793          description="builds and deploys the applications"> 
    12894    <ant antfile="${org.bedework.project.bedework}/deployment/build.xml" inheritrefs="true" 

  • trunk/build/buildTools/deftasks.xml

    r3455 r3460  
    1010  <macrodef name="deftasks"> 
    1111    <sequential> 
     12      <property name="build.dir" location="${bedework.home}/build"/> 
     13 
    1214      <path id="build.cp"> 
    1315        <fileset dir="${build.dir}"> 
    …… 
    2628      </taskdef> 
    2729 
     30      <taskdef name="license" 
     31               classname="org.bedework.deployment.LicenseTask"> 
     32        <classpath refid="build.cp"/> 
     33      </taskdef> 
     34 
    2835      <taskdef name="resolveFile" 
    2936               classname="org.bedework.deployment.ResolveFile"> 
    …… 
    4653    <attribute name="project"/> 
    4754    <attribute name="target"/> 
    48          <sequential> 
    49            <ant antfile="${bedework.home}/../@{project}/build.xml"  
    50                 inheritall="false" 
    51                 target="@{target}" /> 
    52          </sequential> 
    53        </macrodef> 
     55    <sequential> 
     56      <ant antfile="${bedework.home}/../@{project}/build.xml"  
     57           inheritall="false" 
     58           target="@{target}" /> 
     59    </sequential> 
     60  </macrodef> 
    5461     
     62  <macrodef name="buildfilters"> 
     63    <sequential> 
     64      <filterset id="property.filters" > 
     65        <!--      Global settings            --> 
     66        <filter token="QUICKSTART_DIR" 
     67                value="${quickstart.dir}"/> 
     68 
     69        <filter token="APPSERVER-DATA-DIR" 
     70                value="${org.bedework.data.dir}"/> 
     71         
     72        <filter token="DATA_DIR" 
     73                value="${org.bedework.data.dir}"/> 
     74 
     75        <filter token="BW-APP-NAME" 
     76                value="${org.bedework.deploy.name}"/> 
     77 
     78        <filter token="HIBERNATE-DIALECT" 
     79                value="${org.bedework.global.hibernate.dialect}" /> 
     80 
     81        <filter token="SECOND-LEVEL-CACHING" 
     82                value="${org.bedework.global.hibernate.cache.use_second_level_cache}" /> 
     83 
     84        <filter token="CACHE-PROVIDER" 
     85                value="${org.bedework.global.hibernate.cache.provider_class}" /> 
     86 
     87        <filter token="DIRECTORY-BROWSING-DISALLOWED" 
     88                value="${org.bedework.global.directory.browsing.disallowed}" /> 
     89 
     90        <filter token="SERVLET-CLASS" 
     91                value="${org.bedework.global.servlet.class}"/> 
     92 
     93        <filter token="PORTLET-SERVLET-CLASS" 
     94                value="${org.bedework.global.portlet-servlet.class}"/> 
     95 
     96        <filter token="PORTAL-SERVLET-CONTEXT-PROVIDER" 
     97                value="${org.bedework.global.portal-servlet.context.provider}"/> 
     98 
     99        <filter token="PORTAL-SERVLET-CONTEXT-LISTENER" 
     100                value="${org.bedework.global.portal-servlet.context.listener}"/> 
     101 
     102        <filter token="PORTLET-CLASS" 
     103                value="${org.bedework.global.portlet.class}"/> 
     104 
     105        <filter token="IGNORE-CONTENT-TYPE" 
     106                value="${org.bedework.global.ignoreContentType}" /> 
     107 
     108        <filter token="GENURL-TAGLIB-TLD" 
     109                value="${org.bedework.global.genurl.taglib.tld}"/> 
     110 
     111        <filter token="LIFERAY-COMPANY-ID" 
     112                value="${org.bedework.global.liferay.company-id}"/> 
     113 
     114        <filter token="JBOSS-CARDDB-DATASOURCE" 
     115                value="${org.bedework.global.jboss.carddb.datasource.jndiname}"/> 
     116 
     117        <filter token="JBOSS-DB-DATASOURCE" 
     118                value="${org.bedework.global.jboss.db.datasource.jndiname}"/> 
     119 
     120        <!--      Application settings            --> 
     121 
     122        <filter token="APP-DESCRIPTION" 
     123                value="${propval.app.description}" /> 
     124 
     125        <filter token="PORTLET-NAME" 
     126                value="${propval.app.portlet.name}"/> 
     127 
     128        <filter token="CAL-SUITE" 
     129                value="${propval.app.cal.suite}"/> 
     130 
     131        <filter token="SECURITY-DOMAIN" 
     132                value="${propval.app.security.domain}"/> 
     133        <filter token="SECURITY-PREFIX" 
     134                value="${propval.app.security.prefix}"/> 
     135        <filter token="TRANSPORT-GUARANTEE" 
     136                value="${propval.app.transport.guarantee}"/> 
     137 
     138        <filter token="DISPLAY-NAME" 
     139                value="${propval.app.display.name}"/> 
     140        <filter token="CONTEXT-ROOT" 
     141                value="${propval.app.context.root}" /> 
     142        <filter token="APP-NAME" 
     143                value="${propval.app.name}"/> 
     144        <filter token="APP-DESCRIPTION" 
     145                value="${propval.app.description}"/> 
     146        <filter token="APP-VERSION" 
     147                value="${org.bedework.global.version}"/> 
     148        <filter token="WAR-NAME" 
     149                value="${propval.app.war.name}"/> 
     150        <filter token="TOMCAT-DOC-BASE" 
     151                value="${org.bedework.appserver.dir}${propval.app.deploy.dir}/${propval.app.war.name}"/> 
     152 
     153        <filter token="DEFAULT-CONTENTTYPE" 
     154                value="${propval.app.default.contenttype}" /> 
     155        <filter token="NOXSLT" 
     156                value="${propval.app.noxslt}" /> 
     157 
     158        <!-- Change this to be an app par --> 
     159        <filter token="RUN-AS-USER" 
     160                value="${org.bedework.syspar.public.user}" /> 
     161 
     162                <!-- ??????? 
     163        <filter token="CALFILE-NAME" 
     164                value="${propval.app.calfile.name}" /> --> 
     165 
     166        <!--      Shell script settings            --> 
     167 
     168        <filter token="SCHEMA-DELIMITER" 
     169                value="${propval.app.schema.delimiter}" /> 
     170 
     171        <filter token="KEYFILE-DIR" 
     172                value="${org.bedework.global.keyfile.dir}"/> 
     173 
     174        <filter token="calSoapWsURI" 
     175                value="${org.bedework.calws-soap.uri}" /> 
     176 
     177        <filter token="synchWsURI" 
     178                value="${org.bedework.synch.uri}" /> 
     179 
     180        <filter token="synchService" 
     181                value="${org.bedework.synch.service}" /> 
     182 
     183        <filter token="synchServiceManager" 
     184                value="${org.bedework.synch.service.manager}" /> 
     185 
     186        <filter token="SYNCH_WSDL_DIR" 
     187                value="${org.bedework.synch.wsdl.deploy.dir}" /> 
     188 
     189        <filter token="synchWsdlURI" 
     190                value="${org.bedework.synch.wsdl.uri}" /> 
     191 
     192        <filter token="tzdataURI" 
     193                value="${org.bedework.app.tzsvr.tzdata.url}" /> 
     194 
     195        <filter token="tzdataRefreshInterval" 
     196                value="${org.bedework.app.tzsvr.refetch.interval}" /> 
     197 
     198        <filter token="tzserverPrimary" 
     199                value="${org.bedework.app.tzsvr.primary.server}" /> 
     200 
     201        <filter token="tzserverPrimaryUrl" 
     202                value="${org.bedework.app.tzsvr.primary.url}" /> 
     203      </filterset> 
     204    </sequential> 
     205  </macrodef> 
     206       
    55207  <macrodef name="projectDefs"> 
    56208    <attribute name="name"/> 
    …… 
    67219 
    68220      <property name="lib.dir" location="${project.home}/lib"/> 
    69  
    70       <property name="build.dir" location="${bedework.home}/build"/> 
    71221 
    72222      <property name="buildjar" location="${build.dir}/buildTools/buildjar.xml"/> 
    …… 
    103253  </macrodef> 
    104254 
     255  <!-- =================================================================== 
     256       Load the deployment configuration from the properties file. We also load 
     257       the run time options and define some properties based on some of the 
     258       values found there 
     259       =================================================================== --> 
     260  <macrodef name="loadDeployConfig"> 
     261    <!--<attribute name="extra.options" default="${org.bedework.carddav.options}"/> --> 
     262    <sequential> 
     263      <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
     264     
     265      <if> 
     266        <not> 
     267          <isset property="bedework-options.org.bedework.global.portal.platform"/> 
     268        </not> 
     269        <then> 
     270        <property environment="env"/> 
     271   
     272        <!-- Load build property definition overrides --> 
     273        <property file="${org.bedework.build.properties}" /> 
     274   
     275        <configMsg message="Loading build properties from ${org.bedework.build.properties}" /> 
     276        <configMsg message="Use config override properties ${org.bedework.config.override.properties}" /> 
     277        <configMsg message="Use config properties ${org.bedework.config.properties}" /> 
     278        <configMsg message="Runtime options from ${org.bedework.config.options}" /> 
     279   
     280        <property file="${org.bedework.configuration.versions}" /> 
     281        <property file="${org.bedework.config.override.properties}" /> 
     282        <property file="${org.bedework.config.properties}" /> 
     283   
     284        <!-- Load the run time options and define some properties based on some 
     285             of the values --> 
     286   
     287        <!-- Load the general bedework options --> 
     288        <xmlproperty file="${org.bedework.config.options}"/> 
     289   
     290        <!-- Load the extra options  
     291        <xmlproperty file="@{extra.options}"/>--> 
     292   
     293        <if> 
     294          <isset property="bedework-options.org.bedework.global.portal.platform"/> 
     295          <then> 
     296            <property name="org.bedework.global.portal.platform" 
     297                      value="${bedework-options.org.bedework.global.portal.platform}" /> 
     298   
     299            <property name="org.bedework.config.portal.home" 
     300                      value="${org.bedework.configurations.home}/.portal/${org.bedework.global.portal.platform}" /> 
     301   
     302            <property name="org.bedework.config.portal.common.home" 
     303                      value="${org.bedework.configurations.home}/.portal/common-resources" /> 
     304   
     305            <debugMsg message="******************* load from ${org.bedework.config.portal.home}/portal.properties" /> 
     306   
     307            <property file="${org.bedework.config.portal.home}/portal.properties" /> 
     308          </then> 
     309          <else> 
     310            <debugMsg message="******************* load from ${org.bedework.configurations.home}/.standalone/standalone.properties" /> 
     311   
     312            <property file="${org.bedework.configurations.home}/.platform/standalone.properties" /> 
     313          </else> 
     314        </if> 
     315   
     316        <property name="org.bedework.global.version" 
     317                  value="${bedework-options.org.bedework.global.version}" /> 
     318   
     319        <property name="org.bedework.global.directory.browsing.disallowed" 
     320                  value="${bedework-options.org.bedework.syspars.directoryBrowsingDisallowed}" /> 
     321        </then> 
     322      </if> 
     323    </sequential> 
     324  </macrodef> 
     325 
    105326  <!-- ===================================================================== 
    106327       Assumes projectDefs was called previously. 
    …… 
    109330    <sequential> 
    110331      <infoMsg message="* =========== Building ${project.name}" /> 
     332 
     333      <loadDeployConfig/> 
    111334       
    112335      <delete dir="${lib.dir}" /> 
    …… 
    170393      </if> 
    171394       
     395      <property name="org.bedework.global.build.common.context.war.name" 
     396                value="bw-common" /> 
     397       
     398      <property name="org.bedework.temp.wars.home" 
     399                location="${org.bedework.temp.dir}/wars" /> 
     400 
    172401      <property name="org.bedework.temp.shellscr.home" 
    173402                location="${org.bedework.temp.dir}/shellscr" /> 
    174403 
     404      <!-- Recreated by each app build file. Place extra jars here --> 
    175405      <property name="org.bedework.temp.extrajars.dir" 
    176406                location="${org.bedework.temp.dir}/extrajars" /> 
    …… 
    183413                location="${org.bedework.temp.dir}/context-roots.properties" /> 
    184414 
    185       <!-- ===== End of stuff in main bedework deployment build file ======   --> 
     415      <tempfile property="org.bedework.global.context.roots" 
     416                destdir="${org.bedework.temp.dir}" 
     417                prefix="context-roots" suffix=".properties" /> 
    186418       
    187419      <!-- Clean up before we start --> 
    188       <if> 
    189         <isset property="org.bedework.temp.wars.home" /> 
    190         <then>     
    191           <delete dir="${org.bedework.temp.wars.home}" /> 
    192           <mkdir dir="${org.bedework.temp.wars.home}" /> 
    193         </then> 
    194       </if> 
     420      <delete dir="${org.bedework.temp.wars.home}" /> 
     421      <mkdir dir="${org.bedework.temp.wars.home}" /> 
    195422 
    196423      <delete dir="${org.bedework.temp.ear.extrajars.dir}" /> 
    …… 
    231458   
    232459  <!-- Override this --> 
    233   <target name="deploy" depends="build" /> 
     460  <target name="deploy-init" depends="init"> 
     461    <deployInit ear-name="" /> 
     462  </target> 
     463   
     464  <!-- Override this --> 
     465  <target name="deploy" depends="deploy-init,build" /> 
    234466 
    235467  <!-- ================================================================= 
    …… 
    585817  </macrodef> 
    586818   
     819  <macrodef name="configMsg"> 
     820    <attribute name="message"/> 
     821    <sequential> 
     822      <if> 
     823        <istrue value="${org.bedework.build.showconfigs}" /> 
     824        <then> 
     825          <echo message="@{message}" /> 
     826        </then> 
     827      </if> 
     828    </sequential> 
     829  </macrodef> 
     830   
    587831  <macrodef name="debugMsg"> 
    588832    <attribute name="message"/> 

  • trunk/build/buildTools/getJar.xml

    r3435 r3460  
    3535      <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
    3636         
    37         <mkdir dir="@{libcache}" /> 
     37          <mkdir dir="@{libcache}" /> 
     38 
     39      <if> 
     40        <isset property="org.bedework.print.jar.reference.info" /> 
     41        <then> 
     42          <mkdir dir="${bedework.home}/dist"/> 
     43          <echoxml file="${bedework.home}/dist/jarrefs.xml" append="true"> 
     44            <jar-ref> 
     45              <name>@{name}</name> 
     46              <version>@{version}</version> 
     47              <from>${project.name}</from> 
     48            </jar-ref> 
     49          </echoxml> 
     50        </then> 
     51      </if> 
     52 
     53      <if> 
     54        <isset property="org.bedework.print.jar.licence.info" /> 
     55        <then> 
     56          <license name="@{name}" version="@{version}"  
     57                   prefix="org.bedework.license"  
     58                   licenseInfoFile="${org.bedework.license-mappings}" /> 
     59           
     60          <mkdir dir="${bedework.home}/dist"/> 
     61          <echoxml file="${bedework.home}/dist/jarlicenses.xml" append="true"> 
     62            <jar-license> 
     63              <name>@{name}</name> 
     64              <version>${org.bedework.license.version}</version> 
     65              <groupId>${org.bedework.license.groupId}</groupId> 
     66              <artifactId>${org.bedework.license.artifactId}</artifactId> 
     67              <license>${org.bedework.license.license}</license> 
     68              <from>${project.name}</from> 
     69            </jar-license> 
     70          </echoxml> 
     71        </then> 
     72      </if> 
    3873 
    3974      <!-- Names are of form 
    …… 
    4176             <name-part>.jar 
    4277        --> 
    43  
    4478      <if> 
    4579        <equals arg1="@{version}" arg2="" /> 
    …… 
    72106 
    73107      <!-- If a project or projecthome was specified try to get it from the 
    74            local file system 
    75         --> 
     108           local file system --> 
     109       
    76110      <if> 
    77111        <or> 

  • trunk/build/buildsh.xml

    r3170 r3460  
    1616 
    1717<project name="bw.buildsh" default="build"> 
    18   <import file="${build.dir}/buildfilters.xml" /> 
    19  
     18  <!--<import file="${build.dir}/buildfilters.xml" />--> 
     19  <buildfilters/> 
     20   
    2021  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    2122 

  • trunk/build/buildwar.xml

    r3336 r3460  
    4040  <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
    4141 
    42   <import file="${build.dir}/buildfilters.xml" /> 
    43  
     42  <!--<import file="${build.dir}/buildfilters.xml" />--> 
     43  <buildfilters/> 
     44   
    4445  <if> 
    4546    <isset property="org.bedework.global.portal.platform" /> 

  • trunk/build/quickstart/build.xml

    r3336 r3460  
    1010 
    1111<project name="quickstart-build-file" default="deploy" basedir="."> 
     12  <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
     13 
    1214  <property environment="env"/> 
    1315 
    …… 
    1517               file="${ant.file.quickstart-build-file}"/> 
    1618 
    17   <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
    18  
    1919  <import file="${bedework.quickstart.basedir}/run-dir.xml" /> 
    2020  <import file="${bedework.quickstart.basedir}/install.xml" /> 
    …… 
    2222  <import file="${bedework.quickstart.basedir}/../buildTools/deftasks.xml"/> 
    2323 
    24   <import file="${bedework.quickstart.basedir}/../loadDeployConfig.xml"/> 
    25  
    26   <!-- The only properties set below should be those directly used to 
    27        invoke the targets below, in this file. 
    28        Do not set properties here for tasks invoked in other build 
    29        files.  Instead, make sure the targets work in calendar/build.xml, 
    30        then invoke ant on the task in calendar/build.xml. 
    31  
    32        For an example, of invoking ant on another build file, 
    33        see the deploy target, below. 
    34     --> 
     24  <property name="bedework.home" 
     25            location="${env.QUICKSTART_HOME}/bedework" /> 
     26 
     27  <deftasks/> 
     28 
    3529 <target name="init" > 
    3630   <dirname property="quickstart.dir" file="${ant.file}"/> 
    …… 
    6155          description="Describe targets and their usage"> 
    6256    <echo level="info" message="As distributed the package should be ready to go."/> 
    63     <echo level="info" message="Ensure ant is on your path, (a version is in the" /> 
    64     <echo level="info" message="package)"/> 
    65     <echo level="info" message=""/> 
    66     <echo level="info" message="First in one window do"/> 
    67     <echo level="info" message="    ant hsqldb"/> 
    68     <echo level="info" message="This will start the hsqldb server ready for the "/> 
    69     <echo level="info" message="application."/> 
    70     <echo level="info" message=""/> 
    71     <echo level="info" message="In another window do"/> 
    72     <echo level="info" message="    ant tomcatstart"/> 
    73     <echo level="info" message=""/> 
    74     <echo level="info" message="Once tomcat is running you should be able to go to a"/> 
     57    <echo level="info" message=""/> 
     58    <echo level="info" message="cd into the quickstart then do"/> 
     59    <echo level="info" message="    ./startjboss"/> 
     60    <echo level="info" message=""/> 
     61    <echo level="info" message="Once jboss is running you should be able to go to a"/> 
    7562    <echo level="info" message="browser and connect to"/> 
    7663    <echo level="info" message="    http://localhost:8080/bedework"/> 
    7764    <echo level="info" message="and follow the instructions."/> 
    7865    <echo level="info" message=""/> 
    79     <echo level="info" message="To build the calendar do"/> 
     66    <echo level="info" message="To build and deploy bedework do"/> 
    8067    <echo level="info" message="    ./bw -quickstart deploy"/> 
    81     <echo level="info" message="which does a build and deploy of all components"/> 
     68    <echo level="info" message="which does a build and deploy of all calendar components"/> 
    8269    <echo level="info" message=""/> 
    8370    <echo level="info" message="See documentation in the docs directory or on bedework.org"/> 

  • trunk/build/quickstart/linux/bw

    r3422 r3460  
    6868davutil= 
    6969dumprestore= 
     70exchgGateway= 
    7071indexer= 
    7172monitor= 
    …… 
    124125  echo "      -log-inform   A little more noisy" 
    125126  echo "      -log-verbose  Noisier" 
     127  echo "      -log-configs  Some info about configurations" 
    126128  echo "      -ant-debug    Vast amounts of ant output" 
    127129  echo "      -build-debug  Some bedework build debug output" 
    …… 
    394396        fi 
    395397         
     398        if [ "$exchgGateway" != "" ] ; then 
     399          cd $QUICKSTART_HOME/exchgGateway 
     400      exchgGateway= 
     401          return 
     402        fi 
     403 
    396404        if [ "$synch" != "" ] ; then 
    397405          cd $QUICKSTART_HOME/synch 
    …… 
    670678      shift 
    671679      ;; 
     680    -log-configs) 
     681      bw_loglevel="$bw_loglevel -Dorg.bedework.build.showconfigs=true" 
     682      shift 
     683      ;; 
    672684    -ant-debug) 
    673685      ant_loglevel="-debug" 
    …… 
    925937 
    926938      bwxml="yes" 
     939      pkgdefault= 
     940      shift 
     941      ;; 
     942    -exchgGateway) 
     943      exchgGateway="yes" 
     944       
     945#      access="yes" 
     946      bwxml="yes" 
     947#      davutil="yes" 
     948#      rpiutil="yes" 
    927949      pkgdefault= 
    928950      shift 
    …… 
    10431065    $javacmd $specialTarget 
    10441066  else   
     1067#    echo $javacmd $* 
    10451068    $javacmd $* 
    10461069  fi 

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

    r3453 r3460  
    107107org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework 
    108108 
     109org.bedework.project.bedework=${env.QUICKSTART_HOME}/bedework 
     110# 
     111# 
     112org.bedework.license-mappings=${org.bedework.project.bedework}/build/license-mappings.xml 
    109113# 
    110114# ------------------------------------------------------------------------ 

  • trunk/config/bwbuild/.defaults/versions.properties

    r3409 r3460  
    1212org.bedework.caldavtest.version=3.8 
    1313org.bedework.calfacade.version=3.8 
     14org.bedework.carddav.version=3.8 
    1415org.bedework.davutil.version=3.8 
    1516org.bedework.dumprestore.version=3.8 
     17org.bedework.exchggateway.version=3.8 
    1618org.bedework.icalendar.version=3.8 
    1719org.bedework.indexer.version=3.8 
    1820org.bedework.interfaces.version=3.8 
    1921org.bedework.misc.version=3.8 
     22org.bedework.monitor.version=3.8 
    2023org.bedework.rpiutil.version=3.8 
     24org.bedework.synch.version=3.8 
    2125org.bedework.sysevents.version=3.8 
    2226org.bedework.testsuite.version=3.8 
     27org.bedework.bwtzsvr.version=3.8 
    2328org.bedework.webapps.version=3.8 
    2429org.bedework.webdav.version=3.8 
     30org.bedework.xmlschema.version=3.8 
     31 
     32# This is set in the deployutil build file also  
     33org.bedework.deployutil.version=3.8 

  • trunk/config/bwbuild/jboss-postgresql-devel/cal.properties

    r3396 r3460  
    99# True if this is a primary server  
    1010org.bedework.app.tzsvr.primary.server=true 
     11 
     12#Uncomment to output jar reference info 
     13org.bedework.print.jar.reference.info=true 
     14 
     15#Uncomment to output jar licence info 
     16org.bedework.print.jar.licence.info=true 

  • trunk/deployment/build.xml

    r3415 r3460  
    5656 
    5757<project name="deploy.bedework" default="init"> 
    58   <property name="org.bedework.temp.wars.home" 
    59             location="${org.bedework.temp.dir}/wars" /> 
    60  
    61   <property name="org.bedework.temp.shellscr.home" 
    62             location="${org.bedework.temp.dir}/shellscr" /> 
    63  
    64   <!-- Recreated by each app build file. Place extra jars here --> 
    65   <property name="org.bedework.temp.extrajars.dir" 
    66             location="${org.bedework.temp.dir}/extrajars" /> 
    67  
    68   <!-- Preserve extra jars for ear builds --> 
    69   <property name="org.bedework.temp.ear.extrajars.dir" 
    70             location="${org.bedework.temp.dir}/earextrajars" /> 
    71          
    7258  <dirname property="this.build.dir" file="${ant.file}"/> 
     59 
    7360  <property name="bedework.deployment.base" location="${this.build.dir}" /> 
     61   
    7462  <property name="org.bedework.deployment.resources"  
    7563            location="${bedework.deployment.base}/resources" /> 
    76  
    77   <import file="${build.dir}/buildTools/getJar.xml"/> 
    78  
    79   <import file="${build.dir}/loadDeployConfig.xml"/> 
    8064   
    8165  <property name="ear.meta.dir" location="${this.build.dir}/ear.meta"/> 
    …… 
    8468    <property name="org.bedework.struts.tlds" 
    8569              location="${resources.dir}/struts-1.2.9/tlds"/> 
    86  
    87     <loadDeployConfig /> 
    8870 
    8971    <!-- All the projects we deploy --> 
    …… 
    122104    <dirname property="app.root.dir" file="${ant.file}"/> 
    123105     
    124     <property name="org.bedework.deployment.name" 
    125               value="bedework" /> 
    126      
    127106    <property name="org.bedework.sou.hibernate.properties" 
    128107              location="${org.bedework.deployment.resources}/hibernate" /> 
    …… 
    134113    <property name="org.bedework.common.resources" 
    135114              location="${app.root.dir}/resources" /> 
    136  
    137     <property name="org.bedework.global.build.common.context.war.name" 
    138               value="bw-common" /> 
    139  
    140     <!-- Where we put ear stuff --> 
    141     <if> 
    142       <isset property="org.bedework.global.build.ear" /> 
    143       <then> 
    144         <property name="app.ear.file.name" 
    145                   value="${org.bedework.global.ear.name}.ear" /> 
    146  
    147         <property name="org.bedework.ear.name" 
    148                   value="${org.bedework.global.ear.name}" /> 
    149  
    150         <property name="org.bedework.ear.properties.dir" 
    151                   location="${org.bedework.temp.dir}/ear-properties" /> 
    152  
    153         <property name="org.bedework.ear.templib" 
    154                   location="${org.bedework.temp.dir}/earlib"/> 
    155          
    156         <delete dir="${org.bedework.ear.templib}" /> 
    157         <mkdir dir="${org.bedework.ear.templib}" /> 
    158  
    159         <delete dir="${org.bedework.ear.properties.dir}" /> 
    160         <mkdir dir="${org.bedework.ear.properties.dir}" /> 
    161       </then> 
    162     </if> 
    163  
    164     <property name="org.bedework.global.context.roots" 
    165               location="${org.bedework.temp.dir}/context-roots.properties" /> 
    166  
    167     <if> 
    168       <not> 
    169         <isset property="org.bedework.global.context.roots" /> 
    170       </not> 
    171       <then> 
    172         <tempfile property="org.bedework.global.context.roots" 
    173                   destdir="${org.bedework.temp.dir}" 
    174                   prefix="context-roots" suffix=".properties" /> 
    175       </then> 
    176     </if> 
    177115  </target> 
    178116 
    …… 
    231169    <!-- ================= termination tasks for deployment ================ --> 
    232170 
     171    <!-- ensure has value --> 
     172    <property name="propval.app.cal.suite" value="" /> 
     173 
    233174    <ant antfile="${org.bedework.deployment.base}/termination/build.xml" 
    234175         inheritrefs="true" target="deploy" /> 
    …… 
    244185       necessary --> 
    245186  <target name="cp.xalan" if="xalan.in.tomcat.common.endorsed"> 
    246     <copy file="${org.bedework.default.lib}/xalan.jar" 
    247           todir="${appserver.endorsed.dir}"/> 
    248187  </target> 
    249188 
    …… 
    254193       ================================================================= --> 
    255194  <target name="build.configured.apps"> 
     195    <!-- Is this used any more? --> 
    256196    <forEachApp names="${org.bedework.install.app.names}" 
    257197                prefix="org.bedework.deploy" 
    …… 
    291231        <propertycopy name="propval.app.unauthenticated" 
    292232                      from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.guestMode" /> 
     233        <!-- ensure has value --> 
     234        <property name="propval.app.cal.suite" value="" /> 
    293235 
    294236        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" 
    …… 
    332274      <then> 
    333275        <propertyset id="deploy-app-properties"> 
    334           <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/> 
     276          <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}."/> 
    335277          <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*" to="propval.app.*"/> 
    336278        </propertyset> 
    …… 
    338280        <propertycopy name="propval.app.unauthenticated" 
    339281                      from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.guestMode" /> 
     282        <!-- ensure has value --> 
     283        <property name="propval.app.cal.suite" value="" /> 
    340284 
    341285        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" 

  • trunk/deployment/dumprestore/shellscr/build.xml

    r3180 r3460  
    66 
    77<project name="bwdumpres.deploy" default="deploy" > 
    8   <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    9  
    108  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    119 

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

    r3180 r3460  
    66 
    77<project name="bwpublic.deploy" 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 

  • trunk/deployment/genkeys/shellscr/build.xml

    r3001 r3460  
    66 
    77<project name="genkeys.deploy" default="deploy" > 
    8   <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    9  
    108  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    119 

  • trunk/deployment/indexer/shellscr/build.xml

    r3180 r3460  
    66 
    77<project name="indexer.deploy" default="deploy" > 
    8   <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    9  
    108  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    119 

  • trunk/deployment/inoutsched/shellscr/build.xml

    r3180 r3460  
    66 
    77<project name="bwcrawler.deploy" default="deploy" > 
    8   <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    9  
    108  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    119 

  • trunk/deployment/monitor/shellscr/build.xml

    r2787 r3460  
    66 
    77<project name="bwcrawler.deploy" default="deploy" > 
    8   <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    9  
    108  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    119 

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

    r3180 r3460  
    66 
    77<project name="bwpubcaldav.deploy" 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 

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

    r3180 r3460  
    66 
    77<project name="bwpubcaldav.deploy" 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 

  • trunk/deployment/resources/build.xml

    r3143 r3460  
    1515            value="${org.bedework.global.build.common.context.war.name}" /> 
    1616 
    17   <import file="${build.dir}/buildfilters.xml" /> 
     17  <!--<import file="${build.dir}/buildfilters.xml" />--> 
     18  <buildfilters/> 
    1819 
    1920  <target name="init" > 

  • trunk/deployment/sysevlog/shellscr/build.xml

    r2714 r3460  
    66 
    77<project name="bwcrawler.deploy" default="deploy" > 
    8   <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    9  
    108  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
    119 

  • trunk/deployment/termination/build.xml

    r3105 r3460  
    99 
    1010  <dirname property="this.dir" file="${ant.file}"/> 
    11  
    12   <!-- ensure has value --> 
    13   <property name="propval.app.cal.suite" value="" /> 
    1411 
    1512  <target name="init"> 

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

    r3180 r3460  
    88  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" /> 
    99 
    10   <import file="${build.dir}/buildfilters.xml" /> 
     10  <!--<import file="${build.dir}/buildfilters.xml" />--> 
     11  <buildfilters/> 
    1112 
    1213  <dirname property="this.dir" file="${ant.file}"/> 

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

    r3180 r3460  
    66 
    77<project name="bwusercaldav.deploy" 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 

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

    r3180 r3460  
    66 
    77<project name="bwusercaldav.deploy" 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 

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

    r3180 r3460  
    66 
    77<project name="bwadmin.deploy" 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 
    1210  <dirname property="this.dir" file="${ant.file}"/> 
    1311 
    14   <!--<import file="${this.dir}/appjars.xml" />--> 
    1512  <import file="${org.bedework.deployment.base}/bw-core-appjars.xml" /> 
    1613 

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

    r2698 r3460  
    66 
    77<project name="bwconfig.deploy" 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 

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

    r3180 r3460  
    66 
    77<project name="bwpublic.deploy" 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 

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

    r3180 r3460  
    66 
    77<project name="bwsubmit.deploy" 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 

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

    r3180 r3460  
    66 
    77<project name="bwpersonal.deploy" 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