Changeset 1998

Show
Ignore:
Timestamp:
12/30/08 15:54:56
Author:
douglm
Message:

Allow build of timezones server in bedework

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk

    • Property svn:externals changed from build/buildTools https://www.bedework.org/svn/buildTools/trunk projects/access https://www.bedework.org/svn/access/trunk projects/bwtools https://www.bedework.org/svn/bwtools/trunk projects/caldav https://www.bedework.org/svn/caldav/trunk projects/caldavTest https://www.bedework.org/svn/caldavTest/trunk projects/calendarapi https://www.bedework.org/svn/calendarapi/trunk projects/contrib https://www.bedework.org/svn/contrib/trunk projects/davutil https://www.bedework.org/svn/davutil/trunk projects/dumprestore https://www.bedework.org/svn/dumprestore/trunk projects/freebusy https://www.bedework.org/svn/freebusy/trunk projects/rpiutil https://www.bedework.org/svn/rpiutil/trunk projects/synchml https://www.bedework.org/svn/synchml/trunk projects/testsuite https://www.bedework.org/svn/testsuite/trunk projects/webapps https://www.bedework.org/svn/webapps/trunk projects/webdav https://www.bedework.org/svn/webdav/trunk to build/buildTools https://www.bedework.org/svn/buildTools/trunk projects/access https://www.bedework.org/svn/access/trunk projects/bwtools https://www.bedework.org/svn/bwtools/trunk projects/bwtzsvr https://www.bedework.org/svn/bwtzsvr/trunk projects/caldav https://www.bedework.org/svn/caldav/trunk projects/caldavTest https://www.bedework.org/svn/caldavTest/trunk projects/calendarapi https://www.bedework.org/svn/calendarapi/trunk projects/contrib https://www.bedework.org/svn/contrib/trunk projects/davutil https://www.bedework.org/svn/davutil/trunk projects/dumprestore https://www.bedework.org/svn/dumprestore/trunk projects/freebusy https://www.bedework.org/svn/freebusy/trunk projects/rpiutil https://www.bedework.org/svn/rpiutil/trunk projects/synchml https://www.bedework.org/svn/synchml/trunk projects/testsuite https://www.bedework.org/svn/testsuite/trunk projects/webapps https://www.bedework.org/svn/webapps/trunk projects/webdav https://www.bedework.org/svn/webdav/trunk

  • trunk/build.xml

    r1988 r1998  
    2828  <property name="org.bedework.project.bwtools" 
    2929            location="${org.bedework.projects}/bwtools" /> 
     30 
     31  <property name="org.bedework.project.bwtzsvr" 
     32            location="${org.bedework.projects}/bwtzsvr" /> 
    3033 
    3134  <property name="org.bedework.project.caldav" 
    …… 
    122125         =============================================================== --> 
    123126 
    124     <property name="project.home" location="${org.bedework.project.bedework}"/> 
    125  
    126     <property file="${project.home}/build.properties" /> 
     127    <property name="bw.project.home" location="${org.bedework.project.bedework}"/> 
     128 
     129    <property file="${bw.project.home}/build.properties" /> 
    127130 
    128131    <property name="project.name" value="${org.bedework.package.name}"/> 
    129132    <property name="project.version" value="${org.bedework.version}"/> 
    130133 
    131     <property name="dist.home" location="${project.home}/dist"/> 
    132     <property name="lib.dir" location="${project.home}/lib"/> 
    133     <property name="resources.dir" location="${project.home}/resources"/> 
    134     <property name="bin.home" location="${project.home}/bin"/> 
    135  
    136     <property name="build.dir" location="${project.home}/build"/> 
     134    <property name="dist.home" location="${bw.project.home}/dist"/> 
     135    <property name="lib.dir" location="${bw.project.home}/lib"/> 
     136    <property name="resources.dir" location="${bw.project.home}/resources"/> 
     137    <property name="bin.home" location="${bw.project.home}/bin"/> 
     138 
     139    <property name="build.dir" location="${bw.project.home}/build"/> 
    137140    <property name="buildjar" location="${build.dir}/buildTools/buildjar.xml"/> 
    138141    <property name="buildsh" location="${build.dir}/buildsh.xml"/> 
    …… 
    208211       ================================================================= --> 
    209212 
    210   <target name="build" depends="init.build,build.rpiutil,build.access,build.davutil, 
     213  <target name="build" depends="init.build,build.rpiutil,build.bwtzsvr, 
     214                                build.access,build.davutil, 
    211215                                build.calendarapi,build.dumprestore,build.synchml, 
    212216                                build.webdav,build.caldav,build.caldavTest, 
    …… 
    219223  </target> 
    220224 
    221   <target name="clean" depends="init,clean.rpiutil,clean.access,clean.davutil, 
     225  <target name="clean" depends="init,clean.rpiutil,clean.bwtzsvr, 
     226                                clean.access,clean.davutil, 
    222227                                clean.calendarapi,clean.dumprestore,clean.synchml, 
    223228                                clean.webdav,clean.caldav,clean.caldavTest, 
    …… 
    229234  </target> 
    230235 
    231   <target name="quickstart-clean" depends="init,clean.rpiutil,clean.access,clean.davutil, 
     236  <target name="quickstart-clean" depends="init,clean.rpiutil,clean.bwtzsvr, 
     237                                           clean.access,clean.davutil, 
    232238                                           clean.calendarapi,clean.dumprestore,clean.synchml, 
    233239                                           clean.webdav,clean.caldav,clean.caldavTest, 
    …… 
    305311 
    306312  <target name="javadoc" depends="init" description="Generate javadoc"> 
    307     <property name="docs.home" location="${project.home}/docs"/> 
     313    <property name="docs.home" location="${bw.project.home}/docs"/> 
    308314    <property name="org.bedework.projectdocs.home" location="${docs.home}/projectdocs"/> 
    309315    <delete dir="${org.bedework.projectdocs.home}" /> 
    …… 
    439445  <target name="clean.build.bwtools" depends="clean.bwtools,build.bwtools" 
    440446          description="builds the bwtools project"/> 
     447 
     448  <!-- ................................................................. 
     449                          bwtzsvr 
     450       .................................................................. --> 
     451  <target name="build.bwtzsvr" depends="init" 
     452          description="builds the bwtzsvr project"> 
     453    <ant antfile="${org.bedework.project.bwtzsvr}/build.xml" inheritall="false" 
     454           target="build-all"  > 
     455      <property name="org.bedework.libcache.dir" 
     456                location="${org.bedework.project.bedework}/libcache"/> 
     457    </ant> 
     458  </target> 
     459 
     460  <target name="clean.bwtzsvr" depends="init" 
     461          description="clean the bwtzsvr project"> 
     462    <ant antfile="${org.bedework.project.bwtzsvr}/build.xml" inheritall="false" 
     463           target="deep-clean" /> 
     464  </target> 
     465 
     466  <target name="clean.build.bwtzsvr" depends="clean.bwtzsvr,build.bwtzsvr" 
     467          description="builds the bwtzsvr project"/> 
    441468 
    442469  <!-- ................................................................. 

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

    r1991 r1998  
    157157 
    158158      <app> 
     159        <!-- ================================================================== 
     160                          Timezones server 
     161             ================================================================== --> 
     162        <tzsvr classname="org.bedework.calfacade.configs.ConfigCommon"> 
     163          <appType>tzsvr</appType> 
     164          <publicAdmin>false</publicAdmin> 
     165          <guestMode>true</guestMode> 
     166        </tzsvr> 
     167 
    159168        <!-- ================================================================== 
    160169                          Config web client 

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

    r1992 r1998  
    1717# 
    1818# Define the names of the applications we want to build 
    19 org.bedework.install.app.names=bwconfig,CalAdmin,EventSubmit,Events,SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres 
     19org.bedework.install.app.names=tzsvr,bwconfig,CalAdmin,EventSubmit,Events,SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres 
    2020 
    2121# 
    …… 
    119119# content. 
    120120#org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common 
     121 
     122# 
     123# ------------------------------------------------------------------- 
     124# 
     125# Bedework timezones server - a requirement for bedework 
     126# 
     127 
     128org.bedework.app.tzsvr.project=bwtzsvr 
     129org.bedework.app.tzsvr.sou.dir=tzsvr 
     130org.bedework.app.tzsvr.war.name=tzsvr 
     131org.bedework.app.tzsvr.context.root=/tzsvr 
     132# Set for jboss 
     133#org.bedework.app.tzsvr.virtual.host= 
     134 
     135org.bedework.app.tzsvr.description=Bedework timezones server. 
     136org.bedework.app.tzsvr.display.name=Bedework timezones server. 
     137org.bedework.app.tzsvr.name=tzsvr 
     138org.bedework.app.tzsvr.deploy.dir=/webapps 
     139org.bedework.app.tzsvr.logprefix=Tzsvr 
     140 
     141org.bedework.app.tzsvr.tzdata.url=http://localhost:8080/tzdata.zip 
     142 
     143# Property defining integer seconds refetch interval for data 
     144org.bedework.app.tzsvr.refetch.interval=600 
     145 
     146# Property defining a key to allow POST 
     147org.bedework.app.tzsvr.post.id=12345ABCDE 
     148 
     149org.bedework.app.tzsvr.vtimezones.cache.name=vtz 
    121150 
    122151# 

  • trunk/deployment/appjars.xml

    r1996 r1998  
    66     =================================================================== --> 
    77<project name="appJars" basedir="." default=""> 
    8   <property name="org.bedework.app.lib" location="${project.home}/applib" /> 
     8  <property name="org.bedework.app.lib" location="${bw.project.home}/applib" /> 
    99  <macrodef name="getAppJars"> 
    1010    <sequential> 
    …… 
    208208      <getJar lib="${org.bedework.app.lib}" 
    209209              name="rpiaccess" version="3.5" 
    210               projecthome="${project.home}/projects/access" /> 
     210              projecthome="${bw.project.home}/projects/access" /> 
    211211 
    212212      <getJar lib="${org.bedework.app.lib}" 
    213213              name="bw-tools" version="3.5" 
    214               projecthome="${project.home}/projects/bwtools" /> 
     214              projecthome="${bw.project.home}/projects/bwtools" /> 
    215215 
    216216      <getJar lib="${org.bedework.app.lib}" 
    217217              name="rpiutil" version="3.5" 
    218               projecthome="${project.home}/projects/rpiutil" /> 
     218              projecthome="${bw.project.home}/projects/rpiutil" /> 
    219219 
    220220      <getJar lib="${org.bedework.app.lib}" 
    221221              name="bw-davio" version="3.5" 
    222               projecthome="${project.home}/projects/davutil" /> 
     222              projecthome="${bw.project.home}/projects/davutil" /> 
    223223 
    224224      <getJar lib="${org.bedework.app.lib}" 
    225225               name="bw-annotations" version="3.5" 
    226                projecthome="${project.home}/projects/calendarapi" /> 
     226               projecthome="${bw.project.home}/projects/calendarapi" /> 
    227227 
    228228      <getJar lib="${org.bedework.app.lib}" 
    229229               name="bw-apiutil" version="3.5" 
    230                projecthome="${project.home}/projects/calendarapi" /> 
     230               projecthome="${bw.project.home}/projects/calendarapi" /> 
    231231 
    232232      <getJar lib="${org.bedework.app.lib}" 
    233233              name="bw-calcore" version="3.5" 
    234               projecthome="${project.home}/projects/calendarapi" /> 
     234              projecthome="${bw.project.home}/projects/calendarapi" /> 
    235235 
    236236      <getJar lib="${org.bedework.app.lib}" 
    237237              name="bw-calcorei" version="3.5" 
    238               projecthome="${project.home}/projects/calendarapi" /> 
     238              projecthome="${bw.project.home}/projects/calendarapi" /> 
    239239 
    240240      <getJar lib="${org.bedework.app.lib}" 
    241241              name="bw-calfacade" version="3.5" 
    242               projecthome="${project.home}/projects/calendarapi" /> 
     242              projecthome="${bw.project.home}/projects/calendarapi" /> 
    243243 
    244244      <getJar lib="${org.bedework.app.lib}" 
    245245               name="bw-calsvc" version="3.5" 
    246                projecthome="${project.home}/projects/calendarapi" /> 
     246               projecthome="${bw.project.home}/projects/calendarapi" /> 
    247247 
    248248      <getJar lib="${org.bedework.app.lib}" 
    249249              name="bw-calsvci" version="3.5" 
    250               projecthome="${project.home}/projects/calendarapi" /> 
     250              projecthome="${bw.project.home}/projects/calendarapi" /> 
    251251 
    252252      <getJar lib="${org.bedework.app.lib}" 
    253253              name="bw-client" version="3.5" 
    254               projecthome="${project.home}/projects/calendarapi" /> 
     254              projecthome="${bw.project.home}/projects/calendarapi" /> 
    255255 
    256256      <getJar lib="${org.bedework.app.lib}" 
    257257              name="bw-icalendar" version="3.5" 
    258               projecthome="${project.home}/projects/calendarapi" /> 
     258              projecthome="${bw.project.home}/projects/calendarapi" /> 
    259259 
    260260      <getJar lib="${org.bedework.app.lib}" 
    261261              name="bw-logging" version="3.5" 
    262               projecthome="${project.home}/projects/calendarapi" /> 
     262              projecthome="${bw.project.home}/projects/calendarapi" /> 
    263263 
    264264      <getJar lib="${org.bedework.app.lib}" 
    265265              name="bw-mail" version="3.5" 
    266               projecthome="${project.home}/projects/calendarapi" /> 
     266              projecthome="${bw.project.home}/projects/calendarapi" /> 
    267267 
    268268      <getJar lib="${org.bedework.app.lib}" 
    269269              name="bw-appcommon" version="3.5" 
    270               projecthome="${project.home}/projects/webapps" /> 
     270              projecthome="${bw.project.home}/projects/webapps" /> 
    271271 
    272272      <getJar lib="${org.bedework.app.lib}" 
    273273              name="bw-liferay" version="3.5" 
    274               projecthome="${project.home}/projects/webapps" /> 
     274              projecthome="${bw.project.home}/projects/webapps" /> 
    275275 
    276276      <getJar lib="${org.bedework.app.lib}" 
    277277              name="bw-uportal" version="3.5" 
    278               projecthome="${project.home}/projects/webapps" /> 
     278              projecthome="${bw.project.home}/projects/webapps" /> 
    279279 
    280280      <!-- Included jars for eclipse --> 

  • trunk/deployment/build.xml

    r1991 r1998  
    5050  <target name="init" > 
    5151    <getAppJars /> 
    52  
    53     <property name="source.home" location="${this.build.dir}/src"/> 
    5452 
    5553    <loadDeployConfig /> 

  • trunk/deployment/caldavTest/shellscr/appjars.xml

    r1895 r1998  
    1313              libcache="${org.bedework.libcache.dir}" 
    1414              name="caldavtest" version="3.5" 
    15               projecthome="${project.home}/projects/caldavTest" /> 
     15              projecthome="${bw.project.home}/projects/caldavTest" /> 
    1616    </sequential> 
    1717 </macrodef> 

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

    r1895 r1998  
    1313              libcache="${org.bedework.libcache.dir}" 
    1414              name="bw-dumpres" version="3.5" 
    15               projecthome="${project.home}/projects/dumprestore" /> 
     15              projecthome="${bw.project.home}/projects/dumprestore" /> 
    1616    </sequential> 
    1717 </macrodef> 

  • trunk/deployment/freebusyAggregator/webapp/appjars.xml

    r1895 r1998  
    1313              libcache="${org.bedework.libcache.dir}" 
    1414              name="bw-webcommon" version="3.5" 
    15               projecthome="${project.home}/projects/webapps" /> 
     15              projecthome="${bw.project.home}/projects/webapps" /> 
    1616 
    1717      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1818              libcache="${org.bedework.libcache.dir}" 
    1919              name="bw-fbaggregator" version="3.5" 
    20               projecthome="${project.home}/projects/freebusy" /> 
     20              projecthome="${bw.project.home}/projects/freebusy" /> 
    2121 
    2222      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    2323              libcache="${org.bedework.libcache.dir}" 
    2424              name="bw-fbclient" version="3.5" 
    25               projecthome="${project.home}/projects/freebusy" /> 
     25              projecthome="${bw.project.home}/projects/freebusy" /> 
    2626    </sequential> 
    2727 </macrodef> 

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

    r1895 r1998  
    1313              libcache="${org.bedework.libcache.dir}" 
    1414              name="bw-caldav" version="3.5" 
    15               projecthome="${project.home}/projects/caldav" /> 
     15              projecthome="${bw.project.home}/projects/caldav" /> 
    1616 
    1717      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1818              libcache="${org.bedework.libcache.dir}" 
    1919              name="bw-cdvserver" version="3.5" 
    20               projecthome="${project.home}/projects/caldav" /> 
     20              projecthome="${bw.project.home}/projects/caldav" /> 
    2121 
    2222      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    2323              libcache="${org.bedework.libcache.dir}" 
    2424              name="bw-webdavserver" version="3.5" 
    25               projecthome="${project.home}/projects/webdav" /> 
     25              projecthome="${bw.project.home}/projects/webdav" /> 
    2626    </sequential> 
    2727 </macrodef> 

  • trunk/deployment/testsuite/shellscr/appjars.xml

    r1895 r1998  
    1616              libcache="${org.bedework.libcache.dir}" 
    1717              name="bw-appcommon" version="3.5" 
    18               projecthome="${project.home}/projects/webapps" /> 
     18              projecthome="${bw.project.home}/projects/webapps" /> 
    1919 
    2020      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    2121              libcache="${org.bedework.libcache.dir}" 
    2222              name="bw-testsuite" version="3.5" 
    23               projecthome="${project.home}/projects/testsuite" /> 
     23              projecthome="${bw.project.home}/projects/testsuite" /> 
    2424    </sequential> 
    2525 </macrodef> 

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

    r1895 r1998  
    1313              libcache="${org.bedework.libcache.dir}" 
    1414              name="bw-caldav" version="3.5" 
    15               projecthome="${project.home}/projects/caldav" /> 
     15              projecthome="${bw.project.home}/projects/caldav" /> 
    1616 
    1717      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1818              libcache="${org.bedework.libcache.dir}" 
    1919              name="bw-cdvserver" version="3.5" 
    20               projecthome="${project.home}/projects/caldav" /> 
     20              projecthome="${bw.project.home}/projects/caldav" /> 
    2121 
    2222      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    2323              libcache="${org.bedework.libcache.dir}" 
    2424              name="bw-webdavserver" version="3.5" 
    25               projecthome="${project.home}/projects/webdav" /> 
     25              projecthome="${bw.project.home}/projects/webdav" /> 
    2626    </sequential> 
    2727 </macrodef> 

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

    r1895 r1998  
    1313              libcache="${org.bedework.libcache.dir}" 
    1414              name="bw-webcommon" version="3.5" 
    15               projecthome="${project.home}/projects/webapps" /> 
     15              projecthome="${bw.project.home}/projects/webapps" /> 
    1616    </sequential> 
    1717 </macrodef> 

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

    r1895 r1998  
    1313              libcache="${org.bedework.libcache.dir}" 
    1414              name="bw-webconfig" version="3.5" 
    15               projecthome="${project.home}/projects/webapps" /> 
     15              projecthome="${bw.project.home}/projects/webapps" /> 
    1616 
    1717      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1818              libcache="${org.bedework.libcache.dir}" 
    1919              name="bw-webcommon" version="3.5" 
    20               projecthome="${project.home}/projects/webapps" /> 
     20              projecthome="${bw.project.home}/projects/webapps" /> 
    2121    </sequential> 
    2222 </macrodef> 

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

    r1895 r1998  
    1313              libcache="${org.bedework.libcache.dir}" 
    1414              name="bw-webcommon" version="3.5" 
    15               projecthome="${project.home}/projects/webapps" /> 
     15              projecthome="${bw.project.home}/projects/webapps" /> 
    1616    </sequential> 
    1717 </macrodef> 

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

    r1895 r1998  
    1313              libcache="${org.bedework.libcache.dir}" 
    1414              name="bw-webcommon" version="3.5" 
    15               projecthome="${project.home}/projects/webapps" /> 
     15              projecthome="${bw.project.home}/projects/webapps" /> 
    1616    </sequential> 
    1717 </macrodef> 

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

    r1895 r1998  
    1313              libcache="${org.bedework.libcache.dir}" 
    1414              name="bw-webcommon" version="3.5" 
    15               projecthome="${project.home}/projects/webapps" /> 
     15              projecthome="${bw.project.home}/projects/webapps" /> 
    1616    </sequential> 
    1717 </macrodef>