dirkv 01/09/23 04:19:02
Modified: src/webdav/server/org/apache/slide/webdav/method
MkcolMethod.java PropFindMethod.java PutMethod.java
Log:
Owner property
Revision Changes Path
1.14 +8 -3
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MkcolMethod.java 2001/09/10 07:16:17 1.13
+++ MkcolMethod.java 2001/09/23 11:19:02 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
1.13 2001/09/10 07:16:17 juergen Exp $
- * $Revision: 1.13 $
- * $Date: 2001/09/10 07:16:17 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
1.14 2001/09/23 11:19:02 dirkv Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/09/23 11:19:02 $
*
* ====================================================================
*
@@ -165,6 +165,11 @@
property = new NodeProperty("source", "", true);
revisionDescriptor.setProperty(property);
+ // Owner
+ String owner = slideToken.getCredentialsToken().getPublicCredentials();
+ property = new NodeProperty("owner", owner, true);
+ revisionDescriptor.setProperty(property);
+
if (isMsProprietarySupport()) {
// Name
1.37 +28 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- PropFindMethod.java 2001/09/21 00:28:40 1.36
+++ PropFindMethod.java 2001/09/23 11:19:02 1.37
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.36 2001/09/21 00:28:40 dirkv Exp $
- * $Revision: 1.36 $
- * $Date: 2001/09/21 00:28:40 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.37 2001/09/23 11:19:02 dirkv Exp $
+ * $Revision: 1.37 $
+ * $Date: 2001/09/23 11:19:02 $
*
* ====================================================================
*
@@ -190,6 +190,13 @@
/**
+ * Owner.
+ */
+ protected static final String OWNER =
+ "owner";
+
+
+ /**
* Current user privilege set.
*/
protected static final String CURRENT_USER_PRIVILEGE_SET =
@@ -801,6 +808,24 @@
generatedXML.writeText(SUPPORTED_LOCK);
generatedXML.writeElement(null, "supportedlock",
XMLPrinter.CLOSING);
+ } else if ((propertyName.equals(OWNER)) &&
+ (propertyNamespace.equals
+ (NodeProperty.DEFAULT_NAMESPACE))) {
+ NodeProperty ownerProperty =
revisionDescriptor.getProperty(OWNER, NodeProperty.DEFAULT_NAMESPACE);
+ String ownerHref;
+ NamespaceConfig config = token.getNamespaceConfig();
+ if ((ownerProperty != null) &&
(ownerProperty.getValue()!=null) &&
+ (!"".equals(ownerProperty.getValue().toString()))) {
+ ownerHref=config.getUsersPath() + "/" +
ownerProperty.getValue().toString();
+ }
+ else {
+ ownerHref=config.getUsersPath() + "/" +
config.getGuestPath();
+ }
+ generatedXML.writeElement(null, OWNER, XMLPrinter.OPENING);
+ generatedXML.writeElement(null, "href", XMLPrinter.OPENING);
+ generatedXML.writeText(ownerHref);
+ generatedXML.writeElement(null, "href", XMLPrinter.CLOSING);
+ generatedXML.writeElement(null, OWNER, XMLPrinter.CLOSING);
} else if ((propertyName.equals(SUPPORTED_PRIVILEGE_SET)) &&
(propertyNamespace.equals
(NodeProperty.DEFAULT_NAMESPACE))) {
1.19 +8 -3
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- PutMethod.java 2001/09/06 08:51:59 1.18
+++ PutMethod.java 2001/09/23 11:19:02 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.18 2001/09/06 08:51:59 juergen Exp $
- * $Revision: 1.18 $
- * $Date: 2001/09/06 08:51:59 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.19 2001/09/23 11:19:02 dirkv Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/09/23 11:19:02 $
*
* ====================================================================
*
@@ -285,6 +285,11 @@
+ (new NodeRevisionNumber()).hashCode() + "_"
+ req.getContentLength();
property = new NodeProperty("getetag", etag, true);
+ revisionDescriptor.setProperty(property);
+
+ // Owner
+ String owner =
slideToken.getCredentialsToken().getPublicCredentials();
+ property = new NodeProperty("owner", owner, true);
revisionDescriptor.setProperty(property);
if (isMsProprietarySupport()) {
