Changeset 2322

Show
Ignore:
Timestamp:
08/11/09 00:23:07
Author:
douglm
Message:

More work on the jms driven indexer. Still not plugged in to jms yet but has code to handle reindexing of public and private.

Renamed bwcrawler to indexer. Seems to have disturbed svn

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/douglm/build/buildsh.xml

    r2291 r2322  
    134134    </copy> 
    135135 
     136    <copy tofile="${app.dest.classes}/jndi.properties" 
     137          file="${org.bedework.config.jndi.properties}" /> 
     138 
    136139    <copy todir="${app.dest.classes}" overwrite="yes" > 
    137140      <fileset refid="org.bedework.extra.resources" /> 

  • branches/douglm/config/bwbuild/default/build.properties

    r2053 r2322  
    2121org.bedework.config.properties=${env.BEDEWORK_CONFIG}/cal.properties 
    2222org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml 
     23 
     24org.bedework.config.jndi.properties=${env.BEDEWORK_CONFIG}/jndi.properties 
     25 
    2326org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml 
    2427 

  • branches/douglm/config/bwbuild/default/cal.options.xml

    r2310 r2322  
    429429                          Crawler program 
    430430             ================================================================== --> 
    431         <bwcrawler classname="org.bedework.calfacade.configs.BwCrawlerConfig"> 
     431        <indexer classname="org.bedework.calfacade.configs.BwCrawlerConfig"> 
    432432          <debug>true</debug> 
    433           <appType>bwcrawler</appType> 
     433          <appType>indexer</appType> 
    434434          <guestMode>true</guestMode> 
    435435          <debugEntity>false</debugEntity> 
    436         </bwcrawler> 
     436        </indexer> 
    437437 
    438438        <!-- ================================================================== 

  • branches/douglm/config/bwbuild/default/cal.properties

    r2310 r2322  
    1818# Define the names of the applications we want to build 
    1919org.bedework.install.app.names=tzsvr,bwconfig,CalAdmin,EventSubmit,Events,\ 
    20  SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres,bwcrawler,\ 
     20 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres,indexer,\ 
    2121 sysevlog,iosched 
    2222 
    …… 
    392392# 
    393393 
    394 org.bedework.app.bwcrawler.project=bwcrawler 
    395 org.bedework.app.bwcrawler.sou.dir= 
    396 org.bedework.app.bwcrawler.shellscr.name=bwrun 
    397 org.bedework.app.bwcrawler.batscr.name=bwrun.bat 
    398 org.bedework.app.bwcrawler.zip.name=bwcrawler 
    399 org.bedework.app.bwcrawler.description=Bedework crawler application 
     394org.bedework.app.indexer.project=bwcrawler 
     395org.bedework.app.indexer.sou.dir= 
     396org.bedework.app.indexer.shellscr.name=bwrun 
     397org.bedework.app.indexer.batscr.name=bwrun.bat 
     398org.bedework.app.indexer.zip.name=indexer 
     399org.bedework.app.indexer.description=Bedework indexer application 
    400400 
    401401# 

  • branches/douglm/deployment/inoutsched/shellscr/build.xml

    r2310 r2322  
    7272    <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" /> 
    7373 
    74         <copy todir="${app.temp.home}/resources" 
    75               file="${app.resources.dir}/jndi.properties" /> 
    76  
    7774    <!-- =============================================================== 
    7875         Build the shell script 

  • branches/douglm/deployment/sysevlog/shellscr/build.xml

    r2305 r2322  
    7272    <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" /> 
    7373 
    74         <copy todir="${app.temp.home}/resources" 
    75               file="${app.resources.dir}/jndi.properties" /> 
    76  
    7774    <!-- =============================================================== 
    7875         Build the shell script