db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r946641 - in /db/derby/code/trunk/java/client/org/apache/derby/client: am/ClobLocatorInputStream.java am/ClobLocatorReader.java am/PreparedStatement.java net/EncodedInputStream.java
Date Thu, 20 May 2010 14:17:25 GMT
Author: kahatlen
Date: Thu May 20 14:17:25 2010
New Revision: 946641

URL: http://svn.apache.org/viewvc?rev=946641&view=rev
Log:
DERBY-4669 (partial) ClassLoaderBootTest fails if derbyclient.jar
comes before derby.jar on the classpath

Make client classes use the SanityManager found under java/common so
that the engine version of SanityManager is not pulled into
derbyclient.jar.

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorInputStream.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorReader.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/EncodedInputStream.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorInputStream.java?rev=946641&r1=946640&r2=946641&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorInputStream.java
(original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorInputStream.java
Thu May 20 14:17:25 2010
@@ -21,13 +21,9 @@
 
 package org.apache.derby.client.am;
 
-import java.sql.SQLException;
-
 import java.io.IOException;
 
-import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.shared.common.error.ExceptionUtil;
-import org.apache.derby.shared.common.reference.SQLState;
+import org.apache.derby.shared.common.sanity.SanityManager;
 
 /**
  * An <code>InputStream</code> that will use an locator to fetch the

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorReader.java?rev=946641&r1=946640&r2=946641&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorReader.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClobLocatorReader.java Thu
May 20 14:17:25 2010
@@ -23,10 +23,7 @@ package org.apache.derby.client.am;
 
 import java.io.IOException;
 
-import java.sql.SQLException;
-import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.shared.common.error.ExceptionUtil;
-import org.apache.derby.shared.common.reference.SQLState;
+import org.apache.derby.shared.common.sanity.SanityManager;
 
 /**
  * An <code>Reader</code> that will use an locator to fetch the

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java?rev=946641&r1=946640&r2=946641&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java Thu
May 20 14:17:25 2010
@@ -23,7 +23,7 @@ package org.apache.derby.client.am;
 
 import org.apache.derby.shared.common.reference.JDBC40Translation;
 import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.services.sanity.SanityManager;
+import org.apache.derby.shared.common.sanity.SanityManager;
 
 import java.io.InputStream;
 import java.io.Reader;

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/EncodedInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/EncodedInputStream.java?rev=946641&r1=946640&r2=946641&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/EncodedInputStream.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/EncodedInputStream.java Thu
May 20 14:17:25 2010
@@ -29,7 +29,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
-import org.apache.derby.iapi.services.sanity.SanityManager;
+import org.apache.derby.shared.common.sanity.SanityManager;
 
 /**
  * Create an encoded stream from a <code>Reader</code>.



Mime
View raw message