Index: branches/douglm/build/quickstart/build.xml =================================================================== --- branches/douglm/build/quickstart/build.xml (revision 2298) +++ branches/douglm/build/quickstart/build.xml (revision 2310) @@ -21,4 +21,9 @@ + + + + + + - + + + + + + + + + @@ -256,5 +270,5 @@ Index: branches/douglm/build/quickstart/run-crawler.xml =================================================================== --- (revision ) +++ branches/douglm/build/quickstart/run-crawler.xml (revision 2310) @@ -1,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: branches/douglm/build/quickstart/run-inoutscheduler.xml =================================================================== --- (revision ) +++ branches/douglm/build/quickstart/run-inoutscheduler.xml (revision 2310) @@ -1,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: branches/douglm/build/quickstart/run-logger.xml =================================================================== --- (revision ) +++ branches/douglm/build/quickstart/run-logger.xml (revision 2310) @@ -1,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: branches/douglm/config/bwbuild/default/cal.options.xml =================================================================== --- branches/douglm/config/bwbuild/default/cal.options.xml (revision 2305) +++ branches/douglm/config/bwbuild/default/cal.options.xml (revision 2310) @@ -445,4 +445,14 @@ false + + + + true + inoutsched + true + false + Index: branches/douglm/config/bwbuild/default/cal.properties =================================================================== --- branches/douglm/config/bwbuild/default/cal.properties (revision 2305) +++ branches/douglm/config/bwbuild/default/cal.properties (revision 2310) @@ -19,5 +19,5 @@ org.bedework.install.app.names=tzsvr,bwconfig,CalAdmin,EventSubmit,Events,\ SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres,bwcrawler,\ - sysevlog + sysevlog,iosched # @@ -412,2 +412,15 @@ org.bedework.app.sysevlog.description=Bedework system events logger application +# +# -------------------------------------------------------------------- +# +# In/outbox scheduler +# + +org.bedework.app.iosched.project=calendarapi +org.bedework.app.iosched.sou.dir= +org.bedework.app.iosched.shellscr.name=bwrun +org.bedework.app.iosched.batscr.name=bwrun.bat +org.bedework.app.iosched.zip.name=bwiosched +org.bedework.app.iosched.description=Bedework In/outbox scheduler application + Index: branches/douglm/deployment/bwcrawler/shellscr/resources/bwrun.sh =================================================================== --- branches/douglm/deployment/bwcrawler/shellscr/resources/bwrun.sh (revision 2271) +++ branches/douglm/deployment/bwcrawler/shellscr/resources/bwrun.sh (revision 2310) @@ -23,6 +23,10 @@ case "$1" in reindex) - echo $RUNCMD -appname $APPNAME $2 $3 $4 $5 $6 $7 $8 $9 - $RUNCMD -appname $APPNAME $2 $3 $4 $5 $6 $7 $8 $9 + echo $RUNCMD -appname $APPNAME reindex $2 $3 $4 $5 $6 $7 $8 $9 + $RUNCMD -appname $APPNAME reindex $2 $3 $4 $5 $6 $7 $8 $9 + ;; + start) + echo $RUNCMD -appname $APPNAME start $2 $3 $4 $5 $6 $7 $8 $9 + $RUNCMD -appname $APPNAME start $2 $3 $4 $5 $6 $7 $8 $9 ;; *) @@ -30,5 +34,7 @@ echo $"Usage: " echo $" $0 reindex [(-ndebug | -debug)] " - echo $" Reindex the system" + echo $" Reindex the system then process queue events" + echo $" $0 start [(-ndebug | -debug)] " + echo $" Process queue events" echo $" " esac Index: branches/douglm/deployment/scheduler/shellscr/appjars.xml =================================================================== --- (revision ) +++ branches/douglm/deployment/scheduler/shellscr/appjars.xml (revision 2310) @@ -1,0 +1,23 @@ + + + + + + + + + + + + + + + Index: branches/douglm/deployment/scheduler/shellscr/build.xml =================================================================== --- (revision ) +++ branches/douglm/deployment/scheduler/shellscr/build.xml (revision 2310) @@ -1,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' +hibernate.dialect=${org.bedework.global.hibernate.dialect} +hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} +hibernate.connection.username=${org.bedework.global.jdbcid} +hibernate.connection.password=${org.bedework.global.jdbcpw} +hibernate.connection.url=${org.bedework.global.jdbcurl} +hibernate.cglib.use_reflection_optimizer=false +hibernate.cache.use_second_level_cache=false +# +# Here for better debugging +# +hibernate.jdbc.batch_size=0 + + + + + + + + + + + + + + + Index: branches/douglm/deployment/scheduler/shellscr/resources/bwrun.bat =================================================================== --- (revision ) +++ branches/douglm/deployment/scheduler/shellscr/resources/bwrun.bat (revision 2310) @@ -1,0 +1,53 @@ +:: Run the bedework system scheduler task + +:: JAVA_HOME needs to be defined + +@echo off +setlocal + +if not "%JAVA_HOME%"=="" goto noJavaWarn +ECHO +ECHO +ECHO *************************************************************************** +ECHO Warning: JAVA_HOME is not set - results unpredictable +ECHO *************************************************************************** +ECHO +ECHO +:noJavaWarn + +SET cp=@CP@ + +SET RUNCMD="%JAVA_HOME%/bin/java" -cp %cp% org.bedework.scheduler.Scheduler + +SET APPNAME=@BW-APP-NAME@ + +ECHO. +ECHO. +ECHO Bedework Scheduler Task +ECHO ----------------------- +ECHO. + +:branch + if "%1" == "start" GOTO start + +:usage + ECHO Usage: + ECHO. + ECHO start + ECHO Start the logging program + ECHO. + + GOTO end + + +:start + ECHO Starting logging: + ECHO. + ECHO %RUNCMD% -appname %APPNAME% -f %2 %3 %4 %5 %6 %7 %8 %9 + %RUNCMD% -appname %APPNAME% -f %2 %3 %4 %5 %6 %7 %8 %9 + GOTO end + :: + +:end +ECHO. +ECHO. Index: branches/douglm/deployment/scheduler/shellscr/resources/bwrun.sh =================================================================== --- (revision ) +++ branches/douglm/deployment/scheduler/shellscr/resources/bwrun.sh (revision 2310) @@ -1,0 +1,34 @@ +#!/bin/sh + +# Run the bedework system event scheduler task + +# JAVA_HOME needs to be defined + +cp=.:./classes:./resources + +for i in lib/* + do + cp=$cp:$i +done + +# Create a a temp dir +TEMPDIR="./temp" +mkdir $TEMPDIR + +RUNCMD="$JAVA_HOME/bin/java -Djava.io.tmpdir="$TEMPDIR" -cp $cp org.bedework.scheduler.Scheduler" + +APPNAME=iosched + +case "$1" in + start) + echo $RUNCMD -appname $APPNAME $2 $3 $4 $5 $6 $7 $8 $9 + $RUNCMD -appname $APPNAME $2 $3 $4 $5 $6 $7 $8 $9 + ;; + *) + echo $" " + echo $"Usage: " + echo $" $0 start [(-ndebug | -debug)] " + echo $" Start logging the system events" + echo $" " +esac + Index: branches/douglm/deployment/scheduler/shellscr/resources/jndi.properties =================================================================== --- (revision ) +++ branches/douglm/deployment/scheduler/shellscr/resources/jndi.properties (revision 2310) @@ -1,0 +1,57 @@ +# +# activemq jndi.properties +# +java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory + +# use the following property to configure the default connector +java.naming.provider.url = tcp://localhost:61616?trace=true + +# use the following property to specify the JNDI name the connection factory +# should appear as. +connectionFactoryNames = jms/BedeworkConnectionFactory + +# register some queues in JNDI using the form +# queue.[jndiName] = [physicalName] +queue.queue/syseventslog = bedework.sysevents.logger + +# register some topics in JNDI using the form +# topic.[jndiName] = [physicalName] +#topic.MyTopic = example.MyTopic + + + + + +# +# context.xml +# +# +# +# +# +# +# +# +# +# Index: branches/douglm/deployment/scheduler/shellscr/resources/log4j.xml =================================================================== --- (revision ) +++ branches/douglm/deployment/scheduler/shellscr/resources/log4j.xml (revision 2310) @@ -1,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: branches/douglm/deployment/sysevlog/shellscr/resources/bwrun.bat =================================================================== --- branches/douglm/deployment/sysevlog/shellscr/resources/bwrun.bat (revision 2305) +++ branches/douglm/deployment/sysevlog/shellscr/resources/bwrun.bat (revision 2310) @@ -1,5 +1,3 @@ :: Run the bedework system event logger program -:: First arg defines the action, dump, restore etc -:: Second arg should be the filename :: JAVA_HOME needs to be defined @@ -26,19 +24,10 @@ ECHO. ECHO. -ECHO Bedework Database Tools +ECHO Bedework Scheduler Task ECHO ----------------------- ECHO. :branch - if "%1" == "dump" GOTO dump - if "%1" == "restore" GOTO restore - if "%1" == "restore-for-quickstart" GOTO restore-for-quickstart - if "%1" == "backup" GOTO backup - if "%1" == "initdb" GOTO initdb - if "%1" == "newsys" GOTO newsys - if "%1" == "drop" GOTO drop - if "%1" == "drop-export" GOTO drop-export - if "%1" == "schema" GOTO schema - if "%1" == "schema-export" GOTO schema-export + if "%1" == "start" GOTO start :usage