svn commit: r1130077 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/services/info/ iapi/types/ impl/io/vfmem/ impl/sql/execute/ jdbc/

[kr...@apache.org]

Author: kristwaa
Date: Wed Jun  1 10:01:29 2011
New Revision: 1130077

URL: http://svn.apache.org/viewvc?rev=1130077&view=rev
Log:
DERBY-5253: Engine code references org.apache.derby.shared.common.sanity.SanityManager

Replaced references to common.sanity with iapi.services.sanity.

Patch file: derby-5253-1a-engine_imports.diff

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java?rev=1130077&r1=1130076&r2=1130077&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java Wed Jun  1 10:01:29 2011
@@ -27,7 +27,7 @@ import java.net.MalformedURLException;
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
 
-import org.apache.derby.shared.common.sanity.SanityManager;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 
 /**
 	This class is used to determine which Java specification Derby will run at.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java?rev=1130077&r1=1130076&r2=1130077&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java Wed Jun  1 10:01:29 2011
@@ -26,8 +26,7 @@ import org.apache.derby.iapi.reference.L
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.io.CloneableStream;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
-
-import org.apache.derby.shared.common.sanity.SanityManager;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 
 import java.sql.Blob;
 import java.sql.ResultSet;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java?rev=1130077&r1=1130076&r2=1130077&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java Wed Jun  1 10:01:29 2011
@@ -21,7 +21,7 @@
 
 package org.apache.derby.impl.io.vfmem;
 
-import org.apache.derby.shared.common.sanity.SanityManager;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 
 /**
  * Stores data in blocks, and supports reading/writing data from/into these

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java?rev=1130077&r1=1130076&r2=1130077&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java Wed Jun  1 10:01:29 2011
@@ -22,11 +22,11 @@ package org.apache.derby.impl.sql.execut
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.io.FormatableBitSet;
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.sql.Activation;
 import org.apache.derby.iapi.sql.execute.ExecRow;
 import org.apache.derby.iapi.sql.execute.ExecutionContext;
 import org.apache.derby.iapi.store.access.TransactionController;
-import org.apache.derby.shared.common.sanity.SanityManager;
 
 /**
  * Abstract <code>ResultSet</code> class for <code>NoPutResultSet</code>s which

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java?rev=1130077&r1=1130076&r2=1130077&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java Wed Jun  1 10:01:29 2011
@@ -34,9 +34,9 @@ import org.apache.derby.iapi.reference.M
 import org.apache.derby.iapi.reference.Attribute;
 import org.apache.derby.iapi.reference.SQLState;
 import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.jdbc.JDBCBoot;
 import org.apache.derby.impl.jdbc.Util;
-import org.apache.derby.shared.common.sanity.SanityManager;
 
 
 /**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java?rev=1130077&r1=1130076&r2=1130077&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java Wed Jun  1 10:01:29 2011
@@ -44,7 +44,7 @@ import org.apache.derby.iapi.store.acces
 import org.apache.derby.iapi.store.access.xa.XAXactId;
 import org.apache.derby.impl.jdbc.EmbedConnection;
 import org.apache.derby.impl.jdbc.TransactionResourceImpl;
-import org.apache.derby.shared.common.sanity.SanityManager;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.services.property.PropertyUtil;
 import org.apache.derby.iapi.reference.Property;