pnever 2002/07/11 07:57:09
Modified: src/share/org/apache/slide/macro MacroImpl.java
src/webdav/server/org/apache/slide/webdav/method
MoveMethod.java ReportMethod.java
src/webdav/server/org/apache/slide/webdav/util
DeltavUriRedirector.java UriHandler.java
VersioningHelper.java
Log:
Makes now use of constant NodeRevisionNumber.HIDDEN_0_0
Revision Changes Path
1.28 +46 -29 jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
Index: MacroImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- MacroImpl.java 7 May 2002 07:31:02 -0000 1.27
+++ MacroImpl.java 11 Jul 2002 14:57:08 -0000 1.28
@@ -447,7 +447,7 @@
public void delete(SlideToken token, String targetUri, MacroParameters
parameters,
DeleteTargetRedirector deleteRedirector, DeleteListener
deleteListener)
throws DeleteMacroException {
-
+
Domain.debug("Delete " + targetUri);
DeleteMacroException e = new DeleteMacroException("Delete failed");
@@ -652,37 +652,39 @@
deleteListener.beforeDelete(targetUri);
}
- // Removing all revisions
NodeRevisionDescriptors revisionDescriptors =
contentHelper.retrieve(token, currentObject.getUri());
- // if the object is not revisioned remove it completely
- // from it's associated stores
- if (!revisionDescriptors.isVersioned()) {
- // remove the associated locks
- Enumeration locks = lockHelper.enumerateLocks
- (token, currentObject.getUri(), false);
- while (locks.hasMoreElements()) {
- lockHelper.unlock(token, (NodeLock) locks.nextElement());
- }
- // remove the associated security
- Enumeration permissions = securityHelper.enumeratePermissions
- (token, currentObject);
- while (permissions.hasMoreElements()) {
- NodePermission permission =
- (NodePermission) permissions.nextElement();
- securityHelper.revokePermission(token, permission);
- }
- // remove the NodeRevisionDescriptor and associated content
- if (revisionDescriptors.hasRevisions()) {
- contentHelper.remove
- (token, currentObject.getUri(),
- revisionDescriptors.getInitialRevision());
+ // remove the associated locks
+ Enumeration locks = lockHelper.enumerateLocks
+ (token, currentObject.getUri(), false);
+ while (locks.hasMoreElements()) {
+ lockHelper.unlock(token, (NodeLock) locks.nextElement());
+ }
+ // remove the associated security
+ Enumeration permissions = securityHelper.enumeratePermissions
+ (token, currentObject);
+ while (permissions.hasMoreElements()) {
+ NodePermission permission =
+ (NodePermission) permissions.nextElement();
+ securityHelper.revokePermission(token, permission);
+ }
+
+ // remove all revisions
+ if( !revisionDescriptors.isRedirected() ) {
+ Enumeration revisionNumberEnum =
+ revisionDescriptors.enumerateRevisionNumbers();
+ if (revisionNumberEnum != null) {
+ while (revisionNumberEnum.hasMoreElements()) {
+ contentHelper.remove
+ (token, currentObject.getUri(),
+
(NodeRevisionNumber)revisionNumberEnum.nextElement());
+ }
}
+ removeHiddenRevisions( token, targetUri );
// remove the NodeRevisionDescriptors object
contentHelper.remove(token, revisionDescriptors);
-
}
// Removing object.
@@ -704,7 +706,22 @@
}
+ /**
+ * Removes all <i>hidden</i> revisions for the specified URI. Currently there
are hidden
+ * revisions only at 0.0.
+ */
+ private void removeHiddenRevisions( SlideToken token, String targetUri ) throws
ServiceAccessException, ObjectNotFoundException, LinkedObjectNotFoundException,
AccessDeniedException, ObjectLockedException {
+ try {
+ contentHelper.remove(token, targetUri, NodeRevisionNumber.HIDDEN_0_0 );
+ }
+ catch (RevisionDescriptorNotFoundException ne) {
+ // ignore
+ }
+ }
+
}
+
+
1.47 +4 -5
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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- MoveMethod.java 9 Jul 2002 11:18:04 -0000 1.46
+++ MoveMethod.java 11 Jul 2002 14:57:08 -0000 1.47
@@ -152,7 +152,6 @@
*/
protected Element literal = null;
-
// ----------------------------------------------------------- Constructors
@@ -394,7 +393,7 @@
try {
NodeRevisionDescriptor specialRevisionDescriptor =
content.retrieve(slideToken,
destinationRevisionDescriptors,
- new
NodeRevisionNumber(0, 0));
+
NodeRevisionNumber.HIDDEN_0_0);
content.create(slideToken, destinationRevisionDescriptors.getUri(),
null, specialRevisionDescriptor.cloneObject(), null);
}
catch (ServiceAccessException e) {
1.39 +5 -5
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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ReportMethod.java 28 Jun 2002 07:35:17 -0000 1.38
+++ ReportMethod.java 11 Jul 2002 14:57:08 -0000 1.39
@@ -710,7 +710,7 @@
NodeRevisionNumber revisionNumber = revisionDescriptor.getRevisionNumber();
// this is a versioned resource
- NodeRevisionDescriptor historyDescriptor = content.retrieve(slideToken,
revisionDescriptors, new NodeRevisionNumber(0, 0));
+ NodeRevisionDescriptor historyDescriptor = content.retrieve(slideToken,
revisionDescriptors, NodeRevisionNumber.HIDDEN_0_0);
NodeProperty versionSetProperty =
historyDescriptor.getProperty(P_VERSION_SET);
if ( (versionSetProperty != null) && (versionSetProperty.getValue() !=
null) ) {
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeltavUriRedirector.java 22 May 2002 16:23:56 -0000 1.3
+++ DeltavUriRedirector.java 11 Jul 2002 14:57:08 -0000 1.4
@@ -99,7 +99,7 @@
if( Configuration.useVersionControl() ) {
UriHandler rUh = UriHandler.getUriHandler( uri );
if( rUh.isHistoryUri() ) {
- result = new NodeRevisionNumber( 0, 0 );
+ result = NodeRevisionNumber.HIDDEN_0_0;
}
else if( rUh.isVersionUri() ) {
result = new NodeRevisionNumber( rUh.getVersionName() );
1.19 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java
Index: UriHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- UriHandler.java 21 Jun 2002 11:19:10 -0000 1.18
+++ UriHandler.java 11 Jul 2002 14:57:08 -0000 1.19
@@ -108,7 +108,7 @@
b.append( uri );
}
else {
- if( (new NodeRevisionNumber(0, 0)).equals(nrd.getRevisionNumber()) ) {
+ if( (NodeRevisionNumber.HIDDEN_0_0).equals(nrd.getRevisionNumber()) ) {
// history resource
b.append( uri );
}
1.61 +11 -16
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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- VersioningHelper.java 4 Jul 2002 12:19:04 -0000 1.60
+++ VersioningHelper.java 11 Jul 2002 14:57:08 -0000 1.61
@@ -141,13 +141,6 @@
public class VersioningHelper extends AbstractWebdavHelper {
/**
- * The NodeRevisionNumber of the VCR backup needed for checkout-uncheckout.
- */
- public static final NodeRevisionNumber VCR_BACKUP_REVISION_NUMBER = new
NodeRevisionNumber(0, 0);
-
-
-
- /**
* Factory method.
*/
public static VersioningHelper
@@ -304,12 +297,11 @@
vrNrd.setContentLength(rNrd.getContentLength()); // P_GETCONTENTLENGTH
// Set initial VHR properties
- NodeRevisionNumber vhrNrn = new NodeRevisionNumber( 0, 0 ); //major=0;
minor=0
Vector vhrLabels = new Vector();
Hashtable vhrProps = new Hashtable();
String vhrBranch = NodeRevisionDescriptors.MAIN_BRANCH;
NodeRevisionDescriptor vhrNrd =
- new NodeRevisionDescriptor( vhrNrn, vhrBranch, vhrLabels, vhrProps );
+ new NodeRevisionDescriptor( NodeRevisionNumber.HIDDEN_0_0, vhrBranch,
vhrLabels, vhrProps );
i =
pHelp.createInitialProperties(VersionHistoryImpl.getInstance()).iterator();
while( i.hasNext() )
vhrNrd.setProperty( (NodeProperty)i.next() );
@@ -1440,7 +1432,8 @@
*/
protected void backupProperties(NodeRevisionDescriptors revisionDescriptors,
NodeRevisionDescriptor revisionDescriptor) throws SlideException {
- NodeRevisionDescriptor backup = cloneRevisionDescriptor(revisionDescriptor,
VCR_BACKUP_REVISION_NUMBER);
+ NodeRevisionDescriptor backup =
+ cloneRevisionDescriptor(revisionDescriptor,
NodeRevisionNumber.HIDDEN_0_0);
try {
content.retrieve(sToken, revisionDescriptors,
backup.getRevisionNumber());
content.store(sToken, revisionDescriptors.getUri(), backup, null);
@@ -1464,7 +1457,8 @@
*/
protected void restoreProperties(NodeRevisionDescriptors revisionDescriptors,
NodeRevisionDescriptor revisionDescriptor) throws SlideException {
- NodeRevisionDescriptor backup = content.retrieve(sToken,
revisionDescriptors, VCR_BACKUP_REVISION_NUMBER);
+ NodeRevisionDescriptor backup =
+ content.retrieve(sToken, revisionDescriptors,
NodeRevisionNumber.HIDDEN_0_0);
copyRevisionDescriptor(backup, revisionDescriptor);
content.store(sToken, revisionDescriptors.getUri(), revisionDescriptor,
null);
}
@@ -1833,7 +1827,8 @@
UriHandler historyUriHandler = UriHandler.getUriHandler(historyUri);
if (historyUriHandler.isHistoryUri()) {
NodeRevisionDescriptors historyNrds = content.retrieve(sToken,
historyUri);
- NodeRevisionDescriptor historyNrd = content.retrieve(sToken,
historyNrds, new NodeRevisionNumber(0, 0));
+ NodeRevisionDescriptor historyNrd =
+ content.retrieve(sToken, historyNrds,
NodeRevisionNumber.HIDDEN_0_0);
NodeProperty versionSet = historyNrd.getProperty(P_VERSION_SET);
try {
XMLValue versionSetValue = new
XMLValue(versionSet.getValue().toString());
@@ -1950,7 +1945,7 @@
uri.append(revisionDescriptors.getUri());
}
else {
- if (revisionDescriptor.getRevisionNumber().equals(new
NodeRevisionNumber(0, 0))) {
+ if
(revisionDescriptor.getRevisionNumber().equals(NodeRevisionNumber.HIDDEN_0_0)) {
// history resource
uri.append(revisionDescriptors.getUri());
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
