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/29 21:40:18 UTC
svn commit: r1819522 [6/16] - in /db/derby/code/trunk: ./
java/build/org/apache/derbyBuild/ java/build/org/apache/derbyBuild/eclipse/
java/build/org/apache/derbyBuild/lastgoodjarcontents/
java/build/org/apache/derbyPreBuild/ java/client/org/apache/derb...
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java Fri Dec 29 21:40:07 2017
@@ -22,12 +22,12 @@
package org.apache.derby.impl.jdbc.authentication;
import org.apache.derby.authentication.UserAuthenticator;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.iapi.jdbc.AuthenticationService;
-import org.apache.derby.iapi.reference.Limits;
+import org.apache.derby.shared.common.reference.Limits;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.context.Context;
import org.apache.derby.iapi.services.context.ContextService;
@@ -195,7 +195,7 @@ public abstract class AuthenticationServ
// _only_ if we're on a database context of course :)
PropertyFactory pf = (PropertyFactory)
- getServiceModule(this, org.apache.derby.iapi.reference.Module.PropertyFactory);
+ getServiceModule(this, org.apache.derby.shared.common.reference.Module.PropertyFactory);
if (pf != null)
pf.addPropertySetNotification(this);
@@ -392,7 +392,7 @@ public abstract class AuthenticationServ
{
// user password properties need to be remapped. nothing else needs remapping.
- if ( key.startsWith(org.apache.derby.iapi.reference.Property.USER_PROPERTY_PREFIX) ) { return true; }
+ if ( key.startsWith(org.apache.derby.shared.common.reference.Property.USER_PROPERTY_PREFIX) ) { return true; }
String stringValue = (String) value;
boolean settingToNativeLocal = Property.AUTHENTICATION_PROVIDER_NATIVE_LOCAL.equals( stringValue );
@@ -490,7 +490,7 @@ public abstract class AuthenticationServ
{
// We only care for "derby.user." property changes
// at the moment.
- if (!key.startsWith(org.apache.derby.iapi.reference.Property.USER_PROPERTY_PREFIX)) return null;
+ if (!key.startsWith(org.apache.derby.shared.common.reference.Property.USER_PROPERTY_PREFIX)) return null;
// We do not hash 'derby.user.<userName>' password if
// the configured authentication service is LDAP as the
// same property could be used to store LDAP user full DN (X500).
@@ -498,10 +498,10 @@ public abstract class AuthenticationServ
// not system, service or application properties.
String authService =
- (String)p.get(org.apache.derby.iapi.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
+ (String)p.get(org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
if ((authService != null) &&
- (StringUtil.SQLEqualsIgnoreCase(authService, org.apache.derby.iapi.reference.Property.AUTHENTICATION_PROVIDER_LDAP)))
+ (StringUtil.SQLEqualsIgnoreCase(authService, org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_LDAP)))
return null;
// Ok, we can hash this password in the db
@@ -531,7 +531,7 @@ public abstract class AuthenticationServ
//
String requireAuthentication = PropertyUtil.getPropertyFromSet(
properties,
- org.apache.derby.iapi.reference.Property.REQUIRE_AUTHENTICATION_PARAMETER
+ org.apache.derby.shared.common.reference.Property.REQUIRE_AUTHENTICATION_PARAMETER
);
if ( Boolean.valueOf(requireAuthentication).booleanValue() ) { return true; }
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java Fri Dec 29 21:40:07 2017
@@ -28,7 +28,7 @@ import org.apache.derby.authentication.U
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.store.access.TransactionController;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.util.StringUtil;
import org.apache.derby.impl.jdbc.Util;
@@ -80,12 +80,12 @@ public final class BasicAuthenticationSe
String authenticationProvider = PropertyUtil.getPropertyFromSet(
properties,
- org.apache.derby.iapi.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
+ org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
if ( (authenticationProvider != null) &&
(authenticationProvider.length() != 0) &&
(!(StringUtil.SQLEqualsIgnoreCase(authenticationProvider,
- org.apache.derby.iapi.reference.Property.AUTHENTICATION_PROVIDER_BUILTIN))))
+ org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_BUILTIN))))
return false;
else
return true; // Yep, we're on!
@@ -185,7 +185,7 @@ public final class BasicAuthenticationSe
// be retrieved at the datbase level only).
//
String userNameProperty =
- org.apache.derby.iapi.reference.Property.USER_PROPERTY_PREFIX.concat(
+ org.apache.derby.shared.common.reference.Property.USER_PROPERTY_PREFIX.concat(
userName);
// check if user defined at the database level
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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -22,7 +22,7 @@
package org.apache.derby.impl.jdbc.authentication;
import org.apache.derby.iapi.services.context.ContextService;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.store.access.AccessFactory;
import org.apache.derby.iapi.store.access.TransactionController;
@@ -34,7 +34,7 @@ import org.apache.derby.shared.common.sa
import org.apache.derby.shared.common.reference.SQLState;
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 org.apache.derby.shared.common.i18n.MessageService;
import java.util.Properties;
import java.util.Enumeration;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derby.impl.jdbc.authentication;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.iapi.jdbc.AuthenticationService;
@@ -79,11 +79,11 @@ public class JNDIAuthenticationService
authenticationProvider = PropertyUtil.getPropertyFromSet(
properties,
- org.apache.derby.iapi.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
+ org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
if ( (authenticationProvider != null) &&
(StringUtil.SQLEqualsIgnoreCase(authenticationProvider,
- org.apache.derby.iapi.reference.Property.AUTHENTICATION_PROVIDER_LDAP)))
+ org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_LDAP)))
return true;
return false;
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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -145,7 +145,7 @@ extends JNDIAuthenticationSchemeBase
if (useUserPropertyAsDN)
userDN =
authenticationService.getProperty(
- org.apache.derby.iapi.reference.Property.USER_PROPERTY_PREFIX);
+ org.apache.derby.shared.common.reference.Property.USER_PROPERTY_PREFIX);
if (userDN == (String) null) {
userDN = getDNFromUID(userName);
@@ -232,14 +232,14 @@ extends JNDIAuthenticationSchemeBase
// name.
//
String ldapServer = authenticationService.getProperty(
- org.apache.derby.iapi.reference.Property.AUTHENTICATION_SERVER_PARAMETER);
+ org.apache.derby.shared.common.reference.Property.AUTHENTICATION_SERVER_PARAMETER);
if (ldapServer == (String) null) {
// we do expect a LDAP Server name to be configured
Monitor.logTextMessage(
MessageId.AUTH_NO_LDAP_HOST_MENTIONED,
- org.apache.derby.iapi.reference.Property.AUTHENTICATION_SERVER_PARAMETER);
+ org.apache.derby.shared.common.reference.Property.AUTHENTICATION_SERVER_PARAMETER);
this.providerURL = dfltLDAPURL + "/";
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java Fri Dec 29 21:40:07 2017
@@ -34,16 +34,16 @@ import javax.sql.DataSource;
import org.apache.derby.catalog.SystemProcedures;
import org.apache.derby.iapi.db.Database;
-import org.apache.derby.iapi.reference.Property;
-import org.apache.derby.iapi.services.info.JVMInfo;
+import org.apache.derby.shared.common.reference.Property;
+import org.apache.derby.shared.common.info.JVMInfo;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.sql.dictionary.PasswordHasher;
import org.apache.derby.iapi.sql.dictionary.UserDescriptor;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.authentication.UserAuthenticator;
-import org.apache.derby.iapi.error.SQLWarningFactory;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.SQLWarningFactory;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.monitor.ModuleFactory;
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/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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -23,8 +23,8 @@ package org.apache.derby.impl.jdbc.authe
import org.apache.derby.shared.common.reference.MessageId;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.i18n.MessageService;
import org.apache.derby.iapi.jdbc.AuthenticationService;
import org.apache.derby.authentication.UserAuthenticator;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java Fri Dec 29 21:40:07 2017
@@ -22,9 +22,9 @@
package org.apache.derby.impl.jdbc.authentication;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.reference.ClassName;
+import org.apache.derby.shared.common.reference.ClassName;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.jdbc.AuthenticationService;
import org.apache.derby.iapi.util.StringUtil;
import org.apache.derby.authentication.UserAuthenticator;
@@ -76,15 +76,15 @@ public class SpecificAuthenticationServi
specificAuthenticationScheme = PropertyUtil.getPropertyFromSet(
properties,
- org.apache.derby.iapi.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
+ org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
if (
((specificAuthenticationScheme != null) &&
(specificAuthenticationScheme.length() != 0) &&
(!((StringUtil.SQLEqualsIgnoreCase(specificAuthenticationScheme,
- org.apache.derby.iapi.reference.Property.AUTHENTICATION_PROVIDER_BUILTIN)) ||
+ org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_BUILTIN)) ||
(specificAuthenticationScheme.equalsIgnoreCase(
- org.apache.derby.iapi.reference.Property.AUTHENTICATION_PROVIDER_LDAP)) ))))
+ org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_LDAP)) ))))
return true;
else
return false;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java Fri Dec 29 21:40:07 2017
@@ -31,8 +31,8 @@ import java.sql.Types;
import java.util.*;
import org.apache.derby.iapi.jdbc.EngineConnection;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.error.PublicAPI;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.error.PublicAPI;
/**
*
* This class provides supportto create casting/conversions required to
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java Fri Dec 29 21:40:07 2017
@@ -27,9 +27,9 @@ import java.sql.SQLException;
import java.io.File;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import org.apache.derby.iapi.error.PublicAPI;
+import org.apache.derby.shared.common.error.PublicAPI;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.io.FileUtil;
import org.apache.derby.iapi.security.Securable;
import org.apache.derby.iapi.security.SecurityUtil;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java Fri Dec 29 21:40:07 2017
@@ -28,8 +28,8 @@ import java.sql.Connection;
import java.util.*;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.error.PublicAPI;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.error.PublicAPI;
import org.apache.derby.iapi.security.Securable;
import org.apache.derby.iapi.security.SecurityUtil;
import org.apache.derby.iapi.util.IdUtil;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportAbstract.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportAbstract.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportAbstract.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportAbstract.java Fri Dec 29 21:40:07 2017
@@ -30,9 +30,9 @@ import org.apache.derby.vti.VTITemplate;
import java.util.ArrayList;
import java.util.HashMap;
import org.apache.derby.iapi.util.StringUtil;
-import org.apache.derby.iapi.error.PublicAPI;
+import org.apache.derby.shared.common.error.PublicAPI;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportLobFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportLobFile.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportLobFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportLobFile.java Fri Dec 29 21:40:07 2017
@@ -30,9 +30,9 @@ import java.io.FileNotFoundException;
import org.apache.derby.iapi.services.io.LimitInputStream;
import java.security.AccessController;
import java.security.PrivilegedActionException;
-import org.apache.derby.iapi.error.PublicAPI;
+import org.apache.derby.shared.common.error.PublicAPI;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java Fri Dec 29 21:40:07 2017
@@ -25,7 +25,7 @@ import java.sql.SQLException;
import java.util.HashMap;
import org.apache.derby.vti.VTIMetaDataTemplate;
-import org.apache.derby.iapi.reference.Limits;
+import org.apache.derby.shared.common.reference.Limits;
class ImportResultSetMetaData extends VTIMetaDataTemplate {
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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -25,8 +25,8 @@ import java.io.IOException;
import java.sql.SQLException;
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;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.error.PublicAPI;
/**
* These exceptions are thrown by the import and export modules.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java Fri Dec 29 21:40:07 2017
@@ -24,8 +24,8 @@ package org.apache.derby.impl.services.b
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.security.AccessController;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.classfile.ClassFormatOutput;
import org.apache.derby.iapi.services.classfile.ClassHolder;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java Fri Dec 29 21:40:07 2017
@@ -36,7 +36,7 @@ import org.apache.derby.iapi.services.ca
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.monitor.ModuleControl;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.sanity.SanityManager;
@@ -163,7 +163,7 @@ public class BCJava implements JavaFacto
*/
public void boot(boolean create, Properties properties) throws StandardException {
- CacheFactory cf = (CacheFactory) startSystemModule( org.apache.derby.iapi.reference.Module.CacheFactory );
+ CacheFactory cf = (CacheFactory) startSystemModule( org.apache.derby.shared.common.reference.Module.CacheFactory );
/*
** The initial and maximum cache sizes are based on experiments
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java Fri Dec 29 21:40:07 2017
@@ -24,9 +24,9 @@ package org.apache.derby.impl.services.b
import org.apache.derby.iapi.services.compiler.ClassBuilder;
import org.apache.derby.iapi.services.loader.ClassFactory;
import org.apache.derby.iapi.services.loader.GeneratedClass;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.util.ByteArray;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/BackgroundCleaner.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/BackgroundCleaner.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/BackgroundCleaner.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/BackgroundCleaner.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.impl.services.c
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.daemon.DaemonService;
import org.apache.derby.iapi.services.daemon.Serviceable;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockPolicy.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockPolicy.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockPolicy.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockPolicy.java Fri Dec 29 21:40:07 2017
@@ -24,7 +24,7 @@ package org.apache.derby.impl.services.c
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.cache.Cacheable;
import org.apache.derby.shared.common.sanity.SanityManager;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ConcurrentCache.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ConcurrentCache.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ConcurrentCache.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ConcurrentCache.java Fri Dec 29 21:40:07 2017
@@ -27,8 +27,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.Module;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.reference.Module;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.cache.CacheManager;
import org.apache.derby.iapi.services.cache.Cacheable;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ConcurrentCacheMBeanImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ConcurrentCacheMBeanImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ConcurrentCacheMBeanImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ConcurrentCacheMBeanImpl.java Fri Dec 29 21:40:07 2017
@@ -24,7 +24,7 @@ package org.apache.derby.impl.services.c
import java.security.AccessControlException;
import java.security.AccessController;
import org.apache.derby.mbeans.CacheManagerMBean;
-import org.apache.derby.security.SystemPermission;
+import org.apache.derby.shared.common.security.SystemPermission;
/**
* This class provides monitoring capabilities for ConcurrentCache through
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ReplacementPolicy.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ReplacementPolicy.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ReplacementPolicy.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ReplacementPolicy.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derby.impl.services.cache;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
/**
* Interface that must be implemented by classes that provide a replacement
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java Fri Dec 29 21:40:07 2017
@@ -29,7 +29,7 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.iapi.services.monitor.ModuleFactory;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import java.security.AccessController;
import java.security.PrivilegedAction;
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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -29,18 +29,18 @@ import java.util.List;
import org.apache.derby.catalog.UUID;
import org.apache.derby.catalog.types.StatisticsImpl;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.db.Database;
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.Property;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.context.ContextService;
import org.apache.derby.iapi.services.daemon.IndexStatisticsDaemon;
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
import org.apache.derby.iapi.services.uuid.UUIDFactory;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java Fri Dec 29 21:40:07 2017
@@ -25,7 +25,7 @@ import org.apache.derby.iapi.security.Se
import org.apache.derby.iapi.services.crypto.CipherFactory;
import org.apache.derby.iapi.services.crypto.CipherProvider;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.shared.common.reference.Attribute;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactoryBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactoryBuilder.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactoryBuilder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactoryBuilder.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.impl.services.j
import org.apache.derby.iapi.services.crypto.CipherFactory;
import org.apache.derby.iapi.services.crypto.CipherFactoryBuilder;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import java.util.Properties;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java Fri Dec 29 21:40:07 2017
@@ -25,7 +25,7 @@ import org.apache.derby.iapi.services.cr
import org.apache.derby.iapi.services.crypto.CipherProvider;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
import java.security.Key;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java Fri Dec 29 21:40:07 2017
@@ -17,7 +17,7 @@
See the License for the specific language governing permissions and
limitations under the License.
- */
+ */
package org.apache.derby.impl.services.jmx;
@@ -38,9 +38,9 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.Property;
-import org.apache.derby.iapi.services.info.Version;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.reference.Property;
+import org.apache.derby.mbeans.Version;
import org.apache.derby.iapi.services.jmx.ManagementService;
import org.apache.derby.iapi.services.monitor.ModuleControl;
import org.apache.derby.iapi.services.monitor.ModuleFactory;
@@ -48,7 +48,7 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.mbeans.ManagementMBean;
import org.apache.derby.mbeans.VersionMBean;
-import org.apache.derby.security.SystemPermission;
+import org.apache.derby.shared.common.security.SystemPermission;
/**
* This class implements the ManagementService interface and provides a simple
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/AbstractPool.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/AbstractPool.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/AbstractPool.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/AbstractPool.java Fri Dec 29 21:40:07 2017
@@ -27,14 +27,14 @@ import org.apache.derby.iapi.services.lo
import org.apache.derby.iapi.services.locks.Lockable;
import org.apache.derby.iapi.services.locks.Limit;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.iapi.services.daemon.Serviceable;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.util.Matchable;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import java.io.Serializable;
import java.util.Dictionary;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java Fri Dec 29 21:40:07 2017
@@ -25,7 +25,7 @@ import org.apache.derby.iapi.services.lo
import org.apache.derby.iapi.services.locks.Lockable;
import org.apache.derby.iapi.services.locks.C_LockFactory;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
/**
A Lock represents a granted or waiting lock request.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ConcurrentLockSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ConcurrentLockSet.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ConcurrentLockSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ConcurrentLockSet.java Fri Dec 29 21:40:07 2017
@@ -26,12 +26,12 @@ import org.apache.derby.iapi.services.lo
import org.apache.derby.iapi.services.locks.Lockable;
import org.apache.derby.iapi.services.locks.C_LockFactory;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.services.diag.DiagnosticUtil;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
import java.util.concurrent.atomic.AtomicInteger;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.impl.services.l
import org.apache.derby.iapi.services.diag.Diagnosticable;
import org.apache.derby.iapi.services.diag.DiagnosticUtil;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.services.locks.CompatibilitySpace;
import org.apache.derby.iapi.services.locks.Lockable;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.impl.services.l
import org.apache.derby.iapi.services.locks.VirtualLockTable;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java Fri Dec 29 21:40:07 2017
@@ -27,7 +27,7 @@ import org.apache.derby.iapi.services.lo
import org.apache.derby.iapi.util.Matchable;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import java.util.ArrayDeque;
import java.util.Enumeration;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTable.java Fri Dec 29 21:40:07 2017
@@ -22,7 +22,7 @@
package org.apache.derby.impl.services.locks;
import java.util.Map;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.locks.CompatibilitySpace;
import org.apache.derby.iapi.services.locks.Latch;
import org.apache.derby.iapi.services.locks.Lockable;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.impl.services.l
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java Fri Dec 29 21:40:07 2017
@@ -30,7 +30,7 @@ import org.apache.derby.iapi.services.lo
import org.apache.derby.iapi.services.locks.VirtualLockTable;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
import org.apache.derby.iapi.store.access.TransactionController;
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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -48,21 +48,21 @@ import java.util.Properties;
import java.util.ResourceBundle;
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.derby.iapi.error.ErrorStringBuilder;
+import org.apache.derby.shared.common.error.ErrorStringBuilder;
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.error.StandardException;
import org.apache.derby.shared.common.reference.Attribute;
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.Module;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.context.Context;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.context.ContextService;
-import org.apache.derby.iapi.services.i18n.BundleFinder;
-import org.apache.derby.iapi.services.i18n.MessageService;
-import org.apache.derby.iapi.services.info.JVMInfo;
+import org.apache.derby.shared.common.i18n.BundleFinder;
+import org.apache.derby.shared.common.i18n.MessageService;
+import org.apache.derby.shared.common.info.JVMInfo;
import org.apache.derby.iapi.services.io.AccessibleByteArrayOutputStream;
import org.apache.derby.iapi.services.io.FormatIdUtil;
import org.apache.derby.iapi.services.io.FormatableInstanceGetter;
@@ -76,8 +76,8 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.monitor.PersistentService;
import org.apache.derby.iapi.services.property.PropertyUtil;
-import org.apache.derby.iapi.services.stream.InfoStreams;
-import org.apache.derby.iapi.services.stream.PrintWriterGetHeader;
+import org.apache.derby.shared.common.stream.InfoStreams;
+import org.apache.derby.shared.common.stream.PrintWriterGetHeader;
import org.apache.derby.iapi.services.timer.TimerFactory;
import org.apache.derby.iapi.services.uuid.UUIDFactory;
import org.apache.derby.io.StorageFactory;
@@ -334,7 +334,7 @@ abstract class BaseMonitor
}
try {
- systemStreams = (InfoStreams) Monitor.startSystemModule("org.apache.derby.iapi.services.stream.InfoStreams");
+ systemStreams = (InfoStreams) Monitor.startSystemModule("org.apache.derby.shared.common.stream.InfoStreams");
if (SanityManager.DEBUG) {
SanityManager.SET_DEBUG_STREAM(systemStreams.stream().getPrintWriter());
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java Fri Dec 29 21:40:07 2017
@@ -32,10 +32,10 @@ import java.security.PrivilegedException
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.derby.iapi.reference.Property;
-import org.apache.derby.iapi.services.i18n.MessageService;
-import org.apache.derby.iapi.services.info.ProductGenusNames;
-import org.apache.derby.iapi.services.info.ProductVersionHolder;
+import org.apache.derby.shared.common.reference.Property;
+import org.apache.derby.shared.common.i18n.MessageService;
+import org.apache.derby.shared.common.info.ProductGenusNames;
+import org.apache.derby.shared.common.info.ProductVersionHolder;
import org.apache.derby.iapi.services.io.FileUtil;
import org.apache.derby.shared.common.reference.MessageId;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derby.impl.services.monitor;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.monitor.Monitor;
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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -24,14 +24,14 @@ package org.apache.derby.impl.services.m
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.i18n.MessageService;
import org.apache.derby.iapi.services.monitor.ModuleFactory;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.monitor.PersistentService;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.io.StorageFile;
import org.apache.derby.io.StorageFactory;
@@ -39,7 +39,7 @@ import org.apache.derby.io.WritableStora
import org.apache.derby.io.StorageRandomAccessFile;
import org.apache.derby.shared.common.reference.Attribute;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import java.io.BufferedReader;
import java.io.File;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java Fri Dec 29 21:40:07 2017
@@ -25,12 +25,12 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.monitor.PersistentService;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.util.InterruptStatus;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.reference.EngineType;
+import org.apache.derby.shared.common.reference.EngineType;
import java.util.Hashtable;
import java.util.Vector;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java Fri Dec 29 21:40:07 2017
@@ -28,9 +28,9 @@ import java.util.Properties;
import java.util.Hashtable;
import org.apache.derby.io.WritableStorageFactory;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.error.PassThroughException;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.error.PassThroughException;
+import org.apache.derby.shared.common.reference.Property;
/**
*/
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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -30,11 +30,11 @@ import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Properties;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.MessageId;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.shared.common.i18n.MessageService;
import org.apache.derby.iapi.services.loader.ClassFactory;
import org.apache.derby.iapi.services.loader.ClassInspector;
import org.apache.derby.iapi.services.loader.GeneratedClass;
@@ -42,7 +42,7 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.iapi.services.monitor.ModuleFactory;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
import org.apache.derby.iapi.util.ByteArray;
/**
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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -21,8 +21,8 @@
package org.apache.derby.impl.services.reflect;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.error.StandardException;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -47,7 +47,7 @@ import org.apache.derby.iapi.services.io
import org.apache.derby.iapi.util.IdUtil;
import org.apache.derby.shared.common.reference.MessageId;
-import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.shared.common.i18n.MessageService;
import org.apache.derby.io.StorageFile;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java Fri Dec 29 21:40:07 2017
@@ -27,7 +27,7 @@ import org.apache.derby.iapi.services.lo
import org.apache.derby.iapi.services.context.Context;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.loader.ClassInfo;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java Fri Dec 29 21:40:07 2017
@@ -25,7 +25,7 @@ import org.apache.derby.iapi.services.lo
import org.apache.derby.iapi.services.loader.GeneratedByteCode;
import org.apache.derby.iapi.services.loader.ClassFactory;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
import java.lang.reflect.Method;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.impl.services.r
import org.apache.derby.iapi.services.loader.GeneratedMethod;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -24,9 +24,9 @@ package org.apache.derby.impl.services.r
import org.apache.derby.iapi.services.context.Context;
import org.apache.derby.iapi.services.context.ContextService;
import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
import org.apache.derby.iapi.util.IdUtil;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.locks.ShExLockable;
import org.apache.derby.iapi.services.locks.ShExQual;
import org.apache.derby.iapi.services.locks.LockFactory;
@@ -37,15 +37,15 @@ import org.apache.derby.iapi.services.lo
import org.apache.derby.iapi.services.property.PersistentSet;
import org.apache.derby.iapi.services.property.PropertyUtil;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import java.io.InputStream;
import java.security.AccessController;
import java.security.PrivilegedAction;
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.shared.common.reference.Module;
+import org.apache.derby.shared.common.i18n.MessageService;
import org.apache.derby.iapi.services.locks.CompatibilitySpace;
import org.apache.derby.iapi.services.locks.LockOwner;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java Fri Dec 29 21:40:07 2017
@@ -22,14 +22,14 @@
package org.apache.derby.impl.services.stream;
import java.util.Date;
-import org.apache.derby.iapi.services.stream.PrintWriterGetHeader;
+import org.apache.derby.shared.common.stream.PrintWriterGetHeader;
/**
* Get a header to prepend to a line of output. *
* A HeaderPrintWriter requires an object which implements
* this interface to construct line headers.
*
- * @see org.apache.derby.iapi.services.stream.HeaderPrintWriter
+ * @see org.apache.derby.shared.common.stream.HeaderPrintWriter
*/
class BasicGetLogHeader implements PrintWriterGetHeader
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java Fri Dec 29 21:40:07 2017
@@ -21,8 +21,8 @@
package org.apache.derby.impl.services.stream;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
-import org.apache.derby.iapi.services.stream.PrintWriterGetHeader;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.PrintWriterGetHeader;
import java.io.PrintWriter;
import java.io.Writer;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/RollingFileStreamProvider.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/RollingFileStreamProvider.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/RollingFileStreamProvider.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/RollingFileStreamProvider.java Fri Dec 29 21:40:07 2017
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.iapi.services.stream.RollingFileStreamProvider
+ Derby - Class org.apache.derby.shared.common.stream.RollingFileStreamProvider
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -22,7 +22,7 @@ package org.apache.derby.impl.services.s
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.iapi.services.property.PropertyUtil;
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java Fri Dec 29 21:40:07 2017
@@ -21,15 +21,15 @@
package org.apache.derby.impl.services.stream;
-import org.apache.derby.iapi.services.stream.InfoStreams;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
-import org.apache.derby.iapi.services.stream.PrintWriterGetHeader;
+import org.apache.derby.shared.common.stream.InfoStreams;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.PrintWriterGetHeader;
import org.apache.derby.iapi.services.monitor.ModuleControl;
import org.apache.derby.iapi.services.monitor.ModuleFactory;
import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.iapi.services.property.PropertyUtil;
import java.io.BufferedOutputStream;
@@ -49,7 +49,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.lang.reflect.Member;
import java.lang.reflect.InvocationTargetException;
-import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.shared.common.i18n.MessageService;
import org.apache.derby.iapi.services.io.FileUtil;
import org.apache.derby.shared.common.reference.MessageId;
@@ -109,7 +109,7 @@ implements InfoStreams, ModuleControl, j
*/
/**
- * @see org.apache.derby.iapi.services.stream.InfoStreams#stream
+ * @see org.apache.derby.shared.common.stream.InfoStreams#stream
*/
public HeaderPrintWriter stream() {
return theStream;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java Fri Dec 29 21:40:07 2017
@@ -27,8 +27,8 @@ import java.util.Properties;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.i18n.MessageService;
import org.apache.derby.iapi.services.monitor.ModuleControl;
import org.apache.derby.iapi.services.timer.TimerFactory;
import org.apache.derby.shared.common.reference.MessageId;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java Fri Dec 29 21:40:07 2017
@@ -24,7 +24,7 @@ package org.apache.derby.impl.sql;
import org.apache.derby.iapi.sql.execute.ExecCursorTableReference;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.services.io.ArrayUtil;
+import org.apache.derby.shared.common.util.ArrayUtil;
import org.apache.derby.iapi.services.io.StoredFormatIds;
import org.apache.derby.iapi.services.io.Formatable;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java Fri Dec 29 21:40:07 2017
@@ -27,7 +27,7 @@ import java.util.Vector;
import org.apache.derby.catalog.Dependable;
import org.apache.derby.catalog.DependableFinder;
import org.apache.derby.catalog.UUID;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.loader.GeneratedClass;
import org.apache.derby.shared.common.sanity.SanityManager;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java Fri Dec 29 21:40:07 2017
@@ -32,7 +32,7 @@ import org.apache.derby.iapi.sql.Row;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.monitor.ModuleControl;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.sql.conn.LanguageConnectionFactory;
import org.apache.derby.iapi.services.loader.ClassInspector;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.impl.sql;
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.types.DataTypeDescriptor;
import org.apache.derby.iapi.types.DataValueDescriptor;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derby.impl.sql;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.loader.ClassInspector;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java Fri Dec 29 21:40:07 2017
@@ -31,17 +31,17 @@ import java.util.List;
import org.apache.derby.catalog.Dependable;
import org.apache.derby.catalog.DependableFinder;
import org.apache.derby.catalog.UUID;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.cache.Cacheable;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.context.ContextService;
-import org.apache.derby.iapi.services.io.ArrayUtil;
+import org.apache.derby.shared.common.util.ArrayUtil;
import org.apache.derby.iapi.services.loader.GeneratedClass;
import org.apache.derby.iapi.services.monitor.ModuleFactory;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
import org.apache.derby.iapi.services.uuid.UUIDFactory;
import org.apache.derby.iapi.sql.Activation;
import org.apache.derby.iapi.sql.ParameterValueSet;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java Fri Dec 29 21:40:07 2017
@@ -26,7 +26,7 @@ import org.apache.derby.iapi.sql.ResultD
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.services.io.ArrayUtil;
+import org.apache.derby.shared.common.util.ArrayUtil;
import org.apache.derby.iapi.services.io.StoredFormatIds;
import org.apache.derby.iapi.services.io.Formatable;
import org.apache.derby.iapi.util.StringUtil;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java Fri Dec 29 21:40:07 2017
@@ -23,13 +23,13 @@ package org.apache.derby.impl.sql;
import java.sql.Timestamp;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.daemon.IndexStatisticsDaemon;
import org.apache.derby.iapi.services.loader.GeneratedClass;
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
import org.apache.derby.iapi.sql.PreparedStatement;
import org.apache.derby.iapi.sql.Statement;
import org.apache.derby.iapi.sql.compile.CompilerContext;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java Fri Dec 29 21:40:07 2017
@@ -43,7 +43,7 @@ import org.apache.derby.iapi.sql.Storabl
import org.apache.derby.iapi.sql.execute.ConstantAction;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
@@ -54,7 +54,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.io.StoredFormatIds;
import org.apache.derby.iapi.services.io.FormatIdUtil;
-import org.apache.derby.iapi.services.io.ArrayUtil;
+import org.apache.derby.shared.common.util.ArrayUtil;
import org.apache.derby.iapi.services.io.Formatable;
import org.apache.derby.iapi.services.monitor.Monitor;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java Fri Dec 29 21:40:07 2017
@@ -23,13 +23,13 @@ package org.apache.derby.impl.sql;
import org.apache.derby.iapi.services.property.PropertySetCallback;
import org.apache.derby.iapi.services.property.PropertyUtil;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.daemon.Serviceable;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.services.context.Context;
import org.apache.derby.iapi.services.context.ContextService;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.store.access.TransactionController;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java Fri Dec 29 21:40:07 2017
@@ -25,7 +25,7 @@ import org.apache.derby.catalog.UUID;
import org.apache.derby.catalog.Dependable;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.sql.dictionary.TableDescriptor;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.io.FormatableHashtable;
import org.apache.derby.iapi.services.io.FormatableBitSet;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java Fri Dec 29 21:40:07 2017
@@ -24,7 +24,7 @@ package org.apache.derby.impl.sql.catalo
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.shared.common.sanity.SanityManager;
import org.apache.derby.iapi.services.io.Formatable;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory;
import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
@@ -34,7 +34,7 @@ import org.apache.derby.shared.common.re
import org.apache.derby.iapi.store.access.TransactionController;
import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.services.info.ProductVersionHolder;
+import org.apache.derby.shared.common.info.ProductVersionHolder;
import org.apache.derby.iapi.util.IdUtil;
import java.io.IOException;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java Fri Dec 29 21:40:07 2017
@@ -28,7 +28,7 @@ import java.io.ObjectOutput;
import org.apache.derby.catalog.Dependable;
import org.apache.derby.catalog.DependableFinder;
import org.apache.derby.catalog.UUID;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.iapi.services.io.Formatable;
import org.apache.derby.iapi.services.io.StoredFormatIds;