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/02/08 08:56:25 UTC
cvs commit: jakarta-slide/src/stores/slidestore/reference JDBCDescriptorsStore.java
remm 01/02/07 23:56:25
Modified: src/stores/slidestore/reference JDBCDescriptorsStore.java
Log:
- Rename fields:
- number -> xnumber
- exclusive -> xeclusive
Thanks to Rama Kurapati <Ra...@labbook.com> for the info.
Revision Changes Path
1.8 +20 -20 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JDBCDescriptorsStore.java 2001/01/30 06:16:24 1.7
+++ JDBCDescriptorsStore.java 2001/02/08 07:56:25 1.8
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v 1.7 2001/01/30 06:16:24 remm Exp $
- * $Revision: 1.7 $
- * $Date: 2001/01/30 06:16:24 $
+ * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/JDBCDescriptorsStore.java,v 1.8 2001/02/08 07:56:25 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/02/08 07:56:25 $
*
* ====================================================================
*
@@ -84,7 +84,7 @@
* JDBC 1.0 and 2.0 compliant store implementation.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class JDBCDescriptorsStore
@@ -253,8 +253,8 @@
public synchronized void connect()
throws ServiceConnectionFailedException {
try {
- connection = DriverManager.getConnection("jdbc:" + url, user,
- password);
+ connection = DriverManager.getConnection
+ ("jdbc:" + url, user, password);
} catch (SQLException e) {
throw new ServiceConnectionFailedException(this, e);
}
@@ -282,7 +282,7 @@
s = "create table locks(id varchar(65536), object varchar(4096),"
+ " subject varchar(4096), type varchar(4096), "
+ "expirationdate varchar(15), inheritable int, "
- + "exclusive int)";
+ + "xexclusive int)";
statement.execute(s);
s = "create table revisions(uri varchar(65536) primary key, "
@@ -290,26 +290,26 @@
statement.execute(s);
s = "create table workingrevision(uri varchar(65536), "
- + "baserevision varchar(20), number varchar(20))";
+ + "baserevision varchar(20), xnumber varchar(20))";
statement.execute(s);
s = "create table latestrevisions(uri varchar(65536), "
- + "branchname varchar(4096), number varchar(20))";
+ + "branchname varchar(4096), xnumber varchar(20))";
statement.execute(s);
- s = "create table branches(uri varchar(65536), number "
+ s = "create table branches(uri varchar(65536), xnumber "
+ "varchar(20), childnumber varchar(20))";
statement.execute(s);
- s = "create table revision(uri varchar(65536), number "
+ s = "create table revision(uri varchar(65536), xnumber "
+ "varchar(20), branchname varchar(4096))";
statement.execute(s);
- s = "create table label(uri varchar(65536), number 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), number"
+ 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);
@@ -1146,7 +1146,7 @@
// We parse the revision list of the object
s = "select * from branches where uri='" + uri
- + "' and number='" + currentRevisionNumber + "'";
+ + "' and xnumber='" + currentRevisionNumber + "'";
statement2.execute(s);
ResultSet res2 = statement2.getResultSet();
Vector childList = new Vector();
@@ -1306,7 +1306,7 @@
// Retrieving branch name (and also check that revision
// does indeed exist)
- s = "select * from revision where uri='" + uri + "' and number='"
+ s = "select * from revision where uri='" + uri + "' and xnumber='"
+ revisionNumber + "'";
statement.execute(s);
res = statement.getResultSet();
@@ -1319,7 +1319,7 @@
// Retrieve labels
- s = "select * from label where uri='" + uri + "' and number='"
+ s = "select * from label where uri='" + uri + "' and xnumber='"
+ revisionNumber + "'";
statement.execute(s);
res = statement.getResultSet();
@@ -1330,7 +1330,7 @@
// Retrieve properties
- s = "select * from property where uri='" + uri + "' and number='"
+ s = "select * from property where uri='" + uri + "' and xnumber='"
+ revisionNumber + "'";
statement.execute(s);
res = statement.getResultSet();
@@ -1452,19 +1452,19 @@
String s = null;
ResultSet res = null;
- s = "delete from revision where uri='" + uri + "' and number='"
+ s = "delete from revision where uri='" + uri + "' and xnumber='"
+ number + "'";
statement.execute(s);
// Removing revision labels
- s = "delete from label where uri='" + uri + "' and number='"
+ s = "delete from label where uri='" + uri + "' and xnumber='"
+ number + "'";
statement.execute(s);
// Removing associated properties
- s = "delete from property where uri='" + uri + "' and number='"
+ s = "delete from property where uri='" + uri + "' and xnumber='"
+ number + "'";
statement.execute(s);