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 08:40:12 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/get 02_getGroup.xml 03_getUserOfGroup.xml
juergen 2003/08/07 23:40:12
Modified: testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite
01_ACLdenyReadForGroup_GetColFile.xml
02_ACLgrantReadForGroup_GetColFile.xml
03_ACLdenyReadForOneUserOfGroup_GetColFile.xml
04_ACLgrantReadForOneUserOfGroup_GetColFile.xml
05_ACLdenyWriteForGroup_PutColFile.xml
06_ACLgrantWriteForGroup_PutColFile.xml
07_ACLdenyWriteForOneUserOfGroup_PutColFile.xml
08_ACLgrantWriteForOneUserOfGroup_PutColFile.xml
09_ACLdenyWriteForGroup_DeleteColFile.xml
10_ACLgrantWriteForGroup_DeleteColFile.xml
11_ACLdenyWriteForOneUserOfGroup_DeleteColFile.xml
12_ACLgrantWriteForOneUserOfGroup_DeleteColFile.xml
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
testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties
01_PropFind-Principal-collection-set.xml
02_PropFind-group-member-set.xml
03_PropFind-principal-URL.xml
04_PropFind-alternate-URI-set.xml
05_PropFind-group-membership.xml
testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/get
02_getGroup.xml 03_getUserOfGroup.xml
Log:
re-invented the gVGroup variable again.
Revision Changes Path
1.4 +14 -14 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/01_ACLdenyReadForGroup_GetColFile.xml
Index: 01_ACLdenyReadForGroup_GetColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/01_ACLdenyReadForGroup_GetColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsgOSSNH and /tmp/cvs4luIQB differ
1.4 +9 -9 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/02_ACLgrantReadForGroup_GetColFile.xml
Index: 02_ACLgrantReadForGroup_GetColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/02_ACLgrantReadForGroup_GetColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 02_ACLgrantReadForGroup_GetColFile.xml 7 Aug 2003 12:56:28 -0000 1.3
+++ 02_ACLgrantReadForGroup_GetColFile.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -5,9 +5,9 @@
<abstract> Test to check if possible to get file and collection with read privilege for a group</abstract>
<description>
1) Prepare test: MKCOL /test, PUT /test/test.xml
- 2) ACL command which grants read access to %globalVariableGroupsColl%1 on the /test collection
- 3) %globalVariableGroupsColl%1/%user% gets file /test/test.xml
- 4) %globalVariableGroupsColl%1/%user% gets collection /test
+ 2) ACL command which grants read access to %globalVariableGroupsColl,globalVariableGroup,%1 on the /test collection
+ 3) %globalVariableGroupsColl,globalVariableGroup,%1/%user% gets file /test/test.xml
+ 4) %globalVariableGroupsColl,globalVariableGroup,%1/%user% gets collection /test
</description>
<expectedResult> Two Get commands should both return 200 OK </expectedResult>
</specification>
@@ -44,11 +44,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="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read /></D:privilege>
@@ -61,8 +61,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept: */*</header>
@@ -79,8 +79,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
<header>Accept: */*</header>
1.4 +10 -10 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/03_ACLdenyReadForOneUserOfGroup_GetColFile.xml
Index: 03_ACLdenyReadForOneUserOfGroup_GetColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/03_ACLdenyReadForOneUserOfGroup_GetColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 03_ACLdenyReadForOneUserOfGroup_GetColFile.xml 7 Aug 2003 12:56:28 -0000 1.3
+++ 03_ACLdenyReadForOneUserOfGroup_GetColFile.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -5,9 +5,9 @@
<abstract> Test to check if possible to get file and collection without read privilege for a member of a group</abstract>
<description>
1) Prepare test: MKCOL /test, PUT /test/test.xml
- 2) ACL command which grants read access to %globalVariableGroupsColl%1 and denys read access to the user %globalVariableGroupsColl%1/%user% on the /test collection
- 3) %globalVariableGroupsColl%1/%user% gets file /test/test.xml
- 4) %globalVariableGroupsColl%1/%user% gets collection /test
+ 2) ACL command which grants read access to %globalVariableGroupsColl,globalVariableGroup,%1 and denys read access to the user %globalVariableGroupsColl,globalVariableGroup,%1/%user% on the /test collection
+ 3) %globalVariableGroupsColl,globalVariableGroup,%1/%user% gets file /test/test.xml
+ 4) %globalVariableGroupsColl,globalVariableGroup,%1/%user% gets collection /test
</description>
<expectedResult> Two Get commands should both return 403 Forbidden </expectedResult>
</specification>
@@ -44,12 +44,12 @@
<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="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1/%globalVariableGroupsColl%1%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1/%globalVariableGroupsColl,globalVariableGroup,%1%user%</D:href>
</D:principal>
<D:deny>
<D:privilege><D:read /></D:privilege>
@@ -58,7 +58,7 @@
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read /></D:privilege>
@@ -72,8 +72,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept: */*</header>
@@ -88,8 +88,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
<header>Accept: */*</header>
1.4 +10 -10 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/04_ACLgrantReadForOneUserOfGroup_GetColFile.xml
Index: 04_ACLgrantReadForOneUserOfGroup_GetColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/04_ACLgrantReadForOneUserOfGroup_GetColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 04_ACLgrantReadForOneUserOfGroup_GetColFile.xml 7 Aug 2003 12:56:28 -0000 1.3
+++ 04_ACLgrantReadForOneUserOfGroup_GetColFile.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -5,9 +5,9 @@
<abstract> Test to check if possible to get file and collection with read privilege for a member of a group</abstract>
<description>
1) Prepare test: MKCOL /test, PUT /test/test.xml
- 2) ACL command which grants read access to %globalVariableGroupsColl%1 and denys read access to the user %globalVariableGroupsColl%1/%user% on the /test collection
- 3) %globalVariableGroupsColl%1/%user% gets file /test/test.xml
- 4) %globalVariableGroupsColl%1/%user% gets collection /test
+ 2) ACL command which grants read access to %globalVariableGroupsColl,globalVariableGroup,%1 and denys read access to the user %globalVariableGroupsColl,globalVariableGroup,%1/%user% on the /test collection
+ 3) %globalVariableGroupsColl,globalVariableGroup,%1/%user% gets file /test/test.xml
+ 4) %globalVariableGroupsColl,globalVariableGroup,%1/%user% gets collection /test
</description>
<expectedResult> Two Get commands should both return 200 OK </expectedResult>
</specification>
@@ -44,11 +44,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="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1/%globalVariableGroupsColl%1%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1/%globalVariableGroup%1%user%</D:href>
</D:principal>
<D:grant>
<D:privilege><D:read /></D:privilege>
@@ -57,7 +57,7 @@
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1</D:href>
</D:principal>
<D:deny>
<D:privilege><D:read /></D:privilege>
@@ -71,8 +71,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</password>
<request>
<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept: */*</header>
@@ -89,8 +89,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</password>
<request>
<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
<header>Accept: */*</header>
1.4 +9 -9 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/05_ACLdenyWriteForGroup_PutColFile.xml
Index: 05_ACLdenyWriteForGroup_PutColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/05_ACLdenyWriteForGroup_PutColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 05_ACLdenyWriteForGroup_PutColFile.xml 7 Aug 2003 12:56:28 -0000 1.3
+++ 05_ACLdenyWriteForGroup_PutColFile.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -5,9 +5,9 @@
<abstract> Test to check if possible to put file and collection without write privilege for a group</abstract>
<description>
1) prepare test: MKCOL /test
- 2) ACL command which denys write access to the group %globalVariableGroupsColl%1 on the /test collection
- 3) user %globalVariableGroupsColl%1%user% puts file /test/test.xml
- 4) user %globalVariableGroupsColl%1%user% puts collection /test/myCollection
+ 2) ACL command which denys write access to the group %globalVariableGroupsColl,globalVariableGroup,%1 on the /test collection
+ 3) user %globalVariableGroupsColl,globalVariableGroup,%1%user% puts file /test/test.xml
+ 4) user %globalVariableGroupsColl,globalVariableGroup,%1%user% puts collection /test/myCollection
5) cleanup
</description>
<expectedResult> Two put commands should both return 403 Forbidden </expectedResult>
@@ -32,11 +32,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="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroup%/%globalVariableGroup%1</D:href>
</D:principal>
<D:deny>
<D:privilege><D:write /></D:privilege>
@@ -49,8 +49,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</password>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
@@ -64,8 +64,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroup%1%user%</password>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test/myCollection HTTP/1.1</command>
<header>Accept-Language: en-us</header>
1.4 +10 -9 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/06_ACLgrantWriteForGroup_PutColFile.xml
Index: 06_ACLgrantWriteForGroup_PutColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/06_ACLgrantWriteForGroup_PutColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvslTJcVX and /tmp/cvsASSgvQ differ
1.4 +10 -10 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/07_ACLdenyWriteForOneUserOfGroup_PutColFile.xml
Index: 07_ACLdenyWriteForOneUserOfGroup_PutColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/07_ACLdenyWriteForOneUserOfGroup_PutColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 07_ACLdenyWriteForOneUserOfGroup_PutColFile.xml 7 Aug 2003 12:56:28 -0000 1.3
+++ 07_ACLdenyWriteForOneUserOfGroup_PutColFile.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -5,9 +5,9 @@
<abstract> Test to check if possible to put file and collection without write privilege for a member of a group</abstract>
<description>
1) prepare test: MKCOL /test
- 2) ACL command which grants write acces to %globalVariableGroupsColl%1 and denys write access to the user %globalVariableGroupsColl%1/%globalVariableGroupsColl%/%user% on the /test collection
- 3) user %globalVariableGroupsColl%1%user% puts file /test/test.xml
- 4) user %globalVariableGroupsColl%1%user% makes collection /test/myCollection
+ 2) ACL command which grants write acces to %globalVariableGroupsColl,globalVariableGroup,%1 and denys write access to the user %globalVariableGroupsColl,globalVariableGroup,%1/%globalVariableGroupsColl,globalVariableGroup,%/%user% on the /test collection
+ 3) user %globalVariableGroupsColl,globalVariableGroup,%1%user% puts file /test/test.xml
+ 4) user %globalVariableGroupsColl,globalVariableGroup,%1%user% makes collection /test/myCollection
5) cleanup
</description>
<expectedResult> Two put commands should both return 403 Forbidden </expectedResult>
@@ -32,12 +32,12 @@
<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="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1/%globalVariableGroupsColl%1%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1/%globalVariableGroupsColl,globalVariableGroup,%1%user%</D:href>
</D:principal>
<D:deny>
<D:privilege><D:write /></D:privilege>
@@ -46,7 +46,7 @@
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1</D:href>
</D:principal>
<D:grant>
<D:privilege><D:write /></D:privilege>
@@ -60,8 +60,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
@@ -75,8 +75,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test/myCollection HTTP/1.1</command>
<header>Accept-Language: en-us</header>
1.4 +10 -10 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/08_ACLgrantWriteForOneUserOfGroup_PutColFile.xml
Index: 08_ACLgrantWriteForOneUserOfGroup_PutColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/08_ACLgrantWriteForOneUserOfGroup_PutColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 08_ACLgrantWriteForOneUserOfGroup_PutColFile.xml 7 Aug 2003 12:56:28 -0000 1.3
+++ 08_ACLgrantWriteForOneUserOfGroup_PutColFile.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -5,9 +5,9 @@
<abstract> Test to check if possible to put file and collection with write privilege for a member of a group</abstract>
<description>
1) prepare test: MKCOL /test
- 2) ACL command which denys write acces to %globalVariableGroupsColl%1 and grants write access to the user %globalVariableGroupsColl%1/%globalVariableGroupsColl%/%user% on the /test collection
- 3) user %globalVariableGroupsColl%1%user% puts file /test/test.xml
- 4) user %globalVariableGroupsColl%1%user% makes collection /test/myCollection
+ 2) ACL command which denys write acces to %globalVariableGroupsColl,globalVariableGroup,%1 and grants write access to the user %globalVariableGroupsColl,globalVariableGroup,%1/%globalVariableGroupsColl,globalVariableGroup,%/%user% on the /test collection
+ 3) user %globalVariableGroupsColl,globalVariableGroup,%1%user% puts file /test/test.xml
+ 4) user %globalVariableGroupsColl,globalVariableGroup,%1%user% makes collection /test/myCollection
5) cleanup
</description>
<expectedResult> Two put commands should both return 201 Created </expectedResult>
@@ -32,12 +32,12 @@
<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="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1/%globalVariableGroupsColl%1%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1/%globalVariableGroupsColl,globalVariableGroup,%1%user%</D:href>
</D:principal>
<D:grant>
<D:privilege><D:write /></D:privilege>
@@ -46,7 +46,7 @@
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1</D:href>
</D:principal>
<D:deny>
<D:privilege><D:write /></D:privilege>
@@ -60,8 +60,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
@@ -75,8 +75,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test/myCollection HTTP/1.1</command>
<header>Accept-Language: en-us</header>
1.4 +9 -9 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/09_ACLdenyWriteForGroup_DeleteColFile.xml
Index: 09_ACLdenyWriteForGroup_DeleteColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/09_ACLdenyWriteForGroup_DeleteColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 09_ACLdenyWriteForGroup_DeleteColFile.xml 7 Aug 2003 12:56:28 -0000 1.3
+++ 09_ACLdenyWriteForGroup_DeleteColFile.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -5,9 +5,9 @@
<abstract> Test to check if possible to delete file and collection without wrtie privilege for a group</abstract>
<description>
1) Prepare the test: MKCOL /test, PUT /test/test.xml
- 2) ACL command which denys write access to the %globalVariableGroupsColl%1 on the test collection
- 3) user %globalVariableGroupsColl%1%user% deletes file /test/test.xml
- 4) user %globalVariableGroupsColl%1%user% deletes collection /test
+ 2) ACL command which denys write access to the %globalVariableGroupsColl,globalVariableGroup,%1 on the test collection
+ 3) user %globalVariableGroupsColl,globalVariableGroup,%1%user% deletes file /test/test.xml
+ 4) user %globalVariableGroupsColl,globalVariableGroup,%1%user% deletes collection /test
5) cleanup
</description>
<expectedResult> Two Delete commands should both return 403 Forbidden </expectedResult>
@@ -45,11 +45,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="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1</D:href>
</D:principal>
<D:deny>
<D:privilege><D:write /></D:privilege>
@@ -62,8 +62,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
@@ -77,8 +77,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
<header>Accept-Language: en-us</header>
1.4 +9 -9 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/10_ACLgrantWriteForGroup_DeleteColFile.xml
Index: 10_ACLgrantWriteForGroup_DeleteColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/10_ACLgrantWriteForGroup_DeleteColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 10_ACLgrantWriteForGroup_DeleteColFile.xml 7 Aug 2003 12:56:28 -0000 1.3
+++ 10_ACLgrantWriteForGroup_DeleteColFile.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -5,9 +5,9 @@
<abstract> Test to check if possible to delete file and collection with wrtie privilege for a group</abstract>
<description>
1) Prepare the test: MKCOL /test, PUT /test/test.xml
- 2) ACL command which grants write access to the %globalVariableGroupsColl%1 on the test collection
- 3) user %globalVariableGroupsColl%1%user% deletes file /test/test.xml
- 4) user %globalVariableGroupsColl%1%user% deletes collection /test
+ 2) ACL command which grants write access to the %globalVariableGroupsColl,globalVariableGroup,%1 on the test collection
+ 3) user %globalVariableGroupsColl,globalVariableGroup,%1%user% deletes file /test/test.xml
+ 4) user %globalVariableGroupsColl,globalVariableGroup,%1%user% deletes collection /test
5) cleanup
</description>
<expectedResult> Two Delete commands should both return 403 Forbidden </expectedResult>
@@ -45,11 +45,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="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1</D:href>
</D:principal>
<D:grant>
<D:privilege><D:write /></D:privilege>
@@ -62,8 +62,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
@@ -80,8 +80,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
<header>Accept-Language: en-us</header>
1.4 +10 -10 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/11_ACLdenyWriteForOneUserOfGroup_DeleteColFile.xml
Index: 11_ACLdenyWriteForOneUserOfGroup_DeleteColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/11_ACLdenyWriteForOneUserOfGroup_DeleteColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 11_ACLdenyWriteForOneUserOfGroup_DeleteColFile.xml 7 Aug 2003 12:56:28 -0000 1.3
+++ 11_ACLdenyWriteForOneUserOfGroup_DeleteColFile.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -5,9 +5,9 @@
<abstract> Test to check if possible to delete file and collection without wrtie privilege for a member of group</abstract>
<description>
1) Prepare the test: MKCOL /test, PUT /test/test.xml
- 2) ACL command which grants write access to %globalVariableGroupsColl%1 and denys write access to the user %globalVariableGroupsColl%1%user% on the test collection
- 3) %globalVariableGroupsColl%1%user% deletes file /test/test.xml
- 4) %globalVariableGroupsColl%1%user% deletes collection /test
+ 2) ACL command which grants write access to %globalVariableGroupsColl,globalVariableGroup,%1 and denys write access to the user %globalVariableGroupsColl,globalVariableGroup,%1%user% on the test collection
+ 3) %globalVariableGroupsColl,globalVariableGroup,%1%user% deletes file /test/test.xml
+ 4) %globalVariableGroupsColl,globalVariableGroup,%1%user% deletes collection /test
5) cleanup
</description>
<expectedResult> Two Delete commands should both return 403 Forbidden </expectedResult>
@@ -45,12 +45,12 @@
<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="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1/%globalVariableGroupsColl%1%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1/%globalVariableGroupsColl,globalVariableGroup,%1%user%</D:href>
</D:principal>
<D:deny>
<D:privilege><D:write /></D:privilege>
@@ -59,7 +59,7 @@
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1</D:href>
</D:principal>
<D:grant>
<D:privilege><D:write /></D:privilege>
@@ -73,8 +73,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
@@ -88,8 +88,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
<header>Accept-Language: en-us</header>
1.4 +13 -13 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/12_ACLgrantWriteForOneUserOfGroup_DeleteColFile.xml
Index: 12_ACLgrantWriteForOneUserOfGroup_DeleteColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/Principle/EitherReadorWrite/12_ACLgrantWriteForOneUserOfGroup_DeleteColFile.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 12_ACLgrantWriteForOneUserOfGroup_DeleteColFile.xml 7 Aug 2003 12:56:28 -0000 1.3
+++ 12_ACLgrantWriteForOneUserOfGroup_DeleteColFile.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -5,10 +5,10 @@
<abstract> Test to check if possible to delete file and collection with wrtie privilege for a member of a group</abstract>
<description>
1) Prepare test: MKCOL /test, PUT file /test/test.xml
- 3) ACL command which denys write access to %globalVariableGroupsColl%1 and grants write access to the user %globalVariableGroupsColl%1/%user% on test collection
- 4) user %globalVariableGroupsColl%1%user%2 deletes file /test/test.xml
- 5) user %globalVariableGroupsColl%1%user% deletes file /test/test.xml
- 6) user %globalVariableGroupsColl%1%user% deletes collection /test
+ 3) ACL command which denys write access to %globalVariableGroupsColl,globalVariableGroup,%1 and grants write access to the user %globalVariableGroupsColl,globalVariableGroup,%1/%user% on test collection
+ 4) user %globalVariableGroupsColl,globalVariableGroup,%1%user%2 deletes file /test/test.xml
+ 5) user %globalVariableGroupsColl,globalVariableGroup,%1%user% deletes file /test/test.xml
+ 6) user %globalVariableGroupsColl,globalVariableGroup,%1%user% deletes collection /test
7) cleanup
</description>
<expectedResult> Two commands should return 403 Forbidden, 204 No Content and 204 No Content </expectedResult>
@@ -46,12 +46,12 @@
<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="globalVariableGroupsColl,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1/%globalVariableGroupsColl%1%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1/%globalVariableGroupsColl,globalVariableGroup,%1%user%</D:href>
</D:principal>
<D:grant>
<D:privilege><D:write /></D:privilege>
@@ -60,7 +60,7 @@
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%1</D:href>
</D:principal>
<D:deny>
<D:privilege><D:write /></D:privilege>
@@ -74,8 +74,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%2</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%2</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%2</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%2</password>
<request>
<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
@@ -89,8 +89,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
@@ -104,8 +104,8 @@
</response>
</step>
<step>
- <user varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</user>
- <password varUsage="globalVariableGroupsColl,user">%globalVariableGroupsColl%1%user%</password>
+ <user varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</user>
+ <password varUsage="globalVariableGroupsColl,globalVariableGroup,user">%globalVariableGroupsColl,globalVariableGroup,%1%user%</password>
<request>
<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
<header>Accept-Language: en-us</header>
1.5 +5 -5 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 01_ACLPrincipalPropSet_UserAndGroupDisplaynameReport.xml 8 Aug 2003 06:40:11 -0000 1.5
@@ -52,7 +52,7 @@
<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,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -77,7 +77,7 @@
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
</D:principal>
<D:grant>
<D:privilege><D:write/></D:privilege>
@@ -107,7 +107,7 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableGroupsColl,globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>%globalVariableRootUserPath%/%user%2</D:href>
@@ -128,10 +128,10 @@
</D:propstat>
</D:response>
<D:response>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
<D:propstat>
<D:prop>
- <D:displayname>%globalVariableGroupsColl%0</D:displayname>
+ <D:displayname>%globalVariableGroupsColl,globalVariableGroup,%0</D:displayname>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
1.5 +2 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 02_PrincipalPropertySearch_DisplaynameReport.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 02_PrincipalPropertySearch_DisplaynameReport.xml 8 Aug 2003 06:40:11 -0000 1.5
@@ -10,7 +10,7 @@
</specification>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName">REPORT %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%2 HTTP/1.0</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName">REPORT %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%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>
@@ -32,7 +32,7 @@
<body varUsage="globalVariableGroupsColl,globalVariableRootUserPath,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%2/2%globalVariableGroupsColl%2%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%2/2%globalVariableGroupsColl%2%user%</D:href>
<D:propstat>
<D:prop>
<D:displayname>2%globalVariableGroupsColl%2%user%</D:displayname>
1.5 +4 -4 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 03_ACLPrincipalPropSet_ResourcetypeReport.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 03_ACLPrincipalPropSet_ResourcetypeReport.xml 8 Aug 2003 06:40:11 -0000 1.5
@@ -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="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName,user"><![CDATA[
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,user"><![CDATA[
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroups%/%globalVariableGroupsColl%1</D:href>
</D:principal>
<D:deny>
<D:privilege><D:all /></D:privilege>
@@ -58,7 +58,7 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName"><![CDATA[<?xml version="1.0"?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName"><![CDATA[<?xml version="1.0"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href varUsage="globalVariableServerName">%globalVariableRootUserPath%</D:href>
@@ -73,7 +73,7 @@
</D:propstat>
</D:response>
<D:response>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%1</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroups%/%globalVariableGroupsColl%1</D:href>
<D:propstat>
<D:prop>
<D:resourcetype>
1.4 +5 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 04_PrincipalMatch_OwnerReport.xml 7 Aug 2003 12:56:40 -0000 1.3
+++ 04_PrincipalMatch_OwnerReport.xml 8 Aug 2003 06:40:11 -0000 1.4
@@ -8,7 +8,7 @@
2) (usr) REPORT command which obtains objects owned by usr
3) (usr2) REPORT command which obtains objects owned by usr2
</description>
- <expectedResult> The (acl-principal-prop-set) Report returns resourcetype property for principal %globalVariableGroupsColl% and "administration/security/userdb" </expectedResult>
+ <expectedResult> The (acl-principal-prop-set) Report returns resourcetype property for principal %globalVariableGroupsColl,globalVariableGroup,% and "administration/security/userdb" </expectedResult>
</specification>
<step>
<request>
@@ -56,10 +56,10 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableGroupsColl,globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0"?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href varUsage="globalVariableGroupsColl,globalVariableServerName,globalVariableCollection">/%globalVariableServerName%/%globalVariableCollection%/test1</D:href>
+ <D:href>/%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,globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0"?>
+ <body varUsage="globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href varUsage="globalVariableGroupsColl,globalVariableServerName,globalVariableCollection">/%globalVariableServerName%/%globalVariableCollection%/test2</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test2</D:href>
<D:status>HTTP/1.1 200 OK</D:status>
</D:response>
</D:multistatus>
1.5 +3 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 05_PrincipalMatch_SelfReportWithDisplaynameAndOwner.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 05_PrincipalMatch_SelfReportWithDisplaynameAndOwner.xml 8 Aug 2003 06:40:11 -0000 1.5
@@ -10,7 +10,7 @@
</specification>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName,user">REPORT %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0 HTTP/1.0</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,user">REPORT %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0 HTTP/1.0</command>
<header>content-type: text/xml; charset="utf-8"</header>
<body><![CDATA[
<D:principal-match xmlns:D="DAV:">
@@ -23,10 +23,10 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName,user"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,user"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user%</D:href>
<D:propstat>
<D:prop>
<D:displayname>%user%</D:displayname>
1.5 +2 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 06_PrincipalMatch_SelfReportFromRoot.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 06_PrincipalMatch_SelfReportFromRoot.xml 8 Aug 2003 06:40:11 -0000 1.5
@@ -19,14 +19,14 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName,user"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,user"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>%globalVariableRootUserPath%/users/%user%</D:href>
<D:status>HTTP/1.1 200 OK</D:status>
</D:response>
<D:response>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroups%/%globalVariableGroupsColl%0/%user%</D:href>
<D:status>HTTP/1.1 200 OK</D:status>
</D:response>
</D:multistatus>
1.5 +6 -6 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties/01_PropFind-Principal-collection-set.xml
Index: 01_PropFind-Principal-collection-set.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties/01_PropFind-Principal-collection-set.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 01_PropFind-Principal-collection-set.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 01_PropFind-Principal-collection-set.xml 8 Aug 2003 06:40:12 -0000 1.5
@@ -8,7 +8,7 @@
</specification>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName">PROPFIND %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0 HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName">PROPFIND %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0 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,globalVariableServerName,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
@@ -20,10 +20,10 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response xmlns:D="DAV:">
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
<D:propstat>
<D:prop>
<D:principal-collection-set>
@@ -34,7 +34,7 @@
</D:propstat>
</D:response>
<D:response xmlns:D="DAV:">
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/2%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/2%user%</D:href>
<D:propstat>
<D:prop>
<D:principal-collection-set>
@@ -45,7 +45,7 @@
</D:propstat>
</D:response>
<D:response xmlns:D="DAV:">
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%2</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user%2</D:href>
<D:propstat>
<D:prop>
<D:principal-collection-set>
@@ -56,7 +56,7 @@
</D:propstat>
</D:response>
<D:response xmlns:D="DAV:">
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user%</D:href>
<D:propstat>
<D:prop>
<D:principal-collection-set>
1.5 +6 -6 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties/02_PropFind-group-member-set.xml
Index: 02_PropFind-group-member-set.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties/02_PropFind-group-member-set.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 02_PropFind-group-member-set.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 02_PropFind-group-member-set.xml 8 Aug 2003 06:40:12 -0000 1.5
@@ -8,7 +8,7 @@
</specification>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName">PROPFIND %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0 HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName">PROPFIND %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0 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,globalVariableServerName,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
@@ -20,11 +20,11 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response xmlns:D="DAV:">
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
<D:propstat>
<D:prop>
<D:group-member-set />
@@ -33,7 +33,7 @@
</D:propstat>
</D:response>
<D:response xmlns:D="DAV:">
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/2%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/2%user%</D:href>
<D:propstat>
<D:prop>
<D:group-member-set />
@@ -42,7 +42,7 @@
</D:propstat>
</D:response>
<D:response xmlns:D="DAV:">
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%2</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user%2</D:href>
<D:propstat>
<D:prop>
<D:group-member-set />
@@ -51,7 +51,7 @@
</D:propstat>
</D:response>
<D:response xmlns:D="DAV:">
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user%</D:href>
<D:propstat>
<D:prop>
<D:group-member-set />
1.5 +9 -9 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties/03_PropFind-principal-URL.xml
Index: 03_PropFind-principal-URL.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties/03_PropFind-principal-URL.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 03_PropFind-principal-URL.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 03_PropFind-principal-URL.xml 8 Aug 2003 06:40:12 -0000 1.5
@@ -8,7 +8,7 @@
</specification>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName,user">PROPFIND %globalVariableRootUserPath%/users/%user% HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,user">PROPFIND %globalVariableRootUserPath%/users/%user% HTTP/1.1</command>
<header>Content-Type: text/xml; charset=utf-8</header>
<header>User-Agent: Jakarta HTTP Client/1.0</header>
<header>Depth: 0</header>
@@ -21,7 +21,7 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>%globalVariableRootUserPath%/users/%user%</D:href>
@@ -40,7 +40,7 @@
</step>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName,user">PROPFIND %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user% HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,user">PROPFIND %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user% HTTP/1.1</command>
<header>Content-Type: text/xml; charset=utf-8</header>
<header>User-Agent: Jakarta HTTP Client/1.0</header>
<header>Depth: 0</header>
@@ -53,10 +53,10 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user%</D:href>
<D:propstat>
<D:prop>
<D:principal-URL>
@@ -72,7 +72,7 @@
</step>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName">PROPFIND %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0 HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName">PROPFIND %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0 HTTP/1.1</command>
<header>Content-Type: text/html; charset=utf-8</header>
<header>User-Agent: Jakarta HTTP Client/1.0</header>
<header>Depth: 0</header>
@@ -85,14 +85,14 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
<D:propstat>
<D:prop>
<D:principal-URL>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
</D:principal-URL>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
1.5 +10 -10 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties/04_PropFind-alternate-URI-set.xml
Index: 04_PropFind-alternate-URI-set.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties/04_PropFind-alternate-URI-set.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 04_PropFind-alternate-URI-set.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 04_PropFind-alternate-URI-set.xml 8 Aug 2003 06:40:12 -0000 1.5
@@ -8,7 +8,7 @@
</specification>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName,user">PROPFIND %globalVariableRootUserPath%/users/%user% HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,user">PROPFIND %globalVariableRootUserPath%/users/%user% HTTP/1.1</command>
<header>Content-Type: text/xml; charset=utf-8</header>
<header>User-Agent: Jakarta HTTP Client/1.0</header>
<header>Depth: 0</header>
@@ -21,14 +21,14 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>%globalVariableRootUserPath%/users/%user%</D:href>
<D:propstat>
<D:prop>
<D:alternate-URI-set>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user%</D:href>
</D:alternate-URI-set>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
@@ -40,7 +40,7 @@
</step>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName,user">PROPFIND %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user% HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,user">PROPFIND %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user% HTTP/1.1</command>
<header>Content-Type: text/xml; charset=utf-8</header>
<header>User-Agent: Jakarta HTTP Client/1.0</header>
<header>Depth: 0</header>
@@ -53,10 +53,10 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user%</D:href>
<D:propstat>
<D:prop>
<D:principal-URL>
@@ -72,7 +72,7 @@
</step>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName">PROPFIND %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0 HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName">PROPFIND %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0 HTTP/1.1</command>
<header>Content-Type: text/html; charset=utf-8</header>
<header>User-Agent: Jakarta HTTP Client/1.0</header>
<header>Depth: 0</header>
@@ -85,14 +85,14 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
<D:propstat>
<D:prop>
<D:principal-URL>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
</D:principal-URL>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
1.5 +16 -16 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties/05_PropFind-group-membership.xml
Index: 05_PropFind-group-membership.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/AccessControlProperties/05_PropFind-group-membership.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 05_PropFind-group-membership.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 05_PropFind-group-membership.xml 8 Aug 2003 06:40:12 -0000 1.5
@@ -8,10 +8,10 @@
</specification>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableServerName,user">PROPFIND %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user% HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableServerName,user">PROPFIND %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user% 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,globalVariableServerName,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <body><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:group-membership/>
@@ -20,20 +20,20 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
- <D:multistatus xmlns:D="DAV:">
- <D:response xmlns:D="DAV:">
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user%</D:href>
- <D:propstat>
- <D:prop>
- <D:group-membership>
- <D:href>%globalVariableRootUserPath%/users</D:href>
- <D:href>%globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0</D:href>
- </D:group-membership>
- </D:prop>
- <D:status>HTTP/1.1 200 OK</D:status>
- </D:propstat> </D:response>
- </D:multistatus>
+ <body varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,globalVariableCollection,userNumber,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:multistatus xmlns:D="DAV:">
+ <D:response xmlns:D="DAV:">
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user%</D:href>
+ <D:propstat>
+ <D:prop>
+ <D:group-membership>
+ <D:href>%globalVariableRootUserPath%/users</D:href>
+ <D:href>%globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0</D:href>
+ </D:group-membership>
+ </D:prop>
+ <D:status>HTTP/1.1 200 OK</D:status>
+ </D:propstat> </D:response>
+ </D:multistatus>
]]></body>
</response>
</step>
1.5 +1 -1 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/get/02_getGroup.xml
Index: 02_getGroup.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/get/02_getGroup.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 02_getGroup.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 02_getGroup.xml 8 Aug 2003 06:40:12 -0000 1.5
@@ -8,7 +8,7 @@
</specification>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableServerName,globalVariableGroupsColl">GET %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0 HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableServerName,globalVariableGroupsColl,globalVariableGroup">GET %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0 HTTP/1.1</command>
<header>Accept: */*</header>
<header>Accept-Language: en-us</header>
<header>Accept-Encoding: gzip, deflate</header>
1.5 +1 -1 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/get/03_getUserOfGroup.xml
Index: 03_getUserOfGroup.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/groupFunctional/get/03_getUserOfGroup.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 03_getUserOfGroup.xml 7 Aug 2003 13:37:33 -0000 1.4
+++ 03_getUserOfGroup.xml 8 Aug 2003 06:40:12 -0000 1.5
@@ -8,7 +8,7 @@
</specification>
<step>
<request>
- <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,user,globalVariableServerName">GET %globalVariableRootUserPath%/groups/%globalVariableGroupsColl%0/%user% HTTP/1.1</command>
+ <command varUsage="globalVariableRootUserPath,globalVariableGroupsColl,globalVariableGroup,user,globalVariableServerName">GET %globalVariableRootUserPath%/%globalVariableGroupsColl%/%globalVariableGroup%0/%user% HTTP/1.1</command>
<header>Accept: */*</header>
<header>Accept-Language: en-us</header>
<header>Accept-Encoding: gzip, deflate</header>