juergen 2003/08/11 07:51:15
Modified: testsuite/bin TProcessor.pl
Log:
changed the perl script according to the windows variant.
Revision Changes Path
1.2 +35 -7 jakarta-slide/testsuite/bin/TProcessor.pl
Index: TProcessor.pl
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/bin/TProcessor.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TProcessor.pl 14 Jul 2003 14:28:48 -0000 1.1
+++ TProcessor.pl 11 Aug 2003 14:51:15 -0000 1.2
@@ -9,6 +9,7 @@
# (6) DAV_AUTH specifies the authentication type which is enabled on the
server.
# Default os=operating system.
# (4) DAV_GROUP is used for versions supporting groups and users.
+# (4) DAV_DOMAIN is used for the domain specification of groups and users.
# (6) DAV_USER and DAV_PASSWORD are used for authentication against the
server.
# (7) TP_WORKDB internal DB name for the store configuration required for the
webdav and I18N testcases ... :-(
# (8) TP_WORKHOST internal host name the internal DB for the store
configuration required for the webdav and I18N testcases ... :-(
@@ -20,6 +21,7 @@
$DAV_HOST="localhost";
$DAV_AUTH="os";
$DAV_GROUP="group";
+$DAV_DOMAIN="localhost";
$DAV_USER="guest";
$DAV_PASSWORD="guest";
$DAV_PORT="4000";
@@ -48,6 +50,7 @@
elsif ($_ eq "-davhost") {shift; $DAV_HOST=$ARGV[0];}
elsif ($_ eq "-davauth") {shift; $DAV_AUTH=$ARGV[0];}
elsif ($_ eq "-davgroup"){shift; $DAV_GROUP=$ARGV[0];}
+ elsif ($_ eq "-davdomain"){shift; $DAV_DOMAIN=$ARGV[0];}
elsif ($_ eq "-davuser") {shift; $DAV_USER=$ARGV[0];}
elsif ($_ eq "-davpassword") {shift; $DAV_PASSWORD=$ARGV[0];}
elsif ($_ eq "-davport") {shift; $DAV_PORT=$ARGV[0];}
@@ -65,17 +68,42 @@
}
$TP_ITER_SMALL=int ($TP_ITERATIONS/2);
-$DAV_USERS_PATH="/administration/security/userdb";
+
+if ("$DAV_AUTH" eq "none") {
+ $ROOT_USER_PATH="/$DAV_NAME/administration/security/users";
+ $USER_PATH="$ROOT_USER_PATH";
+ $TESTCASE_EXCLUDE="$TESTCASE_EXCLUDE -exclude \"*groupFunctional*\" -exclude
\"*ACL*\"";
+}
if ("$DAV_AUTH" eq "os") {
- $ROOT_USER_PATH="/$DAV_NAME$DAV_USERS_PATH";
- $USER_PATH="$ROOT_USER_PATH/$DAV_HOST/$DAV_USER";
+ $ROOT_USER_PATH="/$DAV_NAME/administration/security/users";
+ $USER_PATH="$ROOT_USER_PATH/$DAV_DOMAIN/$DAV_USER";
+ $TESTCASE_EXCLUDE="$TESTCASE_EXCLUDE -exclude \"*groupFunctional*\"";
}
if ("$DAV_AUTH" eq "ldap") {
- $ROOT_USER_PATH="/$DAV_NAME$DAV_USERS_PATH/users";
+ $ROOT_USER_PATH="/$DAV_NAME/administration/security/users";
+ $USER_PATH="$ROOT_USER_PATH/$DAV_USER";
+ $TESTCASE_EXCLUDE="$TESTCASE_EXCLUDE -exclude \"*groupFunctional*\"";
+}
+if ("$DAV_AUTH" eq "tamino") {
+ $ROOT_USER_PATH="/$DAV_NAME/administration/security/users";
$USER_PATH="$ROOT_USER_PATH/$DAV_USER";
+ $TESTCASE_EXCLUDE="$TESTCASE_EXCLUDE -exclude \"*groupFunctional*\"";
+}
+if ("$DAV_AUTH" eq "ldapgroup") {
+ $ROOT_USER_PATH="/$DAV_NAME/administration/security/userdb";
+ $USER_PATH="$ROOT_USER_PATH/users/$DAV_USER";
+}
+if ("$DAV_AUTH" eq "taminogroup") {
+ $ROOT_USER_PATH="/$DAV_NAME/administration/security/userdb";
+ $USER_PATH="$ROOT_USER_PATH/users/$DAV_USER";
+}
+if ("$DAV_AUTH" eq "urm") {
+ $ROOT_USER_PATH="/$DAV_NAME/administration/security/userdb";
+ $USER_PATH="$ROOT_USER_PATH/users/$DAV_USER";
+ $ACTION_PATH="/$DAV_NAME/administration/security/actions";
}
-$OPTS="-Dxdav.home=\"$TP_HOME\" -Dxdav.host=$DAV_HOST -Dxdav.user=$DAV_USER
-Dxdav.password=$DAV_PASSWORD -Dxdav.port=$DAV_PORT
-Dxdav.globalVariableGroup=$DAV_GROUP -Dxdav.globalVariableUsersPath=$DAV_USERS_PATH
-Dxdav.globalVariableRootUserPath=$ROOT_USER_PATH
-Dxdav.globalVariableUserPath=$USER_PATH -Dxdav.globalVariableServerName=$DAV_NAME
-Dxdav.globalVariableCollection=$TP_STORE -Dxdav.globalVariableUsers=$TP_USERS
-Dxdav.globalVariableIterationCount=$TP_ITERATIONS
-Dxdav.globalVariableIterationCountSmall=$TP_ITER_SMALL
-Dxdav.globalVariablePerformanceIterations=$TP_ITER_SMALL -Dxdav.urlencoding=UTF-8
-Dxdav.workdb=$TP_WORKDB -Dxdav.workhost=$TP_WORKHOST
-Dhttpclient.authentication.preemptive=true";
+$OPTS="-Dxdav.home=\"$TP_HOME\" -Dxdav.host=$DAV_HOST -Dxdav.port=$DAV_PORT
-Dxdav.user=$DAV_USER -Dxdav.password=$DAV_PASSWORD
-Dxdav.globalVariableDomainName=$DAV_DOMAIN -Dxdav.globalVariableGroupsColl=groups
-Dxdav.globalVariableUsersColl=users -Dxdav.globalVariableRolesColl=roles
-Dxdav.globalVariableGroup=$DAV_GROUP
-Dxdav.globalVariableRootUserPath=$ROOT_USER_PATH
-Dxdav.globalVariableUserPath=$USER_PATH -Dxdav.globalVariableServerName=$DAV_NAME
-Dxdav.globalVariableCollection=$TP_STORE -Dxdav.globalVariableUsers=$TP_USERS
-Dxdav.globalVariableIterationCount=$TP_ITERATIONS
-Dxdav.globalVariableIterationCountSmall=$TP_ITER_SMALL
-Dxdav.globalVariablePerformanceIterations=$TP_ITER_SMALL -Dxdav.urlencoding=UTF-8
-Dxdav.workdb=$TP_WORKDB -Dxdav.workhost=$TP_WORKHOST
-Dhttpclient.authentication.preemptive=true";
$ENV{"CLASSPATH"}="";
cpbuild("$TP_HOME"."$PD"."lib");
@@ -107,9 +135,9 @@
Usage: tprocessor [options]
Options:
- -davauth <true_or_false> (default: false)
+ -davauth <user db type> (default: os)
-davuser <webdavserver_user> (default: guest)
- -davgroup (default: group)
+ -davdomain <security domain> (default: localhost)
-davpassword <webdavserver_password> (default: guest)
-davhost <webdavserver_host> (default: localhost)
-davport <webdavserver_port> (default: 4000)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
