pnever 02/05/14 08:33:20
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Removed obsolete methods retrieveRevisionDescriptors and
retireveLatestRevisionDescriptor
Revision Changes Path
1.47 +41 -125
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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- VersioningHelper.java 8 May 2002 16:04:33 -0000 1.46
+++ VersioningHelper.java 14 May 2002 15:33:20 -0000 1.47
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.46 2002/05/08 16:04:33 pnever Exp $
- * $Revision: 1.46 $
- * $Date: 2002/05/08 16:04:33 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.47 2002/05/14 15:33:20 pnever Exp $
+ * $Revision: 1.47 $
+ * $Date: 2002/05/14 15:33:20 $
*
* ====================================================================
*
@@ -211,32 +211,6 @@
}
/**
- * Retrieve the DeltaV-compliant NRDS instance for the specified resource path.
- */
- public NodeRevisionDescriptors
- retrieveRevisionDescriptors( String resourcePath ) throws SlideException {
-
- return retrieveRevisionDescriptors(nsaToken, sToken, content, resourcePath);
- }
-
- /**
- * Retrieve the latest DeltaV-compliant NRD instance for the specified
- * resource path and associated to the specified NRDS instance.
- *
- * @param resourcePath the path of the resource for which to retrieve
- * the NRD.
- * @param rNrds the NodeRevisionDescriptors of the resource.
- *
- * @return the latest DeltaV-compliant NRD instance for the specified
- * resource path and associated to the specified NRDS instance.
- */
- public NodeRevisionDescriptor
- retrieveLatestRevisionDescriptor( String resourcePath,
NodeRevisionDescriptors rNrds ) throws SlideException {
-
- return retrieveLatestRevisionDescriptor(nsaToken, sToken, content,
resourcePath, rNrds);
- }
-
- /**
* Returns slide Uri determinating the NodeRevisionDescriptors and
* NodeRevisionDescriptor associated with the given <code>resourcePath</code>.
* If the given <code>label</code> is not <code>null</code>, and the
@@ -290,8 +264,8 @@
Iterator i;
Enumeration j;
- NodeRevisionDescriptors rNrds = retrieveRevisionDescriptors( resourcePath );
- NodeRevisionDescriptor rNrd = retrieveLatestRevisionDescriptor(
resourcePath, rNrds );
+ NodeRevisionDescriptors rNrds = content.retrieve( sToken, resourcePath );
+ NodeRevisionDescriptor rNrd = content.retrieve( sToken, rNrds );
NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
ResourceKind rRk = AbstractResourceKind.determineResourceKind( nsaToken,
resourcePath, rNrd );
@@ -353,7 +327,7 @@
content.create( sToken, vhrUri, true ); //isVersioned=true
content.create( sToken, vhrUri, vrNrd, rNrc );
NodeRevisionDescriptors vhrNrds =
- retrieveRevisionDescriptors( vhrUri );
+ content.retrieve( sToken, vhrUri );
content.create(
sToken, vhrUri, null, vhrNrd, null ); //branch=null,
revisionContent=null
@@ -401,6 +375,7 @@
UriHandler rUh = UriHandler.getUriHandler( nsaToken, resourcePath );
UriHandler evUh = UriHandler.getUriHandler( nsaToken, existingVersionPath );
+ NodeRevisionNumber evNrn = new NodeRevisionNumber( evUh.getVersionName() );
NodeRevisionDescriptors rNrds = null;
NodeRevisionDescriptor rNrd = null;
NodeRevisionDescriptors vcrNrds = null;
@@ -409,13 +384,15 @@
NodeRevisionDescriptor evNrd = null;
try {
- rNrds = retrieveRevisionDescriptors( resourcePath );
- rNrd = retrieveLatestRevisionDescriptor( resourcePath, rNrds );
+ rNrds = content.retrieve( sToken, resourcePath );
+ rNrd = content.retrieve( sToken, rNrds );
}
catch( ObjectNotFoundException e ) {}; // can be ignored here!
try {
- evNrds = retrieveRevisionDescriptors( existingVersionPath );
- evNrd = retrieveLatestRevisionDescriptor( existingVersionPath, evNrds );
+ evNrds = content.retrieve( sToken, existingVersionPath );
+ evNrd = content.retrieve( sToken, evNrds /*, evNrn*/ );
//existingVersionPath
+ //redirector
should do the job
+ //s.t. evNrn is
not required
}
catch( ObjectNotFoundException e ) {}; // can be ignored here!
@@ -495,8 +472,8 @@
UriHandler rUh = UriHandler.getUriHandler( nsaToken, resourcePath );
NodeRevisionDescriptor rNrd = null;
try {
- NodeRevisionDescriptors rNrds = retrieveRevisionDescriptors(
resourcePath );
- rNrd = retrieveLatestRevisionDescriptor( resourcePath, rNrds );
+ NodeRevisionDescriptors rNrds = content.retrieve( sToken, resourcePath
);
+ rNrd = content.retrieve( sToken, rNrds );
}
catch( ObjectNotFoundException e ) {}; // can be ignored here!
@@ -573,8 +550,8 @@
throws SlideException, JDOMException, IOException,
PreconditionViolationException {
UriHandler rUh = UriHandler.getUriHandler( nsaToken, resourcePath );
- NodeRevisionDescriptors rNrds = retrieveRevisionDescriptors( resourcePath );
- NodeRevisionDescriptor rNrd = retrieveLatestRevisionDescriptor(
resourcePath, rNrds );
+ NodeRevisionDescriptors rNrds = content.retrieve( sToken, resourcePath );
+ NodeRevisionDescriptor rNrd = content.retrieve( sToken, rNrds );
if( rUh.isVersionUri() ) {
NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
@@ -864,8 +841,8 @@
*/
public void uncheckout(String resourcePath) throws SlideException,
JDOMException, IOException, PreconditionViolationException {
- NodeRevisionDescriptors rNrds = retrieveRevisionDescriptors( resourcePath );
- NodeRevisionDescriptor rNrd = retrieveLatestRevisionDescriptor(
resourcePath, rNrds );
+ NodeRevisionDescriptors rNrds = content.retrieve( sToken, resourcePath );
+ NodeRevisionDescriptor rNrd = content.retrieve( sToken, rNrds );
uncheckout( rNrds, rNrd);
}
@@ -931,8 +908,8 @@
public String checkin( String resourcePath, boolean forkOk, boolean
keepCheckedOut )
throws SlideException, JDOMException, IOException,
PreconditionViolationException {
- NodeRevisionDescriptors rNrds = retrieveRevisionDescriptors( resourcePath );
- NodeRevisionDescriptor rNrd = retrieveLatestRevisionDescriptor(
resourcePath, rNrds );
+ NodeRevisionDescriptors rNrds = content.retrieve( sToken, resourcePath );
+ NodeRevisionDescriptor rNrd = content.retrieve( sToken, rNrds );
return checkin( rNrds, rNrd, forkOk, keepCheckedOut );
}
@@ -984,14 +961,15 @@
Element coutElm = pHelp.parsePropertyValue( (String)coutProp.getValue()
);
String vrUriOld = coutElm.getTextTrim();
UriHandler vrUhOld = UriHandler.getUriHandler( nsaToken, vrUriOld );
+ NodeRevisionNumber vrNrnOld = new NodeRevisionNumber(
vrUhOld.getVersionName() );
String vhrUri = vrUhOld.getAssociatedHistoryUri();
- NodeRevisionDescriptors vhrNrds = retrieveRevisionDescriptors( vhrUri );
- NodeRevisionDescriptor vhrNrd = retrieveLatestRevisionDescriptor(
vhrUri, vhrNrds );
+ NodeRevisionDescriptors vhrNrds = content.retrieve( sToken, vhrUri );
+ NodeRevisionDescriptor vhrNrd = content.retrieve( sToken, vhrNrds );
//vhrUri
NodeProperty vSetProp = vhrNrd.getProperty( P_VERSION_SET );
// Retrieve old VR
NodeRevisionDescriptor vrNrdOld =
- retrieveLatestRevisionDescriptor( vrUriOld, vhrNrds );
+ content.retrieve( sToken, vhrNrds, vrNrnOld ); // vrUriOld
ViolatedPrecondition violatedPrecondition =
getCheckinPreconditionViolation(predSetProp, vhrNrds, forkOk, isWorkingResource);
if (violatedPrecondition != null) {
@@ -1194,11 +1172,11 @@
*/
public void update(String vcrUri, String vrUri) throws SlideException {
- NodeRevisionDescriptors vcrRevisionDescriptors =
retrieveRevisionDescriptors(vcrUri);
- NodeRevisionDescriptor vcrRevisionDescriptor =
retrieveLatestRevisionDescriptor(vcrUri, vcrRevisionDescriptors);
+ NodeRevisionDescriptors vcrRevisionDescriptors = content.retrieve(
sToken,vcrUri );
+ NodeRevisionDescriptor vcrRevisionDescriptor = content.retrieve( sToken,
vcrRevisionDescriptors);
- NodeRevisionDescriptors vrRevisionDescriptors =
retrieveRevisionDescriptors(vrUri);
- NodeRevisionDescriptor vrRevisionDescriptor =
retrieveLatestRevisionDescriptor(vrUri, vrRevisionDescriptors);
+ NodeRevisionDescriptors vrRevisionDescriptors = content.retrieve( sToken,
vrUri );
+ NodeRevisionDescriptor vrRevisionDescriptor = content.retrieve( sToken,
vrRevisionDescriptors); // vrUri
update(vcrRevisionDescriptors, vcrRevisionDescriptor,
vrRevisionDescriptors, vrRevisionDescriptor);
}
@@ -1260,6 +1238,7 @@
vcrRevisionDescriptor.setContentType(vrRevisionDescriptor.getContentType());
vcrRevisionDescriptor.setETag(vcrRevisionDescriptors.getUri().hashCode()+
"_"+vcrRevisionDescriptor.getContentLength());
+
// set workspace
setWorkspaceProperty( vcrUri, vcrRevisionDescriptor );
@@ -1410,8 +1389,8 @@
* @throws SlideException
*/
public boolean mustCheckoutAutoVersionedVCR(String resourceUri) throws
SlideException {
- NodeRevisionDescriptors vcrRevisionDescriptors =
retrieveRevisionDescriptors(resourceUri);
- NodeRevisionDescriptor vcrRevisionDescriptor =
retrieveLatestRevisionDescriptor(resourceUri, vcrRevisionDescriptors);
+ NodeRevisionDescriptors vcrRevisionDescriptors =
content.retrieve(sToken,resourceUri);
+ NodeRevisionDescriptor vcrRevisionDescriptor = content.retrieve( sToken,
vcrRevisionDescriptors);
return mustCheckoutAutoVersionedVCR(vcrRevisionDescriptors,
vcrRevisionDescriptor);
}
@@ -1448,8 +1427,8 @@
* @throws SlideException
*/
public boolean mustCheckinAutoVersionedVCR(SlideToken slideToken, String
resourceUri) throws SlideException {
- NodeRevisionDescriptors vcrRevisionDescriptors =
retrieveRevisionDescriptors(resourceUri);
- NodeRevisionDescriptor vcrRevisionDescriptor =
retrieveLatestRevisionDescriptor(resourceUri, vcrRevisionDescriptors);
+ NodeRevisionDescriptors vcrRevisionDescriptors =
content.retrieve(sToken,resourceUri);
+ NodeRevisionDescriptor vcrRevisionDescriptor = content.retrieve( sToken,
vcrRevisionDescriptors);
return mustCheckinAutoVersionedVCR(slideToken, vcrRevisionDescriptors,
vcrRevisionDescriptor);
}
@@ -1612,70 +1591,6 @@
}
/**
- * Retrieve the DeltaV-compliant NRDS instance for the specified resource path.
- *
- * @param nsaToken the NamespaceAccessToken to use.
- * @param sToken the SlideToken to use.
- * @param content the Content helper to use.
- * @param resourcePath the path of the resource for which to retrieve
- * the NRDS.
- *
- * @return the DeltaV-compliant NRDS instance for the specified resource
path.
- */
- public static NodeRevisionDescriptors
retrieveRevisionDescriptors(NamespaceAccessToken nsaToken,
- SlideToken
sToken,
- Content
content,
- String
resourcePath ) throws SlideException {
-
- NodeRevisionDescriptors rNrds = null;
- UriHandler rUh = UriHandler.getUriHandler( nsaToken, resourcePath );
-
- if( rUh.isVersionUri() )
- rNrds = content.retrieve( sToken, rUh.getAssociatedHistoryUri() );
- else
- rNrds = content.retrieve( sToken, resourcePath );
-
- return rNrds;
- }
-
- /**
- * Retrieve the latest DeltaV-compliant NRD instance for the specified
- * resource path and associated to the specified NRDS instance.
- *
- * @param nsaToken the NamespaceAccessToken to use.
- * @param sToken the SlideToken to use.
- * @param content the Content helper to use.
- * @param resourcePath the path of the resource for which to retrieve
- * the NRD.
- * @param rNrds the NodeRevisionDescriptors of the resource.
- *
- * @return the latest DeltaV-compliant NRD instance for the specified
- * resource path and associated to the specified NRDS instance.
- */
- public static NodeRevisionDescriptor
retrieveLatestRevisionDescriptor(NamespaceAccessToken nsaToken,
-
SlideToken sToken,
- Content
content,
- String
resourcePath,
-
NodeRevisionDescriptors rNrds) throws SlideException {
-
- NodeRevisionDescriptor rNrd = null;
- UriHandler rUh = UriHandler.getUriHandler( nsaToken, resourcePath );
-
- if( rUh.isHistoryUri() ) {
- rNrd = content.retrieve( sToken, rNrds,
- new NodeRevisionNumber(0, 0) );
- }
- else if( rUh.isVersionUri() ) {
- rNrd = content.retrieve( sToken, rNrds,
- new NodeRevisionNumber(rUh.getVersionName()) );
- }
- else {
- rNrd = content.retrieve( sToken, rNrds );
- }
- return rNrd;
- }
-
- /**
* Returns slide Uri determinating the NodeRevisionDescriptors and
* NodeRevisionDescriptor associated with the given <code>resourcePath</code>.
* If the given <code>label</code> is not <code>null</code>, and the
@@ -1701,16 +1616,16 @@
public static String getLabeledResourceUri(NamespaceAccessToken nsaToken,
SlideToken sToken, Content content, String resourcePath, String label) throws
SlideException, LabeledRevisionNotFoundException {
NodeRevisionDescriptors revisionDescriptors =
- retrieveRevisionDescriptors(nsaToken, sToken, content, resourcePath);
+ content.retrieve( sToken, resourcePath );
NodeRevisionDescriptor revisionDescriptor =
- retrieveLatestRevisionDescriptor(nsaToken, sToken, content,
resourcePath, revisionDescriptors);
+ content.retrieve( sToken, revisionDescriptors);
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(
nsaToken, resourcePath, revisionDescriptor);
if ( (resourceKind instanceof VersionControlled) && (label != null) ) {
String vrUri = getUriOfAssociatedVR(nsaToken, sToken, content,
revisionDescriptors.getUri());
UriHandler vrUriHandler = UriHandler.getUriHandler(nsaToken, vrUri);
String historyUri = vrUriHandler.getAssociatedHistoryUri();
- revisionDescriptors = retrieveRevisionDescriptors(nsaToken, sToken,
content, historyUri);
+ revisionDescriptors = content.retrieve(sToken, historyUri);
revisionDescriptor = retrieveLabeledRevision(nsaToken, sToken, content,
historyUri, label);
}
return getUri(nsaToken, sToken, content, revisionDescriptors,
revisionDescriptor);
@@ -1741,7 +1656,7 @@
UriHandler historyUriHandler = UriHandler.getUriHandler(nsaToken,
historyUri);
if (historyUriHandler.isHistoryUri()) {
- NodeRevisionDescriptors historyNrds =
retrieveRevisionDescriptors(nsaToken, sToken, content, historyUri);
+ NodeRevisionDescriptors historyNrds = content.retrieve(sToken,
historyUri);
NodeRevisionDescriptor historyNrd = content.retrieve(sToken,
historyNrds, new NodeRevisionNumber(0, 0));
NodeProperty versionSet = historyNrd.getProperty(P_VERSION_SET);
try {
@@ -1805,9 +1720,10 @@
String vrUri = null;
- NodeRevisionDescriptors revisionDescriptors =
retrieveRevisionDescriptors(nsaToken, sToken, content, resourceUri);
+ NodeRevisionDescriptors revisionDescriptors = content.retrieve(sToken,
resourceUri);
if (!revisionDescriptors.isVersioned()) {
- NodeRevisionDescriptor revisionDescriptor =
retrieveLatestRevisionDescriptor(nsaToken, sToken, content, resourceUri,
revisionDescriptors);
+ NodeRevisionDescriptor revisionDescriptor =
+ content.retrieve( sToken, revisionDescriptors);
NodeProperty property = revisionDescriptor.getProperty(P_CHECKED_OUT);
if ( (property == null) || (property.getValue() == null) ) {
property = revisionDescriptor.getProperty(P_CHECKED_IN);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
