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:09:19 UTC
cvs commit: jakarta-slide/src/stores/slidestore/reference JDBCDescriptorsStore.java MemoryDescriptorsStore.java
juergen 01/05/16 05:09:19
Modified: src/stores/slidestore/file
FileDescriptorsStoreNoVersioning.java
src/stores/slidestore/reference JDBCDescriptorsStore.java
MemoryDescriptorsStore.java
Log:
removed the NRD from the API, to be put in NodePermission, see e-mails.
Revision Changes Path
1.6 +54 -54 jakarta-slide/src/stores/slidestore/file/FileDescriptorsStoreNoVersioning.java
Index: FileDescriptorsStoreNoVersioning.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/slidestore/file/FileDescriptorsStoreNoVersioning.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileDescriptorsStoreNoVersioning.java 2001/05/10 18:33:01 1.5
+++ FileDescriptorsStoreNoVersioning.java 2001/05/16 12:09:00 1.6
@@ -1,13 +1,13 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/file/FileDescriptorsStoreNoVersioning.java,v 1.5 2001/05/10 18:33:01 juergen Exp $
- * $Revision: 1.5 $
- * $Date: 2001/05/10 18:33:01 $
+ * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/file/FileDescriptorsStoreNoVersioning.java,v 1.6 2001/05/16 12:09:00 juergen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/05/16 12:09:00 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -23,15 +23,15 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
+ * from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
@@ -59,7 +59,7 @@
*
* [Additional notices, if required by prior licensing conditions]
*
- */
+ */
package slidestore.file;
@@ -76,12 +76,12 @@
/**
* Filesystem implementation of Store.
- *
+ *
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class FileDescriptorsStoreNoVersioning extends AbstractSimpleService
- implements RevisionDescriptorsStore, RevisionDescriptorStore,
+ implements RevisionDescriptorsStore, RevisionDescriptorStore,
SecurityStore, NodeStore {
@@ -109,17 +109,17 @@
/**
* Read parameters.
- *
- * @param parameters Hashtable containing the parameters' name
+ *
+ * @param parameters Hashtable containing the parameters' name
* and associated value
*/
public synchronized void setParameters(Hashtable parameters)
- throws ServiceParameterErrorException,
+ throws ServiceParameterErrorException,
ServiceParameterMissingException {
// A parameter will tell were serialization files are.
rootpath = (String) parameters.get("rootpath");
if (rootpath == null) {
- // Default is that files are stored starting in the
+ // Default is that files are stored starting in the
// current directory
rootpath = "";
}
@@ -128,7 +128,7 @@
/**
* Connects to store.
- *
+ *
* @exception VersionException
*/
public synchronized void connect()
@@ -138,7 +138,7 @@
/**
* Disconnects from content store.
- *
+ *
* @exception ServiceDisconnectionFailedException
*/
public synchronized void disconnect()
@@ -148,8 +148,8 @@
/**
* Initializes content store.
- *
- * @exception ServiceInitializationFailedException Throws an exception
+ *
+ * @exception ServiceInitializationFailedException Throws an exception
* if the store has already been initialized before
*/
public synchronized void initialize(NamespaceAccessToken token)
@@ -166,7 +166,7 @@
/**
* Deletes content store.
- *
+ *
* @exception ServiceResetFailedException
*/
public void reset()
@@ -176,11 +176,11 @@
/**
* This function tells whether or not the service is connected.
- *
+ *
* @return boolean true if we are connected
* @exception ServiceAccessException Service access error
*/
- public boolean isConnected()
+ public boolean isConnected()
throws ServiceAccessException {
return true;
}
@@ -188,7 +188,7 @@
/**
* Does nothing here.
- *
+ *
* @exception ServiceAccessException Unspecified service access error
*/
public synchronized void commit()
@@ -201,7 +201,7 @@
/**
* Retrive an object.
- *
+ *
* @param uri Uri of the object we want to retrieve
* @exception ServiceAccessException Error accessing the Data Source
* @exception ObjectNotFoundException The object to retrieve was not found
@@ -268,7 +268,7 @@
int pos = current.indexOf(uri.toString());
// DEBUG
- System.out.println("Adding child :"
+ System.out.println("Adding child :"
+ current.substring(pos + uri.toString().length()));
// END DEBUG
childrenVector.addElement
@@ -284,15 +284,15 @@
switch (objectType) {
case SUBJECT :
- result = new SubjectNode(uri.toString(), childrenVector,
+ result = new SubjectNode(uri.toString(), childrenVector,
linksVector);
break;
case ACTION :
- result = new ActionNode(uri.toString(), childrenVector,
+ result = new ActionNode(uri.toString(), childrenVector,
linksVector);
break;
case LINK :
- result = new LinkNode(uri.toString(), childrenVector,
+ result = new LinkNode(uri.toString(), childrenVector,
linksVector, linkTo);
break;
}
@@ -303,7 +303,7 @@
/**
* Update an object.
- *
+ *
* @param object Object to update
* @exception ServiceAccessException Error accessing the Data Source
* @exception ObjectNotFoundException The object to update was not found
@@ -315,11 +315,11 @@
/**
* Create a new object.
- *
+ *
* @param object ObjectNode
* @param uri Uri of the object we want to create
* @exception ServiceAccessException Error accessing the Data Source
- * @exception ObjectAlreadyExistsException An object already exists
+ * @exception ObjectAlreadyExistsException An object already exists
* at this Uri
*/
public void createObject(Uri uri, ObjectNode object)
@@ -329,7 +329,7 @@
/**
* Remove an object.
- *
+ *
* @param object Object to remove
* @exception ServiceAccessException Error accessing the Data Source
* @exception ObjectNotFoundException The object to remove was not found
@@ -344,10 +344,10 @@
/**
* Retrieve the revisions informations of an object.
- *
+ *
* @param uri Uri
* @exception ServiceAccessException Service access error
- * @exception RevisionDescriptorNotFoundException Revision descriptor
+ * @exception RevisionDescriptorNotFoundException Revision descriptor
* was not found
*/
public NodeRevisionDescriptors retrieveRevisionDescriptors(Uri uri)
@@ -360,7 +360,7 @@
boolean isVersioned = false;
return new NodeRevisionDescriptors(uri.toString(), initialRevision,
- workingRevisions,
+ workingRevisions,
latestRevisionNumbers,
branches, isVersioned);
}
@@ -368,7 +368,7 @@
/**
* Create a new revision information object.
- *
+ *
* @param uri Uri
* @param revisionDescriptors Node revision descriptors
* @exception ServiceAccessException Service access error
@@ -381,11 +381,11 @@
/**
* Update revision information.
- *
+ *
* @param uri Uri
* @param revisionDescriptors Node revision descriptors
* @exception ServiceAccessException Service access error
- * @exception RevisionDescriptorNotFoundException Revision descriptor
+ * @exception RevisionDescriptorNotFoundException Revision descriptor
* was not found
*/
public void storeRevisionDescriptors
@@ -396,7 +396,7 @@
/**
* Remove revision information.
- *
+ *
* @param uri Uri
* @exception ServiceAccessException Service access error
*/
@@ -410,7 +410,7 @@
/**
* Retrieve an individual object's revision descriptor.
- *
+ *
* @param Uri uri
* @param revisionNumber Node revision number
*/
@@ -423,7 +423,7 @@
/**
* Create a new revision descriptor.
- *
+ *
* @param uri Uri
* @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
@@ -436,11 +436,11 @@
/**
* Update a revision descriptor.
- *
+ *
* @param uri Uri
* @param revisionDescriptors Node revision descriptor
* @exception ServiceAccessException Service access error
- * @exception RevisionDescriptorNotFoundException Revision descriptor
+ * @exception RevisionDescriptorNotFoundException Revision descriptor
* was not found
*/
public void storeRevisionDescriptor
@@ -451,7 +451,7 @@
/**
* Remove a revision descriptor.
- *
+ *
* @param uri Uri
* @param revisionNumber Revision number
* @exception ServiceAccessException Service access error
@@ -466,11 +466,11 @@
/**
* Grant a new permission.
- *
+ *
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Data Source
*/
- public void grantPermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ public void grantPermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
try {
@@ -484,10 +484,10 @@
FileWriter writer = new FileWriter(file);
PrintWriter printer = new PrintWriter(writer);
- Enumeration oldPermissions = enumeratePermissions(uri, revisionDescriptor);
+ Enumeration oldPermissions = enumeratePermissions(uri);
while (oldPermissions.hasMoreElements()) {
- NodePermission currentPermission =
+ NodePermission currentPermission =
(NodePermission) oldPermissions.nextElement();
printer.println(currentPermission.getSubjectUri());
printer.println(currentPermission.getActionUri());
@@ -515,11 +515,11 @@
/**
* Revoke a permission.
- *
+ *
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Data Source
*/
- public void revokePermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ public void revokePermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
try {
@@ -533,10 +533,10 @@
FileWriter writer = new FileWriter(file);
PrintWriter printer = new PrintWriter(writer);
- Enumeration oldPermissions = enumeratePermissions(uri, revisionDescriptor);
+ Enumeration oldPermissions = enumeratePermissions(uri);
while (oldPermissions.hasMoreElements()) {
- NodePermission currentPermission =
+ NodePermission currentPermission =
(NodePermission) oldPermissions.nextElement();
if (!currentPermission.equals(permission)) {
printer.println(currentPermission.getSubjectUri());
@@ -561,11 +561,11 @@
/**
* Revoke all the permissions on an object.
- *
+ *
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Data Source
*/
- public void revokePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public void revokePermissions(Uri uri)
throws ServiceAccessException {
try {
@@ -596,11 +596,11 @@
/**
* Enumerate permissions on an object.
- *
+ *
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Data Source
*/
- public Enumeration enumeratePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public Enumeration enumeratePermissions(Uri uri)
throws ServiceAccessException {
Vector result = new Vector();
@@ -638,7 +638,7 @@
if ((negative == null) || (negative.equals("")))
break;
- permission =
+ permission =
new NodePermission(uri.toString(), subject, action,
Boolean.getBoolean(inheritable),
Boolean.getBoolean(negative));
1.15 +234 -234 jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java
Index: JDBCDescriptorsStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JDBCDescriptorsStore.java 2001/05/10 18:34:08 1.14
+++ JDBCDescriptorsStore.java 2001/05/16 12:09:07 1.15
@@ -1,13 +1,13 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v 1.14 2001/05/10 18:34:08 juergen Exp $
- * $Revision: 1.14 $
- * $Date: 2001/05/10 18:34:08 $
+ * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v 1.15 2001/05/16 12:09:07 juergen Exp $
+ * $Revision: 1.15 $
+ * $Date: 2001/05/16 12:09:07 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -23,15 +23,15 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
+ * from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
@@ -59,7 +59,7 @@
*
* [Additional notices, if required by prior licensing conditions]
*
- */
+ */
package slidestore.reference;
@@ -82,14 +82,14 @@
/**
* JDBC 1.0 and 2.0 compliant store implementation.
- *
+ *
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public class JDBCDescriptorsStore
extends AbstractSimpleService
- implements LockStore, NodeStore, RevisionDescriptorsStore,
+ implements LockStore, NodeStore, RevisionDescriptorsStore,
RevisionDescriptorStore, SecurityStore {
@@ -207,13 +207,13 @@
/**
* Initializes the data source with a set of parameters.
*
- * @param parameters Hashtable containing the parameters' name
+ * @param parameters Hashtable containing the parameters' name
* and associated value
* @exception ServiceParameterErrorException Incorrect service parameter
* @exception ServiceParameterMissingException Service parameter missing
*/
public void setParameters(Hashtable parameters)
- throws ServiceParameterErrorException,
+ throws ServiceParameterErrorException,
ServiceParameterMissingException {
// Driver classname
@@ -246,8 +246,8 @@
/**
* Connects to JDBC and creates the basic table structure.
- *
- * @exception ServiceConnectionFailedException Connection to the
+ *
+ * @exception ServiceConnectionFailedException Connection to the
* database failed
*/
public synchronized void connect()
@@ -265,55 +265,55 @@
statement = connection.createStatement();
- String s = "create table objects(uri varchar(65536) "
+ String s = "create table objects(uri varchar(65536) "
+ " primary key, classname varchar(4096))";
statement.execute(s);
- s = "create table children(uri varchar(65536), childuri "
+ s = "create table children(uri varchar(65536), childuri "
+ "varchar(65536))";
statement.execute(s);
- s = "create table links(link varchar(65536), linkto "
+ s = "create table links(link varchar(65536), linkto "
+ "varchar(65536))";
statement.execute(s);
- s = "create table permissions(object varchar(65536),"
- + " subject varchar(65536), action varchar(65536), "
+ s = "create table permissions(object varchar(65536),"
+ + " subject varchar(65536), action varchar(65536), "
+ "inheritable int, negative int)";
statement.execute(s);
s = "create table locks(id varchar(65536), object varchar(4096),"
- + " subject varchar(4096), type varchar(4096), "
- + "expirationdate varchar(15), inheritable int, "
+ + " subject varchar(4096), type varchar(4096), "
+ + "expirationdate varchar(15), inheritable int, "
+ "xexclusive int)";
statement.execute(s);
- s = "create table revisions(uri varchar(65536) primary key, "
+ s = "create table revisions(uri varchar(65536) primary key, "
+ "isversioned int, initialrevision varchar(10))";
statement.execute(s);
- s = "create table workingrevision(uri varchar(65536), "
+ s = "create table workingrevision(uri varchar(65536), "
+ "baserevision varchar(20), xnumber varchar(20))";
statement.execute(s);
- s = "create table latestrevisions(uri varchar(65536), "
+ s = "create table latestrevisions(uri varchar(65536), "
+ "branchname varchar(4096), xnumber varchar(20))";
statement.execute(s);
- s = "create table branches(uri varchar(65536), xnumber "
+ s = "create table branches(uri varchar(65536), xnumber "
+ "varchar(20), childnumber varchar(20))";
statement.execute(s);
- s = "create table revision(uri varchar(65536), xnumber "
+ s = "create table revision(uri varchar(65536), xnumber "
+ "varchar(20), branchname varchar(4096))";
statement.execute(s);
- s = "create table label(uri varchar(65536), xnumber varchar(20),"
+ s = "create table label(uri varchar(65536), xnumber varchar(20),"
+ " label varchar(4096))";
statement.execute(s);
- s = "create table property(uri varchar(65536), xnumber"
- + " varchar(20), name varchar(4096), value varchar(65536), "
+ s = "create table property(uri varchar(65536), xnumber"
+ + " varchar(20), name varchar(4096), value varchar(65536), "
+ "namespace varchar(4096), type varchar(100), protected int)";
statement.execute(s);
@@ -329,7 +329,7 @@
/**
* Disconnects from data source.
*
- * @exception ServiceDisconnectionFailedException Disconnection
+ * @exception ServiceDisconnectionFailedException Disconnection
* from database failed
*/
public void disconnect()
@@ -352,8 +352,8 @@
* <li>Driver is intantiated</li>
* <li>Driver registration in the driver manager</li>
* <li>Creation of the basic tables, if they didn't exist before</li>
- *
- * @exception ServiceInitializationFailedException Throws an exception
+ *
+ * @exception ServiceInitializationFailedException Throws an exception
* if the data source has already been initialized before
*/
public synchronized void initialize(NamespaceAccessToken token)
@@ -520,7 +520,7 @@
/**
* Retrive an object.
- *
+ *
* @param uri Uri of the object we want to retrieve
* @exception ServiceAccessException Error accessing the Service
* @exception ObjectNotFoundException The object to retrieve was not found
@@ -534,8 +534,8 @@
try {
statement = connection.prepareStatement(
- "select * from objects where uri= ?");
- statement.setString(1, uri.toString());
+ "select * from objects where uri= ?");
+ statement.setString(1, uri.toString());
ResultSet res = statement.executeQuery();
@@ -553,8 +553,8 @@
// Then, retrieve the children
statement = connection.prepareStatement(
- "select * from children where uri= ?");
- statement.setString(1,uri.toString());
+ "select * from children where uri= ?");
+ statement.setString(1,uri.toString());
res = statement.executeQuery();
Vector childrenVector = new Vector();
@@ -566,7 +566,7 @@
}
statement = connection.prepareStatement(
- "select * from links where linkto= ?");
+ "select * from links where linkto= ?");
statement.setString(1,uri.toString());
res = statement.executeQuery();
@@ -582,7 +582,7 @@
String linkTo = new String();
statement = connection.prepareStatement(
- "select * from links where link= ?");
+ "select * from links where link= ?");
statement.setString(1,uri.toString());
res = statement.executeQuery();
@@ -600,15 +600,15 @@
Class[] argClasses = { Class.forName("java.lang.String"),
Class.forName("java.util.Vector"),
Class.forName("java.util.Vector") };
- Object[] arguments = { uri.toString(),
- childrenVector,
+ Object[] arguments = { uri.toString(),
+ childrenVector,
linksVector };
- Constructor constructor =
+ Constructor constructor =
objclass.getConstructor(argClasses);
result = (ObjectNode)constructor.newInstance(arguments);
- } catch(Exception e) {
- // ClassNotFoundException, NoSuchMethodException, etc.
+ } catch(Exception e) {
+ // ClassNotFoundException, NoSuchMethodException, etc.
throw new ServiceAccessException(this, e);
}
@@ -627,7 +627,7 @@
/**
* Update an object.
- *
+ *
* @param object Object to update
* @exception ServiceAccessException Error accessing the Service
* @exception ObjectNotFoundException The object to update was not found
@@ -639,8 +639,8 @@
try {
statement = connection.prepareStatement(
- "select * from objects where uri= ?");
- statement.setString(1, uri.toString());
+ "select * from objects where uri= ?");
+ statement.setString(1, uri.toString());
ResultSet res = statement.executeQuery();
@@ -652,16 +652,16 @@
// Updating children
statement = connection.prepareStatement(
- "delete from children where uri= ?");
- statement.setString(1, object.getUri());
- statement.execute();
+ "delete from children where uri= ?");
+ statement.setString(1, object.getUri());
+ statement.execute();
Enumeration children = object.enumerateChildren();
while (children.hasMoreElements()) {
statement = connection.prepareStatement(
- "insert into children values(?, ?)");
- statement.setString(1, object.getUri());
- statement.setString(2, (String)children.nextElement());
+ "insert into children values(?, ?)");
+ statement.setString(1, object.getUri());
+ statement.setString(2, (String)children.nextElement());
statement.execute();
}
@@ -671,8 +671,8 @@
statement.execute(s);
Enumeration links = object.enumerateLinks();
while (children.hasMoreElements()) {
- s = "insert into links values('"
- + (String) links.nextElement() + "', '"
+ s = "insert into links values('"
+ + (String) links.nextElement() + "', '"
+ object.getUri() + "')";
statement.execute(s);
}
@@ -680,15 +680,15 @@
// Updating links
statement = connection.prepareStatement(
- "delete from links where link= ?");
- statement.setString(1, object.getUri());
+ "delete from links where link= ?");
+ statement.setString(1, object.getUri());
statement.execute();
if (object instanceof LinkNode) {
- statement = connection.prepareStatement(
- "insert into links values(?,?)");
- statement.setString(1, object.getUri());
- statement.setString(2, ((LinkNode) object).getLinkedUri());
+ statement = connection.prepareStatement(
+ "insert into links values(?,?)");
+ statement.setString(1, object.getUri());
+ statement.setString(2, ((LinkNode) object).getLinkedUri());
statement.execute();
}
@@ -705,11 +705,11 @@
/**
* Create a new object.
- *
+ *
* @param object ObjectNode
* @param uri Uri of the object we want to create
* @exception ServiceAccessException Error accessing the Service
- * @exception ObjectAlreadyExistsException An object already exists
+ * @exception ObjectAlreadyExistsException An object already exists
* at this Uri
*/
public void createObject(Uri uri, ObjectNode object)
@@ -722,8 +722,8 @@
String className = object.getClass().getName();
statement = connection.prepareStatement(
- "select * from objects where uri= ?");
- statement.setString(1, uri.toString());
+ "select * from objects where uri= ?");
+ statement.setString(1, uri.toString());
ResultSet res = statement.executeQuery();
@@ -734,8 +734,8 @@
}
statement = connection.prepareStatement(
- "insert into objects values(?,?)");
- statement.setString(1, uri.toString());
+ "insert into objects values(?,?)");
+ statement.setString(1, uri.toString());
statement.setString(2, className );
statement.execute();
@@ -744,9 +744,9 @@
Enumeration children = object.enumerateChildren();
while (children.hasMoreElements()) {
statement = connection.prepareStatement(
- "insert into children values(?,?)");
- statement.setString(1, uri.toString());
- statement.setString(2, (String) children.nextElement());
+ "insert into children values(?,?)");
+ statement.setString(1, uri.toString());
+ statement.setString(2, (String) children.nextElement());
statement.execute();
}
@@ -754,8 +754,8 @@
/*
Enumeration links = object.enumerateLinks();
while (children.hasMoreElements()) {
- s = "insert into links values('"
- + (String) links.nextElement() + "', '"
+ s = "insert into links values('"
+ + (String) links.nextElement() + "', '"
+ object.getUri() + "')";
statement.execute(s);
}
@@ -763,10 +763,10 @@
// If the object is a link, also store the link information
if (object instanceof LinkNode) {
- statement = connection.prepareStatement(
- "insert into links values(?,?)");
- statement.setString(1, uri.toString());
- statement.setString(2, ((LinkNode) object).getLinkedUri());
+ statement = connection.prepareStatement(
+ "insert into links values(?,?)");
+ statement.setString(1, uri.toString());
+ statement.setString(2, ((LinkNode) object).getLinkedUri());
statement.execute();
}
@@ -783,7 +783,7 @@
/**
* Remove an object.
- *
+ *
* @param object Object to remove
* @exception ServiceAccessException Error accessing the Service
* @exception ObjectNotFoundException The object to remove was not found
@@ -797,14 +797,14 @@
// Removing object
statement = connection.prepareStatement(
- "delete from objects where uri= ?");
- statement.setString(1,object.getUri());
+ "delete from objects where uri= ?");
+ statement.setString(1,object.getUri());
statement.execute();
// Removing children
statement = connection.prepareStatement(
- "delete from children where uri=?");
- statement.setString(1, object.getUri());
+ "delete from children where uri=?");
+ statement.setString(1, object.getUri());
statement.execute();
// Removing inbound links
@@ -815,8 +815,8 @@
// Removing links
statement = connection.prepareStatement(
- "delete from links where link= ?");
- statement.setString(1, object.getUri());
+ "delete from links where link= ?");
+ statement.setString(1, object.getUri());
statement.execute();
} catch (SQLException e) {
@@ -827,11 +827,11 @@
/**
* Grant a new permission.
- *
+ *
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Service
*/
- public void grantPermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ public void grantPermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
PreparedStatement statement = null;
@@ -848,12 +848,12 @@
}
statement = connection.prepareStatement(
- "insert into permissions values(?,?,?,?,?)");
- statement.setString(1, permission.getObjectUri());
- statement.setString(2, permission.getSubjectUri());
- statement.setString(3, permission.getActionUri());
- statement.setInt(4, inheritable);
- statement.setInt(5, negative);
+ "insert into permissions values(?,?,?,?,?)");
+ statement.setString(1, permission.getObjectUri());
+ statement.setString(2, permission.getSubjectUri());
+ statement.setString(3, permission.getActionUri());
+ statement.setInt(4, inheritable);
+ statement.setInt(5, negative);
statement.execute();
} catch (SQLException e) {
throw new ServiceAccessException(this, e);
@@ -866,11 +866,11 @@
/**
* Revoke a permission.
- *
+ *
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Service
*/
- public void revokePermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ public void revokePermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
PreparedStatement statement = null;
@@ -878,9 +878,9 @@
try {
statement = connection.prepareStatement
("delete from permissions where object= ? and subject = ? and action = ?");
- statement.setString(1,permission.getObjectUri());
- statement.setString(2, permission.getSubjectUri());
- statement.setString(3, permission.getActionUri());
+ statement.setString(1,permission.getObjectUri());
+ statement.setString(2, permission.getSubjectUri());
+ statement.setString(3, permission.getActionUri());
statement.execute();
} catch (SQLException e) {
throw new ServiceAccessException(this, e);
@@ -893,11 +893,11 @@
/**
* Revoke all the permissions on an object.
- *
+ *
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Service
*/
- public void revokePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public void revokePermissions(Uri uri)
throws ServiceAccessException {
PreparedStatement statement = null;
@@ -905,8 +905,8 @@
try {
statement = connection.prepareStatement(
- "delete from permissions where object= ?");
- statement.setString(1, uri.toString());
+ "delete from permissions where object= ?");
+ statement.setString(1, uri.toString());
statement.execute();
} catch (SQLException e) {
throw new ServiceAccessException(this, e);
@@ -919,11 +919,11 @@
/**
* Enumerate permissions on an object.
- *
+ *
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Service
*/
- public Enumeration enumeratePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public Enumeration enumeratePermissions(Uri uri)
throws ServiceAccessException {
Vector permissionVector = new Vector();
@@ -931,8 +931,8 @@
try {
statement = connection.prepareStatement(
- "select * from permissions where object= ?");
- statement.setString(1, uri.toString());
+ "select * from permissions where object= ?");
+ statement.setString(1, uri.toString());
ResultSet res = statement.executeQuery();
while (res.next()) {
@@ -944,10 +944,10 @@
if (res.getInt(PERMISSIONS_NEGATIVE) == 1) {
negative = true;
}
- NodePermission permission =
+ NodePermission permission =
new NodePermission(res.getString(PERMISSIONS_OBJECT),
res.getString(PERMISSIONS_SUBJECT),
- res.getString(PERMISSIONS_ACTION),
+ res.getString(PERMISSIONS_ACTION),
inheritable, negative);
permissionVector.addElement(permission);
}
@@ -965,11 +965,11 @@
/**
* Create a new lock.
- *
+ *
* @param lock Lock token
* @exception ServiceAccessException Service access error
*/
- public void putLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void putLock(Uri uri, NodeLock lock)
throws ServiceAccessException {
PreparedStatement statement = null;
@@ -986,15 +986,15 @@
}
statement = connection.prepareStatement(
- "insert into locks values(?,?,?,?,?,?,?)");
- statement.setString(1, lock.getLockId());
- statement.setString(2, lock.getObjectUri());
- statement.setString(3, lock.getSubjectUri());
- statement.setString(4, lock.getTypeUri());
- statement.setString(5,
- String.valueOf(lock.getExpirationDate().getTime()));
- statement.setInt(6,inheritable);
- statement.setInt(7, exclusive);
+ "insert into locks values(?,?,?,?,?,?,?)");
+ statement.setString(1, lock.getLockId());
+ statement.setString(2, lock.getObjectUri());
+ statement.setString(3, lock.getSubjectUri());
+ statement.setString(4, lock.getTypeUri());
+ statement.setString(5,
+ String.valueOf(lock.getExpirationDate().getTime()));
+ statement.setInt(6,inheritable);
+ statement.setInt(7, exclusive);
statement.execute();
} catch (SQLException e) {
throw new ServiceAccessException(this, e);
@@ -1007,12 +1007,12 @@
/**
* Renew a lock.
- *
+ *
* @param lock Token to renew
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void renewLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void renewLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
PreparedStatement statement = null;
@@ -1030,20 +1030,20 @@
}
statement = connection.prepareStatement(
- "delete from locks where id=?");
- statement.setString(1, lock.getLockId());
+ "delete from locks where id=?");
+ statement.setString(1, lock.getLockId());
statement.execute();
statement = connection.prepareStatement(
- "insert into locks values(?,?,?,?,?,?,?)");
- statement.setString(1, lock.getLockId());
- statement.setString(2, lock.getObjectUri());
- statement.setString(3, lock.getSubjectUri());
- statement.setString(4, lock.getTypeUri());
- statement.setString(5,
- String.valueOf(lock.getExpirationDate().getTime()));
- statement.setInt(6, inheritable);
- statement.setInt(7, exclusive);
+ "insert into locks values(?,?,?,?,?,?,?)");
+ statement.setString(1, lock.getLockId());
+ statement.setString(2, lock.getObjectUri());
+ statement.setString(3, lock.getSubjectUri());
+ statement.setString(4, lock.getTypeUri());
+ statement.setString(5,
+ String.valueOf(lock.getExpirationDate().getTime()));
+ statement.setInt(6, inheritable);
+ statement.setInt(7, exclusive);
statement.execute();
} catch (SQLException e) {
@@ -1057,12 +1057,12 @@
/**
* Unlock.
- *
+ *
* @param lock Token to remove
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void removeLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void removeLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
Statement statement = null;
@@ -1092,27 +1092,27 @@
/**
* Kill a lock.
- *
+ *
* @param lock Token to remove
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void killLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void killLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
- removeLock(uri, revisionDescriptor, lock);
+ removeLock(uri, lock);
}
/**
* Enumerate locks on an object.
- *
+ *
* @param subject Subject
* @return Enumeration List of locks which have been put on the subject
* @exception ServiceAccessException Service access error
*/
- public Enumeration enumerateLocks(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public Enumeration enumerateLocks(Uri uri)
throws ServiceAccessException {
Vector lockVector = new Vector();
@@ -1121,8 +1121,8 @@
try {
statement = connection.prepareStatement(
- "select * from locks where object= ?");
- statement.setString(1, uri.toString());
+ "select * from locks where object= ?");
+ statement.setString(1, uri.toString());
statement.execute();
ResultSet res = statement.getResultSet();
@@ -1135,12 +1135,12 @@
} catch (NumberFormatException e) {
expirationDate = new Date();
}
- NodeLock lock =
- new NodeLock(res.getString(LOCKS_ID),
+ NodeLock lock =
+ new NodeLock(res.getString(LOCKS_ID),
res.getString(LOCKS_OBJECT),
- res.getString(LOCKS_SUBJECT),
+ res.getString(LOCKS_SUBJECT),
res.getString(LOCKS_TYPE),
- expirationDate,
+ expirationDate,
(res.getInt(LOCKS_INHERITABLE) == 1),
(res.getInt(LOCKS_EXCLUSIVE) == 1));
lockVector.addElement(lock);
@@ -1159,10 +1159,10 @@
/**
* Retrieve the revisions informations of an object.
- *
+ *
* @param uri Uri
* @exception ServiceAccessException Service access error
- * @exception RevisionDescriptorNotFoundException Revision descriptor
+ * @exception RevisionDescriptorNotFoundException Revision descriptor
* was not found
*/
public NodeRevisionDescriptors retrieveRevisionDescriptors(Uri uri)
@@ -1182,8 +1182,8 @@
boolean isVersioned = false;
statement = connection.prepareStatement(
- "select * from revisions where uri= ?");
- statement.setString(1, uri.toString());
+ "select * from revisions where uri= ?");
+ statement.setString(1, uri.toString());
res = statement.executeQuery();
if (res.next()) {
@@ -1196,8 +1196,8 @@
}
statement = connection.prepareStatement(
- "select * from workingrevision where uri= ?");
- statement.setString(1, uri.toString());
+ "select * from workingrevision where uri= ?");
+ statement.setString(1, uri.toString());
res = statement.executeQuery();
while(res.next()) {
@@ -1205,20 +1205,20 @@
}
statement = connection.prepareStatement(
- "select * from latestrevisions where uri=?");
- statement.setString(1, uri.toString());
+ "select * from latestrevisions where uri=?");
+ statement.setString(1, uri.toString());
res = statement.executeQuery();
while(res.next()) {
latestRevisionNumbers
- .put(res.getString(LATESTREVISIONS_BRANCHNAME),
+ .put(res.getString(LATESTREVISIONS_BRANCHNAME),
new NodeRevisionNumber
(res.getString(LATESTREVISIONS_NUMBER)));
}
statement = connection.prepareStatement(
- "select * from revision where uri= ?");
- statement.setString(1, uri.toString());
+ "select * from revision where uri= ?");
+ statement.setString(1, uri.toString());
res = statement.executeQuery();
while(res.next()) {
@@ -1226,9 +1226,9 @@
// We parse the revision list of the object
statement2 = connection.prepareStatement(
- "select * from branches where uri = ? and xnumber = ?");
- statement2.setString(1, uri.toString());
- statement2.setString(2, currentRevisionNumber);
+ "select * from branches where uri = ? and xnumber = ?");
+ statement2.setString(1, uri.toString());
+ statement2.setString(2, currentRevisionNumber);
ResultSet res2 = statement2.executeQuery();
Vector childList = new Vector();
@@ -1237,14 +1237,14 @@
(res2.getString(BRANCHES_CHILDNUMBER)));
}
- branches.put(new NodeRevisionNumber(currentRevisionNumber),
+ branches.put(new NodeRevisionNumber(currentRevisionNumber),
childList);
res2.close();
}
revisionDescriptors = new NodeRevisionDescriptors
- (uri.toString(), initialRevision, workingRevisions,
+ (uri.toString(), initialRevision, workingRevisions,
latestRevisionNumbers, branches, isVersioned);
res.close();
@@ -1261,7 +1261,7 @@
/**
* Create a new revision information object.
- *
+ *
* @param uri Uri
* @param revisionDescriptors Node revision descriptors
* @exception ServiceAccessException Service access error
@@ -1270,7 +1270,7 @@
(Uri uri, NodeRevisionDescriptors revisionDescriptors)
throws ServiceAccessException {
- // TODO : Here, we have the option of "cleaning up" before
+ // TODO : Here, we have the option of "cleaning up" before
// creating the new records in the database.
PreparedStatement statement = null;
@@ -1286,11 +1286,11 @@
}
statement = connection.prepareStatement(
- "insert into revisions values(?,?,?)");
- statement.setString(1,uri.toString());
- statement.setInt(2, isVersioned);
- statement.setString(3,
- revisionDescriptors.getInitialRevision().toString());
+ "insert into revisions values(?,?,?)");
+ statement.setString(1,uri.toString());
+ statement.setInt(2, isVersioned);
+ statement.setString(3,
+ revisionDescriptors.getInitialRevision().toString());
statement.execute();
// Creating records in working revisions table
@@ -1301,12 +1301,12 @@
// For now, only the latest revision from the main branch is stored
if (revisionDescriptors.getLatestRevision() != null) {
statement = connection.prepareStatement(
- "insert into latestrevisions values(?,?,?)");
- statement.setString(1, uri.toString());
- statement.setString(2,
- NodeRevisionDescriptors.MAIN_BRANCH.toString());
- statement.setString(3,
- revisionDescriptors.getLatestRevision().toString());
+ "insert into latestrevisions values(?,?,?)");
+ statement.setString(1, uri.toString());
+ statement.setString(2,
+ NodeRevisionDescriptors.MAIN_BRANCH.toString());
+ statement.setString(3,
+ revisionDescriptors.getLatestRevision().toString());
statement.execute();
}
@@ -1324,11 +1324,11 @@
/**
* Update revision information.
- *
+ *
* @param uri Uri
* @param revisionDescriptors Node revision descriptors
* @exception ServiceAccessException Service access error
- * @exception RevisionDescriptorNotFoundException Revision descriptor
+ * @exception RevisionDescriptorNotFoundException Revision descriptor
* was not found
*/
public void storeRevisionDescriptors
@@ -1343,7 +1343,7 @@
/**
* Remove revision information.
- *
+ *
* @param uri Uri
* @exception ServiceAccessException Service access error
*/
@@ -1355,23 +1355,23 @@
try {
statement = connection.prepareStatement(
- "delete from revisions where uri= ?");
- statement.setString(1, uri.toString());
+ "delete from revisions where uri= ?");
+ statement.setString(1, uri.toString());
statement.execute();
statement = connection.prepareStatement(
- "delete from workingrevision where uri= ?");
- statement.setString(1, uri.toString());
+ "delete from workingrevision where uri= ?");
+ statement.setString(1, uri.toString());
statement.execute();
statement = connection.prepareStatement(
- "delete from latestrevisions where uri= ?");
- statement.setString(1, uri.toString());
+ "delete from latestrevisions where uri= ?");
+ statement.setString(1, uri.toString());
statement.execute();
statement = connection.prepareStatement(
- "delete from branches where uri= ?");
- statement.setString(1, uri.toString());
+ "delete from branches where uri= ?");
+ statement.setString(1, uri.toString());
statement.execute();
} catch (SQLException e) {
@@ -1385,7 +1385,7 @@
/**
* Retrieve an individual object's revision descriptor.
- *
+ *
* @param Uri uri
* @param revisionNumber Node revision number
*/
@@ -1396,8 +1396,8 @@
NodeRevisionDescriptor revisionDescriptor = null;
PreparedStatement statement = null;
- if(revisionNumber == null)
- throw new RevisionDescriptorNotFoundException(uri.toString());
+ if(revisionNumber == null)
+ throw new RevisionDescriptorNotFoundException(uri.toString());
try {
@@ -1407,13 +1407,13 @@
Vector labels = new Vector();
Hashtable properties = new Hashtable();
- // Retrieving branch name (and also check that revision
+ // Retrieving branch name (and also check that revision
// does indeed exist)
statement = connection.prepareStatement(
- "select * from revision where uri= ? and xnumber = ?");
- statement.setString(1, uri.toString());
- statement.setString(2, revisionNumber.toString());
+ "select * from revision where uri= ? and xnumber = ?");
+ statement.setString(1, uri.toString());
+ statement.setString(2, revisionNumber.toString());
res = statement.executeQuery();
if (res.next()) {
@@ -1425,9 +1425,9 @@
// Retrieve labels
statement = connection.prepareStatement(
- "select * from label where uri= ? and xnumber = ?");
- statement.setString(1, uri.toString());
- statement.setString(2, revisionNumber.toString());
+ "select * from label where uri= ? and xnumber = ?");
+ statement.setString(1, uri.toString());
+ statement.setString(2, revisionNumber.toString());
res = statement.executeQuery();
while (res.next()) {
@@ -1437,25 +1437,25 @@
// Retrieve properties
statement = connection.prepareStatement(
- "select * from property where uri= ? and xnumber = ?");
- statement.setString(1, uri.toString());
- statement.setString(2, revisionNumber.toString());
+ "select * from property where uri= ? and xnumber = ?");
+ statement.setString(1, uri.toString());
+ statement.setString(2, revisionNumber.toString());
res = statement.executeQuery();
while (res.next()) {
String propertyName = res.getString(PROPERTY_NAME);
String propertyNamespace = res.getString(PROPERTY_NAMESPACE);
- NodeProperty property =
- new NodeProperty(propertyName,
- res.getString(PROPERTY_VALUE),
- propertyNamespace,
- res.getString(PROPERTY_TYPE),
+ NodeProperty property =
+ new NodeProperty(propertyName,
+ res.getString(PROPERTY_VALUE),
+ propertyNamespace,
+ res.getString(PROPERTY_TYPE),
(res.getInt(PROPERTY_PROTECTED) == 1));
properties.put(propertyNamespace + propertyName, property);
}
- revisionDescriptor =
- new NodeRevisionDescriptor(revisionNumber, branchName,
+ revisionDescriptor =
+ new NodeRevisionDescriptor(revisionNumber, branchName,
labels, properties);
res.close();
@@ -1472,7 +1472,7 @@
/**
* Create a new revision descriptor.
- *
+ *
* @param uri Uri
* @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
@@ -1488,11 +1488,11 @@
ResultSet res = null;
statement = connection.prepareStatement(
- "insert into revision values(?, ?, ?)");
- statement.setString(1, uri.toString());
- statement.setString(2,
- revisionDescriptor.getRevisionNumber().toString());
- statement.setString(3, revisionDescriptor.getBranchName());
+ "insert into revision values(?, ?, ?)");
+ statement.setString(1, uri.toString());
+ statement.setString(2,
+ revisionDescriptor.getRevisionNumber().toString());
+ statement.setString(3, revisionDescriptor.getBranchName());
statement.execute();
// Creating revision labels
@@ -1500,11 +1500,11 @@
Enumeration labels = revisionDescriptor.enumerateLabels();
while (labels.hasMoreElements()) {
statement = connection.prepareStatement(
- "insert into label values(?,?,?)");
- statement.setString(1, uri.toString());
- statement.setString(2,
- revisionDescriptor.getRevisionNumber().toString());
- statement.setString(3, (String)labels.nextElement());
+ "insert into label values(?,?,?)");
+ statement.setString(1, uri.toString());
+ statement.setString(2,
+ revisionDescriptor.getRevisionNumber().toString());
+ statement.setString(3, (String)labels.nextElement());
statement.execute();
}
@@ -1512,22 +1512,22 @@
Enumeration properties = revisionDescriptor.enumerateProperties();
while (properties.hasMoreElements()) {
- NodeProperty property =
+ NodeProperty property =
(NodeProperty) properties.nextElement();
int protectedProperty = 0;
if (property.isProtected()) {
protectedProperty = 1;
}
statement = connection.prepareStatement(
- "insert into property values(?,?,?,?,?,?,?)");
- statement.setString(1, uri.toString());
- statement.setString(2,
- revisionDescriptor.getRevisionNumber().toString());
- statement.setString(3, property.getName());
- statement.setString(4, property.getValue().toString());
- statement.setString(5, property.getNamespace());
- statement.setString(6, property.getType());
- statement.setInt(7, protectedProperty);
+ "insert into property values(?,?,?,?,?,?,?)");
+ statement.setString(1, uri.toString());
+ statement.setString(2,
+ revisionDescriptor.getRevisionNumber().toString());
+ statement.setString(3, property.getName());
+ statement.setString(4, property.getValue().toString());
+ statement.setString(5, property.getNamespace());
+ statement.setString(6, property.getType());
+ statement.setInt(7, protectedProperty);
statement.execute();
}
@@ -1542,11 +1542,11 @@
/**
* Update a revision descriptor.
- *
+ *
* @param uri Uri
* @param revisionDescriptors Node revision descriptor
* @exception ServiceAccessException Service access error
- * @exception RevisionDescriptorNotFoundException Revision descriptor
+ * @exception RevisionDescriptorNotFoundException Revision descriptor
* was not found
*/
public void storeRevisionDescriptor
@@ -1561,7 +1561,7 @@
/**
* Remove a revision descriptor.
- *
+ *
* @param uri Uri
* @param revisionNumber Revision number
* @exception ServiceAccessException Service access error
@@ -1574,25 +1574,25 @@
try {
statement = connection.prepareStatement(
- "delete from revision where uri= ? and xnumber = ?");
- statement.setString(1, uri.toString());
- statement.setString(2, number.toString());
+ "delete from revision where uri= ? and xnumber = ?");
+ statement.setString(1, uri.toString());
+ statement.setString(2, number.toString());
statement.execute();
// Removing revision labels
statement = connection.prepareStatement(
- "delete from label where uri= ? and xnumber = ?");
- statement.setString(1, uri.toString());
- statement.setString(2, number.toString());
+ "delete from label where uri= ? and xnumber = ?");
+ statement.setString(1, uri.toString());
+ statement.setString(2, number.toString());
statement.execute();
// Removing associated properties
statement = connection.prepareStatement(
- "delete from property where uri= ? and xnumber = ?");
- statement.setString(1, uri.toString());
- statement.setString(2, number.toString());
+ "delete from property where uri= ? and xnumber = ?");
+ statement.setString(1, uri.toString());
+ statement.setString(2, number.toString());
statement.execute();
} catch (SQLException e) {
1.6 +10 -10 jakarta-slide/src/stores/slidestore/reference/MemoryDescriptorsStore.java
Index: MemoryDescriptorsStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/slidestore/reference/MemoryDescriptorsStore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MemoryDescriptorsStore.java 2001/05/10 18:36:14 1.5
+++ MemoryDescriptorsStore.java 2001/05/16 12:09:12 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/MemoryDescriptorsStore.java,v 1.5 2001/05/10 18:36:14 juergen Exp $
- * $Revision: 1.5 $
- * $Date: 2001/05/10 18:36:14 $
+ * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/MemoryDescriptorsStore.java,v 1.6 2001/05/16 12:09:12 juergen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/05/16 12:09:12 $
*
* ====================================================================
*
@@ -80,7 +80,7 @@
* Reference implementation.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class MemoryDescriptorsStore extends FileContentStore
implements LockStore, NodeStore, RevisionDescriptorsStore,
@@ -315,7 +315,7 @@
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public void grantPermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ public void grantPermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
Object value = permissions.get(uri.toString());
Vector permissionsVector = null;
@@ -335,7 +335,7 @@
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public void revokePermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ public void revokePermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
Object value = permissions.get(uri.toString());
Vector permissionsVector = null;
@@ -353,7 +353,7 @@
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public void revokePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public void revokePermissions(Uri uri)
throws ServiceAccessException {
Object value = permissions.get(uri.toString());
Vector permissionsVector = null;
@@ -370,7 +370,7 @@
* @param permission Permission we want to create
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public Enumeration enumeratePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public Enumeration enumeratePermissions(Uri uri)
throws ServiceAccessException {
Object value = permissions.get(uri.toString());
Vector permissionsVector = null;
@@ -389,7 +389,7 @@
* @param lock Lock token
* @exception ServiceAccessException Service access error
*/
- public void putLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void putLock(Uri uri, NodeLock lock)
throws ServiceAccessException {
Object value = locks.get(uri.toString());
Vector locksVector = null;
@@ -410,7 +410,7 @@
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void renewLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void renewLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
Object value = locks.get(uri.toString());
Vector locksVector = null;
@@ -434,7 +434,7 @@
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void removeLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void removeLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
Object value = locks.get(uri.toString());
Vector locksVector = null;
@@ -457,9 +457,9 @@
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void killLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void killLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
- removeLock(uri, revisionDescriptor, lock);
+ removeLock(uri, lock);
}
@@ -470,7 +470,7 @@
* @return Enumeration List of locks which have been put on the subject
* @exception ServiceAccessException Service access error
*/
- public Enumeration enumerateLocks(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public Enumeration enumerateLocks(Uri uri)
throws ServiceAccessException {
Object value = locks.get(uri.toString());
Vector locksVector = null;