juergen 02/01/04 07:25:27
Modified: src/webdav/server/org/apache/slide/webdav/method
MkcolMethod.java PutMethod.java
src/share/org/apache/slide/content
NodeRevisionDescriptor.java
Log:
added user path to owner url.
Revision Changes Path
1.16 +8 -7
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java
Index: MkcolMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MkcolMethod.java 7 Dec 2001 13:50:56 -0000 1.15
+++ MkcolMethod.java 4 Jan 2002 15:25:26 -0000 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
1.15 2001/12/07 13:50:56 juergen Exp $
- * $Revision: 1.15 $
- * $Date: 2001/12/07 13:50:56 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
1.16 2002/01/04 15:25:26 juergen Exp $
+ * $Revision: 1.16 $
+ * $Date: 2002/01/04 15:25:26 $
*
* ====================================================================
*
@@ -163,11 +163,12 @@
// Owner
revisionDescriptor.setOwner(
- slideToken.getCredentialsToken().getPublicCredentials());
-
-
+ slideToken.getCredentialsToken().getPublicCredentials(),
+ token.getNamespaceConfig().getUsersPath());
+
+
if (isMsProprietarySupport()) {
-
+
NodeProperty property = null;
// Name
1.22 +17 -14
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java
Index: PutMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PutMethod.java 7 Dec 2001 13:50:56 -0000 1.21
+++ PutMethod.java 4 Jan 2002 15:25:26 -0000 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.21 2001/12/07 13:50:56 juergen Exp $
- * $Revision: 1.21 $
- * $Date: 2001/12/07 13:50:56 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.22 2002/01/04 15:25:26 juergen Exp $
+ * $Revision: 1.22 $
+ * $Date: 2002/01/04 15:25:26 $
*
* ====================================================================
*
@@ -77,6 +77,7 @@
import org.apache.slide.security.*;
import org.apache.slide.lock.*;
import org.apache.slide.webdav.*;
+import org.apache.slide.authenticate.CredentialsToken;
/**
* PUT method.
@@ -183,8 +184,8 @@
// Etag generation
revisionDescriptor.setETag(resourcePath.hashCode() + "_"
- + revisionNumber.hashCode() + "_"
- + revisionDescriptor.getContentLength());
+ + revisionNumber.hashCode() + "_"
+ +
revisionDescriptor.getContentLength());
// Normally assume the 'getcontentlanguage' and
// 'getcontenttype' are set, however, before we clear the
@@ -264,11 +265,13 @@
// Etag generation
revisionDescriptor.setETag(resourcePath.hashCode() + "_"
- + (new NodeRevisionNumber()).hashCode() + "_"
- + req.getContentLength());
+ + (new
NodeRevisionNumber()).hashCode() + "_"
+ + req.getContentLength());
// Owner
-
revisionDescriptor.setOwner(slideToken.getCredentialsToken().getPublicCredentials());
+ revisionDescriptor.setOwner(
+ slideToken.getCredentialsToken().
+
getPublicCredentials(),token.getNamespaceConfig().getUsersPath());
if (isMsProprietarySupport()) {
NodeProperty property = null;
@@ -314,9 +317,9 @@
}
-
-
-
+
+
+
/**
* Get return status based on exception type.
*/
@@ -335,9 +338,9 @@
return super.getErrorCode(e);
}
}
-
-
-
+
+
+
/**
* Returns true
*/
1.21 +12 -9
jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java
Index: NodeRevisionDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- NodeRevisionDescriptor.java 7 Dec 2001 13:50:56 -0000 1.20
+++ NodeRevisionDescriptor.java 4 Jan 2002 15:25:26 -0000 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java,v
1.20 2001/12/07 13:50:56 juergen Exp $
- * $Revision: 1.20 $
- * $Date: 2001/12/07 13:50:56 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java,v
1.21 2002/01/04 15:25:26 juergen Exp $
+ * $Revision: 1.21 $
+ * $Date: 2002/01/04 15:25:26 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
* Node Revision Descriptor class.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public final class NodeRevisionDescriptor implements Serializable, Cloneable {
@@ -605,11 +605,14 @@
setProperty(OWNER, owner, true); // live property, can not be modified
}
-
-
-
-
-
+ /**
+ * Set owner property.
+ *
+ * @param eTag New etag
+ */
+ public void setOwner(String owner, String userpath) {
+ setProperty(OWNER, userpath + "/" + owner, true); // live property, can
not be modified
+ }
/**
* Get the source property (if any).
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
