pnever 02/05/20 05:10:15
Modified: src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java DeleteMethod.java MkcolMethod.java
MoveMethod.java OptionsMethod.java
PropPatchMethod.java PutMethod.java
ReportMethod.java UpdateMethod.java
src/webdav/server/org/apache/slide/webdav/util
DeltavUriRedirector.java PropertyHelper.java
VersioningHelper.java WebdavUtils.java
src/webdav/server/org/apache/slide/webdav/util/resourcekind
AbstractResourceKind.java
Log:
Adapted: UriHandlers do not depend anymore an a namespace.
Revision Changes Path
1.37 +7 -7
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java
Index: CopyMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- CopyMethod.java 17 May 2002 15:50:49 -0000 1.36
+++ CopyMethod.java 20 May 2002 12:10:14 -0000 1.37
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.36 2002/05/17 15:50:49 pnever Exp $
- * $Revision: 1.36 $
- * $Date: 2002/05/17 15:50:49 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.37 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.37 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -180,7 +180,7 @@
}
// check destination URI
- UriHandler destinationUriHandler = UriHandler.getUriHandler(token,
destinationUri);
+ UriHandler destinationUriHandler = UriHandler.getUriHandler(destinationUri);
if (destinationUriHandler.isRestrictedUri()) {
resp.sendError(WebdavStatus.SC_FORBIDDEN, "Destination URI is
restricted by server");
return;
@@ -301,7 +301,7 @@
if(Configuration.useVersionControl()) {
- UriHandler uriHandler = UriHandler.getUriHandler(token, sourceUri);
+ UriHandler uriHandler = UriHandler.getUriHandler(sourceUri);
if (uriHandler.isHistoryUri()) {
throw new PreconditionViolationException(new
ViolatedPrecondition(DeltavConstants.C_CANNOT_COPY_HISTORY,
WebdavStatus.SC_FORBIDDEN),
@@ -403,7 +403,7 @@
// if the source was a VR, we have to remove the
NodeRevisionDescriptor(s)
// which has been created temporarily for the Macro helper
// (see beforeCopy())
- UriHandler uriHandler = UriHandler.getUriHandler(token, sourceUri);
+ UriHandler uriHandler = UriHandler.getUriHandler(sourceUri);
if ( uriHandler.isVersionUri() ) {
NodeRevisionDescriptors vrRevisionDescriptors =
content.retrieve(slideToken, sourceUri);
content.remove(slideToken, vrRevisionDescriptors);
@@ -466,7 +466,7 @@
}
// check precondition DAV:cannot-modify-version
- UriHandler uriHandler = UriHandler.getUriHandler(token, targetUri);
+ UriHandler uriHandler = UriHandler.getUriHandler(targetUri);
if (uriHandler.isVersionUri()) {
throw new PreconditionViolationException(new
ViolatedPrecondition(C_CANNOT_MODIFY_VERSION,
WebdavStatus.SC_FORBIDDEN), targetUri);
1.24 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java
Index: DeleteMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DeleteMethod.java 16 May 2002 07:39:24 -0000 1.23
+++ DeleteMethod.java 20 May 2002 12:10:14 -0000 1.24
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v
1.23 2002/05/16 07:39:24 juergen Exp $
- * $Revision: 1.23 $
- * $Date: 2002/05/16 07:39:24 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v
1.24 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.24 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -244,7 +244,7 @@
if(Configuration.useVersionControl()) {
- uriHandler = UriHandler.getUriHandler(token, targetUri);
+ uriHandler = UriHandler.getUriHandler(targetUri);
if (uriHandler.isVersionUri() && !isCollection) {
// delete of version is only allowed if the history collection is
deleted
throw new PreconditionViolationException(new
ViolatedPrecondition(C_NO_VERSION_DELETE,
1.23 +4 -4
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MkcolMethod.java 25 Apr 2002 21:27:31 -0000 1.22
+++ MkcolMethod.java 20 May 2002 12:10:14 -0000 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
1.22 2002/04/25 21:27:31 jericho Exp $
- * $Revision: 1.22 $
- * $Date: 2002/04/25 21:27:31 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
1.23 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -152,7 +152,7 @@
slideToken.setForceStoreEnlistment(true);
// check destination URI
- UriHandler destinationUriHandler = UriHandler.getUriHandler(token, colName);
+ UriHandler destinationUriHandler = UriHandler.getUriHandler(colName);
if (destinationUriHandler.isRestrictedUri()) {
resp.sendError(WebdavStatus.SC_FORBIDDEN, "Destination URI is
restricted by server");
return;
1.41 +7 -7
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java
Index: MoveMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- MoveMethod.java 17 May 2002 08:38:46 -0000 1.40
+++ MoveMethod.java 20 May 2002 12:10:14 -0000 1.41
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
1.40 2002/05/17 08:38:46 juergen Exp $
- * $Revision: 1.40 $
- * $Date: 2002/05/17 08:38:46 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
1.41 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.41 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -196,13 +196,13 @@
}
// check destination URI
- UriHandler destinationUriHandler = UriHandler.getUriHandler(token,
destinationUri);
+ UriHandler destinationUriHandler = UriHandler.getUriHandler(destinationUri);
if (destinationUriHandler.isRestrictedUri()) {
resp.sendError(WebdavStatus.SC_FORBIDDEN, "Destination URI is
restricted by server");
return;
}
- UriHandler sourceUriHandler = UriHandler.getUriHandler(token, sourceUri);
+ UriHandler sourceUriHandler = UriHandler.getUriHandler(sourceUri);
isRequestSourceWorkspace = sourceUriHandler.isWorkspaceUri();
try {
@@ -296,7 +296,7 @@
if (isRequestSourceWorkspace) {
- UriHandler destinationUriHandler = UriHandler.getUriHandler(token,
destinationUri);
+ UriHandler destinationUriHandler =
UriHandler.getUriHandler(destinationUri);
NodeRevisionDescriptors destinationRevisionDescriptors = null;
NodeRevisionDescriptor destinationRevisionDescriptor = null;
try {
@@ -339,7 +339,7 @@
if( Configuration.useVersionControl() ) {
- UriHandler uriHandler = UriHandler.getUriHandler(token, sourceUri);
+ UriHandler uriHandler = UriHandler.getUriHandler(sourceUri);
if (uriHandler.isVersionUri()) {
throw new PreconditionViolationException(new
ViolatedPrecondition(DeltavConstants.C_CANNOT_RENAME_VERSION,
WebdavStatus.SC_FORBIDDEN),
1.25 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- OptionsMethod.java 17 May 2002 15:50:15 -0000 1.24
+++ OptionsMethod.java 20 May 2002 12:10:14 -0000 1.25
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
1.24 2002/05/17 15:50:15 pnever Exp $
- * $Revision: 1.24 $
- * $Date: 2002/05/17 15:50:15 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
1.25 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.25 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -269,8 +269,8 @@
// build response body if needed
if( responseBodyNeeded ) {
resp.setContentType( TEXT_XML_UTF_8 );
- UriHandler hpath = HistoryPathHandler.getHistoryPathHandler( token );
- UriHandler wspath = WorkspacePathHandler.getWorkspacePathHandler( token
);
+ UriHandler hpath = HistoryPathHandler.getHistoryPathHandler();
+ UriHandler wspath = WorkspacePathHandler.getWorkspacePathHandler();
Element ore =
new Element( E_OPTIONS_RESPONSE, xmlNs );
if( versionHistoryCollectionSetRequested ) {
1.45 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java
Index: PropPatchMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- PropPatchMethod.java 17 May 2002 11:55:58 -0000 1.44
+++ PropPatchMethod.java 20 May 2002 12:10:14 -0000 1.45
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
1.44 2002/05/17 11:55:58 juergen Exp $
- * $Revision: 1.44 $
- * $Date: 2002/05/17 11:55:58 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
1.45 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.45 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -660,7 +660,7 @@
}
// check precondition DAV:cannot-modify-version
- UriHandler uriHandler = UriHandler.getUriHandler(token, resourcePath);
+ UriHandler uriHandler = UriHandler.getUriHandler(resourcePath);
if (uriHandler.isVersionUri()) {
return new ViolatedPrecondition(C_CANNOT_MODIFY_VERSION,
WebdavStatus.SC_FORBIDDEN);
1.50 +5 -5
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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- PutMethod.java 17 May 2002 15:50:50 -0000 1.49
+++ PutMethod.java 20 May 2002 12:10:14 -0000 1.50
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.49 2002/05/17 15:50:50 pnever Exp $
- * $Revision: 1.49 $
- * $Date: 2002/05/17 15:50:50 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.50 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.50 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -170,7 +170,7 @@
slideToken.setForceStoreEnlistment(true);
// check destination URI
- UriHandler destinationUriHandler = UriHandler.getUriHandler(token,
resourcePath);
+ UriHandler destinationUriHandler = UriHandler.getUriHandler(resourcePath);
if (destinationUriHandler.isRestrictedUri()) {
resp.sendError(WebdavStatus.SC_FORBIDDEN, "Destination URI is
restricted by server");
return;
@@ -437,7 +437,7 @@
}
// check precondition DAV:cannot-modify-version
- UriHandler uriHandler = UriHandler.getUriHandler(token, resourcePath);
+ UriHandler uriHandler = UriHandler.getUriHandler(resourcePath);
if (uriHandler.isVersionUri()) {
return new ViolatedPrecondition(C_CANNOT_MODIFY_VERSION,
WebdavStatus.SC_FORBIDDEN);
1.32 +10 -10
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java
Index: ReportMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ReportMethod.java 17 May 2002 11:54:32 -0000 1.31
+++ ReportMethod.java 20 May 2002 12:10:14 -0000 1.32
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.31 2002/05/17 11:54:32 juergen Exp $
- * $Revision: 1.31 $
- * $Date: 2002/05/17 11:54:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.32 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.32 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -168,7 +168,7 @@
/**
* An implementation of the DeltaV <code>REPORT</code> method.
*
- * @version $Revision: 1.31 $
+ * @version $Revision: 1.32 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -647,7 +647,7 @@
NodeRevisionDescriptor revisionDescriptor = null;
NodeRevisionNumber revisionNumber = null;
String slideUri = null;
- UriHandler uriHandler = UriHandler.getUriHandler(token, requestUri);
+ UriHandler uriHandler = UriHandler.getUriHandler(requestUri);
if (uriHandler.isHistoryUri()) {
revisionDescriptors = content.retrieve(slideToken, requestUri);
@@ -677,7 +677,7 @@
if (lastCheckedInRevisionProperty != null) {
String lastCheckedInRevisionUri =
getElementValue((String)lastCheckedInRevisionProperty.getValue());
UriHandler lastCheckedInRevisionUriHandler =
- UriHandler.getUriHandler(token, lastCheckedInRevisionUri);
+ UriHandler.getUriHandler(lastCheckedInRevisionUri);
String revisionUri =
lastCheckedInRevisionUriHandler.getAssociatedHistoryUri();
revisionDescriptors = content.retrieve(slideToken, revisionUri);
revisionNumber = revisionDescriptors.getInitialRevision();
@@ -770,7 +770,7 @@
while (hrefIterator.hasNext()) {
currentRequestUri = ((Element)hrefIterator.next()).getText();
- currentUriHandler = UriHandler.getUriHandler(token,
currentRequestUri);
+ currentUriHandler = UriHandler.getUriHandler(currentRequestUri);
currentSlideUri = currentUriHandler.getAssociatedHistoryUri();
currentRevisionNumber = new
NodeRevisionNumber(currentUriHandler.getVersionName());
currentRevisionDescriptors = content.retrieve(slideToken,
slideUri);
@@ -1375,7 +1375,7 @@
NodeRevisionDescriptor revisionDescriptor = null;
NodeRevisionNumber revisionNumber = null;
String slideUri = null;
- UriHandler uriHandler = UriHandler.getUriHandler(token, requestUri);
+ UriHandler uriHandler = UriHandler.getUriHandler(requestUri);
if (uriHandler.isHistoryUri()) {
revisionDescriptors = content.retrieve(slideToken, requestUri);
@@ -1471,7 +1471,7 @@
isVersionHistory = false;
}
else {
- uriHandler = UriHandler.getUriHandler(token, getSlidePath(href));
+ uriHandler = UriHandler.getUriHandler(getSlidePath(href));
isVersionHistory = uriHandler.isHistoryUri();
}
if ( ! isVersionHistory ) {
@@ -1572,7 +1572,7 @@
Iterator iterator = xmlValue.iterator();
if (iterator.hasNext()) {
String vrUri = ((Element)iterator.next()).getText();
- UriHandler uriHandler = UriHandler.getUriHandler(token, vrUri);
+ UriHandler uriHandler = UriHandler.getUriHandler(vrUri);
if (uriHandler.isVersionUri()) {
historyUri = uriHandler.getAssociatedHistoryUri();
}
1.7 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java
Index: UpdateMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UpdateMethod.java 17 May 2002 11:54:32 -0000 1.6
+++ UpdateMethod.java 20 May 2002 12:10:14 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v
1.6 2002/05/17 11:54:32 juergen Exp $
- * $Revision: 1.6 $
- * $Date: 2002/05/17 11:54:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v
1.7 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -474,8 +474,8 @@
}
String associatedVrUri =
versioningHelper.getUriOfAssociatedVR(resourcePath);
- String vcrHistoryUri = UriHandler.getUriHandler(token,
associatedVrUri).getAssociatedHistoryUri();
- String vrHistoryUri = UriHandler.getUriHandler(token,
updateSourcePath).getAssociatedHistoryUri();
+ String vcrHistoryUri =
UriHandler.getUriHandler(associatedVrUri).getAssociatedHistoryUri();
+ String vrHistoryUri =
UriHandler.getUriHandler(updateSourcePath).getAssociatedHistoryUri();
if ( ! vcrHistoryUri.equals(vrHistoryUri) ) {
return new
ViolatedPrecondition(DeltavConstants.C_MUST_SELECT_VERSION_IN_HISTORY,
WebdavStatus.SC_CONFLICT);
1.2 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavUriRedirector.java
Index: DeltavUriRedirector.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavUriRedirector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeltavUriRedirector.java 14 May 2002 11:45:14 -0000 1.1
+++ DeltavUriRedirector.java 20 May 2002 12:10:14 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavUriRedirector.java,v
1.1 2002/05/14 11:45:14 pnever Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/14 11:45:14 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavUriRedirector.java,v
1.2 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -82,7 +82,7 @@
String result = uri;
if( Configuration.useVersionControl() ) {
- UriHandler rUh = UriHandler.getUriHandler( nsaToken, uri );
+ UriHandler rUh = UriHandler.getUriHandler( uri );
if( rUh.isVersionUri() )
result = rUh.getAssociatedHistoryUri();
}
@@ -97,7 +97,7 @@
NodeRevisionNumber result = null;
if( Configuration.useVersionControl() ) {
- UriHandler rUh = UriHandler.getUriHandler( nsaToken, uri );
+ UriHandler rUh = UriHandler.getUriHandler( uri );
if( rUh.isHistoryUri() ) {
result = new NodeRevisionNumber( 0, 0 );
}
1.24 +6 -6
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java
Index: PropertyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- PropertyHelper.java 17 May 2002 15:50:50 -0000 1.23
+++ PropertyHelper.java 20 May 2002 12:10:14 -0000 1.24
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
1.23 2002/05/17 15:50:50 pnever Exp $
- * $Revision: 1.23 $
- * $Date: 2002/05/17 15:50:50 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
1.24 2002/05/20 12:10:14 pnever Exp $
+ * $Revision: 1.24 $
+ * $Date: 2002/05/20 12:10:14 $
*
* ====================================================================
*
@@ -461,7 +461,7 @@
*/
public NodeProperty getProperty(String propertyName, String resourcePath,
String contextPath, String serverURL) throws SlideException, JDOMException {
- UriHandler uriHandler = UriHandler.getUriHandler(nsaToken, resourcePath);
+ UriHandler uriHandler = UriHandler.getUriHandler(resourcePath);
String uri = null;
NodeRevisionDescriptors revisionDescriptors = null;
NodeRevisionDescriptor revisionDescriptor = null;
@@ -689,7 +689,7 @@
Element element = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
String checkedInHref =
revisionDescriptor.getProperty(P_CHECKED_IN).getValue().toString();
String checkedInUri = ((Element)new
XMLValue(checkedInHref).iterator().next()).getText();
- UriHandler uriHandler = UriHandler.getUriHandler(nsaToken,
checkedInUri);
+ UriHandler uriHandler = UriHandler.getUriHandler(checkedInUri);
element.setText(getAbsoluteURL(serverURL, contextPath,
uriHandler.getAssociatedHistoryUri()));
xmlValue.add(element);
}
@@ -697,7 +697,7 @@
Element element = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
String checkedOutHref =
revisionDescriptor.getProperty(P_CHECKED_OUT).getValue().toString();
String checkedOutUri = ((Element)new
XMLValue(checkedOutHref).iterator().next()).getText();
- UriHandler uriHandler = UriHandler.getUriHandler(nsaToken,
checkedOutUri);
+ UriHandler uriHandler = UriHandler.getUriHandler(checkedOutUri);
element.setText(getAbsoluteURL(serverURL, contextPath,
uriHandler.getAssociatedHistoryUri()));
xmlValue.add(element);
}
1.50 +21 -21
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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- VersioningHelper.java 17 May 2002 12:43:56 -0000 1.49
+++ VersioningHelper.java 20 May 2002 12:10:15 -0000 1.50
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.49 2002/05/17 12:43:56 juergen Exp $
- * $Revision: 1.49 $
- * $Date: 2002/05/17 12:43:56 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.50 2002/05/20 12:10:15 pnever Exp $
+ * $Revision: 1.50 $
+ * $Date: 2002/05/20 12:10:15 $
*
* ====================================================================
*
@@ -255,7 +255,7 @@
* @throws SlideException
*/
public void versionControl( String resourcePath ) throws SlideException {
- UriHandler rUh = UriHandler.getUriHandler( nsaToken, resourcePath );
+ UriHandler rUh = UriHandler.getUriHandler( resourcePath );
Iterator i;
Enumeration j;
@@ -330,7 +330,7 @@
NodeRevisionNumber vrVersion = vrNrd.getRevisionNumber();
SubjectNode vrNode = new SubjectNode();
UriHandler vrUh =
- UriHandler.createVersionUri( nsaToken, vhrUh, String.valueOf(vrVersion)
);
+ UriHandler.createVersionUri( vhrUh, String.valueOf(vrVersion) );
String vrUri = String.valueOf( vrUh );
structure.create( sToken, vrNode, String.valueOf(vrUh) );
@@ -368,8 +368,8 @@
public void versionControl( String resourcePath, String existingVersionPath )
throws SlideException {
Iterator i;
- UriHandler rUh = UriHandler.getUriHandler( nsaToken, resourcePath );
- UriHandler evUh = UriHandler.getUriHandler( nsaToken, existingVersionPath );
+ UriHandler rUh = UriHandler.getUriHandler( resourcePath );
+ UriHandler evUh = UriHandler.getUriHandler( existingVersionPath );
NodeRevisionNumber evNrn = new NodeRevisionNumber( evUh.getVersionName() );
NodeRevisionDescriptors rNrds = null;
NodeRevisionDescriptor rNrd = null;
@@ -406,7 +406,7 @@
// create the VCR
String vcrUri = String.valueOf(rUh);
String evUri = String.valueOf(evUh);
- UriHandler vcrUh = UriHandler.getUriHandler( nsaToken, vcrUri );
+ UriHandler vcrUh = UriHandler.getUriHandler( vcrUri );
vcrNrd = new NodeRevisionDescriptor(0);
i =
pHelp.createInitialProperties(VersionControlledImpl.getInstance()).iterator();
while( i.hasNext() )
@@ -444,7 +444,7 @@
* @throws SlideException
*/
public void setWorkspaceProperty( String rUri, NodeRevisionDescriptor rNrd ) {
- UriHandler rUh = UriHandler.getUriHandler( nsaToken, rUri );
+ UriHandler rUh = UriHandler.getUriHandler( rUri );
String wsUri = rUh.getAssociatedWorkspaceUri();
if( wsUri != null ) {
rNrd.setProperty(
@@ -464,7 +464,7 @@
public void mkworkspace( String resourcePath ) throws SlideException {
Iterator i;
- UriHandler rUh = UriHandler.getUriHandler( nsaToken, resourcePath );
+ UriHandler rUh = UriHandler.getUriHandler( resourcePath );
NodeRevisionDescriptor rNrd = null;
try {
NodeRevisionDescriptors rNrds = content.retrieve( sToken, resourcePath
);
@@ -544,7 +544,7 @@
public String checkout( String resourcePath, boolean forkOk, boolean
applyToVersion, boolean isAutoVersionCheckout )
throws SlideException, JDOMException, IOException,
PreconditionViolationException {
- UriHandler rUh = UriHandler.getUriHandler( nsaToken, resourcePath );
+ UriHandler rUh = UriHandler.getUriHandler( resourcePath );
NodeRevisionDescriptors rNrds = content.retrieve( sToken, resourcePath );
NodeRevisionDescriptor rNrd = content.retrieve( sToken, rNrds );
@@ -610,7 +610,7 @@
// get checked-in VR
NodeProperty cinProp = rNrd.getProperty( P_CHECKED_IN );
String cinHref = getElementValue((String)cinProp.getValue());
- UriHandler cinUriHandler = UriHandler.getUriHandler(nsaToken, cinHref);
+ UriHandler cinUriHandler = UriHandler.getUriHandler(cinHref);
String cinhUri = cinUriHandler.getAssociatedHistoryUri();
NodeRevisionNumber cinNrn = new
NodeRevisionNumber(cinUriHandler.getVersionName());
NodeRevisionDescriptors cinNrds = content.retrieve(sToken, cinhUri);
@@ -702,7 +702,7 @@
if( rRk instanceof Version ) {
- UriHandler rUh = UriHandler.getUriHandler( nsaToken, rUri );
+ UriHandler rUh = UriHandler.getUriHandler( rUri );
String vhUri = rUh.getAssociatedHistoryUri();
ViolatedPrecondition violatedPrecondition =
getCheckoutPreconditionViolation(rNrds, rNrd, forkOk);
@@ -873,7 +873,7 @@
// get checked-out VR
NodeProperty coutProp = rNrd.getProperty( P_CHECKED_OUT );
String coutHref = getElementValue((String)coutProp.getValue());
- UriHandler coutUriHandler = UriHandler.getUriHandler(nsaToken, coutHref);
+ UriHandler coutUriHandler = UriHandler.getUriHandler(coutHref);
String coutUri = coutUriHandler.getAssociatedHistoryUri();
NodeRevisionNumber coutNrn = new
NodeRevisionNumber(coutUriHandler.getVersionName());
NodeRevisionDescriptors coutNrds = content.retrieve(sToken, coutUri);
@@ -959,7 +959,7 @@
// Retrieve VHR
Element coutElm = pHelp.parsePropertyValue( (String)coutProp.getValue()
);
String vrUriOld = coutElm.getTextTrim();
- UriHandler vrUhOld = UriHandler.getUriHandler( nsaToken, vrUriOld );
+ UriHandler vrUhOld = UriHandler.getUriHandler( vrUriOld );
NodeRevisionNumber vrNrnOld = new NodeRevisionNumber(
vrUhOld.getVersionName() );
String vhrUri = vrUhOld.getAssociatedHistoryUri();
NodeRevisionDescriptors vhrNrds = content.retrieve( sToken, vhrUri );
@@ -997,7 +997,7 @@
content.create( sToken, vhrUri, vrNrdNew, rNrc );
String vrUriNew = vhrUri+"/"+vrNrdNew.getRevisionNumber().toString();
- UriHandler vrUhNew = UriHandler.getUriHandler( nsaToken, vrUriNew );
+ UriHandler vrUhNew = UriHandler.getUriHandler( vrUriNew );
SubjectNode vrNodeNew = new SubjectNode();
structure.create( sToken, vrNodeNew, vrUriNew );
@@ -1095,7 +1095,7 @@
String href = ((Element)iterator.next()).getText();
if (href != null) {
- UriHandler predecessorUriHandler = UriHandler.getUriHandler(
nsaToken, href);
+ UriHandler predecessorUriHandler = UriHandler.getUriHandler(
href);
// check precondition C_VERSION_HISTORY_IS_TREE
if ( !predecessorUriHandler.isVersionUri() ||
@@ -1625,7 +1625,7 @@
if ( (resourceKind instanceof VersionControlled) && (label != null) ) {
String vrUri = getUriOfAssociatedVR(nsaToken, sToken, content,
revisionDescriptors.getUri());
- UriHandler vrUriHandler = UriHandler.getUriHandler(nsaToken, vrUri);
+ UriHandler vrUriHandler = UriHandler.getUriHandler(vrUri);
String historyUri = vrUriHandler.getAssociatedHistoryUri();
revisionDescriptors = content.retrieve(sToken, historyUri);
revisionDescriptor = retrieveLabeledRevision(nsaToken, sToken, content,
historyUri, label);
@@ -1656,7 +1656,7 @@
NodeRevisionDescriptor labeledRevision = null;
- UriHandler historyUriHandler = UriHandler.getUriHandler(nsaToken,
historyUri);
+ UriHandler historyUriHandler = UriHandler.getUriHandler(historyUri);
if (historyUriHandler.isHistoryUri()) {
NodeRevisionDescriptors historyNrds = content.retrieve(sToken,
historyUri);
NodeRevisionDescriptor historyNrd = content.retrieve(sToken,
historyNrds, new NodeRevisionNumber(0, 0));
@@ -1672,7 +1672,7 @@
boolean found = false;
while ( !found && versionSetIterator.hasNext() ) {
vrUri = ((Element)versionSetIterator.next()).getText();
- vrUriHandler = UriHandler.getUriHandler(nsaToken, vrUri);
+ vrUriHandler = UriHandler.getUriHandler(vrUri);
NodeRevisionNumber vrRevisionNumber = new
NodeRevisionNumber(vrUriHandler.getVersionName());
vrNrd = content.retrieve(sToken, historyNrds, vrRevisionNumber);
labelNameSetProperty = vrNrd.getProperty(P_LABEL_NAME_SET);
@@ -1770,7 +1770,7 @@
NodeRevisionDescriptor revisionDescriptor) throws
SlideException {
StringBuffer uri = new StringBuffer();
- UriHandler uriHandler = UriHandler.getUriHandler(nsaToken,
revisionDescriptors.getUri());
+ UriHandler uriHandler =
UriHandler.getUriHandler(revisionDescriptors.getUri());
if ( ! uriHandler.isHistoryUri() ) {
// any resource
uri.append(revisionDescriptors.getUri());
1.5 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavUtils.java
Index: WebdavUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebdavUtils.java 25 Apr 2002 21:15:15 -0000 1.4
+++ WebdavUtils.java 20 May 2002 12:10:15 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavUtils.java,v
1.4 2002/04/25 21:15:15 jericho Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/25 21:15:15 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavUtils.java,v
1.5 2002/05/20 12:10:15 pnever Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/20 12:10:15 $
*
* ====================================================================
*
@@ -91,7 +91,7 @@
*
*
* @author Christopher Lenz (cmlenz at apache.org)
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
**/
public class WebdavUtils {
@@ -396,7 +396,7 @@
// Added for DeltaV --start--
if( Configuration.useVersionControl() ) {
- UriHandler uh = UriHandler.getUriHandler( token, path );
+ UriHandler uh = UriHandler.getUriHandler( path );
if( uh.isWorkspaceUri() )
return true;
if( uh.isHistoryUri() )
1.12 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java
Index: AbstractResourceKind.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractResourceKind.java 8 May 2002 16:00:11 -0000 1.11
+++ AbstractResourceKind.java 20 May 2002 12:10:15 -0000 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java,v
1.11 2002/05/08 16:00:11 pnever Exp $
- * $Revision: 1.11 $
- * $Date: 2002/05/08 16:00:11 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java,v
1.12 2002/05/20 12:10:15 pnever Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/05/20 12:10:15 $
*
* ====================================================================
*
@@ -177,7 +177,7 @@
* Factory method.
*/
static public ResourceKind determineResourceKind( NamespaceAccessToken
nsaToken, NodeRevisionDescriptors nrds, NodeRevisionDescriptor nrd ) {
- UriHandler uh = UriHandler.getUriHandler( nsaToken, nrds, nrd );
+ UriHandler uh = UriHandler.getUriHandler( nrds, nrd );
return determineResourceKind( nsaToken, uh.toString(), nrd );
}
@@ -185,7 +185,7 @@
* Factory method.
*/
static public ResourceKind determineResourceKind( NamespaceAccessToken
nsaToken, String resourcePath, NodeRevisionDescriptor nrd ) {
- UriHandler uh = UriHandler.getUriHandler( nsaToken, resourcePath );
+ UriHandler uh = UriHandler.getUriHandler( resourcePath );
if( nrd == null ) {
return DeltavCompliantUnmappedUrlImpl.getInstance();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
