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 [16/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/der...
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java Fri Dec 29 21:40:07 2017
@@ -25,10 +25,10 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.context.ContextService;
import org.apache.derby.iapi.services.monitor.ModuleFactory;
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.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 java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/T_Bombable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/T_Bombable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/T_Bombable.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/T_Bombable.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derbyTesting.unitTests.harness;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
public interface T_Bombable
{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/T_Generic.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/T_Generic.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/T_Generic.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/T_Generic.java Fri Dec 29 21:40:07 2017
@@ -26,9 +26,9 @@ import org.apache.derby.iapi.services.mo
import org.apache.derbyTesting.unitTests.harness.UnitTest;
import org.apache.derbyTesting.unitTests.harness.UnitTestConstants;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
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.sanity.SanityManager;
import java.util.Properties;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/UnitTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/UnitTest.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/UnitTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/UnitTest.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derbyTesting.unitTests.harness;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
/**
* The UnitTest interface is implemented by the class
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java Fri Dec 29 21:40:07 2017
@@ -24,7 +24,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import junit.framework.Test;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.jdbc.CharacterStreamDescriptor;
import org.apache.derby.iapi.types.PositionedStream;
import org.apache.derbyTesting.junit.BaseTestCase;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.policy?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.policy (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.policy Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ grant codeBase "${derbyTesting.codejar}d
permission java.lang.RuntimePermission "setSecurityManager";
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.
//
@@ -87,9 +87,9 @@ grant codeBase "${derbyTesting.codejar}d
// 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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest1.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest1.policy?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest1.policy (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest1.policy Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@ grant codeBase "${derbyTesting.codejar}d
//
permission java.lang.RuntimePermission "createClassLoader";
permission java.lang.RuntimePermission "setSecurityManager";
- permission org.apache.derby.security.SystemPermission "engine", "usederbyinternals";
+ permission org.apache.derby.shared.common.security.SystemPermission "engine", "usederbyinternals";
//
// **** Removed these for this test:
// permission java.util.PropertyPermission "derby.*", "read";
@@ -89,9 +89,9 @@ grant codeBase "${derbyTesting.codejar}d
// 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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest2.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest2.policy?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest2.policy (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest2.policy Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ grant codeBase "${derbyTesting.codejar}d
permission java.lang.RuntimePermission "setSecurityManager";
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.
//
@@ -81,9 +81,9 @@ grant codeBase "${derbyTesting.codejar}d
// 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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java Fri Dec 29 21:40:07 2017
@@ -44,10 +44,10 @@ import java.util.Set;
import javax.security.auth.Subject;
import junit.framework.Test;
import org.apache.derby.authentication.SystemPrincipal;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.util.IdUtil;
import org.apache.derby.security.DatabasePermission;
-import org.apache.derby.security.SystemPermission;
+import org.apache.derby.shared.common.security.SystemPermission;
import org.apache.derbyTesting.junit.BaseTestCase;
import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.policy?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.policy (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.policy Fri Dec 29 21:40:07 2017
@@ -45,7 +45,7 @@
// Specific test authorizations for System Privileges
grant principal org.apache.derby.authentication.SystemPrincipal "AUTHORIZEDSYSTEMUSER" {
- permission org.apache.derby.security.SystemPermission "server", "shutdown";
+ permission org.apache.derby.shared.common.security.SystemPermission "server", "shutdown";
permission org.apache.derby.security.DatabasePermission "directory:*", "create";
permission org.apache.derby.security.DatabasePermission "directory:level0/level1/-", "create";
permission org.apache.derby.security.DatabasePermission "directory:/*", "create";
@@ -54,7 +54,7 @@ grant principal org.apache.derby.authent
// Specific test authorizations for System Privileges
grant principal org.apache.derby.authentication.SystemPrincipal "SUPERUSER" {
- permission org.apache.derby.security.SystemPermission "server", "shutdown";
+ permission org.apache.derby.shared.common.security.SystemPermission "server", "shutdown";
permission org.apache.derby.security.DatabasePermission "directory:<<ALL FILES>>", "create";
};
@@ -89,7 +89,7 @@ grant codeBase "${derbyTesting.testjar}d
grant codeBase "${derbyTesting.codejar}derby.jar" {
// System Privileges framework needs to run "doAsPrivileged"
//permission javax.security.auth.AuthPermission "doAsPrivileged";
- permission org.apache.derby.security.SystemPermission "engine", "usederbyinternals";
+ permission org.apache.derby.shared.common.security.SystemPermission "engine", "usederbyinternals";
// System Privileges framework needs to resolve relative directory names,
// which requires a property-read permission
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest1.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest1.policy?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest1.policy (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest1.policy Fri Dec 29 21:40:07 2017
@@ -69,7 +69,7 @@ grant codeBase "${derbyTesting.testjar}d
grant codeBase "${derbyTesting.codejar}derby.jar" {
// System Privileges framework needs to run "doAsPrivileged"
//permission javax.security.auth.AuthPermission "doAsPrivileged";
- permission org.apache.derby.security.SystemPermission "engine", "usederbyinternals";
+ permission org.apache.derby.shared.common.security.SystemPermission "engine", "usederbyinternals";
// System Privileges framework needs to resolve relative directory names,
// which requires a property-read permission
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/EmptyResultSetStatisticsFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/EmptyResultSetStatisticsFactory.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/EmptyResultSetStatisticsFactory.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/EmptyResultSetStatisticsFactory.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derbyTesting.unitTest
import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.sql.Activation;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/T_Like.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/T_Like.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/T_Like.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/lang/T_Like.java Fri Dec 29 21:40:07 2017
@@ -27,11 +27,11 @@ import org.apache.derbyTesting.unitTests
import org.apache.derby.iapi.types.*;
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.sql.execute.ExecutionFactory;
-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/testing/org/apache/derbyTesting/unitTests/services/D_T_DiagTestClass1.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/D_T_DiagTestClass1.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/D_T_DiagTestClass1.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/D_T_DiagTestClass1.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derbyTesting.unitTests.services;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.diag.DiagnosticableGeneric;
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheException.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheException.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheException.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derbyTesting.unitTests.services;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheService.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheService.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheService.java Fri Dec 29 21:40:07 2017
@@ -34,7 +34,7 @@ import org.apache.derby.iapi.services.da
import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
public class T_CacheService extends T_Generic implements CacheableFactory {
@@ -52,7 +52,7 @@ public class T_CacheService extends T_Ge
DaemonFactory df;
try {
cf = (CacheFactory) startSystemModule(getModuleToTestProtocolName());
- df = (DaemonFactory) startSystemModule(org.apache.derby.iapi.reference.Module.DaemonFactory);
+ df = (DaemonFactory) startSystemModule(org.apache.derby.shared.common.reference.Module.DaemonFactory);
} catch (StandardException mse) {
throw T_Fail.exceptionFail(mse);
}
@@ -60,7 +60,7 @@ public class T_CacheService extends T_Ge
throw T_Fail.testFailMsg(getModuleToTestProtocolName() + " module not started.");
}
if (df == null)
- throw T_Fail.testFailMsg(org.apache.derby.iapi.reference.Module.DaemonFactory + " module not started.");
+ throw T_Fail.testFailMsg(org.apache.derby.shared.common.reference.Module.DaemonFactory + " module not started.");
try {
@@ -129,7 +129,7 @@ public class T_CacheService extends T_Ge
*/
protected String getModuleToTestProtocolName() {
- return org.apache.derby.iapi.reference.Module.CacheFactory;
+ return org.apache.derby.shared.common.reference.Module.CacheFactory;
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheUser.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheUser.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheUser.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CacheUser.java Fri Dec 29 21:40:07 2017
@@ -25,9 +25,9 @@ import org.apache.derby.iapi.services.ca
import org.apache.derbyTesting.unitTests.harness.T_Fail;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.shared.common.reference.SQLState;
public class T_CacheUser implements Runnable {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Cacheable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Cacheable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Cacheable.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Cacheable.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derbyTesting.unitTest
import org.apache.derby.iapi.services.cache.*;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CachedInteger.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CachedInteger.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CachedInteger.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_CachedInteger.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derbyTesting.unitTest
import org.apache.derby.iapi.services.cache.*;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DaemonService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DaemonService.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DaemonService.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DaemonService.java Fri Dec 29 21:40:07 2017
@@ -25,7 +25,7 @@ import org.apache.derbyTesting.unitTests
import org.apache.derbyTesting.unitTests.harness.T_MultiThreadedIterations;
import org.apache.derby.iapi.services.context.ContextService;
import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.daemon.*;
import java.security.AccessController;
@@ -59,7 +59,7 @@ public class T_DaemonService extends T_M
*/
protected String getModuleToTestProtocolName() {
- return org.apache.derby.iapi.reference.Module.DaemonFactory;
+ return org.apache.derby.shared.common.reference.Module.DaemonFactory;
}
/**
@@ -71,12 +71,12 @@ public class T_DaemonService extends T_M
DaemonFactory daemonFactory;
try {
- daemonFactory = (DaemonFactory)startSystemModule(org.apache.derby.iapi.reference.Module.DaemonFactory);
+ daemonFactory = (DaemonFactory)startSystemModule(org.apache.derby.shared.common.reference.Module.DaemonFactory);
} catch (StandardException mse) {
throw T_Fail.exceptionFail(mse);
}
if (daemonFactory == null)
- throw T_Fail.testFailMsg("cannot find daemon factory " + org.apache.derby.iapi.reference.Module.DaemonFactory);
+ throw T_Fail.testFailMsg("cannot find daemon factory " + org.apache.derby.shared.common.reference.Module.DaemonFactory);
try
{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DiagTestClass1.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DiagTestClass1.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DiagTestClass1.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DiagTestClass1.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derbyTesting.unitTests.services;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DiagTestClass1Sub.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DiagTestClass1Sub.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DiagTestClass1Sub.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_DiagTestClass1Sub.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derbyTesting.unitTests.services;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java Fri Dec 29 21:40:07 2017
@@ -26,7 +26,7 @@ import org.apache.derby.iapi.services.di
import org.apache.derby.iapi.services.diag.DiagnosticUtil;
import org.apache.derby.iapi.services.monitor.Monitor;
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.store.access.AccessFactory;
import org.apache.derby.iapi.store.access.ConglomerateController;
import org.apache.derby.iapi.store.access.TransactionController;
@@ -39,7 +39,7 @@ import org.apache.derby.iapi.store.raw.R
import org.apache.derbyTesting.unitTests.harness.T_MultiIterations;
import org.apache.derbyTesting.unitTests.harness.T_Fail;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import java.util.Properties;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java Fri Dec 29 21:40:07 2017
@@ -34,7 +34,7 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.shared.common.reference.SQLState;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
/**
Protocol unit test for the LockManager.
@@ -59,7 +59,7 @@ public class T_LockFactory extends T_Mul
protected String getModuleToTestProtocolName() {
- return org.apache.derby.iapi.reference.Module.LockFactory;
+ return org.apache.derby.shared.common.reference.Module.LockFactory;
}
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Serviceable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Serviceable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Serviceable.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Serviceable.java Fri Dec 29 21:40:07 2017
@@ -27,7 +27,7 @@ import org.apache.derbyTesting.unitTests
import org.apache.derby.iapi.services.context.Context;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.services.daemon.*;
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_StandardException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_StandardException.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_StandardException.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_StandardException.java Fri Dec 29 21:40:07 2017
@@ -21,7 +21,7 @@
package org.apache.derbyTesting.unitTests.services;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import java.text.MessageFormat;
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java Fri Dec 29 21:40:07 2017
@@ -31,9 +31,9 @@ import org.apache.derby.catalog.UUID;
import org.apache.derby.iapi.services.monitor.ModuleFactory;
import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
-import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
+import org.apache.derby.shared.common.stream.HeaderPrintWriter;
import org.apache.derby.iapi.services.uuid.UUIDFactory;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_User.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_User.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_User.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_User.java Fri Dec 29 21:40:07 2017
@@ -23,7 +23,7 @@ package org.apache.derbyTesting.unitTest
import org.apache.derbyTesting.unitTests.harness.T_Fail;
-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.*;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java Fri Dec 29 21:40:07 2017
@@ -35,17 +35,17 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.monitor.Monitor;
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.types.DataValueDescriptor;
import org.apache.derby.iapi.types.RowLocation;
import org.apache.derby.iapi.store.raw.RawStoreFactory;
-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.io.FormatableBitSet;
-import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.shared.common.i18n.MessageService;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedAction;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessRow.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessRow.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessRow.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessRow.java Fri Dec 29 21:40:07 2017
@@ -29,7 +29,7 @@ import org.apache.derby.iapi.types.DataV
import org.apache.derby.iapi.types.SQLInteger;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
public class T_AccessRow
{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Compensation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Compensation.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Compensation.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Compensation.java Fri Dec 29 21:40:07 2017
@@ -26,7 +26,7 @@ import org.apache.derby.iapi.store.raw.*
import org.apache.derby.iapi.services.io.FormatIdUtil;
import org.apache.derby.iapi.services.io.Formatable;
import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.store.raw.log.LogInstant;
import org.apache.derby.iapi.util.ByteArray;
import java.io.IOException;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java Fri Dec 29 21:40:07 2017
@@ -34,14 +34,14 @@ import org.apache.derby.shared.common.sa
import org.apache.derby.iapi.services.io.Storable;
import org.apache.derby.iapi.services.property.PropertyUtil;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.store.raw.*;
import org.apache.derby.iapi.store.raw.xact.RawTransaction;
import org.apache.derby.iapi.store.raw.data.RawContainerHandle;
import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import java.io.*;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Heap.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Heap.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Heap.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Heap.java Fri Dec 29 21:40:07 2017
@@ -34,9 +34,9 @@ import java.io.PrintWriter;
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.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.ConglomerateController;
import org.apache.derby.iapi.store.access.Qualifier;
@@ -44,7 +44,7 @@ import org.apache.derby.iapi.types.RowLo
import org.apache.derby.iapi.store.access.ScanController;
import org.apache.derby.iapi.store.access.TransactionController;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java Fri Dec 29 21:40:07 2017
@@ -30,8 +30,8 @@ import java.util.HashSet;
import java.util.List;
import java.io.PrintWriter;
-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 org.apache.derby.iapi.store.access.ConglomerateController;
import org.apache.derby.iapi.store.access.GroupFetchScanController;
import org.apache.derby.iapi.store.access.Qualifier;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java Fri Dec 29 21:40:07 2017
@@ -39,7 +39,7 @@ import org.apache.derby.catalog.UUID;
import org.apache.derby.iapi.db.Database;
import org.apache.derby.iapi.services.property.PropertyUtil;
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.store.access.*;
import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo;
@@ -55,7 +55,7 @@ import org.apache.derby.impl.store.raw.l
import org.apache.derby.iapi.types.SQLChar;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.iapi.services.io.FormatableBitSet;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java Fri Dec 29 21:40:07 2017
@@ -34,13 +34,13 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.iapi.services.locks.LockFactory;
import org.apache.derby.iapi.services.io.Storable;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.reference.Property;
-import org.apache.derby.iapi.reference.EngineType;
+import org.apache.derby.shared.common.reference.Property;
+import org.apache.derby.shared.common.reference.EngineType;
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.iapi.services.io.FormatableBitSet;
import org.apache.derby.io.StorageRandomAccessFile;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.store.raw.*;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java Fri Dec 29 21:40:07 2017
@@ -37,12 +37,12 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.iapi.services.locks.LockFactory;
import org.apache.derby.iapi.services.io.Storable;
import org.apache.derby.shared.common.sanity.SanityManager;
-import org.apache.derby.iapi.reference.Property;
-import org.apache.derby.iapi.reference.EngineType;
+import org.apache.derby.shared.common.reference.Property;
+import org.apache.derby.shared.common.reference.EngineType;
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.iapi.services.io.FormatableBitSet;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.store.raw.*;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java Fri Dec 29 21:40:07 2017
@@ -38,7 +38,7 @@ import org.apache.derby.iapi.services.mo
import org.apache.derby.iapi.services.monitor.Monitor;
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.store.raw.xact.RawTransaction;
import org.apache.derby.iapi.store.raw.data.RawContainerHandle;
@@ -55,7 +55,7 @@ import org.apache.derby.iapi.types.DataV
import org.apache.derby.iapi.services.uuid.UUIDFactory;
import org.apache.derby.catalog.UUID;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.iapi.services.io.FormatableBitSet;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RowSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RowSource.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RowSource.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RowSource.java Fri Dec 29 21:40:07 2017
@@ -27,7 +27,7 @@ import org.apache.derby.iapi.types.SQLIn
import org.apache.derby.iapi.services.io.FormatableBitSet;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.store.raw.Transaction;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_SecondaryIndexRow.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_SecondaryIndexRow.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_SecondaryIndexRow.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_SecondaryIndexRow.java Fri Dec 29 21:40:07 2017
@@ -27,7 +27,7 @@ import org.apache.derby.shared.common.sa
import org.apache.derby.iapi.services.io.Storable;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.types.DataValueDescriptor;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_SortController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_SortController.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_SortController.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_SortController.java Fri Dec 29 21:40:07 2017
@@ -32,13 +32,13 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.io.Storable;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.types.DataValueDescriptor;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
-import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.shared.common.i18n.MessageService;
import org.apache.derby.shared.common.reference.SQLState;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_StreamFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_StreamFile.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_StreamFile.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_StreamFile.java Fri Dec 29 21:40:07 2017
@@ -35,7 +35,7 @@ import org.apache.derby.shared.common.sa
import org.apache.derby.iapi.services.io.Storable;
import org.apache.derby.iapi.services.io.FormatIdOutputStream;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.store.raw.*;
import org.apache.derby.iapi.store.raw.xact.RawTransaction;
import org.apache.derby.iapi.store.raw.data.RawContainerHandle;
@@ -44,7 +44,7 @@ import org.apache.derby.iapi.store.acces
import org.apache.derby.iapi.types.DataValueDescriptor;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.iapi.services.io.FormatableBitSet;
import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_TWC.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_TWC.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_TWC.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_TWC.java Fri Dec 29 21:40:07 2017
@@ -26,7 +26,7 @@ import org.apache.derby.iapi.store.raw.*
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.shared.common.sanity.SanityManager;
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.services.locks.LockFactory;
import org.apache.derby.iapi.store.access.AccessFactoryGlobals;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Undoable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Undoable.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Undoable.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Undoable.java Fri Dec 29 21:40:07 2017
@@ -29,7 +29,7 @@ import org.apache.derby.shared.common.sa
import org.apache.derby.iapi.services.io.FormatIdUtil;
import org.apache.derby.iapi.services.io.Formatable;
import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import org.apache.derby.iapi.store.raw.log.LogInstant;
import org.apache.derby.iapi.util.ByteArray;
import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Util.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Util.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Util.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Util.java Fri Dec 29 21:40:07 2017
@@ -25,7 +25,7 @@ import org.apache.derby.iapi.store.raw.*
import org.apache.derby.iapi.services.io.FormatableBitSet;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
// impl imports are the preferred way to create unit tests.
import org.apache.derbyTesting.unitTests.harness.T_MultiThreadedIterations;
@@ -36,7 +36,7 @@ import org.apache.derby.iapi.services.co
import org.apache.derby.iapi.services.locks.*;
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.store.access.AccessFactoryGlobals;
import org.apache.derby.iapi.store.access.Qualifier;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_XA.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_XA.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_XA.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_XA.java Fri Dec 29 21:40:07 2017
@@ -29,7 +29,7 @@ import org.apache.derby.iapi.store.acces
import org.apache.derby.iapi.services.io.FormatableBitSet;
-import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.shared.common.reference.Property;
import org.apache.derby.iapi.services.context.ContextService;
import org.apache.derby.iapi.services.context.ContextManager;
@@ -40,7 +40,7 @@ import org.apache.derby.shared.common.sa
import org.apache.derby.iapi.services.io.FormatIdUtil;
-import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.shared.common.error.StandardException;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_b2i.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_b2i.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_b2i.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_b2i.java Fri Dec 29 21:40:07 2017
@@ -29,23 +29,23 @@ import org.apache.derby.impl.store.acces
import org.apache.derby.iapi.types.SQLLongint;
-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.io.FormatableBitSet;
-import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.shared.common.i18n.MessageService;
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.context.Context;
import org.apache.derby.iapi.services.context.ContextService;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.io.FormatIdUtil;
import org.apache.derby.iapi.db.Database;
-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.conglomerate.TransactionManager;
import org.apache.derby.iapi.store.access.AccessFactory;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/util/MsgTrace.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/util/MsgTrace.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/util/MsgTrace.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/util/MsgTrace.java Fri Dec 29 21:40:07 2017
@@ -27,10 +27,10 @@ import java.security.PrivilegedAction;
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.property.PropertyUtil;
-import org.apache.derby.iapi.services.stream.InfoStreams;
+import org.apache.derby.shared.common.stream.InfoStreams;
// static methods
// set up automatically first time it's used
Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/ToolUtils.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/ToolUtils.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/ToolUtils.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/ToolUtils.java Fri Dec 29 21:40:07 2017
@@ -27,7 +27,7 @@ public abstract class ToolUtils
//
// Methods to copy arrays. We'd like to use java.util.copyOf(), but
// we have to run on Java 5. The same methods also appear in
- // org.apache.derby.iapi.services.io.ArrayUtil. They are repeated here
+ // org.apache.derby.shared.common.util.ArrayUtil. They are repeated here
// in order to avoid sealing issues.
//
///////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj Fri Dec 29 21:40:07 2017
@@ -41,7 +41,7 @@ import org.apache.derby.tools.JDBCDispla
import org.apache.derby.iapi.tools.i18n.LocalizedInput;
import org.apache.derby.iapi.tools.i18n.LocalizedResource;
-import org.apache.derby.iapi.services.info.JVMInfo;
+import org.apache.derby.shared.common.info.JVMInfo;
import java.lang.reflect.*;
import java.security.AccessController;
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java Fri Dec 29 21:40:07 2017
@@ -24,8 +24,8 @@ package org.apache.derby.impl.tools.ij;
import org.apache.derby.tools.JDBCDisplayUtil;
import org.apache.derby.iapi.tools.i18n.*;
-import org.apache.derby.iapi.services.info.ProductVersionHolder;
-import org.apache.derby.iapi.services.info.ProductGenusNames;
+import org.apache.derby.shared.common.info.ProductVersionHolder;
+import org.apache.derby.shared.common.info.ProductGenusNames;
import java.util.List;
import java.util.Stack;
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java Fri Dec 29 21:40:07 2017
@@ -50,9 +50,9 @@ import java.security.ProtectionDomain;
import java.security.CodeSource;
import java.security.AccessController;
-import org.apache.derby.iapi.services.info.PropertyNames;
-import org.apache.derby.iapi.services.info.ProductVersionHolder;
-import org.apache.derby.iapi.services.info.ProductGenusNames;
+import org.apache.derby.shared.common.info.PropertyNames;
+import org.apache.derby.shared.common.info.ProductVersionHolder;
+import org.apache.derby.shared.common.info.ProductGenusNames;
import org.apache.derby.iapi.tools.i18n.*;
@@ -869,12 +869,12 @@ public static void getMainInfo (java.io.
private static final String infoNames[] =
{
- org.apache.derby.iapi.services.info.ProductGenusNames.DBMS_INFO,
- org.apache.derby.iapi.services.info.ProductGenusNames.TOOLS_INFO,
- org.apache.derby.iapi.services.info.ProductGenusNames.NET_INFO,
- org.apache.derby.iapi.services.info.ProductGenusNames.CLIENT_INFO,
- org.apache.derby.iapi.services.info.ProductGenusNames.SHARED_INFO,
- org.apache.derby.iapi.services.info.ProductGenusNames.OPTIONAL_INFO,
+ org.apache.derby.shared.common.info.ProductGenusNames.DBMS_INFO,
+ org.apache.derby.shared.common.info.ProductGenusNames.TOOLS_INFO,
+ org.apache.derby.shared.common.info.ProductGenusNames.NET_INFO,
+ org.apache.derby.shared.common.info.ProductGenusNames.CLIENT_INFO,
+ org.apache.derby.shared.common.info.ProductGenusNames.SHARED_INFO,
+ org.apache.derby.shared.common.info.ProductGenusNames.OPTIONAL_INFO,
};
/**
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java Fri Dec 29 21:40:07 2017
@@ -25,8 +25,8 @@ package org.apache.derby.impl.tools.sysi
import java.util.Properties;
import java.io.OutputStream;
-import org.apache.derby.iapi.services.info.PropertyNames;
-import org.apache.derby.iapi.services.info.ProductVersionHolder;
+import org.apache.derby.shared.common.info.PropertyNames;
+import org.apache.derby.shared.common.info.ProductVersionHolder;
public class ZipInfoProperties // extends Properties
{
Modified: db/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java Fri Dec 29 21:40:07 2017
@@ -21,8 +21,8 @@
package org.apache.derby.tools;
-import org.apache.derby.iapi.services.info.ProductVersionHolder;
-import org.apache.derby.iapi.services.info.JVMInfo;
+import org.apache.derby.shared.common.info.ProductVersionHolder;
+import org.apache.derby.shared.common.info.JVMInfo;
import org.apache.derby.impl.tools.sysinfo.Main;
/**
Modified: db/derby/code/trunk/tools/jar/tools.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/tools.properties?rev=1819522&r1=1819521&r2=1819522&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/tools.properties (original)
+++ db/derby/code/trunk/tools/jar/tools.properties Fri Dec 29 21:40:07 2017
@@ -24,7 +24,6 @@
derby.module.ij=org.apache.derby.tools.ij
derby.module.ij.xaHelper=org.apache.derby.impl.tools.ij.xaHelper
-derby.module.Attribute=org.apache.derby.iapi.reference.Attribute
derby.module.cslook=org.apache.derby.tools.dblook
derby.module.SignatureChecker=org.apache.derby.tools.SignatureChecker
derby.module.planexporter=org.apache.derby.tools.PlanExporter