juergen 2003/08/07 05:56:40
Modified: testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report
01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml
02_PrincipalPropertySearch_DisplaynameReport.xml
03_ACLPrincipalPropSet_ResourcetypeReport.xml
04_PrincipalMatch_OwnerReport.xml
05_PrincipalMatch_SelfReportWithDisplaynameAndOwner.xml
06_PrincipalMatch_SelfReportFromRoot.xml
Log:
replced /%globalVariableServerName%%globalVariableUsersPath% mit
%globalVariableRootUserPath% (josef)
Revision Changes Path
1.3 +7 -7
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml
Index: 01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml 7 Aug 2003 11:42:27
-0000 1.2
+++ 01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml 7 Aug 2003 12:56:40
-0000 1.3
@@ -52,11 +52,11 @@
<command
varUsage="globalVariableCollection,globalVariableServerName">ACL
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Content-Type: text/xml; charset=utf-8</header>
<header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[
+ <body
varUsage="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>/%globalVariableServerName%%globalVariableUsersPath%</D:href>
+ <D:href>%globalVariableRootUserPath%</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read/></D:privilege>
@@ -77,7 +77,7 @@
<D:ace>
<D:principal>
-
<D:href>/%globalVariableServerName%%globalVariableUsersPath%/groups/%globalVariableGroupsColl%0</D:href>
+
<D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
</D:principal>
<D:grant>
<D:privilege><D:write/></D:privilege>
@@ -107,10 +107,10 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableUsersPath,globalVariableGroupsColl,globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0"?>
+ <body
varUsage="globalVariableGroupsColl,globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href
varUsage="globalVariableUsersPath,globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user">%globalVariableRootUserPath%/%user%2</D:href>
+ <D:href
varUsage="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user">%globalVariableRootUserPath%/%user%2</D:href>
<D:propstat>
<D:prop>
<D:displayname>%user%2</D:displayname>
@@ -119,7 +119,7 @@
</D:propstat>
</D:response>
<D:response>
- <D:href
varUsage="globalVariableUsersPath,globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user">/%globalVariableServerName%%globalVariableUsersPath%</D:href>
+ <D:href
varUsage="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user">%globalVariableRootUserPath%</D:href>
<D:propstat>
<D:prop>
<D:displayname>all</D:displayname>
@@ -128,7 +128,7 @@
</D:propstat>
</D:response>
<D:response>
- <D:href
varUsage="globalVariableUsersPath,globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName">/%globalVariableServerName%%globalVariableUsersPath%/groups/%globalVariableGroupsColl%0</D:href>
+ <D:href
varUsage="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName">%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
<D:propstat>
<D:prop>
<D:displayname>%globalVariableGroupsColl%0</D:displayname>
1.3 +5 -5
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/02_PrincipalPropertySearch_DisplaynameReport.xml
Index: 02_PrincipalPropertySearch_DisplaynameReport.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/02_PrincipalPropertySearch_DisplaynameReport.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 02_PrincipalPropertySearch_DisplaynameReport.xml 7 Aug 2003 11:42:27 -0000
1.2
+++ 02_PrincipalPropertySearch_DisplaynameReport.xml 7 Aug 2003 12:56:40 -0000
1.3
@@ -10,11 +10,11 @@
</specification>
<step>
<request>
- <command
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName">REPORT
/%globalVariableServerName%%globalVariableUsersPath%/groups/%globalVariableGroupsColl%2
HTTP/1.0</command>
+ <command
varUsage="globalVariableGroupsColl,globalVariableServerName">REPORT
%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%2 HTTP/1.0</command>
<header>content-type: text/html; charset="utf-8"</header>
<header>User-Agent: Jakarta HTTP Client/1.0</header>
<header>Depth: INFINITY</header>
- <body
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName,user"><![CDATA[
+ <body
varUsage="globalVariableGroupsColl,globalVariableServerName,user"><![CDATA[
<D:principal-property-search xmlns:D="DAV:">
<D:property-search>
<D:prop>
@@ -29,10 +29,10 @@
</request>
<response>
<command>HTTP/1.1 207 Multi-Status</command>
- <body
varUsage="globalVariableUsersPath,globalVariableGroupsColl,globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0"?>
+ <body
varUsage="globalVariableGroupsColl,globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%%globalVariableUsersPath%/groups/%globalVariableGroupsColl%2/2%globalVariableGroupsColl%2%user%</D:href>
+
<D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%2/2%globalVariableGroupsColl%2%user%</D:href>
<D:propstat>
<D:prop>
<D:displayname>2%globalVariableGroupsColl%2%user%</D:displayname>
@@ -41,7 +41,7 @@
</D:propstat>
</D:response>
<D:response>
-
<D:href>/%globalVariableServerName%%globalVariableUsersPath%/users/2%globalVariableGroupsColl%2%user%</D:href>
+
<D:href>%globalVariableRootUserPath%/users/2%globalVariableGroupsColl%2%user%</D:href>
<D:propstat>
<D:prop>
<D:displayname>2%globalVariableGroupsColl%2%user%</D:displayname>
1.3 +5 -5
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/03_ACLPrincipalPropSet_ResourcetypeReport.xml
Index: 03_ACLPrincipalPropSet_ResourcetypeReport.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/03_ACLPrincipalPropSet_ResourcetypeReport.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 03_ACLPrincipalPropSet_ResourcetypeReport.xml 7 Aug 2003 11:42:27 -0000
1.2
+++ 03_ACLPrincipalPropSet_ResourcetypeReport.xml 7 Aug 2003 12:56:40 -0000
1.3
@@ -29,11 +29,11 @@
<command
varUsage="globalVariableCollection,globalVariableServerName">ACL
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
<header>Content-Type: text/xml; charset=utf-8</header>
<header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body
varUsage="globalVariableUsersPath,globalVariableGroupsColl,globalVariableServerName,user"><![CDATA[
+ <body
varUsage="globalVariableGroupsColl,globalVariableServerName,user"><![CDATA[
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
-
<D:href>/%globalVariableServerName%%globalVariableUsersPath%/groups/%globalVariableGroupsColl%1</D:href>
+
<D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
</D:principal>
<D:deny>
<D:privilege><D:all /></D:privilege>
@@ -58,10 +58,10 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName"><![CDATA[<?xml
version="1.0"?>
+ <body
varUsage="globalVariableGroupsColl,globalVariableServerName"><![CDATA[<?xml
version="1.0"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href
varUsage="globalVariableUsersPath,globalVariableServerName">/%globalVariableServerName%%globalVariableUsersPath%</D:href>
+ <D:href
varUsage="globalVariableServerName">%globalVariableRootUserPath%</D:href>
<D:propstat>
<D:prop>
<D:resourcetype>
@@ -73,7 +73,7 @@
</D:propstat>
</D:response>
<D:response>
- <D:href
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName">/%globalVariableServerName%%globalVariableUsersPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href
varUsage="globalVariableGroupsColl,globalVariableServerName">%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
<D:propstat>
<D:prop>
<D:resourcetype>
1.3 +4 -4
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/04_PrincipalMatch_OwnerReport.xml
Index: 04_PrincipalMatch_OwnerReport.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/04_PrincipalMatch_OwnerReport.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 04_PrincipalMatch_OwnerReport.xml 7 Aug 2003 11:42:27 -0000 1.2
+++ 04_PrincipalMatch_OwnerReport.xml 7 Aug 2003 12:56:40 -0000 1.3
@@ -56,10 +56,10 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName,globalVariableCollection"><![CDATA[<?xml
version="1.0"?>
+ <body
varUsage="globalVariableGroupsColl,globalVariableServerName,globalVariableCollection"><![CDATA[<?xml
version="1.0"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName,globalVariableCollection">/%globalVariableServerName%/%globalVariableCollection%/test1</D:href>
+ <D:href
varUsage="globalVariableGroupsColl,globalVariableServerName,globalVariableCollection">/%globalVariableServerName%/%globalVariableCollection%/test1</D:href>
<D:status>HTTP/1.1 200 OK</D:status>
</D:response>
</D:multistatus>
@@ -82,10 +82,10 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName,globalVariableCollection"><![CDATA[<?xml
version="1.0"?>
+ <body
varUsage="globalVariableGroupsColl,globalVariableServerName,globalVariableCollection"><![CDATA[<?xml
version="1.0"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName,globalVariableCollection">/%globalVariableServerName%/%globalVariableCollection%/test2</D:href>
+ <D:href
varUsage="globalVariableGroupsColl,globalVariableServerName,globalVariableCollection">/%globalVariableServerName%/%globalVariableCollection%/test2</D:href>
<D:status>HTTP/1.1 200 OK</D:status>
</D:response>
</D:multistatus>
1.3 +4 -4
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/05_PrincipalMatch_SelfReportWithDisplaynameAndOwner.xml
Index: 05_PrincipalMatch_SelfReportWithDisplaynameAndOwner.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/05_PrincipalMatch_SelfReportWithDisplaynameAndOwner.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 05_PrincipalMatch_SelfReportWithDisplaynameAndOwner.xml 7 Aug 2003 11:42:27
-0000 1.2
+++ 05_PrincipalMatch_SelfReportWithDisplaynameAndOwner.xml 7 Aug 2003 12:56:40
-0000 1.3
@@ -10,7 +10,7 @@
</specification>
<step>
<request>
- <command
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName,user">REPORT
/%globalVariableServerName%%globalVariableUsersPath%/groups/%globalVariableGroupsColl%0
HTTP/1.0</command>
+ <command
varUsage="globalVariableGroupsColl,globalVariableServerName,user">REPORT
%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0 HTTP/1.0</command>
<header>content-type: text/xml; charset="utf-8"</header>
<body><![CDATA[
<D:principal-match xmlns:D="DAV:">
@@ -23,15 +23,15 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName,user"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ <body
varUsage="globalVariableGroupsColl,globalVariableServerName,user"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%%globalVariableUsersPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
+
<D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
<D:propstat>
<D:prop>
<D:displayname>%user%</D:displayname>
<D:owner>
-
<D:href>/%globalVariableServerName%%globalVariableUsersPath%/users/</D:href>
+ <D:href>%globalVariableRootUserPath%/users/</D:href>
</D:owner>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
1.3 +4 -4
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/06_PrincipalMatch_SelfReportFromRoot.xml
Index: 06_PrincipalMatch_SelfReportFromRoot.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Report/06_PrincipalMatch_SelfReportFromRoot.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 06_PrincipalMatch_SelfReportFromRoot.xml 7 Aug 2003 11:42:27 -0000 1.2
+++ 06_PrincipalMatch_SelfReportFromRoot.xml 7 Aug 2003 12:56:40 -0000 1.3
@@ -10,7 +10,7 @@
</specification>
<step>
<request>
- <command
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName,user">REPORT
/%globalVariableServerName% HTTP/1.0</command>
+ <command
varUsage="globalVariableGroupsColl,globalVariableServerName,user">REPORT
/%globalVariableServerName% HTTP/1.0</command>
<header>content-type: text/xml; charset="utf-8"</header>
<body><![CDATA[
<D:principal-match xmlns:D="DAV:">
@@ -19,14 +19,14 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableGroupsColl,globalVariableUsersPath,globalVariableServerName,user"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ <body
varUsage="globalVariableGroupsColl,globalVariableServerName,user"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%%globalVariableUsersPath%/users/%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/users/%user%</D:href>
<D:status>HTTP/1.1 200 OK</D:status>
</D:response>
<D:response>
-
<D:href>/%globalVariableServerName%%globalVariableUsersPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
+
<D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
<D:status>HTTP/1.1 200 OK</D:status>
</D:response>
</D:multistatus>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
