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 re...@apache.org on 2001/04/28 05:52:30 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/structure StructureImpl.java
remm 01/04/27 20:52:30
Modified: src/share/org/apache/slide/content ContentImpl.java
src/share/org/apache/slide/lock LockImpl.java
src/share/org/apache/slide/security SecurityImpl.java
src/share/org/apache/slide/structure StructureImpl.java
Log:
- Set the token field of the Uri object.
Revision Changes Path
1.25 +28 -22 jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
Index: ContentImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ContentImpl.java 2001/04/25 01:56:14 1.24
+++ ContentImpl.java 2001/04/28 03:52:30 1.25
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.24 2001/04/25 01:56:14 remm Exp $
- * $Revision: 1.24 $
- * $Date: 2001/04/25 01:56:14 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.25 2001/04/28 03:52:30 remm Exp $
+ * $Revision: 1.25 $
+ * $Date: 2001/04/28 03:52:30 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Implementation of the content interface.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.25 $
*/
public final class ContentImpl implements Content {
@@ -169,7 +169,7 @@
lockHelper.checkLock(token, associatedObject,
namespaceConfig.getReadRevisionMetadataAction());
- Uri objectUri = namespace.getUri(strUri);
+ Uri objectUri = namespace.getUri(token, strUri);
NodeRevisionDescriptors revisionDescriptors = null;
try {
revisionDescriptors = objectUri.getStore()
@@ -199,7 +199,7 @@
RevisionDescriptorNotFoundException, ObjectLockedException,
BranchNotFoundException, NodeNotVersionedException {
- Uri objectUri = namespace.getUri(revisionDescriptors.getUri());
+ Uri objectUri = namespace.getUri(token, revisionDescriptors.getUri());
NodeRevisionDescriptors realRevisionDescriptors = objectUri.getStore()
.retrieveRevisionDescriptors(objectUri);
@@ -249,7 +249,7 @@
lockHelper.checkLock(token, associatedObject,
namespaceConfig.getReadRevisionMetadataAction());
- Uri objectUri = namespace.getUri(revisionDescriptors.getUri());
+ Uri objectUri = namespace.getUri(token, revisionDescriptors.getUri());
NodeRevisionDescriptor revisionDescriptor =
objectUri.getStore().retrieveRevisionDescriptor
@@ -276,7 +276,7 @@
LinkedObjectNotFoundException, ServiceAccessException,
RevisionDescriptorNotFoundException, ObjectLockedException {
- Uri objectUri = namespace.getUri(revisionDescriptors.getUri());
+ Uri objectUri = namespace.getUri(token, revisionDescriptors.getUri());
NodeRevisionDescriptors realRevisionDescriptors = objectUri.getStore()
.retrieveRevisionDescriptors(objectUri);
@@ -328,7 +328,7 @@
lockHelper.checkLock(token, associatedObject,
namespaceConfig.getReadRevisionContentAction());
- Uri objectUri = namespace.getUri(strUri);
+ Uri objectUri = namespace.getUri(token, strUri);
NodeRevisionContent revisionContent =
objectUri.getStore().retrieveRevisionContent(objectUri,
revisionDescriptor);
@@ -373,7 +373,7 @@
namespaceConfig.getCreateRevisionContentAction());
}
- Uri objectUri = namespace.getUri(strUri);
+ Uri objectUri = namespace.getUri(token, strUri);
NodeRevisionDescriptors revisionDescriptors =
new NodeRevisionDescriptors(isVersioned);
@@ -430,7 +430,7 @@
resourceName = resourceName.substring(lastSlash + 1);
revisionDescriptor.setName(resourceName);
- Uri objectUri = namespace.getUri(strUri);
+ Uri objectUri = namespace.getUri(token, strUri);
NodeRevisionDescriptors revisionDescriptors = null;
try {
@@ -513,16 +513,21 @@
} else {
try {
- { // merge the new received properties into the revisionDescriptor
+ {
+ // merge the new received properties into the
+ // revisionDescriptor
+
// We update the descriptor's properties
NodeRevisionDescriptor oldRevisionDescriptor =
objectUri.getStore()
- .retrieveRevisionDescriptor(objectUri, newRevisionNumber);
+ .retrieveRevisionDescriptor
+ (objectUri, newRevisionNumber);
Enumeration newPropertiesList =
revisionDescriptor.enumerateProperties();
while (newPropertiesList.hasMoreElements()) {
oldRevisionDescriptor
- .setProperty( (NodeProperty) newPropertiesList.nextElement() );
+ .setProperty((NodeProperty) newPropertiesList
+ .nextElement() );
}
// now use the merged revision descriptor
@@ -550,7 +555,8 @@
}
objectUri.getStore()
- .storeRevisionDescriptor(objectUri, revisionDescriptor);
+ .storeRevisionDescriptor
+ (objectUri, revisionDescriptor);
} catch (RevisionDescriptorNotFoundException e) {
// Should NEVER happen.
@@ -607,7 +613,7 @@
ObjectLockedException, NodeNotVersionedException,
BranchNotFoundException {
- Uri objectUri = namespace.getUri(strUri);
+ Uri objectUri = namespace.getUri(token, strUri);
NodeRevisionDescriptors revisionDescriptors = objectUri.getStore()
.retrieveRevisionDescriptors(objectUri);
@@ -681,7 +687,7 @@
lockHelper.checkLock(token, associatedObject,
namespaceConfig.getCreateRevisionContentAction());
- Uri objectUri = namespace.getUri(strUri);
+ Uri objectUri = namespace.getUri(token, strUri);
// Retrieve the revision table
NodeRevisionDescriptors revisionDescriptors =
@@ -806,7 +812,7 @@
setDefaultProperties(associatedObject, newRevisionDescriptor);
- Uri objectUri = namespace.getUri(strUri);
+ Uri objectUri = namespace.getUri(token, strUri);
// Retrieve the revision table
NodeRevisionDescriptors revisionDescriptors =
@@ -897,7 +903,7 @@
setDefaultProperties(associatedObject, revisionDescriptor);
- Uri objectUri = namespace.getUri(strUri);
+ Uri objectUri = namespace.getUri(token, strUri);
// Retrieve the revision table
NodeRevisionDescriptors revisionDescriptors =
@@ -964,7 +970,7 @@
lockHelper.checkLock(token, associatedObject,
namespaceConfig.getRemoveRevisionContentAction());
- Uri objectUri = namespace.getUri(revisionDescriptors.getUri());
+ Uri objectUri = namespace.getUri(token, revisionDescriptors.getUri());
objectUri.getStore().removeRevisionDescriptors(objectUri);
@@ -1016,7 +1022,7 @@
lockHelper.checkLock(token, associatedObject,
namespaceConfig.getRemoveRevisionContentAction());
- Uri objectUri = namespace.getUri(strUri);
+ Uri objectUri = namespace.getUri(token, strUri);
NodeRevisionDescriptor revisionDescriptor =
objectUri.getStore().retrieveRevisionDescriptor
@@ -1069,7 +1075,7 @@
setDefaultProperties(associatedObject, newRevisionDescriptor);
- Uri objectUri = namespace.getUri(strUri);
+ Uri objectUri = namespace.getUri(token, strUri);
// Retrieve the revision table
NodeRevisionDescriptors revisionDescriptors =
1.12 +19 -18 jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java
Index: LockImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LockImpl.java 2000/11/25 01:34:52 1.11
+++ LockImpl.java 2001/04/28 03:52:30 1.12
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v 1.11 2000/11/25 01:34:52 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2000/11/25 01:34:52 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v 1.12 2001/04/28 03:52:30 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/04/28 03:52:30 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* Lock helper class.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public final class LockImpl implements Lock {
@@ -148,13 +148,13 @@
// action, we will get a SecurityException which will in turn be
// thrown by this function.
if (canLock) {
- Uri objectUri = namespace.getUri(token.getObjectUri());
+ Uri objectUri = namespace.getUri(slideToken, token.getObjectUri());
ObjectNode lockedObject = objectUri.getStore()
.retrieveObject(objectUri);
securityHelper
.checkCredentials(slideToken, lockedObject,
namespaceConfig.getLockObjectAction());
- Uri lockedUri = namespace.getUri(token.getObjectUri());
+ Uri lockedUri = namespace.getUri(slideToken, token.getObjectUri());
lockedUri.getStore().putLock(lockedUri, token);
} else {
throw new ObjectIsAlreadyLockedException(token.getObjectUri());
@@ -174,7 +174,7 @@
*/
public void unlock(SlideToken slideToken, NodeLock token)
throws ServiceAccessException, LockTokenNotFoundException {
- Uri lockedUri = namespace.getUri(token.getObjectUri());
+ Uri lockedUri = namespace.getUri(slideToken, token.getObjectUri());
lockedUri.getStore().removeLock(lockedUri, token);
}
@@ -219,7 +219,7 @@
Date newExpirationDate)
throws ServiceAccessException, LockTokenNotFoundException {
token.setExpirationDate(newExpirationDate);
- Uri lockedUri = namespace.getUri(token.getObjectUri());
+ Uri lockedUri = namespace.getUri(slideToken, token.getObjectUri());
lockedUri.getStore().renewLock(lockedUri, token);
}
@@ -269,7 +269,7 @@
// We retrieve the enumeration of locks which have been put on the
// subject.
- Uri subjectUri = namespace.getUri(subject.getUri());
+ Uri subjectUri = namespace.getUri(slideToken, subject.getUri());
Enumeration locks = subjectUri.getStore()
.enumerateLocks(subjectUri);
// Then, try to kill each individual lock.
@@ -300,12 +300,12 @@
// We retrieve the LockStore service from the namespace.
Vector locksVector = new Vector();
- Uri subjectUri = namespace.getUri(objectUri);
+ Uri subjectUri = namespace.getUri(slideToken, objectUri);
Enumeration scopes = subjectUri.getScopes();
while (scopes.hasMoreElements()) {
String currentScope = (String) scopes.nextElement();
- Uri currentScopeUri = namespace.getUri(currentScope);
+ Uri currentScopeUri = namespace.getUri(slideToken, currentScope);
Enumeration currentLocks =
currentScopeUri.getStore()
.enumerateLocks(currentScopeUri);
@@ -344,12 +344,12 @@
if (Configuration.useIntegratedLocking()) {
- Uri objectUri = namespace.getUri(object.getUri());
+ Uri objectUri = namespace.getUri(token, object.getUri());
ObjectNode realObject = objectUri.getStore()
.retrieveObject(objectUri);
Uri subjectUri = null;
subjectUri = namespace.getUri
- (namespaceConfig.getUsersPath() + "/"
+ (token, namespaceConfig.getUsersPath() + "/"
+ token.getCredentialsToken().getPublicCredentials());
SubjectNode subject = (SubjectNode) subjectUri
.getStore().retrieveObject(subjectUri);
@@ -449,7 +449,7 @@
boolean tryToLock)
throws ServiceAccessException, ObjectNotFoundException {
- Uri objectUri = namespace.getUri(token.getObjectUri());
+ Uri objectUri = namespace.getUri(slideToken, token.getObjectUri());
ObjectNode initialObject = objectUri.getStore()
.retrieveObject(objectUri);
Enumeration scopes = objectUri.getScopes();
@@ -463,7 +463,7 @@
// First, we parse all the parents of the subject.
while (!isLocked && scopes.hasMoreElements()) {
String currentScope = (String) scopes.nextElement();
- Uri currentScopeUri = namespace.getUri(currentScope);
+ Uri currentScopeUri = namespace.getUri(slideToken, currentScope);
Enumeration locks = currentScopeUri.getStore()
.enumerateLocks(currentScopeUri);
@@ -485,7 +485,7 @@
while (!isLocked && !childrenStack.empty()) {
ObjectNode currentObject = (ObjectNode) childrenStack.pop();
Uri currentObjectUri =
- namespace.getUri(currentObject.getUri());
+ namespace.getUri(slideToken, currentObject.getUri());
// We test the compatibility of the child
Enumeration locks = currentObjectUri.getStore()
.enumerateLocks(currentObjectUri);
@@ -504,7 +504,7 @@
Enumeration childrenUri = currentObject.enumerateChildren();
while (childrenUri.hasMoreElements()) {
String childUri = (String) childrenUri.nextElement();
- Uri tempUri = namespace.getUri(childUri);
+ Uri tempUri = namespace.getUri(slideToken, childUri);
ObjectNode child = tempUri.getStore()
.retrieveObject(tempUri);
childrenVector.addElement(child);
@@ -561,7 +561,8 @@
if (token2.hasExpired()) {
// Since the lock has expired, it is removed
try {
- Uri token2Uri = namespace.getUri(token2.getObjectUri());
+ Uri token2Uri = namespace.getUri(slideToken,
+ token2.getObjectUri());
token2Uri.getStore().removeLock(token2Uri, token2);
} catch (SlideException e) {
e.printStackTrace();
1.24 +12 -13 jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java
Index: SecurityImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SecurityImpl.java 2001/03/26 07:04:50 1.23
+++ SecurityImpl.java 2001/04/28 03:52:30 1.24
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v 1.23 2001/03/26 07:04:50 remm Exp $
- * $Revision: 1.23 $
- * $Date: 2001/03/26 07:04:50 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v 1.24 2001/04/28 03:52:30 remm Exp $
+ * $Revision: 1.24 $
+ * $Date: 2001/04/28 03:52:30 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Security helper.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.23 $
+ * @version $Revision: 1.24 $
*/
public final class SecurityImpl implements Security {
@@ -138,7 +138,7 @@
throws ServiceAccessException, ObjectNotFoundException,
AccessDeniedException {
- Uri objectUri = namespace.getUri(object);
+ Uri objectUri = namespace.getUri(token, object);
ObjectNode objectNode = objectUri.getStore().retrieveObject(objectUri);
checkCredentials(token, objectNode,
@@ -216,7 +216,7 @@
NodePermission permission)
throws ServiceAccessException, ObjectNotFoundException,
AccessDeniedException {
- Uri objectUri = namespace.getUri(permission.getObjectUri());
+ Uri objectUri = namespace.getUri(token, permission.getObjectUri());
ObjectNode object = objectUri.getStore()
.retrieveObject(objectUri);
@@ -325,7 +325,7 @@
.getRevokePermissionAction());
NodePermission permission = new NodePermission(object, subject,
action);
- Uri objectUri = namespace.getUri(object.getUri());
+ Uri objectUri = namespace.getUri(token, object.getUri());
objectUri.getStore()
.revokePermission(objectUri, permission);
}
@@ -346,7 +346,7 @@
throws ServiceAccessException, ObjectNotFoundException,
AccessDeniedException {
- Uri objectUri = namespace.getUri(permission.getObjectUri());
+ Uri objectUri = namespace.getUri(token, permission.getObjectUri());
ObjectNode object = objectUri.getStore().retrieveObject(objectUri);
checkCredentials(token, object,
@@ -371,7 +371,7 @@
throws ServiceAccessException, AccessDeniedException {
try {
if (Configuration.useIntegratedSecurity()) {
- Uri objectUri = namespace.getUri(object.getUri());
+ Uri objectUri = namespace.getUri(token, object.getUri());
ObjectNode realObject = objectUri.getStore()
.retrieveObject(objectUri);
SubjectNode subject = (SubjectNode) getPrincipal(token);
@@ -512,8 +512,7 @@
Uri childUri =
namespace.getUri
- ((String)
- groupMembers.nextElement());
+ ((String) groupMembers.nextElement());
ObjectNode childNode =
childUri.getStore().retrieveObject
(childUri);
@@ -621,7 +620,7 @@
String object)
throws ServiceAccessException, ObjectNotFoundException,
AccessDeniedException {
- Uri objectUri = namespace.getUri(object);
+ Uri objectUri = namespace.getUri(token, object);
return objectUri.getStore().enumeratePermissions(objectUri);
}
@@ -759,7 +758,7 @@
}
Uri subjectUri = namespace.getUri
- (namespaceConfig.getUsersPath() + "/" + principalPath);
+ (token, namespaceConfig.getUsersPath() + "/" + principalPath);
try {
return subjectUri.getStore().retrieveObject(subjectUri);
1.16 +13 -13 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StructureImpl.java 2001/02/19 17:02:08 1.15
+++ StructureImpl.java 2001/04/28 03:52:30 1.16
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v 1.15 2001/02/19 17:02:08 juergen Exp $
- * $Revision: 1.15 $
- * $Date: 2001/02/19 17:02:08 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v 1.16 2001/04/28 03:52:30 remm Exp $
+ * $Revision: 1.16 $
+ * $Date: 2001/04/28 03:52:30 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* Data helper class.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public final class StructureImpl implements Structure {
@@ -179,7 +179,7 @@
throws ServiceAccessException, ObjectNotFoundException,
LinkedObjectNotFoundException, AccessDeniedException {
String objectUriStr = object.getUri();
- Uri parentUri = namespace.getUri(objectUriStr).getParentUri();
+ Uri parentUri = namespace.getUri(token, objectUriStr).getParentUri();
if (parentUri == null) {
return null;
}
@@ -231,7 +231,7 @@
throws ServiceAccessException, ObjectNotFoundException,
LinkedObjectNotFoundException, AccessDeniedException {
- Uri uri = namespace.getUri(strUri);
+ Uri uri = namespace.getUri(token, strUri);
ObjectNode result = null;
@@ -242,7 +242,7 @@
(token, result, namespaceConfig.getReadObjectAction());
if ((translateLastUriElement) && (result instanceof LinkNode)) {
LinkNode link = (LinkNode) result;
- Uri linkedUri = namespace.getUri(link.getLinkedUri());
+ Uri linkedUri = namespace.getUri(token, link.getLinkedUri());
result = linkedUri.getStore()
.retrieveObject(linkedUri);
securityHelper.checkCredentials
@@ -357,7 +357,7 @@
// Checking role
if (!securityHelper.hasRole(token, object.getClass().getName())) {
// Allow the namespace admin to create roles he doesn't have
- Uri rootUri = namespace.getUri("/");
+ Uri rootUri = namespace.getUri(token, "/");
ObjectNode rootObject = rootUri.getStore().retrieveObject(rootUri);
securityHelper.checkCredentials
(token, rootObject,
@@ -485,7 +485,7 @@
// Add the newly created object to its parent's
// children list
parentObject.addChild(newObject);
- //namespace.getUri(parentObject.getUri())
+ //namespace.getUri(token, parentObject.getUri())
//.getDataSource().storeObject(parentObject, false);
store(token, parentObject);
@@ -595,7 +595,7 @@
// Checking role
if (!securityHelper.hasRole(token, object.getClass().getName())) {
// Allow the namespace admin to create roles he doesn't have
- Uri rootUri = namespace.getUri("/");
+ Uri rootUri = namespace.getUri(token, "/");
ObjectNode rootObject = rootUri.getStore().retrieveObject(rootUri);
securityHelper.checkCredentials
(token, rootObject,
@@ -606,7 +606,7 @@
securityHelper
.checkCredentials(token, realObject,
namespaceConfig.getCreateObjectAction());
- Uri realObjectUri = namespace.getUri(realObject.getUri());
+ Uri realObjectUri = namespace.getUri(token, realObject.getUri());
realObjectUri.getStore().storeObject(realObjectUri, object);
}
@@ -634,13 +634,13 @@
ObjectNode realObject = retrieve(token, object.getUri(), false);
Enumeration enum = realObject.enumerateChildren();
- Uri uri = namespace.getUri(realObject.getUri());
+ Uri uri = namespace.getUri(token, realObject.getUri());
if (enum.hasMoreElements()) {
throw new ObjectHasChildrenException(uri);
}
if (!object.getUri().equals("/")) {
- Uri curUri = namespace.getUri(realObject.getUri());
+ Uri curUri = namespace.getUri(token, realObject.getUri());
Uri parentUri = curUri.getParentUri();
ObjectNode obj = parentUri.getStore().retrieveObject(parentUri);
obj.removeChild(realObject.getUri());