db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1819522 [2/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...
Date Fri, 29 Dec 2017 21:40:18 GMT

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Dec 29 21:40:07 2017
@@ -1724,7 +1724,7 @@
     <delete file="${derby.jar.dir}/derbyshared.jar"/>
     <jar destfile="${derby.jar.dir}/derbyshared.jar"
          basedir="${out.dir}"
-         includes="org/apache/derby/iapi/error/**,org/apache/derby/iapi/reference/**,org/apache/derby/iapi/services/info/**,org/apache/derby/shared/common/**,org/apache/derby/info/*.class,org/apache/derby/info/shared/info.properties"
+         includes="org/apache/derby/shared/common/**,org/apache/derby/info/shared/info.properties"
          compress="true"
          filesonly="true"
     	 manifest="${derby.jar.dir}/lists/smfshared.mf"/>

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java Fri Dec 29 21:40:07 2017
@@ -531,7 +531,7 @@ public class classlister {
     // for more information.
     //
     if (
-        className.startsWith("org.apache.derby.iapi.reference.DRDAConstants") ||
+        className.startsWith("org.apache.derby.shared.common.reference.DRDAConstants") ||
         className.startsWith("org.apache.derby.shared.common.sanity.SanityState") ||
         className.startsWith("org.apache.derbyPreBuild.ReleaseProperties")
         )
@@ -550,14 +550,14 @@ public class classlister {
 		}
 
 		/*
-			org.apache.derby.iapi.reference.ClassName &
+			org.apache.derby.shared.common.reference.ClassName &
 			RegisteredFormatIds has a list of all registered classes, If we pull this in then
 			we will pull in the complete set of classes. So we add this to our list but don't
 			dependency check it.
 		*/
 		boolean dontCheckDependencies = false;
 		/*
-		if (className.equals("org.apache.derby.iapi.reference.ClassName") ||
+		if (className.equals("org.apache.derby.shared.common.reference.ClassName") ||
 			className.equals("org.apache.derby.iapi.services.io.RegisteredFormatIds")) {
 			dontCheckDependencies = true;
 		}
@@ -706,9 +706,9 @@ public class classlister {
       return
         (
          className.startsWith("org.apache.derby.shared")
-         || className.startsWith("org.apache.derby.iapi.error")
-         || className.startsWith("org.apache.derby.iapi.reference")
-         || className.startsWith("org.apache.derby.iapi.services.info")
+         || className.startsWith("org.apache.derby.shared.common.error")
+         || className.startsWith("org.apache.derby.shared.common.reference")
+         || className.startsWith("org.apache.derby.shared.common.info")
          );
     }
 

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/eclipse/DerbyEclipsePlugin.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/eclipse/DerbyEclipsePlugin.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/eclipse/DerbyEclipsePlugin.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/eclipse/DerbyEclipsePlugin.java Fri Dec 29 21:40:07 2017
@@ -26,8 +26,8 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.InputStream;
-import org.apache.derby.iapi.services.info.ProductGenusNames;
-import org.apache.derby.iapi.services.info.PropertyNames;
+import org.apache.derby.shared.common.info.ProductGenusNames;
+import org.apache.derby.shared.common.info.PropertyNames;
 
 /**
  * This class provides the functionality to create the build related

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents Fri Dec 29 21:40:07 2017
@@ -69,7 +69,6 @@ org.apache.derby.iapi.jdbc.EngineLOB.cla
 org.apache.derby.iapi.jdbc.EnginePreparedStatement.class
 org.apache.derby.iapi.jdbc.EngineResultSet.class
 org.apache.derby.iapi.jdbc.EngineStatement.class
-org.apache.derby.iapi.jdbc.ExceptionFactory.class
 org.apache.derby.iapi.jdbc.FailedProperties40.class
 org.apache.derby.iapi.jdbc.JDBCBoot.class
 org.apache.derby.iapi.jdbc.ResourceAdapter.class
@@ -119,14 +118,10 @@ org.apache.derby.iapi.services.diag.Diag
 org.apache.derby.iapi.services.diag.Diagnosticable.class
 org.apache.derby.iapi.services.diag.DiagnosticableGeneric.class
 org.apache.derby.iapi.services.diag.Performance.class
-org.apache.derby.iapi.services.i18n.BundleFinder.class
-org.apache.derby.iapi.services.i18n.LocaleFinder.class
-org.apache.derby.iapi.services.i18n.MessageService.class
 org.apache.derby.iapi.services.io.AccessibleByteArrayOutputStream.class
 org.apache.derby.iapi.services.io.ApplicationObjectInputStream.class
 org.apache.derby.iapi.services.io.ArrayInputStream.class
 org.apache.derby.iapi.services.io.ArrayOutputStream.class
-org.apache.derby.iapi.services.io.ArrayUtil.class
 org.apache.derby.iapi.services.io.CloneableStream.class
 org.apache.derby.iapi.services.io.CloseFilterInputStream.class
 org.apache.derby.iapi.services.io.CompressedNumber.class
@@ -191,9 +186,6 @@ org.apache.derby.iapi.services.property.
 org.apache.derby.iapi.services.property.PropertySetCallback.class
 org.apache.derby.iapi.services.property.PropertyUtil.class
 org.apache.derby.iapi.services.property.PropertyValidation.class
-org.apache.derby.iapi.services.stream.HeaderPrintWriter.class
-org.apache.derby.iapi.services.stream.InfoStreams.class
-org.apache.derby.iapi.services.stream.PrintWriterGetHeader.class
 org.apache.derby.iapi.services.timer.TimerFactory.class
 org.apache.derby.iapi.services.uuid.UUIDFactory.class
 org.apache.derby.iapi.sql.Activation.class
@@ -1379,10 +1371,10 @@ org.apache.derby.mbeans.CacheManagerMBea
 org.apache.derby.mbeans.JDBCMBean.class
 org.apache.derby.mbeans.Management.class
 org.apache.derby.mbeans.ManagementMBean.class
+org.apache.derby.mbeans.Version.class
 org.apache.derby.mbeans.VersionMBean.class
 org.apache.derby.osgi.EmbeddedActivator.class
 org.apache.derby.security.DatabasePermission.class
-org.apache.derby.security.SystemPermission.class
 org.apache.derby.vti.AwareVTI.class
 org.apache.derby.vti.DeferModification.class
 org.apache.derby.vti.ForeignTableVTI.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyclient.jar.lastcontents Fri Dec 29 21:40:07 2017
@@ -98,7 +98,6 @@ org.apache.derby.client.net.EbcdicCcsidM
 org.apache.derby.client.net.EncodedInputStream.class
 org.apache.derby.client.net.FdocaConstants.class
 org.apache.derby.client.net.FdocaSimpleDataArray.class
-org.apache.derby.client.net.NaiveTrustManager.class
 org.apache.derby.client.net.NetAgent.class
 org.apache.derby.client.net.NetCallableStatement.class
 org.apache.derby.client.net.NetConfiguration.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbynet.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbynet.jar.lastcontents?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbynet.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbynet.jar.lastcontents Fri Dec 29 21:40:07 2017
@@ -28,7 +28,6 @@ org.apache.derby.impl.drda.EbcdicCcsidMa
 org.apache.derby.impl.drda.FailingEXTDTAInputStream.class
 org.apache.derby.impl.drda.FdocaConstants.class
 org.apache.derby.impl.drda.LayerBStreamedEXTDTAReaderInputStream.class
-org.apache.derby.impl.drda.NaiveTrustManager.class
 org.apache.derby.impl.drda.NetworkServerControlImpl.class
 org.apache.derby.impl.drda.NetworkServerMBeanImpl.class
 org.apache.derby.impl.drda.PiggyBackedSessionData.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents Fri Dec 29 21:40:07 2017
@@ -69,7 +69,6 @@ org.apache.derby.iapi.jdbc.EngineLOB.cla
 org.apache.derby.iapi.jdbc.EnginePreparedStatement.class
 org.apache.derby.iapi.jdbc.EngineResultSet.class
 org.apache.derby.iapi.jdbc.EngineStatement.class
-org.apache.derby.iapi.jdbc.ExceptionFactory.class
 org.apache.derby.iapi.jdbc.FailedProperties40.class
 org.apache.derby.iapi.jdbc.JDBCBoot.class
 org.apache.derby.iapi.jdbc.ResourceAdapter.class
@@ -119,14 +118,10 @@ org.apache.derby.iapi.services.diag.Diag
 org.apache.derby.iapi.services.diag.Diagnosticable.class
 org.apache.derby.iapi.services.diag.DiagnosticableGeneric.class
 org.apache.derby.iapi.services.diag.Performance.class
-org.apache.derby.iapi.services.i18n.BundleFinder.class
-org.apache.derby.iapi.services.i18n.LocaleFinder.class
-org.apache.derby.iapi.services.i18n.MessageService.class
 org.apache.derby.iapi.services.io.AccessibleByteArrayOutputStream.class
 org.apache.derby.iapi.services.io.ApplicationObjectInputStream.class
 org.apache.derby.iapi.services.io.ArrayInputStream.class
 org.apache.derby.iapi.services.io.ArrayOutputStream.class
-org.apache.derby.iapi.services.io.ArrayUtil.class
 org.apache.derby.iapi.services.io.CloneableStream.class
 org.apache.derby.iapi.services.io.CloseFilterInputStream.class
 org.apache.derby.iapi.services.io.CompressedNumber.class
@@ -192,9 +187,6 @@ org.apache.derby.iapi.services.property.
 org.apache.derby.iapi.services.property.PropertySetCallback.class
 org.apache.derby.iapi.services.property.PropertyUtil.class
 org.apache.derby.iapi.services.property.PropertyValidation.class
-org.apache.derby.iapi.services.stream.HeaderPrintWriter.class
-org.apache.derby.iapi.services.stream.InfoStreams.class
-org.apache.derby.iapi.services.stream.PrintWriterGetHeader.class
 org.apache.derby.iapi.services.timer.TimerFactory.class
 org.apache.derby.iapi.services.uuid.UUIDFactory.class
 org.apache.derby.iapi.sql.Activation.class
@@ -1382,10 +1374,10 @@ org.apache.derby.mbeans.CacheManagerMBea
 org.apache.derby.mbeans.JDBCMBean.class
 org.apache.derby.mbeans.Management.class
 org.apache.derby.mbeans.ManagementMBean.class
+org.apache.derby.mbeans.Version.class
 org.apache.derby.mbeans.VersionMBean.class
 org.apache.derby.osgi.EmbeddedActivator.class
 org.apache.derby.security.DatabasePermission.class
-org.apache.derby.security.SystemPermission.class
 org.apache.derby.vti.AwareVTI.class
 org.apache.derby.vti.DeferModification.class
 org.apache.derby.vti.ForeignTableVTI.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyclient.jar.lastcontents Fri Dec 29 21:40:07 2017
@@ -98,7 +98,6 @@ org.apache.derby.client.net.EbcdicCcsidM
 org.apache.derby.client.net.EncodedInputStream.class
 org.apache.derby.client.net.FdocaConstants.class
 org.apache.derby.client.net.FdocaSimpleDataArray.class
-org.apache.derby.client.net.NaiveTrustManager.class
 org.apache.derby.client.net.NetAgent.class
 org.apache.derby.client.net.NetCallableStatement.class
 org.apache.derby.client.net.NetConfiguration.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbynet.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbynet.jar.lastcontents?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbynet.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbynet.jar.lastcontents Fri Dec 29 21:40:07 2017
@@ -28,7 +28,6 @@ org.apache.derby.impl.drda.EbcdicCcsidMa
 org.apache.derby.impl.drda.FailingEXTDTAInputStream.class
 org.apache.derby.impl.drda.FdocaConstants.class
 org.apache.derby.impl.drda.LayerBStreamedEXTDTAReaderInputStream.class
-org.apache.derby.impl.drda.NaiveTrustManager.class
 org.apache.derby.impl.drda.NetworkServerControlImpl.class
 org.apache.derby.impl.drda.NetworkServerMBeanImpl.class
 org.apache.derby.impl.drda.PiggyBackedSessionData.class

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java Fri Dec 29 21:40:07 2017
@@ -24,7 +24,7 @@ package org.apache.derbyBuild;
 import java.io.*;
 import java.util.*;
 
-import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.shared.common.i18n.MessageService;
 import org.apache.derby.shared.common.reference.SQLState;
 
 public class splitmessages {

Modified: db/derby/code/trunk/java/build/org/apache/derbyPreBuild/ReleaseProperties.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyPreBuild/ReleaseProperties.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyPreBuild/ReleaseProperties.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyPreBuild/ReleaseProperties.java Fri Dec 29 21:40:07 2017
@@ -75,7 +75,7 @@ public class ReleaseProperties extends T
         "# See the License for the specific language governing permissions and" + LS +
         "# limitations under the License." + LS + LS;
     
-	public final static int	MAINT_ENCODING = org.apache.derby.iapi.services.info.PropertyNames.MAINT_ENCODING;
+	public final static int	MAINT_ENCODING = org.apache.derby.shared.common.info.PropertyNames.MAINT_ENCODING;
     private final static int MAINT_LENGTH = 7;
 
     private final   static  String  DRDA_MAINT = "drdamaint";

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java Fri Dec 29 21:40:07 2017
@@ -29,7 +29,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.StringTokenizer;
 
-import org.apache.derby.iapi.services.info.JVMInfo;
+import org.apache.derby.shared.common.info.JVMInfo;
 import org.apache.derby.shared.common.reference.SQLState;
 
 // Note:

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientTypes.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientTypes.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientTypes.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientTypes.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 package org.apache.derby.client.am;
 
 import java.sql.Types;
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 
 // This enumeration of types represents the typing scheme used by our jdbc driver.
 // Once this is finished, we need to review our switches to make sure they are exhaustive

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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -26,7 +26,7 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Hashtable;
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 import org.apache.derby.shared.common.reference.JDBC40Translation;
 import org.apache.derby.shared.common.reference.SQLState;
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java Fri Dec 29 21:40:07 2017
@@ -28,8 +28,8 @@ import java.security.PrivilegedActionExc
 import java.security.PrivilegedExceptionAction;
 import java.sql.Connection;
 
-import org.apache.derby.iapi.services.info.ProductGenusNames;
-import org.apache.derby.iapi.services.info.ProductVersionHolder;
+import org.apache.derby.shared.common.info.ProductGenusNames;
+import org.apache.derby.shared.common.info.ProductVersionHolder;
 import org.apache.derby.shared.common.reference.SQLState;
 
 public class Configuration {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 package org.apache.derby.client.am;
 
 import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 
 import java.nio.charset.Charset;
 import java.sql.Date;

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/DssConstants.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.client.net;
 
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 
 class DssConstants {
     static final int MAX_DSS_LEN = DRDAConstants.DATA_STREAM_STRUCTURE_MAX_LENGTH;

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConfiguration.java Fri Dec 29 21:40:07 2017
@@ -20,7 +20,7 @@
 */
 package org.apache.derby.client.net;
 
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 import org.apache.derby.client.am.Version;
 
 public class NetConfiguration {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java Fri Dec 29 21:40:07 2017
@@ -46,7 +46,7 @@ import org.apache.derby.client.am.Sectio
 import org.apache.derby.client.am.SqlException;
 import org.apache.derby.client.am.ClientTypes;
 import org.apache.derby.client.am.Utils;
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 import org.apache.derby.shared.common.reference.SQLState;
 
 // For performance, should we worry about the ordering of our DDM command parameters

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/Request.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/Request.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/Request.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/Request.java Fri Dec 29 21:40:07 2017
@@ -28,7 +28,7 @@ import org.apache.derby.client.am.Client
 import org.apache.derby.client.am.SqlException;
 import org.apache.derby.shared.common.reference.SQLState;
 import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java Fri Dec 29 21:40:07 2017
@@ -35,7 +35,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 
 /**

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java Fri Dec 29 21:40:07 2017
@@ -30,7 +30,7 @@ import java.security.CodeSource;
 import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
 import java.util.Properties;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
 import org.apache.derby.iapi.services.property.PropertyUtil;
 import org.apache.derby.impl.drda.NetworkServerControlImpl;
 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy Fri Dec 29 21:40:07 2017
@@ -22,7 +22,7 @@ grant codeBase "${derby.install.url}derb
   permission java.lang.RuntimePermission "createClassLoader";
   permission java.util.PropertyPermission "derby.*", "read";
   permission java.util.PropertyPermission "user.dir", "read";
-  permission org.apache.derby.security.SystemPermission "engine", "usederbyinternals";
+  permission org.apache.derby.shared.common.security.SystemPermission "engine", "usederbyinternals";
 
   // The next two properties are used to determine if the VM is 32 or 64 bit.
   //
@@ -84,9 +84,9 @@ grant codeBase "${derby.install.url}derb
   // to create a whole set of fine-grained permissions to allow specific users
   // access to MBeans and actions they perform.
   //
-  permission org.apache.derby.security.SystemPermission "jmx", "control";
-  permission org.apache.derby.security.SystemPermission "engine", "monitor";
-  permission org.apache.derby.security.SystemPermission "server", "monitor";
+  permission org.apache.derby.shared.common.security.SystemPermission "jmx", "control";
+  permission org.apache.derby.shared.common.security.SystemPermission "engine", "monitor";
+  permission org.apache.derby.shared.common.security.SystemPermission "server", "monitor";
 
   // getProtectionDomain is an optional permission needed for printing
   // classpath information to derby.log
@@ -118,8 +118,8 @@ grant codeBase "${derby.install.url}derb
   // In that case the application would need to create
   // a whole set of fine-grained permissions to allow specific
   // users access to MBeans and actions they perform.
-  permission org.apache.derby.security.SystemPermission "engine", "monitor";
-  permission org.apache.derby.security.SystemPermission "server", "monitor";  
+  permission org.apache.derby.shared.common.security.SystemPermission "engine", "monitor";
+  permission org.apache.derby.shared.common.security.SystemPermission "server", "monitor";  
 };
 
 
@@ -156,9 +156,9 @@ grant codeBase "${derby.install.url}derb
 
   // Needed for NetworkServerMBean access (see JMX section above)
   //
-  permission org.apache.derby.security.SystemPermission "server",
+  permission org.apache.derby.shared.common.security.SystemPermission "server",
       "control,monitor";
-  permission org.apache.derby.security.SystemPermission "engine", "usederbyinternals";
+  permission org.apache.derby.shared.common.security.SystemPermission "engine", "usederbyinternals";
 
   // Needed by sysinfo. The file permission is needed to check the existence of
   // jars on the classpath. You can limit this permission to just the locations

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/template.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/template.policy?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/template.policy (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/template.policy Fri Dec 29 21:40:07 2017
@@ -24,7 +24,7 @@ grant codeBase "${derby.install.url}derb
   // These permissions are needed for everyday, embedded Derby usage.
   //
   permission java.lang.RuntimePermission "createClassLoader";
-  permission org.apache.derby.security.SystemPermission "engine", "usederbyinternals";
+  permission org.apache.derby.shared.common.security.SystemPermission "engine", "usederbyinternals";
 
   // Next, the permission to read "derby.*" properties is granted to
   // derby.jar. This is necessary for the engine to read derby properties.
@@ -109,8 +109,8 @@ grant codeBase "${derby.install.url}derb
   // In that case the application would need to create
   // a whole set of fine-grained permissions to allow specific
   // users access to MBeans and actions they perform.
-  permission org.apache.derby.security.SystemPermission "engine", "monitor";
-  permission org.apache.derby.security.SystemPermission "server", "monitor";  
+  permission org.apache.derby.shared.common.security.SystemPermission "engine", "monitor";
+  permission org.apache.derby.shared.common.security.SystemPermission "server", "monitor";  
 };
 
 
@@ -148,7 +148,7 @@ grant codeBase "${derby.install.url}derb
       "read, write";
 
   // Needed to start the monitoring MBeans
-  permission org.apache.derby.security.SystemPermission "engine", "usederbyinternals";
+  permission org.apache.derby.shared.common.security.SystemPermission "engine", "usederbyinternals";
 
   // JMX: Uncomment this permission to allow the ping operation of the
   //      NetworkServerMBean to connect to the Network Server.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java Fri Dec 29 21:40:07 2017
@@ -20,7 +20,7 @@
  */
 
 package org.apache.derby.impl.drda;
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 import org.apache.derby.shared.common.error.MessageUtils;
 import org.apache.derby.shared.common.sanity.SanityManager;
 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java Fri Dec 29 21:40:07 2017
@@ -35,8 +35,8 @@ import java.nio.charset.CodingErrorActio
 import java.sql.DataTruncation;
 import java.sql.SQLException;
 import java.util.Arrays;
-import org.apache.derby.iapi.reference.DRDAConstants;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.Property;
 import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
 import org.apache.derby.iapi.services.property.PropertyUtil;
 import org.apache.derby.shared.common.sanity.SanityManager;

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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -52,21 +52,21 @@ import java.util.Properties;
 import java.util.TimeZone;
 import org.apache.derby.catalog.SystemProcedures;
 import org.apache.derby.shared.common.error.ExceptionSeverity;
-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.jdbc.EngineLOB;
 import org.apache.derby.iapi.jdbc.EngineStatement;
 import org.apache.derby.iapi.jdbc.EnginePreparedStatement;
 import org.apache.derby.shared.common.reference.Attribute;
-import org.apache.derby.iapi.reference.DRDAConstants;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.Property;
 import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.services.info.JVMInfo;
+import org.apache.derby.shared.common.info.JVMInfo;
 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.shared.common.error.MessageUtils;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 import org.apache.derby.iapi.util.StringUtil;
 import org.apache.derby.impl.jdbc.Util;

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java Fri Dec 29 21:40:07 2017
@@ -30,7 +30,7 @@ import java.sql.Clob;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import org.apache.derby.iapi.jdbc.EngineResultSet;
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 import org.apache.derby.shared.common.sanity.SanityManager;
 import org.apache.derby.impl.jdbc.Util;
 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java Fri Dec 29 21:40:07 2017
@@ -22,9 +22,9 @@ package org.apache.derby.impl.drda;
 
 import java.io.IOException;
 import java.io.InputStream;
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 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.io.DerbyIOException;
 import org.apache.derby.shared.common.reference.MessageId;
 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java Fri Dec 29 21:40:07 2017
@@ -22,8 +22,8 @@ package org.apache.derby.impl.drda;
 
 import java.sql.SQLException;
 import java.sql.Types;
-import org.apache.derby.iapi.reference.DRDAConstants;
-import org.apache.derby.iapi.reference.Limits;
+import org.apache.derby.shared.common.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.Limits;
 
 class FdocaConstants
 {

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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -59,19 +59,19 @@ import javax.net.ssl.SSLServerSocketFact
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 import org.apache.derby.drda.NetworkServerControl;
-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.jdbc.DRDAServerStarter;
 import org.apache.derby.shared.common.reference.Attribute;
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 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.i18n.MessageService;
-import org.apache.derby.iapi.services.info.ProductGenusNames;
-import org.apache.derby.iapi.services.info.ProductVersionHolder;
-import org.apache.derby.iapi.services.info.Version;
+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.mbeans.Version;
 import org.apache.derby.iapi.services.jmx.ManagementService;
 import org.apache.derby.iapi.services.monitor.Monitor;
 import org.apache.derby.iapi.services.property.PropertyUtil;
@@ -82,7 +82,7 @@ import org.apache.derby.iapi.util.String
 import org.apache.derby.impl.jdbc.Util;
 import org.apache.derby.mbeans.VersionMBean;
 import org.apache.derby.mbeans.drda.NetworkServerMBean;
-import org.apache.derby.security.SystemPermission;
+import org.apache.derby.shared.common.security.SystemPermission;
 import org.apache.derby.shared.common.error.MessageUtils;
 import org.apache.derby.shared.common.drda.NaiveTrustManager;
 
@@ -1216,7 +1216,7 @@ public final class NetworkServerControlI
      * <li> the given user needs to be covered by a grant:
      *      principal org.apache.derby.authentication.SystemPrincipal "..." {}
      * <li> that lists a shutdown permission:
-     *      permission org.apache.derby.security.SystemPermission "shutdown";
+     *      permission org.apache.derby.shared.common.security.SystemPermission "shutdown";
      * </ul>
      * or it will fail with a SQLException detailing the cause.
      *

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java Fri Dec 29 21:40:07 2017
@@ -24,11 +24,11 @@ package org.apache.derby.impl.drda;
 import java.security.AccessControlException;
 import java.security.AccessController;
 import org.apache.derby.drda.NetworkServerControl;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
 import org.apache.derby.iapi.services.monitor.Monitor;
 import org.apache.derby.iapi.services.property.PropertyUtil;
 import org.apache.derby.mbeans.drda.NetworkServerMBean;
-import org.apache.derby.security.SystemPermission;
+import org.apache.derby.shared.common.security.SystemPermission;
 
 /**
  * <p>
@@ -458,9 +458,9 @@ class NetworkServerMBeanImpl implements
     *  Gets the value of a specific network server setting (property). 
     *  Most server-related property keys have the prefix 
     *  <code>derby.drda.</code> and may be found in the 
-    *  org.apache.derby.iapi.reference.Property class.
+    *  org.apache.derby.shared.common.reference.Property class.
     * 
-    *  @see org.apache.derby.iapi.reference.Property
+    *  @see org.apache.derby.shared.common.reference.Property
     *  @param property the name of the server property
     *  @return the value of the given server property
     */

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.impl.drda;
 
 import java.sql.SQLException;
 import java.sql.Types;
-import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.shared.common.reference.DRDAConstants;
 
 class SQLTypes {
 

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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -29,8 +29,8 @@ import org.apache.derby.shared.common.er
 import org.apache.derby.iapi.jdbc.EngineConnection;
 import org.apache.derby.iapi.jdbc.ResourceAdapter;
 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.shared.common.i18n.MessageService;
+import org.apache.derby.shared.common.info.JVMInfo;
 import org.apache.derby.jdbc.EmbeddedXADataSourceInterface;
 import org.apache.derby.jdbc.EmbeddedXADataSource;
 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java Fri Dec 29 21:40:07 2017
@@ -44,7 +44,7 @@ package org.apache.derby.mbeans.drda;
  * For more information on Managed Beans, refer to the JMX specification.</p>
  *
  * @see org.apache.derby.drda.NetworkServerControl
- * @see org.apache.derby.security.SystemPermission
+ * @see org.apache.derby.shared.common.security.SystemPermission
  * @see <a href="../package-summary.html"><code>org.apache.derby.mbeans</code></a>
  */
 public interface NetworkServerMBean {

Modified: db/derby/code/trunk/java/engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/build.xml?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/build.xml (original)
+++ db/derby/code/trunk/java/engine/build.xml Fri Dec 29 21:40:07 2017
@@ -52,7 +52,6 @@
  
   <target name="engine"
           description="Build Derby engine">
-    <ant dir="${derby.engine.dir}/iapi/reference"/>
     <ant dir="${derby.engine.dir}/authentication"/>
     <ant dir="${derby.engine.dir}/security"/>
     <ant dir="${derby.engine.dir}/io"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.catalog;
 
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
 
 /**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/Java5SystemProcedures.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/Java5SystemProcedures.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/Java5SystemProcedures.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/Java5SystemProcedures.java Fri Dec 29 21:40:07 2017
@@ -26,8 +26,8 @@ import java.security.PrivilegedAction;
 import java.sql.SQLException;
 
 import org.apache.derby.iapi.sql.dictionary.OptionalTool;
-import org.apache.derby.iapi.error.PublicAPI;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.PublicAPI;
+import org.apache.derby.shared.common.error.StandardException;
 import org.apache.derby.shared.common.reference.SQLState;
 import org.apache.derby.iapi.services.context.Context;
 import org.apache.derby.iapi.services.context.ContextService;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java Fri Dec 29 21:40:07 2017
@@ -39,14 +39,14 @@ import java.util.StringTokenizer;
 import org.apache.derby.catalog.AliasInfo;
 import org.apache.derby.iapi.db.Factory;
 import org.apache.derby.iapi.db.PropertyInfo;
-import org.apache.derby.iapi.error.PublicAPI;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.error.PublicAPI;
+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.security.Securable;
 import org.apache.derby.iapi.security.SecurityUtil;
 import org.apache.derby.iapi.services.cache.CacheManager;
-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.property.PropertyUtil;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java Fri Dec 29 21:40:07 2017
@@ -27,7 +27,7 @@ import java.io.ObjectOutput;
 import java.sql.Types;
 import org.apache.derby.catalog.TypeDescriptor;
 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.io.Formatable;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.shared.common.sanity.SanityManager;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.catalog.types;
 
-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/catalog/types/IndexDescriptorImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.catalog.types;
 
 import org.apache.derby.catalog.IndexDescriptor;
 
-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.io.StoredFormatIds;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java Fri Dec 29 21:40:07 2017
@@ -22,7 +22,7 @@
 package org.apache.derby.catalog.types;
 
 
-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.io.StoredFormatIds;
 import org.apache.derby.catalog.ReferencedColumns;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java Fri Dec 29 21:40:07 2017
@@ -22,7 +22,7 @@
 package org.apache.derby.catalog.types;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.services.io.ArrayUtil;
+import org.apache.derby.shared.common.util.ArrayUtil;
 import org.apache.derby.catalog.TypeDescriptor;
 import java.io.IOException;
 import java.io.ObjectInput;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RowMultiSetImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RowMultiSetImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RowMultiSetImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RowMultiSetImpl.java Fri Dec 29 21:40:07 2017
@@ -22,7 +22,7 @@
 package org.apache.derby.catalog.types;
 import org.apache.derby.catalog.TypeDescriptor;
 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 java.io.ObjectOutput;
 import java.io.ObjectInput;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.catalog.types;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.util.IdUtil;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 
 import java.sql.Types;
 import java.io.ObjectOutput;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/ContainedRoles.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/ContainedRoles.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/ContainedRoles.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/ContainedRoles.java Fri Dec 29 21:40:07 2017
@@ -30,9 +30,9 @@ import org.apache.derby.iapi.sql.diction
 import org.apache.derby.iapi.sql.dictionary.RoleClosureIterator;
 import org.apache.derby.iapi.sql.dictionary.RoleGrantDescriptor;
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.Limits;
-import org.apache.derby.iapi.error.PublicAPI;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.reference.Limits;
+import org.apache.derby.shared.common.error.PublicAPI;
 import org.apache.derby.iapi.util.IdUtil;
 import org.apache.derby.vti.VTITemplate;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/DiagUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/DiagUtil.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/DiagUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/DiagUtil.java Fri Dec 29 21:40:07 2017
@@ -24,7 +24,7 @@ package org.apache.derby.diag;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-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.context.Context;
 import org.apache.derby.iapi.services.context.ContextService;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java Fri Dec 29 21:40:07 2017
@@ -33,11 +33,11 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
 import org.apache.derby.vti.VTITemplate;
-import org.apache.derby.iapi.reference.Limits;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Limits;
+import org.apache.derby.shared.common.reference.Property;
 import org.apache.derby.iapi.util.StringUtil;
 
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
 

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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -28,10 +28,10 @@ import java.util.Properties;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 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.shared.common.i18n.MessageService;
+import org.apache.derby.shared.common.reference.Limits;
 import org.apache.derby.iapi.util.StringUtil;
 
 import org.apache.derby.vti.VTITemplate;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java Fri Dec 29 21:40:07 2017
@@ -30,11 +30,11 @@ 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.sql.conn.ConnectionUtil;
 import org.apache.derby.iapi.store.access.TransactionController;
-import org.apache.derby.iapi.error.PublicAPI;
+import org.apache.derby.shared.common.error.PublicAPI;
 
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.diag;
 
 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.conn.ConnectionUtil;
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
@@ -33,7 +33,7 @@ import org.apache.derby.iapi.sql.diction
 import org.apache.derby.iapi.store.access.TransactionController;
 import org.apache.derby.iapi.store.access.ConglomerateController;
 import org.apache.derby.iapi.store.access.SpaceInfo;
-import org.apache.derby.iapi.error.PublicAPI;
+import org.apache.derby.shared.common.error.PublicAPI;
 
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java Fri Dec 29 21:40:07 2017
@@ -30,8 +30,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Vector;
 
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.Limits;
+import org.apache.derby.shared.common.error.StandardException;
+import org.apache.derby.shared.common.reference.Limits;
 import org.apache.derby.iapi.services.cache.CacheManager;
 import org.apache.derby.iapi.services.context.Context;
 import org.apache.derby.iapi.services.context.ContextService;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java Fri Dec 29 21:40:07 2017
@@ -36,11 +36,11 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.util.Locale;
 import org.apache.derby.vti.VTITemplate;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
-import org.apache.derby.iapi.reference.Limits;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Limits;
+import org.apache.derby.shared.common.reference.Property;
 import org.apache.derby.iapi.util.StringUtil;
 
 /**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.diag;
 
-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.conn.ConnectionUtil;
 import org.apache.derby.iapi.store.access.TransactionInfo;
@@ -33,7 +33,7 @@ import org.apache.derby.vti.VTIEnvironme
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
 
-import org.apache.derby.iapi.reference.Limits;
+import org.apache.derby.shared.common.reference.Limits;
 import org.apache.derby.iapi.util.StringUtil;
 
 import java.sql.ResultSetMetaData;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java Fri Dec 29 21:40:07 2017
@@ -21,8 +21,8 @@
 
 package org.apache.derby.iapi.db;
 
-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;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java Fri Dec 29 21:40:07 2017
@@ -22,12 +22,12 @@
 package org.apache.derby.iapi.db;
 
 import org.apache.derby.iapi.services.context.ContextManager;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 import org.apache.derby.iapi.sql.ResultSet;
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
 import org.apache.derby.iapi.jdbc.AuthenticationService;
-import org.apache.derby.iapi.services.i18n.LocaleFinder;
+import org.apache.derby.shared.common.i18n.LocaleFinder;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.sql.Date;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java Fri Dec 29 21:40:07 2017
@@ -21,8 +21,8 @@
 
 package org.apache.derby.iapi.db;
 
-import org.apache.derby.iapi.error.PublicAPI;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.PublicAPI;
+import org.apache.derby.shared.common.error.StandardException;
 
 import org.apache.derby.iapi.security.Securable;
 import org.apache.derby.iapi.security.SecurityUtil;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java Fri Dec 29 21:40:07 2017
@@ -39,8 +39,9 @@ import java.sql.Statement;
 import java.sql.Struct;
 import java.util.Properties;
 import java.util.concurrent.Executor;
-import org.apache.derby.iapi.error.SQLWarningFactory;
+import org.apache.derby.shared.common.error.SQLWarningFactory;
 import org.apache.derby.shared.common.reference.SQLState;
+import org.apache.derby.shared.common.error.ExceptionFactory;
 
 /**
  * This is a rudimentary connection that delegates

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java Fri Dec 29 21:40:07 2017
@@ -21,6 +21,7 @@
 
 package org.apache.derby.iapi.jdbc;
 
+import org.apache.derby.shared.common.error.ExceptionFactory;
 import org.apache.derby.shared.common.reference.SQLState;
 
 import java.sql.Connection;

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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -26,7 +26,7 @@ import org.apache.derby.iapi.services.mo
 import org.apache.derby.iapi.services.monitor.ModuleControl;
 import org.apache.derby.iapi.services.monitor.ModuleFactory;
 import org.apache.derby.shared.common.reference.MessageId;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
 import java.io.PrintWriter;
 import java.lang.Runnable;
 import java.lang.Thread;

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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -25,9 +25,9 @@ import java.io.PrintWriter;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 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.iapi.services.monitor.Monitor;
 import org.apache.derby.iapi.services.property.PropertyUtil;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java Fri Dec 29 21:40:07 2017
@@ -25,7 +25,7 @@ import javax.transaction.xa.XAException;
 import org.apache.derby.iapi.services.context.ContextService;
 import org.apache.derby.iapi.store.access.xa.XAResourceManager;
 import org.apache.derby.iapi.store.access.xa.XAXactId;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 
 /**
 	The resource adapter is the clearing house for managing connections,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/security/SecurityUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/security/SecurityUtil.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/security/SecurityUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/security/SecurityUtil.java Fri Dec 29 21:40:07 2017
@@ -37,7 +37,7 @@ import javax.security.auth.Subject;
 
 import org.apache.derby.authentication.SystemPrincipal;
 import org.apache.derby.catalog.AliasInfo;
-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;
 import org.apache.derby.iapi.sql.conn.Authorizer;
@@ -47,7 +47,7 @@ import org.apache.derby.iapi.sql.diction
 import org.apache.derby.iapi.sql.dictionary.StatementPermission;
 import org.apache.derby.iapi.sql.dictionary.StatementRoutinePermission;
 import org.apache.derby.iapi.util.IdUtil;
-import org.apache.derby.security.SystemPermission;
+import org.apache.derby.shared.common.security.SystemPermission;
 
 /**
  * This class provides helper functions for security-related features.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.iapi.services.cache;
 
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 import org.apache.derby.iapi.services.daemon.DaemonService;
 
 import org.apache.derby.iapi.util.Matchable;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.iapi.services.cache;
 
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 
 /**
 	Any object that implements this interface can be cached using the services of

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java Fri Dec 29 21:40:07 2017
@@ -22,7 +22,7 @@
 package org.apache.derby.iapi.services.compiler;
 
 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.iapi.util.ByteArray;
 
 /**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.iapi.services.context;
 
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 
 /**
  * Contexts are created and used to manage the execution

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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -22,22 +22,22 @@
 package org.apache.derby.iapi.services.context;
 
 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.error.ErrorStringBuilder;
-import org.apache.derby.iapi.error.PassThroughException;
+import org.apache.derby.shared.common.error.ErrorStringBuilder;
+import org.apache.derby.shared.common.error.PassThroughException;
 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.error.ExceptionUtil;
 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 org.apache.derby.shared.common.error.ExceptionSeverity;
-import org.apache.derby.iapi.services.i18n.LocaleFinder;
-import org.apache.derby.iapi.services.info.JVMInfo;
+import org.apache.derby.shared.common.i18n.LocaleFinder;
+import org.apache.derby.shared.common.info.JVMInfo;
 
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -45,7 +45,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Collections;
 import java.util.Locale;
-import org.apache.derby.iapi.reference.ContextId;
+import org.apache.derby.shared.common.reference.ContextId;
 
 /**
  *
@@ -297,7 +297,7 @@ public class ContextManager
 			
 			if (!shutdown)		// Do this only during normal processing.
 			{	
-				ContextImpl sc = (ContextImpl) getContext(org.apache.derby.iapi.reference.ContextId.LANG_STATEMENT);
+				ContextImpl sc = (ContextImpl) getContext(org.apache.derby.shared.common.reference.ContextId.LANG_STATEMENT);
 				// Output the SQL statement that failed in the log file.
 				if (sc != null)
 				{					

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java Fri Dec 29 21:40:07 2017
@@ -30,7 +30,7 @@ import org.apache.derby.shared.common.er
 import org.apache.derby.iapi.security.SecurityUtil;
 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;
 
 /**
 	A set of static methods to supply easier access to contexts.

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=1819522&r1=1819521&r2=1819522&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 Fri Dec 29 21:40:07 2017
@@ -25,7 +25,7 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 
 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.iapi.services.monitor.ModuleFactory;
 import org.apache.derby.iapi.services.monitor.Monitor;
 import org.apache.derby.shared.common.error.ExceptionSeverity;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.iapi.services.crypto;
 
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 import java.security.SecureRandom;
 import java.util.Properties;
 import org.apache.derby.io.StorageFactory;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactoryBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactoryBuilder.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactoryBuilder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactoryBuilder.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 
 package org.apache.derby.iapi.services.crypto;
-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/iapi/services/crypto/CipherProvider.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derby.iapi.services.c
 
 import java.security.Key;
 
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 
 /**
 	A CipherProvider is a wrapper for a Cipher class in JCE.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.iapi.services.daemon;
 
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 
 /**
 	Daemon Factory can create new DaemonService, which runs on seperate

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/IndexStatisticsDaemon.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/IndexStatisticsDaemon.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/IndexStatisticsDaemon.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/IndexStatisticsDaemon.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.iapi.services.daemon;
 
-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.ConglomerateDescriptor;
 import org.apache.derby.iapi.sql.dictionary.TableDescriptor;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java Fri Dec 29 21:40:07 2017
@@ -22,7 +22,7 @@
 package org.apache.derby.iapi.services.daemon;
 
 import org.apache.derby.iapi.services.context.ContextManager;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 
 /**
   To use a DaemonService, one implements the Serviceable interface.  Only one

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
 
 package org.apache.derby.iapi.services.diag;
 
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
 
 import java.util.Properties;
 



Mime
View raw message