Changeset 3252

Show
Ignore:
Timestamp:
04/22/11 10:56:55
Author:
douglm
Message:

Change usage text in bw scripts to clarify what's required.

Remove reindex option. Now done via JMX console

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/quickstart/linux/bw

    r3237 r3252  
    4040  echo "    deployed application. ACTION may be one of" 
    4141  echo "      -updateall  Does an svn update of all projects" 
    42   echo "      -reindex    runs the indexer directly out of the quickstart bedework" 
    43   echo "                  dist directory to rebuild the lucene indexes" 
    4442  echo "      -zoneinfo   builds zoneinfo data for the timezones server" 
    45   echo "                  requires -version and -tzdata parameters.   NOTE: build depends on glib2" 
     43  echo "                  requires -version and -tzdata parameters.   " 
     44  echo "                  NOTE: build depends on glib2 and only works on Linux/Unix" 
    4645  echo "      -buildwebcache     builds webcache" 
    4746  echo "      -deploywebcache    deploys webcache" 
    …… 
    6968  echo "   target       Ant target to execute" 
    7069  echo "" 
    71   echo "   PROJECT optionally defines the package to build and is none or more of" 
     70  echo "   PROJECT optionally defines the package to build and is one of" 
     71  echo "           the core, ancillary or experimental targets below:" 
     72  echo "" 
     73  echo "   Core projects: required for a functioning system" 
     74  echo "     -bwxml       Target is for the Bedework XML schemas build" 
     75  echo "                       (usually built automatically be dependent projects" 
     76  echo "     -carddav     Target is for the CardDAV build" 
     77  echo "     -carddav deploy-addrbook    To deploy the Javascript Addressbook client." 
     78  echo "     -tzsvr       Target is for the timezones server build" 
     79  echo "   Ancillary projects: not required" 
    7280  echo "     -bwtools     Target is for the Bedework tools build" 
    73   echo "     -bwxml       Target is for the Bedework XML schemas build" 
    7481  echo "     -caldavTest  Target is for the CalDAV Test build" 
    75   echo "     -carddav     Target is for the CardDAV build" 
     82  echo "     -monitor     Target is for the bedework monitor application" 
     83  echo "     -testsuite   Target is for the bedework test suite" 
     84  echo "   Experimental projects: no guarantees" 
     85  echo "     -catdav      Target is for the CatDAV build" 
    7686  echo "     -client      Target is for the bedework client application build" 
    7787  echo "     -exsynch     Target is for the Exchange synch build" 
    78   echo "     -monitor     Target is for the bedework monitor application" 
    7988  echo "     -naming      Target is for the abstract naming api" 
    80   echo "     -testsuite   Target is for the bedework test suite" 
    81   echo "     -tzsvr       Target is for the timezones server build" 
    8289  echo "     The default is a calendar build" 
    83   echo "" 
    84   echo "     -carddav deploy-addrbook    To deploy the Javascript Addressbook client." 
    8590  echo "" 
    8691  echo "   Invokes ant to build or deploy the Bedework system. Uses a configuration" 
    …… 
    123128} 
    124129 
    125 # ----------------------------------------------------------------------------  
    126 # Reindex the data 
    127 # ----------------------------------------------------------------------------  
    128 actionReindex() { 
    129   INDEXER=$QUICKSTART_HOME/bedework/dist/temp/shellscr/indexer 
    130    
    131         if [ ! -d "$INDEXER" ] ; then 
    132           errorUsage "The indexer directory $INDEXER does not exist. You probably need to do a rebuild." 
    133         fi 
    134  
    135   cd $INDEXER 
    136   chmod +x bwrun 
    137   ./bwrun reindex-nostart -user admin -indexlocprefix ../../../../../ 
    138    
    139   exit 0 
    140 } 
    141  
    142130usageZoneinfo() { 
    143131  echo "" 
    …… 
    268256bwxml= 
    269257bwtools= 
    270 carddav= 
    271258caldav= 
    272259caldavTest= 
     260carddav= 
     261catdav= 
    273262client= 
    274263exsynch= 
    …… 
    292281fi 
    293282 
    294 if [ "$1" = "-reindex" ] ; then 
    295   actionReindex 
    296 fi 
    297  
    298283if [ "$1" = "-zoneinfo" ] ; then 
    299284  actionZoneinfo $* 
    …… 
    388373      shift 
    389374      ;; 
     375    -caldav) 
     376      caldav="yes" 
     377      pkgdefault= 
     378      shift 
     379      ;; 
     380    -caldavTest) 
     381      caldavTest="yes" 
     382      pkgdefault= 
     383      shift 
     384      ;; 
    390385    -carddav) 
    391386      carddav="yes" 
    …… 
    393388      shift 
    394389      ;; 
    395     -caldav) 
    396       caldav="yes" 
    397       pkgdefault= 
    398       shift 
    399       ;; 
    400     -caldavTest) 
    401       caldavTest="yes" 
     390    -catdav) 
     391      catdav="yes" 
    402392      pkgdefault= 
    403393      shift 
    …… 
    499489fi 
    500490 
     491if [ "$catdav" != "" ] ; then 
     492  cd $QUICKSTART_HOME/catdav 
     493fi 
     494 
    501495if [ "$client" != "" ] ; then 
    502496  cd $QUICKSTART_HOME/bwclient 

  • trunk/build/quickstart/windows/bw.bat

    r3202 r3252  
    179179  GOTO:EOF 
    180180   
    181 :reindex 
    182   ECHO     Calling the reindexer 
    183   SET INDEXER=%QUICKSTART_HOME%\bedework\dist\temp\shellscr\indexer 
    184  
    185   if exist %INDEXER% goto indexerok 
    186     ECHO The indexer directory %INDEXER% does not exist. You probably need to do a rebuild. 
    187     GOTO:EOF 
    188  
    189   :indexerok 
    190   cd %INDEXER% 
    191   bwrun.bat reindex-nostart -user admin -indexlocprefix ..\..\..\..\..\ 
    192  
    193   GOTO:EOF 
    194  
    195181:zoneinfo 
    196182   ECHO    zoneinfo target is not supported on Windows 
    …… 
    294280IF "%1" == "-offline" GOTO offline 
    295281IF "%1" == "-updateall" GOTO updateall 
    296 IF "%1" == "-reindex" GOTO reindex 
    297282IF "%1" == "-zoneinfo" GOTO zoneinfo 
    298283IF "%1" == "-buildwebcache" GOTO buildwebcache 
    …… 
    329314  ECHO    deployed application. ACTION may be one of 
    330315  ECHO      -updateall  Does an svn update of all projects" 
    331   ECHO      -reindex    runs the indexer directly out of the quickstart bedework 
    332   ECHO                  dist directory to rebuild the lucene indexes 
    333316REM   Don't support zoneinfo command on Windows for now 
    334317REM   ECHO      -zoneinfo - builds zoneinfo data for the timezones server 
    …… 
    351334  ECHO    target       Ant target to execute (e.g. "start") 
    352335  ECHO. 
    353   ECHO. 
    354   ECHO. 
    355   ECHO    PROJECT optionally defines the package to build and is none or more of 
     336  ECHO    PROJECT optionally defines the package to build and is one of 
     337  ECHO            the core, ancillary or experimental targets below: 
     338  ECHO. 
     339  ECHO   Core projects: required for a functioning system 
    356340  ECHO      -bwxml       Target is for the Bedework XML schemas build 
     341  ECHO                       (usually built automatically be dependent projects 
    357342  ECHO      -carddav     Target is for the CardDAV build 
     343  ECHO      -carddav deploy-addrbook    To deploy the Javascript Addressbook client. 
     344  ECHO      -tzsvr       Target is for the timezones server build 
     345  ECHO   Ancillary projects: not required 
     346  ECHO      -monitor     Target is for the bedework monitor application 
     347  ECHO   Experimental projects: no guarantees 
     348  ECHO      -client      Target is for the bedework client application build 
    358349  ECHO      -exsynch     Target is for the Exchange synch build 
    359   ECHO      -client      Target is for the bedework client application build 
    360   ECHO      -monitor     Target is for the bedework monitor application 
    361350  ECHO      -naming      Target is for the abstract naming api 
    362   ECHO      -tzsvr       Target is for the timezones server build 
    363351  ECHO     The default is a calendar build 
    364352  ECHO.