unico 2004/07/25 04:33:55
Modified: src/stores/org/apache/slide/store/impl/rdbms
OldJDBCAdapter.java SQLServerRDBMSAdapter.java
CommonRDBMSAdapter.java
Log:
- another bugfix reported by Davide Savazzi
- organize imports
Revision Changes Path
1.3 +4 -5
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/OldJDBCAdapter.java
Index: OldJDBCAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/OldJDBCAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OldJDBCAdapter.java 11 Feb 2004 11:30:21 -0000 1.2
+++ OldJDBCAdapter.java 25 Jul 2004 11:33:54 -0000 1.3
@@ -47,7 +47,6 @@
import org.apache.slide.content.RevisionNotFoundException;
import org.apache.slide.lock.LockTokenNotFoundException;
import org.apache.slide.lock.NodeLock;
-import org.apache.slide.macro.ConflictException;
import org.apache.slide.security.NodePermission;
import org.apache.slide.structure.LinkNode;
import org.apache.slide.structure.ObjectAlreadyExistsException;
1.5 +6 -7
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/SQLServerRDBMSAdapter.java
Index: SQLServerRDBMSAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/SQLServerRDBMSAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SQLServerRDBMSAdapter.java 11 May 2004 10:41:56 -0000 1.4
+++ SQLServerRDBMSAdapter.java 25 Jul 2004 11:33:55 -0000 1.5
@@ -27,11 +27,10 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
-import org.apache.slide.common.*;
+import org.apache.slide.common.Service;
+import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.macro.ConflictException;
-import org.apache.slide.store.SequenceStore;
import org.apache.slide.util.logger.Logger;
/**
1.2 +17 -12
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/CommonRDBMSAdapter.java
Index: CommonRDBMSAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/CommonRDBMSAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommonRDBMSAdapter.java 15 Jul 2004 06:38:24 -0000 1.1
+++ CommonRDBMSAdapter.java 25 Jul 2004 11:33:55 -0000 1.2
@@ -23,21 +23,26 @@
package org.apache.slide.store.impl.rdbms;
-import org.apache.slide.common.*;
-import org.apache.slide.content.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.apache.slide.common.Service;
+import org.apache.slide.common.ServiceAccessException;
+import org.apache.slide.common.Uri;
+import org.apache.slide.content.NodeRevisionDescriptor;
+import org.apache.slide.content.NodeRevisionNumber;
import org.apache.slide.lock.LockTokenNotFoundException;
import org.apache.slide.lock.NodeLock;
import org.apache.slide.security.NodePermission;
-import org.apache.slide.structure.LinkNode;
-import org.apache.slide.structure.ObjectAlreadyExistsException;
import org.apache.slide.structure.ObjectNode;
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.util.logger.Logger;
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-
/**
* This adapter has code that has been ported from OracleRDBMSAdapter so that it
can be
@@ -205,7 +210,7 @@
try {
statement =
connection.prepareStatement(
- "delete from URI where URI.URI_ID in (select LOCK_ID from
LOCKS) and URI_STRING=?");
+ "delete from URI where URI_STRING=?");
statement.setString(1, lock.getLockId());
statement.executeUpdate();
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
