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 2018/01/10 01:00:38 UTC
svn commit: r1820717 - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/lastgoodjarcontents/ engine/org/apache/derby/ engine/org/apache/derby/iapi/jdbc/ engine/org/apache/derby/jdbc/

Author: rhillegas
Date: Wed Jan 10 01:00:38 2018
New Revision: 1820717

URL: http://svn.apache.org/viewvc?rev=1820717&view=rev
Log:
DERBY-6945: Move Driver42 out of the public api package and into the engine-internal api package; commit derby-6945-10-aa-moveDriver42.diff.

Added:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/Driver42.java
      - copied, changed from r1820615, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver42.java
Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver42.java
Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derby.jar.lastcontents
    db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derby.jar.lastcontents
    db/derby/code/trunk/java/engine/org/apache/derby/modules.properties

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=1820717&r1=1820716&r2=1820717&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 Wed Jan 10 01:00:38 2018
@@ -63,6 +63,7 @@ org.apache.derby.iapi.jdbc.BrokeredState
 org.apache.derby.iapi.jdbc.CharacterStreamDescriptor.class
 org.apache.derby.iapi.jdbc.ConnectionContext.class
 org.apache.derby.iapi.jdbc.DRDAServerStarter.class
+org.apache.derby.iapi.jdbc.Driver42.class
 org.apache.derby.iapi.jdbc.EngineCallableStatement.class
 org.apache.derby.iapi.jdbc.EngineConnection.class
 org.apache.derby.iapi.jdbc.EngineLOB.class
@@ -1349,7 +1350,6 @@ org.apache.derby.jdbc.AutoloadedDriver.c
 org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40.class
 org.apache.derby.jdbc.BasicEmbeddedDataSource40.class
 org.apache.derby.jdbc.BasicEmbeddedXADataSource40.class
-org.apache.derby.jdbc.Driver42.class
 org.apache.derby.jdbc.EmbedPooledConnection.class
 org.apache.derby.jdbc.EmbedXAConnection.class
 org.apache.derby.jdbc.EmbedXAResource.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=1820717&r1=1820716&r2=1820717&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 Wed Jan 10 01:00:38 2018
@@ -63,6 +63,7 @@ org.apache.derby.iapi.jdbc.BrokeredState
 org.apache.derby.iapi.jdbc.CharacterStreamDescriptor.class
 org.apache.derby.iapi.jdbc.ConnectionContext.class
 org.apache.derby.iapi.jdbc.DRDAServerStarter.class
+org.apache.derby.iapi.jdbc.Driver42.class
 org.apache.derby.iapi.jdbc.EngineCallableStatement.class
 org.apache.derby.iapi.jdbc.EngineConnection.class
 org.apache.derby.iapi.jdbc.EngineLOB.class
@@ -1352,7 +1353,6 @@ org.apache.derby.jdbc.AutoloadedDriver.c
 org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40.class
 org.apache.derby.jdbc.BasicEmbeddedDataSource40.class
 org.apache.derby.jdbc.BasicEmbeddedXADataSource40.class
-org.apache.derby.jdbc.Driver42.class
 org.apache.derby.jdbc.EmbedPooledConnection.class
 org.apache.derby.jdbc.EmbedXAConnection.class
 org.apache.derby.jdbc.EmbedXAResource.class

Copied: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/Driver42.java (from r1820615, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver42.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/Driver42.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/Driver42.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver42.java&r1=1820615&r2=1820717&rev=1820717&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver42.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/Driver42.java Wed Jan 10 01:00:38 2018
@@ -1,6 +1,6 @@
 /*
  
-   Derby - Class org.apache.derby.jdbc.Driver42
+   Derby - Class org.apache.derby.iapi.jdbc.Driver42
  
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -19,16 +19,12 @@
  
  */
 
-package org.apache.derby.jdbc;
+package org.apache.derby.iapi.jdbc;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.apache.derby.iapi.jdbc.BrokeredConnection;
-import org.apache.derby.iapi.jdbc.BrokeredConnectionControl;
-import org.apache.derby.iapi.jdbc.BrokeredConnection42;
-import org.apache.derby.iapi.jdbc.InternalDriver;
 import org.apache.derby.iapi.sql.ResultSet;
 
 import org.apache.derby.impl.jdbc.EmbedPreparedStatement42;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/modules.properties?rev=1820717&r1=1820716&r2=1820717&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/modules.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/modules.properties Wed Jan 10 01:00:38 2018
@@ -164,7 +164,7 @@ cloudscape.config.cryptographyJ2=derby
 
 # jdbc42 - requires JDK 1.8 (which is constant 9 in Derby)
 #
-derby.module.jdbcJ8=org.apache.derby.jdbc.Driver42
+derby.module.jdbcJ8=org.apache.derby.iapi.jdbc.Driver42
 derby.env.jdk.jdbcJ8=9
 derby.env.classes.jdbcJ8=java.sql.Driver
 cloudscape.config.jdbcJ8=derby