Changeset 2310

Show
Ignore:
Timestamp:
08/05/09 15:37:14
Author:
douglm
Message:

Redo in/outbox scheduler as a listener on a JMS queue

Create a new deployable module for it.

Change startup to start each separate module as well as the 'infrastructure' components.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/douglm/build/quickstart/build.xml

    r2298 r2310  
    2121  <import file="${bedework.quickstart.basedir}/run-dir.xml" /> 
    2222  <import file="${bedework.quickstart.basedir}/install.xml" /> 
     23 
     24        <!-- Bedework services --> 
     25  <import file="${bedework.quickstart.basedir}/run-logger.xml" /> 
     26  <import file="${bedework.quickstart.basedir}/run-crawler.xml" /> 
     27  <import file="${bedework.quickstart.basedir}/run-inoutscheduler.xml" /> 
    2328 
    2429  <target name="README" depends="init" 
    …… 
    246251      <antcall target="dirstart" inheritrefs="true" /> 
    247252      <antcall target="hsqldb" inheritrefs="true" /> 
     253 
    248254      <sequential> 
    249255        <waitfor maxwait="3" maxwaitunit="minute" checkevery="250"> 
    250256           <socket server="localhost" port="10389"/> 
    251257        </waitfor> 
    252         <antcall target="tomcatstart" inheritrefs="true" /> 
     258 
     259        <parallel> 
     260          <!-- Start the bedework non-web services --> 
     261          <antcall target="start-logger" inheritrefs="true" /> 
     262          <antcall target="start-crawler" inheritrefs="true" /> 
     263          <antcall target="start-inoutscheduler" inheritrefs="true" /> 
     264 
     265          <antcall target="tomcatstart" inheritrefs="true" /> 
     266        </parallel> 
    253267      </sequential> 
    254268    </parallel> 
    …… 
    256270 
    257271  <!-- ================================================================= 
    258        The "start-debug" target starts all quickstart components except tomcat 
     272       The "start-debug" target starts the quickstart infrastructure components 
    259273       ================================================================= --> 
    260274 

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

    r2305 r2310  
    445445          <debugEntity>false</debugEntity> 
    446446        </sysevlog> 
     447 
     448        <!-- ================================================================== 
     449                          In/outbox scheduler program 
     450             ================================================================== --> 
     451        <iosched classname="org.bedework.calfacade.configs.BwCrawlerConfig"> 
     452          <debug>true</debug> 
     453          <appType>inoutsched</appType> 
     454          <guestMode>true</guestMode> 
     455          <debugEntity>false</debugEntity> 
     456        </iosched> 
    447457      </app> 
    448458    </bedework> 

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

    r2305 r2310  
    1919org.bedework.install.app.names=tzsvr,bwconfig,CalAdmin,EventSubmit,Events,\ 
    2020 SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres,bwcrawler,\ 
    21  sysevlog 
     21 sysevlog,iosched 
    2222 
    2323# 
    …… 
    412412org.bedework.app.sysevlog.description=Bedework system events logger application 
    413413 
     414# 
     415# -------------------------------------------------------------------- 
     416# 
     417# In/outbox scheduler 
     418# 
     419 
     420org.bedework.app.iosched.project=calendarapi 
     421org.bedework.app.iosched.sou.dir= 
     422org.bedework.app.iosched.shellscr.name=bwrun 
     423org.bedework.app.iosched.batscr.name=bwrun.bat 
     424org.bedework.app.iosched.zip.name=bwiosched 
     425org.bedework.app.iosched.description=Bedework In/outbox scheduler application 
     426 

  • branches/douglm/deployment/bwcrawler/shellscr/resources/bwrun.sh

    r2271 r2310  
    2323case "$1" in 
    2424  reindex) 
    25     echo $RUNCMD -appname $APPNAME $2 $3 $4 $5 $6 $7 $8 $9 
    26     $RUNCMD -appname $APPNAME $2 $3 $4 $5 $6 $7 $8 $9 
     25    echo $RUNCMD -appname $APPNAME reindex $2 $3 $4 $5 $6 $7 $8 $9 
     26    $RUNCMD -appname $APPNAME reindex $2 $3 $4 $5 $6 $7 $8 $9 
     27    ;; 
     28  start) 
     29    echo $RUNCMD -appname $APPNAME start $2 $3 $4 $5 $6 $7 $8 $9 
     30    $RUNCMD -appname $APPNAME start $2 $3 $4 $5 $6 $7 $8 $9 
    2731    ;; 
    2832  *) 
    …… 
    3034    echo $"Usage: " 
    3135    echo $"  $0 reindex [(-ndebug | -debug)] " 
    32     echo $"     Reindex the system" 
     36    echo $"     Reindex the system then process queue events" 
     37    echo $"  $0 start [(-ndebug | -debug)] " 
     38    echo $"     Process queue events" 
    3339    echo $" " 
    3440esac 

  • branches/douglm/deployment/sysevlog/shellscr/resources/bwrun.bat

    r2305 r2310  
    11:: Run the bedework system event logger program 
    2 :: First arg defines the action, dump, restore etc 
    3 :: Second arg should be the filename 
    42 
    53:: JAVA_HOME needs to be defined 
    …… 
    2624ECHO. 
    2725ECHO. 
    28 ECHO   Bedework Database Tools 
     26ECHO   Bedework Scheduler Task 
    2927ECHO   ----------------------- 
    3028ECHO. 
    3129 
    3230:branch 
    33   if "%1" == "dump" GOTO dump 
    34   if "%1" == "restore" GOTO restore 
    35   if "%1" == "restore-for-quickstart" GOTO restore-for-quickstart 
    36   if "%1" == "backup" GOTO backup 
    37   if "%1" == "initdb" GOTO initdb 
    38   if "%1" == "newsys" GOTO newsys 
    39   if "%1" == "drop" GOTO drop 
    40   if "%1" == "drop-export" GOTO drop-export 
    41   if "%1" == "schema" GOTO schema 
    42   if "%1" == "schema-export" GOTO schema-export 
     31  if "%1" == "start" GOTO start 
    4332 
    4433:usage