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...@locus.apache.org on 2000/12/01 08:30:52 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/structure StructureImpl.java
remm 00/11/30 23:30:52
Modified: src/share/org/apache/slide/content ContentImpl.java
src/share/org/apache/slide/structure StructureImpl.java
Log:
- Add some simple transaction start and commit calls in Structure and
Content.
Revision Changes Path
1.10 +14 -4 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ContentImpl.java 2000/11/26 18:21:48 1.9
+++ ContentImpl.java 2000/12/01 07:30:51 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.9 2000/11/26 18:21:48 remm Exp $
- * $Revision: 1.9 $
- * $Date: 2000/11/26 18:21:48 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.10 2000/12/01 07:30:51 remm Exp $
+ * $Revision: 1.10 $
+ * $Date: 2000/12/01 07:30:51 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Implementation of the content interface.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public final class ContentImpl implements Content {
@@ -304,6 +304,8 @@
Uri objectUri = namespace.getUri(strUri);
+ objectUri.getStore().begin();
+
NodeRevisionDescriptors revisionDescriptors = null;
try {
revisionDescriptors = objectUri.getStore()
@@ -433,6 +435,8 @@
e.printStackTrace();
}
+ objectUri.getStore().commit();
+
}
@@ -471,6 +475,7 @@
namespaceConfig.getCreateRevisionContentAction());
Uri objectUri = namespace.getUri(strUri);
+ objectUri.getStore().begin();
// Retrieve the revision table
NodeRevisionDescriptors revisionDescriptors =
@@ -539,6 +544,8 @@
e.printStackTrace();
}
+ objectUri.getStore().commit();
+
}
@@ -648,6 +655,7 @@
lockHelper.checkLock(token, associatedObject,
namespaceConfig.getModifyRevisionContentAction());
+ Domain.info("Store not implemented");
}
@@ -730,10 +738,12 @@
Uri objectUri = namespace.getUri(strUri);
+ objectUri.getStore().begin();
objectUri.getStore()
.removeRevisionDescriptor(objectUri, revisionNumber);
objectUri.getStore()
.removeRevisionContent(objectUri, revisionNumber);
+ objectUri.getStore().commit();
}
1.9 +10 -4 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StructureImpl.java 2000/11/25 01:34:55 1.8
+++ StructureImpl.java 2000/12/01 07:30:52 1.9
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v 1.8 2000/11/25 01:34:55 remm Exp $
- * $Revision: 1.8 $
- * $Date: 2000/11/25 01:34:55 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v 1.9 2000/12/01 07:30:52 remm Exp $
+ * $Revision: 1.9 $
+ * $Date: 2000/12/01 07:30:52 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* Data helper class.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public final class StructureImpl implements Structure {
@@ -463,6 +463,8 @@
("Basic permissions granted for user "
+ token.getCredentialsToken().getPublicCredentials());
+ courUri.getStore().begin();
+
// Now creating the new object
newObject.setUri(courUri.toString());
courUri.getStore().createObject
@@ -475,6 +477,8 @@
//.getDataSource().storeObject(parentObject, false);
store(token, parentObject);
+ courUri.getStore().commit();
+
} else {
throw new ObjectNotFoundException(courUri);
}
@@ -615,8 +619,10 @@
obj.removeChild(realObject.getUri());
securityHelper.checkCredentials
(token, realObject, namespaceConfig.getRemoveObjectAction());
+ uri.getStore().begin();
store(token, obj);
uri.getStore().removeObject(uri, realObject);
+ uri.getStore().commit();
}
}