You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2017/12/27 15:52:42 UTC
svn commit: r1819343 [1/2] - in /db/derby/code/trunk/java:
client/org/apache/derby/client/ client/org/apache/derby/client/am/
drda/org/apache/derby/impl/drda/ engine/org/apache/derby/catalog/types/
engine/org/apache/derby/diag/ engine/org/apache/derby/...
Author: rhillegas
Date: Wed Dec 27 15:52:42 2017
New Revision: 1819343
URL: http://svn.apache.org/viewvc?rev=1819343&view=rev
Log:
DERBY-6945: Eliminate more duplicated classes in derbyshared.jar; commit derby-6945-06-aa-removeOtherSharedDuplicates.diff.
Removed:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ThreadDump.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC40Translation.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/MessageId.java
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java
db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/SQLWarningFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/transaction/TransactionControl.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBInputStream.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBOutputStream.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBStreamControl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UserDefinedAggregator.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValidateCheckConstraintResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/ReplicationLogger.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAResource.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionSeverity.java
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Util.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java Wed Dec 27 15:52:42 2017
@@ -38,7 +38,7 @@ import org.apache.derby.client.am.Logica
import org.apache.derby.client.am.SqlException;
import org.apache.derby.client.am.stmtcache.JDBCStatementCache;
import org.apache.derby.client.net.NetXAConnection;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.jdbc.BasicClientDataSource40;
import org.apache.derby.jdbc.ClientDriver;
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java Wed Dec 27 15:52:42 2017
@@ -27,7 +27,7 @@ import java.sql.SQLException;
import java.sql.Types;
import java.util.Hashtable;
import org.apache.derby.iapi.reference.DRDAConstants;
-import org.apache.derby.iapi.reference.JDBC40Translation;
+import org.apache.derby.shared.common.reference.JDBC40Translation;
import org.apache.derby.shared.common.reference.SQLState;
// Under JDBC 2, we must new up our parameter meta data as column meta data instances
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Wed Dec 27 15:52:42 2017
@@ -51,7 +51,7 @@ import java.util.List;
import java.util.Properties;
import java.util.TimeZone;
import org.apache.derby.catalog.SystemProcedures;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.jdbc.AuthenticationService;
import org.apache.derby.iapi.jdbc.EngineLOB;
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Wed Dec 27 15:52:42 2017
@@ -64,7 +64,7 @@ import org.apache.derby.iapi.jdbc.Authen
import org.apache.derby.iapi.jdbc.DRDAServerStarter;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.iapi.reference.DRDAConstants;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Module;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java Wed Dec 27 15:52:42 2017
@@ -25,10 +25,10 @@ import java.sql.SQLException;
import java.util.Properties;
import javax.sql.XAConnection;
import javax.transaction.xa.XAResource;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.jdbc.EngineConnection;
import org.apache.derby.iapi.jdbc.ResourceAdapter;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.services.i18n.MessageService;
import org.apache.derby.iapi.services.info.JVMInfo;
import org.apache.derby.jdbc.EmbeddedXADataSourceInterface;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java Wed Dec 27 15:52:42 2017
@@ -27,7 +27,7 @@ import java.io.ObjectOutput;
import java.sql.Types;
import org.apache.derby.catalog.TypeDescriptor;
-import org.apache.derby.iapi.reference.JDBC40Translation;
+import org.apache.derby.shared.common.reference.JDBC40Translation;
import org.apache.derby.iapi.services.io.Formatable;
import org.apache.derby.iapi.services.io.StoredFormatIds;
import org.apache.derby.iapi.types.StringDataValue;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java Wed Dec 27 15:52:42 2017
@@ -29,7 +29,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Enumeration;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.services.i18n.MessageService;
import org.apache.derby.iapi.reference.Limits;
import org.apache.derby.iapi.util.StringUtil;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/SQLWarningFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/SQLWarningFactory.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/SQLWarningFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/SQLWarningFactory.java Wed Dec 27 15:52:42 2017
@@ -25,6 +25,7 @@ import java.sql.SQLWarning;
import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
// for javadoc
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java Wed Dec 27 15:52:42 2017
@@ -26,6 +26,7 @@ import java.security.PrivilegedActionExc
import java.sql.SQLException;
import java.sql.SQLWarning;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.io.ArrayUtil;
import org.apache.derby.iapi.services.i18n.MessageService;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java Wed Dec 27 15:52:42 2017
@@ -25,7 +25,7 @@ import org.apache.derby.shared.common.sa
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.monitor.ModuleControl;
import org.apache.derby.iapi.services.monitor.ModuleFactory;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Property;
import java.io.PrintWriter;
import java.lang.Runnable;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java Wed Dec 27 15:52:42 2017
@@ -26,7 +26,7 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Properties;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.property.PropertyUtil;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java Wed Dec 27 15:52:42 2017
@@ -71,7 +71,7 @@ public interface Property {
Indicates the minimum level of severity for errors that are reported to the error stream.
Default to 0 in a "sane" server, and SESSION_SEVERITY in the insane (and product) server.
- @see org.apache.derby.iapi.error.ExceptionSeverity#SESSION_SEVERITY
+ @see org.apache.derby.shared.common.error.ExceptionSeverity#SESSION_SEVERITY
*/
String LOG_SEVERITY_LEVEL = "derby.stream.error.logSeverityLevel";
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java Wed Dec 27 15:52:42 2017
@@ -29,13 +29,13 @@ import org.apache.derby.iapi.error.PassT
import org.apache.derby.shared.common.error.ShutdownException;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.error.ExceptionUtil;
+import org.apache.derby.shared.common.error.ExceptionUtil;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.iapi.services.property.PropertyUtil;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.services.i18n.LocaleFinder;
import org.apache.derby.iapi.services.info.JVMInfo;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java Wed Dec 27 15:52:42 2017
@@ -28,7 +28,7 @@ import org.apache.derby.shared.common.er
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.monitor.ModuleFactory;
import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
/**
A context that shuts the system down if it gets an StandardException
with a severity greater than or equal to ExceptionSeverity.SYSTEM_SEVERITY
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java Wed Dec 27 15:52:42 2017
@@ -24,7 +24,7 @@ import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.services.i18n.MessageService;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java Wed Dec 27 15:52:42 2017
@@ -25,7 +25,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.locks.CompatibilitySpace;
import org.apache.derby.iapi.services.property.PersistentSet;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.StandardException;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java Wed Dec 27 15:52:42 2017
@@ -26,7 +26,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.i18n.MessageService;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import java.security.PrivilegedAction;
import java.security.AccessController;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java Wed Dec 27 15:52:42 2017
@@ -35,7 +35,7 @@ import java.util.Properties;
import org.apache.derby.iapi.services.property.PersistentSet;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
/**
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/transaction/TransactionControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/transaction/TransactionControl.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/transaction/TransactionControl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/transaction/TransactionControl.java Wed Dec 27 15:52:42 2017
@@ -23,7 +23,7 @@ package org.apache.derby.iapi.transactio
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.io.ArrayUtil;
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java Wed Dec 27 15:52:42 2017
@@ -21,7 +21,7 @@
package org.apache.derby.iapi.types;
-import org.apache.derby.iapi.reference.JDBC40Translation;
+import org.apache.derby.shared.common.reference.JDBC40Translation;
import java.sql.Timestamp;
import java.sql.Types;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java Wed Dec 27 15:52:42 2017
@@ -25,7 +25,7 @@ import org.apache.derby.iapi.sql.conn.St
import org.apache.derby.iapi.reference.ContextId;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.error.StandardException;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java Wed Dec 27 15:52:42 2017
@@ -30,7 +30,7 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.iapi.db.Database;
import org.apache.derby.iapi.db.DatabaseContext;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import java.security.PrivilegedAction;
import java.security.AccessController;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java Wed Dec 27 15:52:42 2017
@@ -42,7 +42,7 @@ import java.security.AccessController;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.impl.store.replication.ReplicationLogger;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java Wed Dec 27 15:52:42 2017
@@ -25,7 +25,7 @@ package org.apache.derby.impl.jdbc;
import java.io.IOException;
import java.io.Writer;
import java.sql.SQLException;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.services.i18n.MessageService;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java Wed Dec 27 15:52:42 2017
@@ -24,7 +24,7 @@ package org.apache.derby.impl.jdbc;
import org.apache.derby.jdbc.InternalDriver;
import org.apache.derby.shared.common.reference.Attribute;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
@@ -42,7 +42,7 @@ import org.apache.derby.iapi.security.Se
import org.apache.derby.iapi.db.Database;
import org.apache.derby.impl.db.SlaveDatabase;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.SQLWarningFactory;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.i18n.MessageService;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java Wed Dec 27 15:52:42 2017
@@ -31,7 +31,7 @@ import org.apache.derby.iapi.error.Stand
import org.apache.derby.iapi.sql.ResultSet;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.sql.SQLException;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Wed Dec 27 15:52:42 2017
@@ -51,7 +51,7 @@ import org.apache.derby.iapi.types.Varia
import org.apache.derby.iapi.sql.ResultDescription;
import org.apache.derby.iapi.services.io.LimitInputStream;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.shared.common.reference.SQLState;
/* can't import these due to name overlap:
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBInputStream.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBInputStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBInputStream.java Wed Dec 27 15:52:42 2017
@@ -26,12 +26,12 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.i18n.MessageService;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.types.PositionedStream;
-import org.apache.derby.iapi.error.ExceptionUtil;
+import org.apache.derby.shared.common.error.ExceptionUtil;
/**
* This input stream is built on top of {@link LOBStreamControl}.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBOutputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBOutputStream.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBOutputStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBOutputStream.java Wed Dec 27 15:52:42 2017
@@ -25,10 +25,10 @@ package org.apache.derby.impl.jdbc;
import java.io.IOException;
import java.io.OutputStream;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.i18n.MessageService;
-import org.apache.derby.iapi.error.ExceptionUtil;
+import org.apache.derby.shared.common.error.ExceptionUtil;
/**
* This is an output stream built on top of LOBStreamControl.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBStreamControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBStreamControl.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBStreamControl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/LOBStreamControl.java Wed Dec 27 15:52:42 2017
@@ -38,7 +38,7 @@ import org.apache.derby.iapi.services.i1
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.store.raw.data.DataFactory;
import org.apache.derby.io.StorageFile;
-import org.apache.derby.iapi.error.ExceptionUtil;
+import org.apache.derby.shared.common.error.ExceptionUtil;
import org.apache.derby.shared.common.reference.MessageId;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java Wed Dec 27 15:52:42 2017
@@ -32,7 +32,7 @@ import org.apache.derby.shared.common.sa
import org.apache.derby.iapi.db.Database;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java Wed Dec 27 15:52:42 2017
@@ -25,11 +25,11 @@ import java.io.IOException;
import java.sql.SQLException;
import java.sql.Types;
import org.apache.derby.iapi.error.ErrorStringBuilder;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.jdbc.ExceptionFactory;
-import org.apache.derby.iapi.reference.JDBC40Translation;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.JDBC40Translation;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.i18n.MessageService;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java Wed Dec 27 15:52:42 2017
@@ -32,8 +32,8 @@ import org.apache.derby.authentication.U
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.error.ExceptionSeverity;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.services.i18n.MessageService;
import java.util.Properties;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java Wed Dec 27 15:52:42 2017
@@ -30,7 +30,7 @@ import java.util.Properties;
import javax.naming.*;
import javax.naming.directory.*;
import org.apache.derby.authentication.UserAuthenticator;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.util.StringUtil;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java Wed Dec 27 15:52:42 2017
@@ -21,7 +21,7 @@
package org.apache.derby.impl.jdbc.authentication;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.i18n.MessageService;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java Wed Dec 27 15:52:42 2017
@@ -23,7 +23,7 @@ package org.apache.derby.impl.load;
import java.io.IOException;
import java.sql.SQLException;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.error.PublicAPI;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java Wed Dec 27 15:52:42 2017
@@ -31,7 +31,7 @@ import org.apache.derby.catalog.UUID;
import org.apache.derby.catalog.types.StatisticsImpl;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.db.Database;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.shared.common.error.ShutdownException;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java Wed Dec 27 15:52:42 2017
@@ -49,11 +49,11 @@ import java.util.ResourceBundle;
import java.util.StringTokenizer;
import java.util.Vector;
import org.apache.derby.iapi.error.ErrorStringBuilder;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.shared.common.error.ShutdownException;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.shared.common.reference.Attribute;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Module;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java Wed Dec 27 15:52:42 2017
@@ -23,7 +23,7 @@ package org.apache.derby.impl.services.m
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.context.ContextImpl;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
/**
A context that is used during a service boot to
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java Wed Dec 27 15:52:42 2017
@@ -21,7 +21,7 @@
package org.apache.derby.impl.services.monitor;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.i18n.MessageService;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java Wed Dec 27 15:52:42 2017
@@ -31,7 +31,7 @@ import java.security.PrivilegedActionExc
import java.security.PrivilegedExceptionAction;
import java.util.Properties;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.i18n.MessageService;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java Wed Dec 27 15:52:42 2017
@@ -46,7 +46,7 @@ import org.apache.derby.iapi.services.io
import org.apache.derby.iapi.services.io.LimitInputStream;
import org.apache.derby.iapi.util.IdUtil;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.services.i18n.MessageService;
import org.apache.derby.io.StorageFile;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java Wed Dec 27 15:52:42 2017
@@ -43,7 +43,7 @@ import java.io.InputStream;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Module;
import org.apache.derby.iapi.services.i18n.MessageService;
import org.apache.derby.iapi.services.locks.CompatibilitySpace;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java Wed Dec 27 15:52:42 2017
@@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import org.apache.derby.catalog.UUID;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.compiler.JavaFactory;
import org.apache.derby.iapi.services.context.ContextImpl;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java Wed Dec 27 15:52:42 2017
@@ -32,7 +32,7 @@ import java.util.WeakHashMap;
import org.apache.derby.catalog.UUID;
import org.apache.derby.iapi.db.Database;
import org.apache.derby.iapi.db.TriggerExecutionContext;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.reference.ContextId;
import org.apache.derby.iapi.reference.Limits;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java Wed Dec 27 15:52:42 2017
@@ -46,7 +46,7 @@ import org.apache.derby.iapi.sql.Paramet
import org.apache.derby.iapi.services.context.ContextImpl;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.shared.common.reference.SQLState;
import java.util.ArrayList;
import java.util.Iterator;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java Wed Dec 27 15:52:42 2017
@@ -21,7 +21,7 @@
package org.apache.derby.impl.sql.execute;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.context.ContextImpl;
import org.apache.derby.iapi.services.context.ContextManager;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java Wed Dec 27 15:52:42 2017
@@ -29,7 +29,7 @@ import java.util.Vector;
import org.apache.derby.catalog.UUID;
import org.apache.derby.iapi.db.TriggerExecutionContext;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.PublicAPI;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.jdbc.ConnectionContext;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UserDefinedAggregator.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UserDefinedAggregator.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UserDefinedAggregator.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UserDefinedAggregator.java Wed Dec 27 15:52:42 2017
@@ -40,7 +40,7 @@ import org.apache.derby.iapi.types.TypeI
import org.apache.derby.iapi.services.i18n.MessageService;
import org.apache.derby.iapi.services.io.StoredFormatIds;
import org.apache.derby.iapi.services.loader.ClassFactory;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.SQLState;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValidateCheckConstraintResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValidateCheckConstraintResultSet.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValidateCheckConstraintResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValidateCheckConstraintResultSet.java Wed Dec 27 15:52:42 2017
@@ -21,7 +21,7 @@
package org.apache.derby.impl.sql.execute;
-import org.apache.derby.iapi.error.ExceptionUtil;
+import org.apache.derby.shared.common.error.ExceptionUtil;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.loader.GeneratedMethod;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java Wed Dec 27 15:52:42 2017
@@ -21,7 +21,7 @@
package org.apache.derby.impl.store.access;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.context.ContextManager;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java Wed Dec 27 15:52:42 2017
@@ -64,7 +64,7 @@ import org.apache.derby.iapi.store.acces
import org.apache.derby.iapi.services.io.FileUtil;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Property;
import java.security.AccessController;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java Wed Dec 27 15:52:42 2017
@@ -22,7 +22,7 @@
package org.apache.derby.impl.store.raw.data;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.security.SecurityUtil;
import org.apache.derby.iapi.services.info.ProductVersionHolder;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java Wed Dec 27 15:52:42 2017
@@ -36,7 +36,7 @@ import org.apache.derby.shared.common.sa
import org.apache.derby.iapi.services.io.FormatIdUtil;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.util.InterruptStatus;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java Wed Dec 27 15:52:42 2017
@@ -32,7 +32,7 @@ import java.util.Arrays;
import java.util.zip.CRC32;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.io.ArrayInputStream;
import org.apache.derby.iapi.services.io.ArrayOutputStream;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java Wed Dec 27 15:52:42 2017
@@ -22,7 +22,7 @@
package org.apache.derby.impl.store.raw.log;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.impl.store.raw.log.LogCounter;
import org.apache.derby.impl.store.raw.log.LogRecord;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java Wed Dec 27 15:52:42 2017
@@ -22,7 +22,7 @@
package org.apache.derby.impl.store.raw.log;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.impl.store.raw.log.LogCounter;
import org.apache.derby.impl.store.raw.log.LogRecord;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java Wed Dec 27 15:52:42 2017
@@ -25,7 +25,7 @@ import org.apache.derby.iapi.services.di
import org.apache.derby.iapi.services.info.ProductVersionHolder;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java Wed Dec 27 15:52:42 2017
@@ -52,7 +52,7 @@ import org.apache.derby.iapi.store.raw.l
import org.apache.derby.iapi.store.access.FileResource;
import org.apache.derby.iapi.store.access.RowSource;
import org.apache.derby.iapi.store.access.TransactionController;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.types.DataValueFactory;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java Wed Dec 27 15:52:42 2017
@@ -34,7 +34,7 @@ import org.apache.derby.iapi.store.raw.x
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
/**
The context associated with the transaction.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/ReplicationLogger.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/ReplicationLogger.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/ReplicationLogger.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/ReplicationLogger.java Wed Dec 27 15:52:42 2017
@@ -23,7 +23,7 @@
package org.apache.derby.impl.store.replication;
import java.util.Date;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.iapi.error.ErrorStringBuilder;
import org.apache.derby.iapi.services.monitor.Monitor;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/MasterController.java Wed Dec 27 15:52:42 2017
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.monitor.ModuleControl;
import org.apache.derby.iapi.services.monitor.ModuleSupportable;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java Wed Dec 27 15:52:42 2017
@@ -30,7 +30,7 @@ import java.security.PrivilegedActionExc
import java.security.PrivilegedExceptionAction;
import javax.net.ServerSocketFactory;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.impl.store.raw.log.LogCounter;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java Wed Dec 27 15:52:42 2017
@@ -24,7 +24,7 @@ package org.apache.derby.impl.store.repl
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.shared.common.reference.Attribute;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.monitor.ModuleControl;
import org.apache.derby.iapi.services.monitor.ModuleSupportable;
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=1819343&r1=1819342&r2=1819343&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 Dec 27 15:52:42 2017
@@ -35,7 +35,7 @@ import java.security.PrivilegedException
import java.util.Properties;
import java.util.logging.Logger;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.i18n.MessageService;
import org.apache.derby.shared.common.sanity.SanityManager;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java Wed Dec 27 15:52:42 2017
@@ -32,10 +32,10 @@ import java.sql.SQLFeatureNotSupportedEx
import java.util.Properties;
import java.util.logging.Logger;
import org.apache.derby.iapi.db.Database;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.jdbc.ResourceAdapter;
import org.apache.derby.shared.common.reference.Attribute;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.i18n.MessageService;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java Wed Dec 27 15:52:42 2017
@@ -23,7 +23,7 @@ package org.apache.derby.jdbc;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.reference.Property;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
/* import impl class */
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=1819343&r1=1819342&r2=1819343&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 Dec 27 15:52:42 2017
@@ -33,8 +33,8 @@ import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import javax.transaction.xa.XAException;
-import org.apache.derby.iapi.error.ExceptionSeverity;
-import org.apache.derby.iapi.error.ExceptionUtil;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionUtil;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.jdbc.BrokeredConnection;
import org.apache.derby.iapi.jdbc.ResourceAdapter;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/InternalDriver.java Wed Dec 27 15:52:42 2017
@@ -59,7 +59,7 @@ import org.apache.derby.iapi.jdbc.Broker
import org.apache.derby.iapi.jdbc.ConnectionContext;
import org.apache.derby.iapi.jdbc.ResourceAdapter;
import org.apache.derby.shared.common.reference.Attribute;
-import org.apache.derby.iapi.reference.MessageId;
+import org.apache.derby.shared.common.reference.MessageId;
import org.apache.derby.iapi.reference.Module;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java Wed Dec 27 15:52:42 2017
@@ -33,14 +33,14 @@ import org.apache.derby.impl.jdbc.EmbedC
import javax.transaction.xa.XAResource;
import org.apache.derby.iapi.services.context.ContextImpl;
import org.apache.derby.iapi.services.context.ContextManager;
-import org.apache.derby.iapi.error.ExceptionSeverity;
+import org.apache.derby.shared.common.error.ExceptionSeverity;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.store.access.XATransactionController;
import org.apache.derby.iapi.store.access.xa.XAXactId;
import org.apache.derby.shared.common.reference.SQLState;
import java.util.HashMap;
import javax.transaction.xa.XAException;
-import org.apache.derby.iapi.error.ExceptionUtil;
+import org.apache.derby.shared.common.error.ExceptionUtil;
import org.apache.derby.shared.common.reference.MessageId;
/**
Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionSeverity.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionSeverity.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionSeverity.java (original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionSeverity.java Wed Dec 27 15:52:42 2017
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.iapi.error.ExceptionSeverity
+ Derby - Class org.apache.derby.shared.common.error.ExceptionSeverity
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java (original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java Wed Dec 27 15:52:42 2017
@@ -1,5 +1,5 @@
/*
- Derby - Class org.apache.derby.common.error.ExceptionUtil
+ Derby - Class org.apache.derby.shared.common.error.ExceptionUtil
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,6 +19,23 @@
*/
package org.apache.derby.shared.common.error;
+/* Until DERBY-289 related issue settle for shared code
+ * Engine have similar code as client code even though some of
+ * code is potentially sharable. If you fix a bug in ExceptionUtil for engine,
+ * please also change the code in
+ * java/shared/org/apache/derby/shared/common/error/ExceptionUtil.java for
+ * client if necessary.
+ */
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.security.AccessControlException;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.shared.common.error.ExceptionSeverity;
/**
@@ -26,87 +43,176 @@ import org.apache.derby.shared.common.er
*/
public class ExceptionUtil
{
- /**
- * Convert a message identifer from
+
+
+ /**
+ * Convert a message identifier from
* org.apache.derby.shared.common.reference.SQLState to
- * a SQLState five character string.
+ * a SQLState five character string.
*
- * @param messageID - the sql state id of the message from Derby
- * @return String - the 5 character code of the SQLState ID to returned to the user
- */
- public static String getSQLStateFromIdentifier(String messageID) {
-
- if (messageID.length() == 5)
- return messageID;
- return messageID.substring(0, 5);
- }
+ * @param messageID - the sql state id of the message from Derby
+ * @return String - the 5 character code of the SQLState ID to returned to the user
+ */
+ public static String getSQLStateFromIdentifier(String messageID) {
+
+ if (messageID.length() == 5)
+ return messageID;
+ return messageID.substring(0, 5);
+ }
- /**
- * Get the severity given a message identifier from SQLState.
- */
- public static int getSeverityFromIdentifier(String messageID) {
-
- int lseverity = ExceptionSeverity.NO_APPLICABLE_SEVERITY;
-
- switch (messageID.length()) {
- case 5:
- switch (messageID.charAt(0)) {
- case '0':
- switch (messageID.charAt(1)) {
- case '1':
- lseverity = ExceptionSeverity.WARNING_SEVERITY;
- break;
- case 'A':
- case '7':
- lseverity = ExceptionSeverity.STATEMENT_SEVERITY;
- break;
- case '8':
- lseverity = ExceptionSeverity.SESSION_SEVERITY;
- break;
- }
- break;
- case '2':
- case '3':
- lseverity = ExceptionSeverity.STATEMENT_SEVERITY;
- break;
- case '4':
- switch (messageID.charAt(1)) {
- case '0':
- lseverity = ExceptionSeverity.TRANSACTION_SEVERITY;
- break;
- case '2':
- lseverity = ExceptionSeverity.STATEMENT_SEVERITY;
- break;
- }
- break;
- }
- break;
-
- default:
- switch (messageID.charAt(6)) {
- case 'M':
- lseverity = ExceptionSeverity.SYSTEM_SEVERITY;
- break;
- case 'D':
- lseverity = ExceptionSeverity.DATABASE_SEVERITY;
- break;
- case 'C':
- lseverity = ExceptionSeverity.SESSION_SEVERITY;
- break;
- case 'T':
- lseverity = ExceptionSeverity.TRANSACTION_SEVERITY;
- break;
- case 'S':
- lseverity = ExceptionSeverity.STATEMENT_SEVERITY;
- break;
- case 'U':
- lseverity = ExceptionSeverity.NO_APPLICABLE_SEVERITY;
- break;
- }
- break;
- }
-
- return lseverity;
- }
-
+ /**
+ * Get the severity given a message identifier from {@code SQLState}.
+ *
+ * @param messageID the string carrying the SQL state
+ * @return the constant representing the severity, as defined in
+ * {@link org.apache.derby.shared.common.error.ExceptionSeverity}.
+ */
+ public static int getSeverityFromIdentifier(String messageID) {
+
+ int lseverity = ExceptionSeverity.NO_APPLICABLE_SEVERITY;
+
+ switch (messageID.length()) {
+ case 5:
+ switch (messageID.charAt(0)) {
+ case '0':
+ switch (messageID.charAt(1)) {
+ case '1':
+ lseverity = ExceptionSeverity.WARNING_SEVERITY;
+ break;
+ case 'A':
+ case '7':
+ lseverity = ExceptionSeverity.STATEMENT_SEVERITY;
+ break;
+ case '8':
+ lseverity = ExceptionSeverity.SESSION_SEVERITY;
+ break;
+ }
+ break;
+ case '2':
+ case '3':
+ lseverity = ExceptionSeverity.STATEMENT_SEVERITY;
+ break;
+ case '4':
+ switch (messageID.charAt(1)) {
+ case '0':
+ lseverity = ExceptionSeverity.TRANSACTION_SEVERITY;
+ break;
+ case '2':
+ lseverity = ExceptionSeverity.STATEMENT_SEVERITY;
+ break;
+ }
+ break;
+ }
+ break;
+
+ default:
+ switch (messageID.charAt(6)) {
+ case 'M':
+ lseverity = ExceptionSeverity.SYSTEM_SEVERITY;
+ break;
+ case 'D':
+ lseverity = ExceptionSeverity.DATABASE_SEVERITY;
+ break;
+ case 'C':
+ lseverity = ExceptionSeverity.SESSION_SEVERITY;
+ break;
+ case 'T':
+ lseverity = ExceptionSeverity.TRANSACTION_SEVERITY;
+ break;
+ case 'S':
+ lseverity = ExceptionSeverity.STATEMENT_SEVERITY;
+ break;
+ case 'U':
+ lseverity = ExceptionSeverity.NO_APPLICABLE_SEVERITY;
+ break;
+ }
+ break;
+ }
+
+ return lseverity;
+ }
+
+ /**
+ * Dumps stack traces for all the threads if the JVM supports it.
+ * The result is returned as a string, ready to print.
+ *
+ * If the JVM doesn't have the method Thread.getAllStackTraces
+ * i.e, we are on a JVM < 1.5, or if we don't have the permissions:
+ * java.lang.RuntimePermission "getStackTrace" and "modifyThreadGroup",
+ * a message saying so is returned instead.
+ *
+ * @return stack traces for all live threads as a string or an error message.
+ */
+ @SuppressWarnings({"BroadCatchBlock", "TooBroadCatch", "UseSpecificCatch"})
+ public static String dumpThreads() {
+
+ StringWriter out = new StringWriter();
+ PrintWriter p = new PrintWriter(out, true);
+
+ //Try to get a thread dump and deal with various situations.
+ try {
+ //This checks that we are on a jvm >= 1.5 where we
+ //can actually do threaddumps.
+ Thread.class.getMethod("getAllStackTraces", new Class<?>[] {});
+
+ //Then get the thread dump.
+ Class<?> c = Class.forName("org.apache.derby.shared.common.sanity.ThreadDump");
+ final Method m = c.getMethod("getStackDumpString",new Class<?>[] {});
+
+ String dump;
+
+ dump = (String) AccessController.doPrivileged
+ (new PrivilegedExceptionAction<Object>(){
+ public Object run() throws
+ IllegalArgumentException,
+ IllegalAccessException,
+ InvocationTargetException{
+ return m.invoke(null, (Object[]) null);
+ }
+ }
+ );
+
+ //Print the dump to the message string. That went OK.
+ p.print("---------------\nStack traces for all " +
+ "live threads:");
+ p.println("\n" + dump);
+ p.println("---------------");
+ } catch (NoSuchMethodException e) {
+ p.println("(Skipping thread dump because it is not " +
+ "supported on JVM 1.4)");
+
+ } catch (Exception e) {
+ if (e instanceof PrivilegedActionException &&
+ e.getCause() instanceof InvocationTargetException &&
+ e.getCause().getCause() instanceof AccessControlException){
+
+ p.println("(Skipping thread dump "
+ + "because of insufficient permissions:\n"
+ + e.getCause().getCause() + ")\n");
+ } else {
+ p.println("\nAssertFailure tried to do a thread dump, but "
+ + "there was an error:");
+ e.getCause().printStackTrace(p);
+ }
+ }
+ return out.toString();
+ }
+
+ /**
+ * Determine if the given {@code SQLState} string constant is a deferred
+ * constraint transactional error. If this is so, return {@code true}, else
+ * return {@code false}.
+ *
+ * @param e the string with the SQL state
+ * @return see method description
+ */
+ public static boolean isDeferredConstraintViolation(String e) {
+ return
+ e.equals(
+ ExceptionUtil.getSQLStateFromIdentifier(
+ SQLState.LANG_DEFERRED_DUPLICATE_KEY_CONSTRAINT_T)) ||
+ e.equals(
+ ExceptionUtil.getSQLStateFromIdentifier(
+ SQLState.LANG_DEFERRED_CHECK_CONSTRAINT_T));
+ }
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java?rev=1819343&r1=1819342&r2=1819343&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java Wed Dec 27 15:52:42 2017
@@ -37,7 +37,7 @@ import java.util.Arrays;
import junit.framework.AssertionFailedError;
import junit.framework.Test;
import org.apache.derby.drda.NetworkServerControl;
-import org.apache.derby.iapi.error.ExceptionUtil;
+import org.apache.derby.shared.common.error.ExceptionUtil;
import org.apache.derby.iapi.services.info.JVMInfo;
/**