Author: kmarsden
Date: Fri Mar 23 16:55:04 2012
New Revision: 1304478

URL: http://svn.apache.org/viewvc?rev=1304478&view=rev
Log:
DERBY-4669 ClassLoaderBootTest fails if derbyclient.jar comes before derby.jar
 on the classpath

Contributed by Knut Anders Hatlen merge 1136020 from 10.8


Modified:
    db/derby/code/branches/10.5/   (props changed)
    db/derby/code/branches/10.5/build.xml   (contents, props changed)
    db/derby/code/branches/10.5/java/   (props changed)
    db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/types/SQLBlob.java
    db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
    db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
    db/derby/code/branches/10.5/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
    db/derby/code/branches/10.5/java/engine/org/apache/derby/jdbc/EmbedXAResource.java

Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
  Reverse-merged /db/derby/code/trunk:r997325*
  Merged /db/derby/code/branches/10.7:r1304465
  Merged /db/derby/code/branches/10.6:r1304470
  Merged /db/derby/code/trunk:r1130077,1130084,1133752
  Merged /db/derby/code/branches/10.8:r1136020

Modified: db/derby/code/branches/10.5/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/build.xml?rev=1304478&r1=1304477&r2=1304478&view=diff
==============================================================================
--- db/derby/code/branches/10.5/build.xml (original)
+++ db/derby/code/branches/10.5/build.xml Fri Mar 23 16:55:04 2012
@@ -1363,6 +1363,10 @@
     	<section name="org/apache/derby/iapi/services/i18n/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
+        <!-- See DERBY-4669. -->
+        <section name="org/apache/derby/shared/common/sanity/">
+          <attribute name="Sealed" value="false"/>
+        </section>
         <section name="org/apache/derby/iapi/tools/i18n/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
@@ -1558,6 +1562,10 @@
       <attribute name="Bundle-SymbolicName" value="derbyclient"/>
       <attribute name="DynamicImport-Package" value="*"/>
       <attribute name="Export-Package" value="org.apache.derby.jdbc"/> 
+      <!-- See DERBY-4669. -->
+      <section name="org/apache/derby/shared/common/sanity/">
+        <attribute name="Sealed" value="false"/>
+      </section>
     </manifest> 
 
     <!-- declare the client driver for autoloading by the JDBC 4 DriverManager -->

Propchange: db/derby/code/branches/10.5/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Mar 23 16:55:04 2012
@@ -0,0 +1,4 @@
+/db/derby/code/branches/10.6/build.xml:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167,1304470
+/db/derby/code/branches/10.7/build.xml:1294731,1303263
+/db/derby/code/branches/10.8/build.xml:1209227-1209228,1209284
+/db/derby/code/trunk/build.xml:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039
 ,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1086799,1087346,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1210846,1293494,1294512

Propchange: db/derby/code/branches/10.5/java/
------------------------------------------------------------------------------
  Merged /db/derby/code/branches/10.6/java:r1304470

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/types/SQLBlob.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/types/SQLBlob.java?rev=1304478&r1=1304477&r2=1304478&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/types/SQLBlob.java (original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/types/SQLBlob.java Fri Mar 23 16:55:04 2012
@@ -25,6 +25,7 @@ import org.apache.derby.iapi.reference.S
 import org.apache.derby.iapi.reference.Limits;
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 
 import java.sql.Blob;
 import java.sql.ResultSet;

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java?rev=1304478&r1=1304477&r2=1304478&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java (original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java Fri Mar 23 16:55:04 2012
@@ -21,7 +21,7 @@
 
 package org.apache.derby.impl.io.vfmem;
 
-import org.apache.derby.shared.common.sanity.SanityManager;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 
 /**
  * Stores data in blocks, and supports reading/writing data from/into these

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java?rev=1304478&r1=1304477&r2=1304478&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java (original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java Fri Mar 23 16:55:04 2012
@@ -22,11 +22,11 @@ package org.apache.derby.impl.sql.execut
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.io.FormatableBitSet;
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.sql.Activation;
 import org.apache.derby.iapi.sql.execute.ExecRow;
 import org.apache.derby.iapi.sql.execute.ExecutionContext;
 import org.apache.derby.iapi.store.access.TransactionController;
-import org.apache.derby.shared.common.sanity.SanityManager;
 
 /**
  * Abstract <code>ResultSet</code> class for <code>NoPutResultSet</code>s which

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java?rev=1304478&r1=1304477&r2=1304478&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java (original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java Fri Mar 23 16:55:04 2012
@@ -33,6 +33,7 @@ import java.util.Properties;
 import org.apache.derby.iapi.reference.MessageId;
 import org.apache.derby.iapi.reference.Attribute;
 import org.apache.derby.iapi.services.i18n.MessageService;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.jdbc.JDBCBoot;
 
 

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/jdbc/EmbedXAResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/jdbc/EmbedXAResource.java?rev=1304478&r1=1304477&r2=1304478&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/jdbc/EmbedXAResource.java (original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/jdbc/EmbedXAResource.java Fri Mar 23 16:55:04 2012
@@ -44,7 +44,7 @@ import org.apache.derby.iapi.store.acces
 import org.apache.derby.iapi.store.access.xa.XAXactId;
 import org.apache.derby.impl.jdbc.EmbedConnection;
 import org.apache.derby.impl.jdbc.TransactionResourceImpl;
-import org.apache.derby.shared.common.sanity.SanityManager;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.services.property.PropertyUtil;
 import org.apache.derby.iapi.reference.Property;