juergen     2003/07/04 04:10:55

  Modified:    testsuite/bin TProcessor.CMD
  Log:
  DAV_AUTH controls different authentication types like os or ldap.
  This version supports also the ACL group tests to be found in groupFunctional
  (Josef)
  
  Revision  Changes    Path
  1.17      +22 -6     jakarta-slide/testsuite/bin/TProcessor.CMD
  
  Index: TProcessor.CMD
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/bin/TProcessor.CMD,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- TProcessor.CMD    16 Jan 2003 16:16:45 -0000      1.16
  +++ TProcessor.CMD    4 Jul 2003 11:10:55 -0000       1.17
  @@ -10,7 +10,9 @@
   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_AUTH specifies whether authentication is enabled on the server.
  +rem       (6) DAV_AUTH specifies the authentication type which is enabled on the 
server. 
  +rem           Default os=operating system. 
  +rem       (4) DAV_GROUP is used for versions supporting groups and users.
   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 webdav and I18N testcases ... :-(
   rem       (8) TP_WORKHOST internal host name the internal DB for the store 
configuration required for the webdav and I18N testcases ... :-(
  @@ -18,10 +20,11 @@
   set TP_WORKDB=xdavtest
   set TP_WORKHOST=localhost
   set DAV_HOST=localhost
  -set DAV_AUTH=false
  +set DAV_AUTH=os
  +set DAV_GROUP=group
   set DAV_USER=guest
   set DAV_PASSWORD=guest
  -set DAV_PORT=8080
  +set DAV_PORT=4000
   set DAV_NAME=slide
   set TP_STORE=files
   set TP_USERS=10
  @@ -41,6 +44,7 @@
   if "%1" == "-home" goto SET_HOME
   if "%1" == "-davhost" goto SET_HOST
   if "%1" == "-davauth" goto SET_AUTH
  +if "%1" == "-davgroup" goto SET_GROUP
   if "%1" == "-davuser" goto SET_USER
   if "%1" == "-davpassword" goto SET_PASSWORD
   if "%1" == "-davport" goto SET_PORT
  @@ -78,6 +82,12 @@
   shift
   goto LOOP
   
  +:SET_GROUP
  +shift
  +set DAV_GROUP=%1
  +shift
  +goto LOOP
  +
   :SET_USER
   shift
   set DAV_USER=%1
  @@ -152,9 +162,12 @@
   
   :INVOKE_TP
   set /A TP_ITER_SMALL=%TP_ITERATIONS%/2
  -set ROOT_USER_PATH=/%DAV_NAME%/administration/security/users
  -set USER_PATH=%ROOT_USER_PATH%
  -if "%DAV_AUTH%" == "true" set USER_PATH=%ROOT_USER_PATH%/%DAV_HOST%/%DAV_USER%
  +
  +set DAV_USERS_PATH=/administration/security/userdb
  +set ROOT_USER_PATH=/%DAV_NAME%%DAV_USERS_PATH%/users
  +
  +if "%DAV_AUTH%" == "os" set USER_PATH=%ROOT_USER_PATH%/%DAV_HOST%/%DAV_USER%
  +if "%DAV_AUTH%" == "ldap" set USER_PATH=%ROOT_USER_PATH%/%DAV_USER%
   
   set OPTS=
   set OPTS=%OPTS% -Dxdav.home="%TP_HOME%"
  @@ -162,6 +175,9 @@
   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.globalVariableGroup=%DAV_GROUP%
  +set OPTS=%OPTS% -Dxdav.globalVariableUsersPath=%DAV_USERS_PATH%
   set OPTS=%OPTS% -Dxdav.globalVariableRootUserPath=%ROOT_USER_PATH%
   set OPTS=%OPTS% -Dxdav.globalVariableUserPath=%USER_PATH%
   set OPTS=%OPTS% -Dxdav.globalVariableServerName=%DAV_NAME%
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to