From derby-commits-return-14453-apmail-db-derby-commits-archive=db.apache.org@db.apache.org Wed Jun 1 10:01:54 2011 Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9CC5260F0 for ; Wed, 1 Jun 2011 10:01:54 +0000 (UTC) Received: (qmail 25283 invoked by uid 500); 1 Jun 2011 10:01:54 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 25235 invoked by uid 500); 1 Jun 2011 10:01:54 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 25228 invoked by uid 99); 1 Jun 2011 10:01:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2011 10:01:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2011 10:01:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 985D823888CD; Wed, 1 Jun 2011 10:01:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Wed, 01 Jun 2011 10:01:29 -0000 To: derby-commits@db.apache.org From: kristwaa@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110601100129.985D823888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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 ResultSet class for NoPutResultSets 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;