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 ju...@apache.org on 2001/05/16 14:07:26 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/structure StructureImpl.java
juergen 01/05/16 05:07:26
Modified: src/share/org/apache/slide/structure StructureImpl.java
Log:
removed the NRD from the API, to be put in NodePermission, see e-mails.
Revision Changes Path
1.18 +10 -16 jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java
Index: StructureImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- StructureImpl.java 2001/05/10 18:36:55 1.17
+++ StructureImpl.java 2001/05/16 12:07:20 1.18
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v 1.17 2001/05/10 18:36:55 juergen Exp $
- * $Revision: 1.17 $
- * $Date: 2001/05/10 18:36:55 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v 1.18 2001/05/16 12:07:20 juergen Exp $
+ * $Revision: 1.18 $
+ * $Date: 2001/05/16 12:07:20 $
*
* ====================================================================
*
@@ -73,21 +73,16 @@
import org.apache.slide.lock.*;
import org.apache.slide.security.*;
import org.apache.slide.authenticate.CredentialsToken;
-import org.apache.slide.content.NodeRevisionDescriptor;
/**
* Data helper class.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*/
public final class StructureImpl implements Structure {
- /** private field to indicate, that the versionNumber is not correctly supported yet
- **/
- private static final NodeRevisionDescriptor dummyNodeRevisionDescriptor = null;
-
// ----------------------------------------------------------- Constructors
@@ -244,14 +239,14 @@
try {
result = uri.getStore().retrieveObject(uri);
securityHelper.checkCredentials
- (token, result, dummyNodeRevisionDescriptor, namespaceConfig.getReadObjectAction());
+ (token, result, namespaceConfig.getReadObjectAction());
if ((translateLastUriElement) && (result instanceof LinkNode)) {
LinkNode link = (LinkNode) result;
Uri linkedUri = namespace.getUri(token, link.getLinkedUri());
result = linkedUri.getStore()
.retrieveObject(linkedUri);
securityHelper.checkCredentials
- (token, result, dummyNodeRevisionDescriptor, namespaceConfig.getReadObjectAction());
+ (token, result, namespaceConfig.getReadObjectAction());
}
} catch (ObjectNotFoundException e) {
}
@@ -281,8 +276,7 @@
// We check to see if the credentials gives access to
//the current object
securityHelper.checkCredentials
- (token, courObject, dummyNodeRevisionDescriptor,
- namespaceConfig.getReadObjectAction());
+ (token, courObject, namespaceConfig.getReadObjectAction());
// 4 - Test if object is a link, ie if it is an instance
// of LinkNode or one of its subclasses
@@ -366,7 +360,7 @@
Uri rootUri = namespace.getUri(token, "/");
ObjectNode rootObject = rootUri.getStore().retrieveObject(rootUri);
securityHelper.checkCredentials
- (token, rootObject, dummyNodeRevisionDescriptor,
+ (token, rootObject,
namespaceConfig.getGrantPermissionAction());
}
@@ -393,7 +387,7 @@
courObject = courUri.getStore()
.retrieveObject(courUri);
securityHelper
- .checkCredentials(token, courObject, dummyNodeRevisionDescriptor,
+ .checkCredentials(token, courObject,
namespaceConfig.getReadObjectAction());
if (!uriTokenizer.hasMoreElements()) {
// The object already exists
@@ -413,8 +407,8 @@
}
if (parentObject != null) {
securityHelper
- .checkCredentials(token, courObject, dummyNodeRevisionDescriptor,
- namespaceConfig.getCreateObjectAction());
+ .checkCredentials(token, courObject, namespaceConfig
+ .getCreateObjectAction());
// The role who creates the new object should have
// read/write access permissions
@@ -604,13 +598,13 @@
Uri rootUri = namespace.getUri(token, "/");
ObjectNode rootObject = rootUri.getStore().retrieveObject(rootUri);
securityHelper.checkCredentials
- (token, rootObject, dummyNodeRevisionDescriptor,
+ (token, rootObject,
namespaceConfig.getGrantPermissionAction());
}
ObjectNode realObject = retrieve(token, object.getUri(), false);
securityHelper
- .checkCredentials(token, realObject, dummyNodeRevisionDescriptor,
+ .checkCredentials(token, realObject,
namespaceConfig.getCreateObjectAction());
Uri realObjectUri = namespace.getUri(token, realObject.getUri());
realObjectUri.getStore().storeObject(realObjectUri, object);
@@ -651,7 +645,7 @@
ObjectNode obj = parentUri.getStore().retrieveObject(parentUri);
obj.removeChild(realObject.getUri());
securityHelper.checkCredentials
- (token, realObject, dummyNodeRevisionDescriptor, namespaceConfig.getRemoveObjectAction());
+ (token, realObject, namespaceConfig.getRemoveObjectAction());
store(token, obj);
uri.getStore().removeObject(uri, realObject);
}