juergen 2002/07/31 05:53:34
Modified: testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility
sharedshared.xml sharedexclusive.xml noneshared.xml
noneexclusive.xml exclusiveshared.xml
exclusiveexclusive.xml
testsuite/testsuite/junit/xmltestcases/functional/put/code
put423.xml
testsuite/testsuite/junit/xmltestcases/functional/proppatch/code
PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml
PropPatch423File.xml PropPatch423Collection.xml
testsuite/testsuite/junit/xmltestcases/functional/propfind/code
propfind207.xml
testsuite/testsuite/junit/xmltestcases/functional/lock/mix
nullLockPut.xml nullLockDir.xml nullLock.xml
lockRefresh.xml colUnlock.xml colLockREditR.xml
colLockEdit.xml colLock424.xml colLock423.xml
colLock.xml colFileLockPut.xml colFileLock.xml
colDoubleLock.xml
testsuite/testsuite/junit/xmltestcases/functional/extra/move/code
move423.xml
testsuite/testsuite/junit/xmltestcases/functional/move/code
move423.xml
testsuite/testsuite/junit/xmltestcases/functional/users/mkcol
MkLLD.xml
testsuite/testsuite/junit/xmltestcases/functional/mkcol/mix
mkColLockDel.xml mkCol201Lock.xml
testsuite/testsuite/junit/xmltestcases/functional/extra/lock/header
lockTimeout0.xml
testsuite/testsuite/junit/xmltestcases/functional/lock/header
lockTimeout0.xml
testsuite/testsuite/junit/xmltestcases/functional/extra/lock/code
lock423.xml lock200.xml
testsuite/testsuite/junit/xmltestcases/functional/lock/code
lock423.xml lock200.xml
testsuite/testsuite/junit/xmltestcases/functional/users/lock
LDULD.xml LCpULCp.xml
testsuite/testsuite/junit/xmltestcases/functional/msexplorer
dragAndDropSmall.xml
testsuite/testsuite/junit/xmltestcases/functional/delete/code
deleteLock423.xml
testsuite/testsuite/junit/xmltestcases/functional/extra/delete/code
deleteLock423.xml
testsuite/testsuite/junit/xmltestcases/functional/delete/mix
deleteDependency.xml
testsuite/testsuite/junit/xmltestcases/functional/extra/delete/mix
deleteDependency.xml
testsuite/testsuite/junit/xmltestcases/functional/copy/code
copy423.xml
testsuite/testsuite/junit/xmltestcases/functional/extra/copy/code
copy423.xml
Log:
the user path (returned and computed by e.g. lock method) is now be parameterised
from the command line.
Revision Changes Path
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/sharedshared.xml
Index: sharedshared.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/sharedshared.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sharedshared.xml 4 Feb 2002 13:08:57 -0000 1.3
+++ sharedshared.xml 31 Jul 2002 12:53:31 -0000 1.4
@@ -60,7 +60,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:shared/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:shared/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
@@ -79,7 +79,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:shared/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:shared/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/sharedexclusive.xml
Index: sharedexclusive.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/sharedexclusive.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sharedexclusive.xml 4 Feb 2002 13:08:57 -0000 1.3
+++ sharedexclusive.xml 31 Jul 2002 12:53:31 -0000 1.4
@@ -57,7 +57,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:shared/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:shared/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
@@ -76,7 +76,7 @@
<response>
<command>HTTP/1.0 423 Locked</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/noneshared.xml
Index: noneshared.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/noneshared.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- noneshared.xml 4 Feb 2002 13:08:57 -0000 1.3
+++ noneshared.xml 31 Jul 2002 12:53:31 -0000 1.4
@@ -54,7 +54,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:shared/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:shared/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/noneexclusive.xml
Index: noneexclusive.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/noneexclusive.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- noneexclusive.xml 4 Feb 2002 13:08:57 -0000 1.3
+++ noneexclusive.xml 31 Jul 2002 12:53:31 -0000 1.4
@@ -56,7 +56,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/exclusiveshared.xml
Index: exclusiveshared.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/exclusiveshared.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- exclusiveshared.xml 4 Feb 2002 13:08:57 -0000 1.3
+++ exclusiveshared.xml 31 Jul 2002 12:53:31 -0000 1.4
@@ -57,7 +57,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
@@ -76,7 +76,7 @@
<response>
<command>HTTP/1.0 423 Locked</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/exclusiveexclusive.xml
Index: exclusiveexclusive.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/compatibility/exclusiveexclusive.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- exclusiveexclusive.xml 4 Feb 2002 13:08:57 -0000 1.3
+++ exclusiveexclusive.xml 31 Jul 2002 12:53:31 -0000 1.4
@@ -58,7 +58,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
@@ -77,7 +77,7 @@
<response>
<command>HTTP/1.0 423 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/put/code/put423.xml
Index: put423.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/put/code/put423.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- put423.xml 5 Feb 2002 10:17:58 -0000 1.3
+++ put423.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -38,7 +38,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.6 +4 -4
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml 24 May 2002 08:09:26
-0000 1.5
+++ PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml 31 Jul 2002 12:53:32
-0000 1.6
@@ -107,7 +107,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName">
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host">
<![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<d:prop xmlns:d="DAV:">
<d:lockdiscovery>
@@ -115,7 +115,7 @@
<d:locktype><d:write/></d:locktype>
<d:lockscope><d:exclusive/></d:lockscope>
<d:depth>infinity</d:depth>
-
<d:owner>/%globalVariableServerName%/administration/security/users</d:owner>
+ <d:owner>%globalVariableUserPath%</d:owner>
<d:timeout>Second-604800</d:timeout>
<d:locktoken><d:href></d:href></d:locktoken>
</d:activelock>
@@ -143,7 +143,7 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet
2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body
varUsage="globalVariableCollection,userNumber,automaticVariable1,globalVariableServerName"><?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,userNumber,automaticVariable1,globalVariableUserPath,globalVariableServerName,user,host"><?xml
version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:"
xmlns:S="http://jakarta.apache.org/slide/"; >
<response>
<href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
@@ -154,7 +154,7 @@
<locktype><write/></locktype>
<lockscope><exclusive/></lockscope>
<depth>infinity</depth>
-
<owner>/%globalVariableServerName%/administration/security/users</owner>
+
<owner>%globalVariableUserPath%</owner>
<timeout>*</timeout>
<locktoken><href>%automaticVariable1%</href></locktoken>
</activelock>
1.5 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatch423File.xml
Index: PropPatch423File.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatch423File.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PropPatch423File.xml 5 Feb 2002 09:48:32 -0000 1.4
+++ PropPatch423File.xml 31 Jul 2002 12:53:32 -0000 1.5
@@ -60,7 +60,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.5 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatch423Collection.xml
Index: PropPatch423Collection.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatch423Collection.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PropPatch423Collection.xml 5 Feb 2002 09:48:32 -0000 1.4
+++ PropPatch423Collection.xml 31 Jul 2002 12:53:32 -0000 1.5
@@ -52,7 +52,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1;
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems
Inc.)</header>
- <body varUsage ="globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage
="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +3 -3
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/propfind/code/propfind207.xml
Index: propfind207.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/propfind/code/propfind207.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- propfind207.xml 29 May 2002 08:54:40 -0000 1.3
+++ propfind207.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -325,7 +325,7 @@
</request>
<response>
<command>HTTP/1.1 207 Multi-Status</command>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml
version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:"
xmlns:S="http://jakarta.apache.org/slide/"; >
+ <body
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><?xml
version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:"
xmlns:S="http://jakarta.apache.org/slide/"; >
<response>
<href>/%globalVariableServerName%/%globalVariableCollection%</href>
<propstat>
@@ -381,7 +381,7 @@
<acl>
<ace>
-
<principal><href>/%globalVariableServerName%/administration/security/users</href></principal>
+
<principal><href>%globalVariableUserPath%</href></principal>
<grant>
<privilege><all/></privilege>
</grant>
@@ -411,7 +411,7 @@
</acl-semantics>
<principal-collection-set>
-
<href>/%globalVariableServerName%/administration/security/users</href>
+ <href>%globalVariableUserPath%</href>
</principal-collection-set>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/nullLockPut.xml
Index: nullLockPut.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/nullLockPut.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nullLockPut.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ nullLockPut.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -21,8 +21,8 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName">
- <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host">
+ <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/nullLockDir.xml
Index: nullLockDir.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/nullLockDir.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nullLockDir.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ nullLockDir.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -21,7 +21,7 @@
<response>
<command>HTTP/1.0 412 Precondition Failed</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
</test>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/nullLock.xml
Index: nullLock.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/nullLock.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nullLock.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ nullLock.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -21,7 +21,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/lockRefresh.xml
Index: lockRefresh.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/lockRefresh.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lockRefresh.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ lockRefresh.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -38,7 +38,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
@@ -56,7 +56,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colUnlock.xml
Index: colUnlock.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colUnlock.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- colUnlock.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ colUnlock.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -69,7 +69,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLockREditR.xml
Index: colLockREditR.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLockREditR.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- colLockREditR.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ colLockREditR.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -68,12 +68,12 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/test/allclasses-frame.html
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host">DELETE
/%globalVariableServerName%/%globalVariableCollection%/test/allclasses-frame.html
HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Destroy: NoUndelete</header>
<header>Translate: f</header>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLockEdit.xml
Index: colLockEdit.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLockEdit.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- colLockEdit.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ colLockEdit.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -58,7 +58,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLock424.xml
Index: colLock424.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLock424.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- colLock424.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ colLock424.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -69,7 +69,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLock423.xml
Index: colLock423.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLock423.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- colLock423.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ colLock423.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -69,7 +69,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLock.xml
Index: colLock.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLock.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- colLock.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ colLock.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -58,7 +58,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colFileLockPut.xml
Index: colFileLockPut.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colFileLockPut.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- colFileLockPut.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ colFileLockPut.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -58,7 +58,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colFileLock.xml
Index: colFileLock.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colFileLock.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- colFileLock.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ colFileLock.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -58,7 +58,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colDoubleLock.xml
Index: colDoubleLock.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colDoubleLock.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- colDoubleLock.xml 4 Feb 2002 13:25:55 -0000 1.3
+++ colDoubleLock.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -69,7 +69,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
@@ -86,7 +86,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/move/code/move423.xml
Index: move423.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/move/code/move423.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- move423.xml 4 Feb 2002 12:46:08 -0000 1.3
+++ move423.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -90,14 +90,14 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<d:prop xmlns:d="DAV:">
<d:lockdiscovery>
<d:activelock>
<d:locktype><d:write/></d:locktype>
<d:lockscope><d:exclusive/></d:lockscope>
<d:depth>infinity</d:depth>
-
<d:owner>/%globalVariableServerName%/administration/security/users</d:owner>
+ <d:owner>%globalVariableUserPath%</d:owner>
<d:timeout>Second-604800</d:timeout>
<d:locktoken><d:href></d:href></d:locktoken>
</d:activelock>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/move/code/move423.xml
Index: move423.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/move/code/move423.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- move423.xml 5 Feb 2002 10:17:24 -0000 1.3
+++ move423.xml 31 Jul 2002 12:53:32 -0000 1.4
@@ -71,14 +71,14 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<d:prop xmlns:d="DAV:">
<d:lockdiscovery>
<d:activelock>
<d:locktype><d:write/></d:locktype>
<d:lockscope><d:exclusive/></d:lockscope>
<d:depth>infinity</d:depth>
-
<d:owner>/%globalVariableServerName%/administration/security/users</d:owner>
+ <d:owner>%globalVariableUserPath%</d:owner>
<d:timeout>Second-604800</d:timeout>
<d:locktoken><d:href></d:href></d:locktoken>
</d:activelock>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/users/mkcol/MkLLD.xml
Index: MkLLD.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/users/mkcol/MkLLD.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MkLLD.xml 5 Feb 2002 10:19:00 -0000 1.3
+++ MkLLD.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -40,7 +40,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/mkcol/mix/mkColLockDel.xml
Index: mkColLockDel.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/mkcol/mix/mkColLockDel.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mkColLockDel.xml 5 Feb 2002 10:05:51 -0000 1.3
+++ mkColLockDel.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -37,7 +37,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/mkcol/mix/mkCol201Lock.xml
Index: mkCol201Lock.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/mkcol/mix/mkCol201Lock.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mkCol201Lock.xml 5 Feb 2002 10:05:51 -0000 1.3
+++ mkCol201Lock.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -37,7 +37,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/lock/header/lockTimeout0.xml
Index: lockTimeout0.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/lock/header/lockTimeout0.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lockTimeout0.xml 4 Feb 2002 12:44:23 -0000 1.3
+++ lockTimeout0.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -40,7 +40,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-0</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-0</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/header/lockTimeout0.xml
Index: lockTimeout0.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/header/lockTimeout0.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lockTimeout0.xml 4 Feb 2002 13:16:43 -0000 1.3
+++ lockTimeout0.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -40,7 +40,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-0</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-0</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/lock/code/lock423.xml
Index: lock423.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/lock/code/lock423.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lock423.xml 4 Feb 2002 12:44:15 -0000 1.3
+++ lock423.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -38,7 +38,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/lock/code/lock200.xml
Index: lock200.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/lock/code/lock200.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lock200.xml 4 Feb 2002 12:44:15 -0000 1.3
+++ lock200.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -38,8 +38,8 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName">
- <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host">
+ <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/code/lock423.xml
Index: lock423.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/code/lock423.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lock423.xml 4 Feb 2002 12:52:58 -0000 1.3
+++ lock423.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -42,7 +42,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/code/lock200.xml
Index: lock200.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/code/lock200.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lock200.xml 4 Feb 2002 12:52:58 -0000 1.3
+++ lock200.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -40,8 +40,8 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName">
- <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host">
+ <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/users/lock/LDULD.xml
Index: LDULD.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/users/lock/LDULD.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LDULD.xml 5 Feb 2002 10:09:05 -0000 1.3
+++ LDULD.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -55,7 +55,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/users/lock/LCpULCp.xml
Index: LCpULCp.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/users/lock/LCpULCp.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LCpULCp.xml 5 Feb 2002 10:09:05 -0000 1.3
+++ LCpULCp.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -79,7 +79,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
1.3 +15 -15
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/msexplorer/dragAndDropSmall.xml
Index: dragAndDropSmall.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/msexplorer/dragAndDropSmall.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dragAndDropSmall.xml 29 May 2002 08:49:48 -0000 1.2
+++ dragAndDropSmall.xml 31 Jul 2002 12:53:33 -0000 1.3
@@ -146,7 +146,7 @@
</request>
<response>
<command>HTTP/1.1 207 Multi-Status</command>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:"
xmlns:S="http://jakarta.apache.org/%globalVariableServerName%/";
><response><href>/%globalVariableServerName%/%globalVariableCollection%/test/folder1</href>
<propstat><prop><supportedlock><lockentry><lockscope><exclusive/></lockscope><locktype><write/></locktype></lockentry><lockentry><lockscope><shared/></lockscope><locktype><write/></locktype></lockentry></supportedlock>
<supported-privilege-set><supported-privilege><privilege><all/></privilege><abstract/><description>Any
operation</description><supported-privilege><privilege><read/></privilege><description>Read
any
object</description></supported-privilege><supported-privilege><privilege><write/></privilege><description>Write
any
object</description></supported-privilege><supported-privilege><privilege><read-acl/></privilege><description>Read
the
ACL</description></supported-privilege><supported-privilege><privilege><write-acl/></privilege><description>Write
the
ACL</description></supported-privilege></supported-privilege></supported-privilege-set>
@@ -156,7 +156,7 @@
<privilege><write-acl/></privilege>
<privilege><all/></privilege>
</current-user-privilege-set>
-<acl><ace><principal><href>/%globalVariableServerName%/administration/security/users</href>
+<acl><ace><principal><href>%globalVariableUserPath%</href>
</principal>
<grant><privilege><all/></privilege>
</grant>
@@ -165,7 +165,7 @@
</ace>
</acl>
<acl-semantics><acl-sem><ace-combination><no-deny/></ace-combination></acl-sem><acl-sem><required-principal><href/></required-principal></acl-sem><acl-sem><required-principal><self/></required-principal></acl-sem><acl-sem><required-principal><all/></required-principal></acl-sem></acl-semantics>
-<principal-collection-set><href>/%globalVariableServerName%/administration/security/users</href>
+<principal-collection-set><href>%globalVariableUserPath%</href>
</principal-collection-set>
<ns0:resourcetype xmlns:ns0="DAV:"><collection/></ns0:resourcetype>
<ns0:source xmlns:ns0="DAV:"/><ns0:displayname
xmlns:ns0="DAV:">folder1</ns0:displayname>
@@ -208,7 +208,7 @@
</request>
<response>
<command>HTTP/1.1 207 Multi-Status</command>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:"
xmlns:S="http://jakarta.apache.org/%globalVariableServerName%/";
><response><href>/%globalVariableServerName%/%globalVariableCollection%/test/folder1/nestedOne</href>
<propstat><prop><supportedlock><lockentry><lockscope><exclusive/></lockscope><locktype><write/></locktype></lockentry><lockentry><lockscope><shared/></lockscope><locktype><write/></locktype></lockentry></supportedlock>
<supported-privilege-set><supported-privilege><privilege><all/></privilege><abstract/><description>Any
operation</description><supported-privilege><privilege><read/></privilege><description>Read
any
object</description></supported-privilege><supported-privilege><privilege><write/></privilege><description>Write
any
object</description></supported-privilege><supported-privilege><privilege><read-acl/></privilege><description>Read
the
ACL</description></supported-privilege><supported-privilege><privilege><write-acl/></privilege><description>Write
the
ACL</description></supported-privilege></supported-privilege></supported-privilege-set>
@@ -218,7 +218,7 @@
<privilege><write-acl/></privilege>
<privilege><all/></privilege>
</current-user-privilege-set>
-<acl><ace><principal><href>/%globalVariableServerName%/administration/security/users</href>
+<acl><ace><principal><href>%globalVariableUserPath%</href>
</principal>
<grant><privilege><all/></privilege>
</grant>
@@ -227,7 +227,7 @@
</ace>
</acl>
<acl-semantics><acl-sem><ace-combination><no-deny/></ace-combination></acl-sem><acl-sem><required-principal><href/></required-principal></acl-sem><acl-sem><required-principal><self/></required-principal></acl-sem><acl-sem><required-principal><all/></required-principal></acl-sem></acl-semantics>
-<principal-collection-set><href>/%globalVariableServerName%/administration/security/users</href>
+<principal-collection-set><href>%globalVariableUserPath%</href>
</principal-collection-set>
<ns0:resourcetype xmlns:ns0="DAV:"><collection/></ns0:resourcetype>
<ns0:source xmlns:ns0="DAV:"/><ns0:displayname
xmlns:ns0="DAV:">nestedOne</ns0:displayname>
@@ -270,7 +270,7 @@
</request>
<response>
<command>HTTP/1.1 207 Multi-Status</command>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:"
xmlns:S="http://jakarta.apache.org/%globalVariableServerName%/";
><response><href>/%globalVariableServerName%/%globalVariableCollection%/test/folder1/nestedOne/nested2</href>
<propstat><prop><supportedlock><lockentry><lockscope><exclusive/></lockscope><locktype><write/></locktype></lockentry><lockentry><lockscope><shared/></lockscope><locktype><write/></locktype></lockentry></supportedlock>
<supported-privilege-set><supported-privilege><privilege><all/></privilege><abstract/><description>Any
operation</description><supported-privilege><privilege><read/></privilege><description>Read
any
object</description></supported-privilege><supported-privilege><privilege><write/></privilege><description>Write
any
object</description></supported-privilege><supported-privilege><privilege><read-acl/></privilege><description>Read
the
ACL</description></supported-privilege><supported-privilege><privilege><write-acl/></privilege><description>Write
the
ACL</description></supported-privilege></supported-privilege></supported-privilege-set>
@@ -280,7 +280,7 @@
<privilege><write-acl/></privilege>
<privilege><all/></privilege>
</current-user-privilege-set>
-<acl><ace><principal><href>/%globalVariableServerName%/administration/security/users</href>
+<acl><ace><principal><href>%globalVariableUserPath%</href>
</principal>
<grant><privilege><all/></privilege>
</grant>
@@ -289,7 +289,7 @@
</ace>
</acl>
<acl-semantics><acl-sem><ace-combination><no-deny/></ace-combination></acl-sem><acl-sem><required-principal><href/></required-principal></acl-sem><acl-sem><required-principal><self/></required-principal></acl-sem><acl-sem><required-principal><all/></required-principal></acl-sem></acl-semantics>
-<principal-collection-set><href>/%globalVariableServerName%/administration/security/users</href>
+<principal-collection-set><href>%globalVariableUserPath%</href>
</principal-collection-set>
<ns0:resourcetype xmlns:ns0="DAV:"><collection/></ns0:resourcetype>
<ns0:source xmlns:ns0="DAV:"/><ns0:displayname
xmlns:ns0="DAV:">nested2</ns0:displayname>
@@ -332,7 +332,7 @@
</request>
<response>
<command>HTTP/1.1 207 Multi-Status</command>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:"
xmlns:S="http://jakarta.apache.org/%globalVariableServerName%/";
><response><href>/%globalVariableServerName%/%globalVariableCollection%/test/folder1/nestedOne/nested2/nested3</href>
<propstat><prop><supportedlock><lockentry><lockscope><exclusive/></lockscope><locktype><write/></locktype></lockentry><lockentry><lockscope><shared/></lockscope><locktype><write/></locktype></lockentry></supportedlock>
<supported-privilege-set><supported-privilege><privilege><all/></privilege><abstract/><description>Any
operation</description><supported-privilege><privilege><read/></privilege><description>Read
any
object</description></supported-privilege><supported-privilege><privilege><write/></privilege><description>Write
any
object</description></supported-privilege><supported-privilege><privilege><read-acl/></privilege><description>Read
the
ACL</description></supported-privilege><supported-privilege><privilege><write-acl/></privilege><description>Write
the
ACL</description></supported-privilege></supported-privilege></supported-privilege-set>
@@ -342,7 +342,7 @@
<privilege><write-acl/></privilege>
<privilege><all/></privilege>
</current-user-privilege-set>
-<acl><ace><principal><href>/%globalVariableServerName%/administration/security/users</href>
+<acl><ace><principal><href>%globalVariableUserPath%</href>
</principal>
<grant><privilege><all/></privilege>
</grant>
@@ -351,7 +351,7 @@
</ace>
</acl>
<acl-semantics><acl-sem><ace-combination><no-deny/></ace-combination></acl-sem><acl-sem><required-principal><href/></required-principal></acl-sem><acl-sem><required-principal><self/></required-principal></acl-sem><acl-sem><required-principal><all/></required-principal></acl-sem></acl-semantics>
-<principal-collection-set><href>/%globalVariableServerName%/administration/security/users</href>
+<principal-collection-set><href>%globalVariableUserPath%</href>
</principal-collection-set>
<ns0:resourcetype xmlns:ns0="DAV:"><collection/></ns0:resourcetype>
<ns0:source xmlns:ns0="DAV:"/><ns0:displayname
xmlns:ns0="DAV:">nested3</ns0:displayname>
@@ -2670,7 +2670,7 @@
</request>
<response>
<command>HTTP/1.1 207 Multi-Status</command>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:"
xmlns:S="http://jakarta.apache.org/%globalVariableServerName%/";
><response><href>/%globalVariableServerName%/%globalVariableCollection%/</href>
<propstat><prop><supportedlock><lockentry><lockscope><exclusive/></lockscope><locktype><write/></locktype></lockentry><lockentry><lockscope><shared/></lockscope><locktype><write/></locktype></lockentry></supportedlock>
<supported-privilege-set><supported-privilege><privilege><all/></privilege><abstract/><description>Any
operation</description><supported-privilege><privilege><read/></privilege><description>Read
any
object</description></supported-privilege><supported-privilege><privilege><write/></privilege><description>Write
any
object</description></supported-privilege><supported-privilege><privilege><read-acl/></privilege><description>Read
the
ACL</description></supported-privilege><supported-privilege><privilege><write-acl/></privilege><description>Write
the
ACL</description></supported-privilege></supported-privilege></supported-privilege-set>
@@ -2680,7 +2680,7 @@
<privilege><write-acl/></privilege>
<privilege><all/></privilege>
</current-user-privilege-set>
-<acl><ace><principal><href>/%globalVariableServerName%/administration/security/users</href>
+<acl><ace><principal><href>%globalVariableUserPath%</href>
</principal>
<grant><privilege><all/></privilege>
</grant>
@@ -2689,7 +2689,7 @@
</ace>
</acl>
<acl-semantics><acl-sem><ace-combination><no-deny/></ace-combination></acl-sem><acl-sem><required-principal><href/></required-principal></acl-sem><acl-sem><required-principal><self/></required-principal></acl-sem><acl-sem><required-principal><all/></required-principal></acl-sem></acl-semantics>
-<principal-collection-set><href>/%globalVariableServerName%/administration/security/users</href>
+<principal-collection-set><href>%globalVariableUserPath%</href>
</principal-collection-set>
<ns0:resourcetype xmlns:ns0="DAV:"><collection/></ns0:resourcetype>
<ns0:source xmlns:ns0="DAV:"/><ns0:displayname
xmlns:ns0="DAV:">%globalVariableCollection%</ns0:displayname>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/delete/code/deleteLock423.xml
Index: deleteLock423.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/delete/code/deleteLock423.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deleteLock423.xml 4 Feb 2002 12:35:51 -0000 1.3
+++ deleteLock423.xml 31 Jul 2002 12:53:33 -0000 1.4
@@ -38,7 +38,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/delete/code/deleteLock423.xml
Index: deleteLock423.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/delete/code/deleteLock423.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deleteLock423.xml 4 Feb 2002 12:39:55 -0000 1.3
+++ deleteLock423.xml 31 Jul 2002 12:53:34 -0000 1.4
@@ -38,7 +38,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/delete/mix/deleteDependency.xml
Index: deleteDependency.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/delete/mix/deleteDependency.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deleteDependency.xml 4 Feb 2002 12:35:59 -0000 1.3
+++ deleteDependency.xml 31 Jul 2002 12:53:34 -0000 1.4
@@ -86,7 +86,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.4 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/delete/mix/deleteDependency.xml
Index: deleteDependency.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/delete/mix/deleteDependency.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deleteDependency.xml 4 Feb 2002 12:40:02 -0000 1.3
+++ deleteDependency.xml 31 Jul 2002 12:53:34 -0000 1.4
@@ -86,8 +86,8 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName">
- <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host">
+ <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
</body>
</response>
</step>
1.4 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/copy/code/copy423.xml
Index: copy423.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/copy/code/copy423.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- copy423.xml 4 Feb 2002 12:30:20 -0000 1.3
+++ copy423.xml 31 Jul 2002 12:53:34 -0000 1.4
@@ -70,7 +70,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>/%globalVariableServerName%/administration/security/users</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
+ <body
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
</response>
</step>
<step>
1.5 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/copy/code/copy423.xml
Index: copy423.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/copy/code/copy423.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- copy423.xml 31 Jul 2002 11:38:23 -0000 1.4
+++ copy423.xml 31 Jul 2002 12:53:34 -0000 1.5
@@ -94,7 +94,7 @@
<response>
<command>HTTP/1.0 200 OK</command>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java
1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableServerName,globalVariableUserPath,user,host">
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host">
<![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop
xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-119</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>
]]>
</body>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
