You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2003/08/08 12:42:14 UTC
cvs commit: jakarta-slide/testsuite/bin TProcessor.CMD
juergen 2003/08/08 03:42:14
Modified: testsuite/bin TProcessor.CMD
Log:
distinguish the different user db types.
Revision Changes Path
1.19 +36 -8 jakarta-slide/testsuite/bin/TProcessor.CMD
Index: TProcessor.CMD
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/bin/TProcessor.CMD,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TProcessor.CMD 9 Jul 2003 14:42:50 -0000 1.18
+++ TProcessor.CMD 8 Aug 2003 10:42:14 -0000 1.19
@@ -13,6 +13,7 @@
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 (4) DAV_DOMAIN is used for the domain specification of 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 ... :-(
@@ -22,6 +23,7 @@
set DAV_HOST=localhost
set DAV_AUTH=os
set DAV_GROUP=group
+set DAV_DOMAIN=localhost
set DAV_USER=guest
set DAV_PASSWORD=guest
set DAV_PORT=4000
@@ -46,6 +48,7 @@
if "%1" == "-davauth" goto SET_AUTH
if "%1" == "-davgroup" goto SET_GROUP
if "%1" == "-davuser" goto SET_USER
+if "%1" == "-davdomain" goto SET_DOMAIN
if "%1" == "-davpassword" goto SET_PASSWORD
if "%1" == "-davport" goto SET_PORT
if "%1" == "-davname" goto SET_NAME
@@ -94,6 +97,12 @@
shift
goto LOOP
+:SET_DOMAIN
+shift
+set DAV_DOMAIN=%1
+shift
+goto LOOP
+
:SET_PASSWORD
shift
set DAV_PASSWORD=%1
@@ -163,23 +172,41 @@
:INVOKE_TP
set /A TP_ITER_SMALL=%TP_ITERATIONS%/2
-set DAV_USERS_PATH=/administration/security/userdb
-if "%DAV_AUTH%" == "os" set ROOT_USER_PATH=/%DAV_NAME%%DAV_USERS_PATH%
-if "%DAV_AUTH%" == "ldap" set ROOT_USER_PATH=/%DAV_NAME%%DAV_USERS_PATH%/users
+if "%DAV_AUTH%" == "os" set ROOT_USER_PATH=/%DAV_NAME%/administration/security/users
+if "%DAV_AUTH%" == "os" set USER_PATH=%ROOT_USER_PATH%/%DAV_DOMAIN%/%DAV_USER%
+if "%DAV_AUTH%" == "os" set TESTCASE_EXCLUDE=%TESTCASE_EXCLUDE% -exclude "*groupFunctional*"
-if "%DAV_AUTH%" == "os" set USER_PATH=%ROOT_USER_PATH%/%DAV_HOST%/%DAV_USER%
+if "%DAV_AUTH%" == "ldap" set ROOT_USER_PATH=/%DAV_NAME%/administration/security/users
if "%DAV_AUTH%" == "ldap" set USER_PATH=%ROOT_USER_PATH%/%DAV_USER%
+if "%DAV_AUTH%" == "os" set TESTCASE_EXCLUDE=%TESTCASE_EXCLUDE% -exclude "*groupFunctional*"
+
+if "%DAV_AUTH%" == "tamino" set ROOT_USER_PATH=/%DAV_NAME%/administration/security/users
+if "%DAV_AUTH%" == "tamino" set USER_PATH=%ROOT_USER_PATH%/%DAV_USER%
+if "%DAV_AUTH%" == "os" set TESTCASE_EXCLUDE=%TESTCASE_EXCLUDE% -exclude "*groupFunctional*"
+
+if "%DAV_AUTH%" == "ldapgroup" set ROOT_USER_PATH=/%DAV_NAME%/administration/security/userdb
+if "%DAV_AUTH%" == "ldapgroup" set USER_PATH=%ROOT_USER_PATH%/users/%DAV_USER%
+
+if "%DAV_AUTH%" == "urm" set ROOT_USER_PATH=/%DAV_NAME%/administration/security/userdb
+if "%DAV_AUTH%" == "urm" set USER_PATH=%ROOT_USER_PATH%/users/%DAV_USER%
+if "%DAV_AUTH%" == "urm" set ACTION_PATH=/%DAV_NAME%/administration/security/actions
+
+
set OPTS=
set OPTS=%OPTS% -Dxdav.home="%TP_HOME%"
set OPTS=%OPTS% -Dxdav.host=%DAV_HOST%
+set OPTS=%OPTS% -Dxdav.port=%DAV_PORT%
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.globalVariableDomainName=%DAV_DOMAIN%
set OPTS=%OPTS% -Dxdav.globalVariableGroup=%DAV_GROUP%
-set OPTS=%OPTS% -Dxdav.globalVariableUsersPath=%DAV_USERS_PATH%
+set OPTS=%OPTS% -Dxdav.globalVariableGroupsColl=groups
+set OPTS=%OPTS% -Dxdav.globalVariableUsersColl=users
+set OPTS=%OPTS% -Dxdav.globalVariableRolesColl=roles
+
set OPTS=%OPTS% -Dxdav.globalVariableRootUserPath=%ROOT_USER_PATH%
set OPTS=%OPTS% -Dxdav.globalVariableUserPath=%USER_PATH%
set OPTS=%OPTS% -Dxdav.globalVariableServerName=%DAV_NAME%
@@ -226,11 +253,12 @@
echo Usage: tprocessor [options]
echo.
echo Options:
-echo -davauth ^<true_or_false^> (default: false)
+echo -davauth ^<user db type^> (default: os)
echo -davuser ^<webdavserver_user^> (default: guest)
+echo -davdomain ^<security domain^> (default: localhost)
echo -davpassword ^<webdavserver_password^> (default: guest)
echo -davhost ^<webdavserver_host^> (default: localhost)
-echo -davport ^<webdavserver_port^> (default: 8080)
+echo -davport ^<webdavserver_port^> (default: 4000)
echo -davname ^<webdavserver_name^> (default: slide)
echo -store ^<store_to_operate_on^> (default: files)
echo -users ^<number_of_users^> (default: 10)