You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by pn...@apache.org on 2003/08/18 09:03:41 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util VersioningHelper.java ViolatedPrecondition.java WebdavConstants.java
pnever 2003/08/18 00:03:41
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java ViolatedPrecondition.java
WebdavConstants.java
Log:
Prepare for binding and minor issues
Revision Changes Path
1.88 +13 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
Index: VersioningHelper.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- VersioningHelper.java 17 May 2003 16:14:01 -0000 1.87
+++ VersioningHelper.java 18 Aug 2003 07:03:41 -0000 1.88
@@ -103,6 +103,7 @@
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.Structure;
import org.apache.slide.structure.SubjectNode;
+import org.apache.slide.util.Configuration;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.method.MethodNotAllowedException;
@@ -341,7 +342,7 @@
structure.create( sToken, vrNode, String.valueOf(vrUh) );
// Set specific properties
- vrNrd.setName(rNrd.getName()); // P_DISPLAYNAME
+ vrNrd.setName(rUh.getName()); // P_DISPLAYNAME
rNrd.setProperty(
new NodeProperty(P_CHECKED_IN, pHelp.createHrefValue(vrUri)) );
vhrNrd.setCreationDate( new Date() ); // P_CREATIONDATE
@@ -430,7 +431,10 @@
vcrNrd.setContentLanguage(evNrd.getContentLanguage()); // P_GETCONTENTLANGUAGE
String[] utok = vcrUh.getUriTokens();
+
+ if (!Configuration.useBinding(nsaToken.getUri(sToken, vcrUri).getStore())) {
vcrNrd.setName( utok[utok.length - 1] ); // P_DISPLAYNAME
+ }
vcrNrd.setCreationDate( new Date() ); // P_CREATIONDATE
vcrNrd.setProperty( new NodeProperty(P_CHECKED_IN,
pHelp.createHrefValue(evUri)) );
@@ -660,7 +664,9 @@
wsNrd.setLastModified( new Date() ); //P_GETLASTMODIFIED
wsNrd.setContentLength( 0 ); // P_GETCONTENTLENGTH
wsNrd.setETag( PropertyHelper.computeEtag(wsUri, wsNrd) ); // P_GETETAG
+ if (!Configuration.useBinding(nsaToken.getUri(sToken, wsUri).getStore())) {
wsNrd.setName( rUh.getWorkspaceName() ); // P_DISPLAYNAME
+ }
wsNrd.setCreationDate( new Date() ); // P_CREATIONDATE
// Create the ws resource
@@ -1214,6 +1220,8 @@
String branch = vrNrdOld.getBranchName();
content.create( sToken, vhrUri, branch, vrNrdNew, rNrc );
}
+
+ // create new VR node
String vrUriNew = vhrUri+"/"+vrNrdNew.getRevisionNumber().toString();
UriHandler vrUhNew = UriHandler.getUriHandler( vrUriNew );
SubjectNode vrNodeNew = new SubjectNode();
@@ -2065,6 +2073,7 @@
return uri.toString();
}
}
+
1.5 +4 -8 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ViolatedPrecondition.java
Index: ViolatedPrecondition.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ViolatedPrecondition.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ViolatedPrecondition.java 25 Apr 2002 21:15:15 -0000 1.4
+++ ViolatedPrecondition.java 18 Aug 2003 07:03:41 -0000 1.5
@@ -131,10 +131,6 @@
if (precondition == null) {
throw new IllegalArgumentException(PRECONDITION_MUST_NOT_BE_NULL);
}
-
- if ( (statusCode != WebdavStatus.SC_FORBIDDEN) && (statusCode != WebdavStatus.SC_CONFLICT) ) {
- throw new IllegalArgumentException(getInvalidStatusCodeMessage(statusCode));
- }
this.precondition = precondition;
this.statusCode = statusCode;
1.15 +7 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavConstants.java
Index: WebdavConstants.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavConstants.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WebdavConstants.java 23 May 2003 11:29:37 -0000 1.14
+++ WebdavConstants.java 18 Aug 2003 07:03:41 -0000 1.15
@@ -72,6 +72,10 @@
*/
public interface WebdavConstants {
+ /** URI schemes */
+ String S_DAV = "DAV:"; // DAV: namespace URI
+ String S_LOCK_TOKEN = "opaquelocktoken:"; // LOCK feature
+
/** Features */
String F_WEBDAV = "1"; // class 1
String F_LOCKING = "2"; // class 2
@@ -133,14 +137,12 @@
String E_PROPFIND = "propfind";
String E_PROPNAME = "propname";
String E_PROPSTAT = "propstat";
- String E_REBIND = "rebind";
String E_REMOVE = "remove";
String E_REPORT = "report";
String E_RESPONSE = "response";
String E_RESPONSEDESCRIPTION = "responsedescription";
String E_SET = "set";
String E_SHARED = "shared";
- String E_SEGMENT = "segment";
String E_SRC = "src";
String E_STATUS = "status";
String E_TIMEOUT = "timeout";
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org