pnever 2002/07/31 09:09:51 Modified: testsuite/bin TProcessor.CMD Log: Added new option -davauth to specify whether the server is running with or without authentication Revision Changes Path 1.10 +23 -13 jakarta-slide/testsuite/bin/TProcessor.CMD Index: TProcessor.CMD =================================================================== RCS file: /home/cvs/jakarta-slide/testsuite/bin/TProcessor.CMD,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- TProcessor.CMD 21 Jun 2002 12:59:22 -0000 1.9 +++ TProcessor.CMD 31 Jul 2002 16:09:51 -0000 1.10 @@ -10,10 +10,13 @@ rem (3) TP_STORE identifies the Slide store for the TProcessor to operate on. rem (4) TP_USERS is the number of concurrent users for the multiuser testcases. rem (5) TP_ITERATIONS is the number of iterations each concurrent user performs an action. -rem (6) DAV_USER and DAV_PASSWORD are used for authentification against the web server. -rem (7) WORKDB is a helping global variable specifying the underlying DB, if needed. -set WORKDB=xdavtest +rem (6) DAV_AUTH specifies whether authentication is enabled on the server. +rem (6) DAV_USER and DAV_PASSWORD are used for authentication against the server. +rem (7) TP_WORKDB internal DB name for the store configuration required for the I18N testcases ... :-( + +set TP_WORKDB=xdavtest set DAV_HOST=localhost +set DAV_AUTH=false set DAV_USER=guest set DAV_PASSWORD=guest set DAV_PORT=8080 @@ -35,14 +38,15 @@ if "%1" == "-help" goto HELP if "%1" == "-home" goto SET_HOME if "%1" == "-davhost" goto SET_HOST +if "%1" == "-davauth" goto SET_AUTH if "%1" == "-davuser" goto SET_USER -if "%1" == "-workdb" goto SET_WORKDB if "%1" == "-davpassword" goto SET_PASSWORD if "%1" == "-davport" goto SET_PORT if "%1" == "-davname" goto SET_NAME if "%1" == "-store" goto SET_STORE if "%1" == "-users" goto SET_USERS if "%1" == "-iterations" goto SET_ITERATIONS +if "%1" == "-workdb" goto SET_WORKDB if "%1" == "-testcase" goto SET_TESTCASE if "%1" == "-pattern" goto SET_PATTERN goto SET_PAR @@ -64,22 +68,18 @@ shift goto LOOP - -:SET_USER +:SET_AUTH shift -set DAV_USER=%1 +set DAV_AUTH=%1 shift goto LOOP - - -:SET_WORKDB +:SET_USER shift -set WORKDB=%1 +set DAV_USER=%1 shift goto LOOP - :SET_PASSWORD shift set DAV_PASSWORD=%1 @@ -116,6 +116,12 @@ shift goto LOOP +:SET_WORKDB +shift +set TP_WORKDB=%1 +shift +goto LOOP + :SET_TESTCASE shift set TESTCASE_PATH=%1 @@ -130,6 +136,8 @@ :INVOKE_TP set /A TP_ITER_SMALL=%TP_ITERATIONS%/2 +set USER_PATH=/%DAV_NAME%/administration/security/users +if "%DAV_AUTH%" == "true" set USER_PATH=/%DAV_NAME%/administration/security/users/%DAV_HOST%/%DAV_USER% set OPTS= set OPTS=%OPTS% -Dxdav.home="%TP_HOME%" @@ -137,6 +145,7 @@ set OPTS=%OPTS% -Dxdav.user=%DAV_USER% set OPTS=%OPTS% -Dxdav.password=%DAV_PASSWORD% set OPTS=%OPTS% -Dxdav.port=%DAV_PORT% +set OPTS=%OPTS% -Dxdav.globalVariableUserPath=%USER_PATH% set OPTS=%OPTS% -Dxdav.globalVariableServerName=%DAV_NAME% set OPTS=%OPTS% -Dxdav.globalVariableCollection=%TP_STORE% set OPTS=%OPTS% -Dxdav.globalVariableUsers=%TP_USERS% @@ -178,18 +187,19 @@ echo Usage: tprocessor [options] echo. echo Options: +echo -davauth ^<true_or_false^> (default: false) echo -davuser ^<webdavserver_user^> (default: guest) echo -davpassword ^<webdavserver_password^> (default: guest) echo -davhost ^<webdavserver_host^> (default: localhost) echo -davport ^<webdavserver_port^> (default: 8080) echo -davname ^<webdavserver_name^> (default: slide) -echo -workdb ^<underlying_DB^> (default: xdavtest) echo -store ^<store_to_operate_on^> (default: files) echo -users ^<number_of_users^> (default: 10) echo -iterations ^<number_of_iterations^> (default: 10) echo -testcase ^<xmltestcase_path^> (relative to the home directory) echo -pattern ^<xmltestcase_pattern^> (wildard is *, file separator is \\) echo. +echo The -davauth option specifies whether authentication is enabled at server side. echo If both, -testcase and -pattern are omitted, all testcases are executed. echo. echo Examples:
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
