db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1136020 - in /db/derby/code/branches/10.8: ./ java/client/org/apache/derby/client/net/ java/engine/org/apache/derby/iapi/services/info/ java/engine/org/apache/derby/iapi/types/ java/engine/org/apache/derby/impl/io/vfmem/ java/engine/org/ap...
Date Wed, 15 Jun 2011 13:02:11 GMT
Author: kristwaa
Date: Wed Jun 15 13:02:11 2011
New Revision: 1136020

URL: http://svn.apache.org/viewvc?rev=1136020&view=rev
Log:
DERBY-4669: ClassLoaderBootTest fails if derbyclient.jar comes before derby.jar on the classpath
DERBY-5253: Engine code references org.apache.derby.shared.common.sanity.SanityManager

Merged fixes from trunk (revisions 1130077, 1130084, and 1133752).

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/build.xml
    db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/Utf8CcsidManager.java
    db/derby/code/branches/10.8/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
    db/derby/code/branches/10.8/java/engine/org/apache/derby/iapi/types/SQLBlob.java
    db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
    db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
    db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
    db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/EmbedXAResource.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 15 13:02:11 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101839,1102826,1103681,1103718,1125305,1126358,1127825,1127883,1129136,1129764,1129797,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133741
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101839,1102826,1103681,1103718,1125305,1126358,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133741,1133752

Modified: db/derby/code/branches/10.8/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/build.xml?rev=1136020&r1=1136019&r2=1136020&view=diff
==============================================================================
--- db/derby/code/branches/10.8/build.xml (original)
+++ db/derby/code/branches/10.8/build.xml Wed Jun 15 13:02:11 2011
@@ -1492,6 +1492,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>
@@ -1689,6 +1693,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 -->

Modified: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/Utf8CcsidManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/Utf8CcsidManager.java?rev=1136020&r1=1136019&r2=1136020&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/Utf8CcsidManager.java
(original)
+++ db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/Utf8CcsidManager.java
Wed Jun 15 13:02:11 2011
@@ -26,7 +26,7 @@ import java.io.UnsupportedEncodingExcept
 import org.apache.derby.client.am.Agent;
 import org.apache.derby.client.am.ClientMessageId;
 import org.apache.derby.client.am.SqlException;
-import org.apache.derby.iapi.services.sanity.SanityManager;
+import org.apache.derby.shared.common.sanity.SanityManager;
 import org.apache.derby.shared.common.reference.SQLState;
 
 public class Utf8CcsidManager extends CcsidManager {

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java?rev=1136020&r1=1136019&r2=1136020&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
(original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
Wed Jun 15 13:02:11 2011
@@ -27,6 +27,10 @@ import java.net.MalformedURLException;
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
 
+// As an exception to the rule we import SanityManager from the shared package
+// here, because the JVMInfo class is included in both derby.jar and
+// derbyclient.jar. Pulling in the class from the shared package allows us to
+// unseal the shared package only (leaving iapi.services.sanity sealed).
 import org.apache.derby.shared.common.sanity.SanityManager;
 
 /**

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/iapi/types/SQLBlob.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/iapi/types/SQLBlob.java?rev=1136020&r1=1136019&r2=1136020&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/iapi/types/SQLBlob.java (original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/iapi/types/SQLBlob.java Wed Jun
15 13:02:11 2011
@@ -26,8 +26,7 @@ import org.apache.derby.iapi.reference.L
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.io.CloneableStream;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
-
-import org.apache.derby.shared.common.sanity.SanityManager;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 
 import java.sql.Blob;
 import java.sql.ResultSet;

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java?rev=1136020&r1=1136019&r2=1136020&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
(original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
Wed Jun 15 13:02:11 2011
@@ -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.8/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java?rev=1136020&r1=1136019&r2=1136020&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
(original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
Wed Jun 15 13:02:11 2011
@@ -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.8/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java?rev=1136020&r1=1136019&r2=1136020&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java (original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java Wed
Jun 15 13:02:11 2011
@@ -33,8 +33,8 @@ 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;
-import org.apache.derby.shared.common.sanity.SanityManager;
 
 
 /**

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/EmbedXAResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/EmbedXAResource.java?rev=1136020&r1=1136019&r2=1136020&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/EmbedXAResource.java (original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/EmbedXAResource.java Wed
Jun 15 13:02:11 2011
@@ -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;
 



Mime
View raw message