db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1481248 - in /db/derby/code/trunk: java/demo/simplemobile/ java/engine/org/apache/derby/ java/engine/org/apache/derby/diag/ java/engine/org/apache/derby/jdbc/ java/stubs/jdbc4/javax/sql/ java/testing/org/apache/derbyTesting/functionTests/t...
Date Sat, 11 May 2013 01:40:10 GMT
Author: rhillegas
Date: Sat May 11 01:40:09 2013
New Revision: 1481248

URL: http://svn.apache.org/r1481248
Log:
DERBY-6213: Remove CDC DataSource and Driver.

Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java
Modified:
    db/derby/code/trunk/java/demo/simplemobile/SimpleMobileApp.java
    db/derby/code/trunk/java/engine/org/apache/derby/diag/ContainedRoles.java
    db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java
    db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java
    db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java
    db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java
    db/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
    db/derby/code/trunk/java/stubs/jdbc4/javax/sql/ConnectionEvent.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
    db/derby/code/trunk/java/tools/org/apache/derby/tools/SignatureChecker.java
    db/derby/code/trunk/tools/jar/extraDBMSclasses.properties

Modified: db/derby/code/trunk/java/demo/simplemobile/SimpleMobileApp.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/simplemobile/SimpleMobileApp.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/simplemobile/SimpleMobileApp.java (original)
+++ db/derby/code/trunk/java/demo/simplemobile/SimpleMobileApp.java Sat May 11 01:40:09 2013
@@ -24,7 +24,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import org.apache.derby.jdbc.EmbeddedSimpleDataSource;  // from derby.jar
+import org.apache.derby.jdbc.EmbeddedDataSource40;  // from derby.jar
 
 /**
  * <p>This sample program is a small JDBC application showing how to use and
@@ -51,7 +51,7 @@ import org.apache.derby.jdbc.EmbeddedSim
  * as opposed to a Java SE or EE environment is that the JSR-169 specification
  * does not include the <code>java.sql.DriverManager</code> class. However, 
  * Derby provides a DataSource class that can be used to obtain connections to 
- * Derby databases: <code>org.apache.derby.jdbc.EmbeddedSimpleDataSource</code>.
+ * Derby databases: <code>org.apache.derby.jdbc.EmbeddedDataSource40</code>.
  * This is demonstrated in this simple demo application.
  * </p>
  * <p>To compile this application on your own, make sure you include derby.jar 
@@ -105,11 +105,11 @@ public class SimpleMobileApp {
          * 
          * If we were to use a DataSource for Java SE, we could use
          * the org.apache.derby.jdbc.EmbeddedDataSource, rather than the
-         * org.apache.derby.jdbc.EmbeddedSimpleDataSource that we need to 
+         * org.apache.derby.jdbc.EmbeddedDataSource40 that we need to 
          * use for Java ME.
          */
         
-        EmbeddedSimpleDataSource ds = new EmbeddedSimpleDataSource();
+        EmbeddedDataSource40 ds = new EmbeddedDataSource40();
         
         /*
          * The connection specifies "create" in the DataSource settings for
@@ -147,7 +147,7 @@ public class SimpleMobileApp {
              *   Connection conn = ds.getConnection(username, password);
              * or use the
              *    setUser(String) and setPassword(String) methods of
-             * EmbeddedSimpleDataSource.
+             * EmbeddedDataSource40.
              * 
              * Note that user authentication is off by default, meaning that any
              * user can connect to your database using any password. To enable

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/ContainedRoles.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/ContainedRoles.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/ContainedRoles.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/ContainedRoles.java Sat May 11 01:40:09
2013
@@ -37,6 +37,7 @@ import org.apache.derby.iapi.util.IdUtil
 import org.apache.derby.vti.VTITemplate;
 
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
+import org.apache.derby.impl.jdbc.EmbedResultSetMetaData40;
 
 
 /**
@@ -171,6 +172,6 @@ public class ContainedRoles extends VTIT
     };
 
     private static final ResultSetMetaData metadata =
-        new EmbedResultSetMetaData(columnInfo);
+        new EmbedResultSetMetaData40(columnInfo);
 
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java Sat May 11 01:40:09
2013
@@ -43,6 +43,7 @@ import org.apache.derby.iapi.util.String
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
+import org.apache.derby.impl.jdbc.EmbedResultSetMetaData40;
 
 /**
 
@@ -347,7 +348,7 @@ public class ErrorLogReader extends VTIT
 		EmbedResultSetMetaData.getResultColumnDescriptor("DRDAID", Types.VARCHAR, true, 50),
 		EmbedResultSetMetaData.getResultColumnDescriptor("LOGTEXT",Types.VARCHAR, false, Limits.DB2_VARCHAR_MAXWIDTH)
 	};
-	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData(columnInfo);
+	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData40(columnInfo);
 
 }
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java Sat May 11 01:40:09
2013
@@ -44,6 +44,7 @@ import org.apache.derby.vti.VTICosting;
 import org.apache.derby.vti.VTIEnvironment;
 
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
+import org.apache.derby.impl.jdbc.EmbedResultSetMetaData40;
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 
 
@@ -233,6 +234,6 @@ public final class ErrorMessages extends
 		EmbedResultSetMetaData.getResultColumnDescriptor("SEVERITY",   Types.INTEGER, true),
 	};
 	
-	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData(columnInfo);
+	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData40(columnInfo);
 
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java Sat May 11 01:40:09
2013
@@ -38,6 +38,7 @@ import org.apache.derby.iapi.error.Publi
 
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
+import org.apache.derby.impl.jdbc.EmbedResultSetMetaData40;
 
 import java.util.Hashtable;
 import java.util.Enumeration;
@@ -340,6 +341,6 @@ public class LockTable extends VTITempla
 		EmbedResultSetMetaData.getResultColumnDescriptor(VirtualLockTable.INDEXNAME, Types.VARCHAR,
true,  128)
 	};
 	
-	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData(columnInfo);
+	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData40(columnInfo);
 }
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java Sat May 11 01:40:09
2013
@@ -39,6 +39,7 @@ import org.apache.derby.iapi.error.Publi
 
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
+import org.apache.derby.impl.jdbc.EmbedResultSetMetaData40;
 
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -377,7 +378,7 @@ public class SpaceTable extends VTITempl
 		EmbedResultSetMetaData.getResultColumnDescriptor("TABLEID",  Types.CHAR, false, 36),
 	};
 	
-	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData(columnInfo);
+	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData40(columnInfo);
 
 }
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java Sat May 11 01:40:09
2013
@@ -37,6 +37,7 @@ import org.apache.derby.iapi.sql.ResultC
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
 import org.apache.derby.iapi.util.StringUtil;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
+import org.apache.derby.impl.jdbc.EmbedResultSetMetaData40;
 import org.apache.derby.impl.sql.GenericPreparedStatement;
 import org.apache.derby.impl.sql.GenericStatement;
 import org.apache.derby.impl.sql.conn.CachedStatement;
@@ -175,7 +176,7 @@ public final class StatementCache extend
 
 	};
 	
-	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData(columnInfo);
+	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData40(columnInfo);
 
 	public ResultSetMetaData getMetaData() {
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java Sat May 11
01:40:09 2013
@@ -41,6 +41,7 @@ import org.apache.derby.vti.VTITemplate;
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
+import org.apache.derby.impl.jdbc.EmbedResultSetMetaData40;
 import org.apache.derby.iapi.reference.Limits;
 import org.apache.derby.iapi.reference.Property;
 import org.apache.derby.iapi.util.StringUtil;
@@ -398,6 +399,6 @@ public class StatementDuration extends V
 		EmbedResultSetMetaData.getResultColumnDescriptor("DURATION",  Types.VARCHAR, false, 10),
 	};
 	
-	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData(columnInfo);
+	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData40(columnInfo);
 }
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java Sat May 11
01:40:09 2013
@@ -32,6 +32,7 @@ import org.apache.derby.vti.VTIEnvironme
 
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
 import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
+import org.apache.derby.impl.jdbc.EmbedResultSetMetaData40;
 
 import org.apache.derby.iapi.reference.Limits;
 import org.apache.derby.iapi.util.StringUtil;
@@ -239,6 +240,6 @@ public class TransactionTable extends VT
 		EmbedResultSetMetaData.getResultColumnDescriptor("SQL_TEXT",      Types.VARCHAR, true,
 Limits.DB2_VARCHAR_MAXWIDTH),
 	};
 	
-	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData(columnInfo);
+	private static final ResultSetMetaData metadata = new EmbedResultSetMetaData40(columnInfo);
 }
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml Sat May 11 01:40:09 2013
@@ -36,31 +36,8 @@
   <target name="jdbc" depends="checkVMLevel,compile_jdbc3,compile_jdbc4,compile_jdbc42"/>
 
 <!-- build targets which need JDBC 3.0 libs in the end-->
-<!-- first build all non-special (non-JDBC 3.0) targets-->
-  <target name="compile_jsr169">
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${compile.classpath}"/>
-      </classpath>
-      <include name="${derby.dir}/jdbc/InternalDriver.java"/>
-      <include name="${derby.dir}/jdbc/EmbeddedSimpleDataSource.java"/>
-      <include name="${derby.dir}/jdbc/Driver169.java"/>
-    </javac>
-  </target>
 
-  <target name="compile_jdbc3" depends="compile_jsr169">
+  <target name="compile_jdbc3">
     <javac
       source="1.5"
       target="1.5"
@@ -77,6 +54,7 @@
       <classpath>
         <pathelement path="${java15compile.classpath}"/>
       </classpath>
+      <include name="${derby.dir}/jdbc/InternalDriver.java"/>
       <include name="${derby.dir}/jdbc/AutoloadedDriver.java"/>
       <include name="${derby.dir}/jdbc/EmbeddedDriver.java"/>
       <include name="${derby.dir}/jdbc/ReferenceableDataSource.java"/>

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=1481248&r1=1481247&r2=1481248&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 Sat May 11 01:40:09
2013
@@ -175,13 +175,6 @@ cloudscape.config.cryptographyJ2=derby
 # Connectivity
 ######################
 
-# jdbc30 - requires JDK 1.4
-#
-derby.module.jdbcJ4=org.apache.derby.jdbc.Driver30
-derby.env.jdk.jdbcJ4=4
-derby.env.classes.jdbcJ4=java.sql.Driver
-cloudscape.config.jdbcJ4=derby
-
 # jdbc40 - requires JDK 1.6 (which is constant 7 in Derby)
 #
 derby.module.jdbcJ6=org.apache.derby.jdbc.Driver40
@@ -383,9 +376,3 @@ cloudscape.config.mgmt.jmx=derby
 derby.module.mgmt.null=org.apache.derby.impl.services.jmxnone.NoManagementService
 cloudscape.config.mgmt.null=derby
 
-# Modules used on J2ME only
-derby.module.dvfCDC=org.apache.derby.iapi.types.CDCDataValueFactory
-cloudscape.config.dvfCDC=derby
-derby.module.jdbc169=org.apache.derby.jdbc.Driver169
-derby.env.classes.jdbc169=javax.sql.DataSource
-cloudscape.config.jdbc169=derby

Modified: db/derby/code/trunk/java/stubs/jdbc4/javax/sql/ConnectionEvent.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/stubs/jdbc4/javax/sql/ConnectionEvent.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/stubs/jdbc4/javax/sql/ConnectionEvent.java (original)
+++ db/derby/code/trunk/java/stubs/jdbc4/javax/sql/ConnectionEvent.java Sat May 11 01:40:09
2013
@@ -22,7 +22,7 @@ import java.sql.SQLException;
 public  class   ConnectionEvent extends java.util.EventObject
 {
     public  ConnectionEvent(PooledConnection con)   { super( con ); }
-    public  ConnectionEvent(PooledConnection con, SQLException ex) throws SQLException {
super( con ); }
+    public  ConnectionEvent(PooledConnection con, SQLException ex) { super( con ); }
 
     public  SQLException 	getSQLException() { return null; }
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
Sat May 11 01:40:09 2013
@@ -33,7 +33,6 @@ import javax.sql.DataSource;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.derby.jdbc.ClientDataSourceInterface;
-import org.apache.derby.jdbc.EmbeddedSimpleDataSource;
 import org.apache.derby.jdbc.BasicEmbeddedDataSource40;
 import org.apache.derbyTesting.functionTests.util.SecurityCheck;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
@@ -182,7 +181,7 @@ public class DataSourceTest extends Base
 
     // the J2EEDataSourceTest version of this includes testing for
     // setTypeMap, which is supported for both EmbeddedDataSource and
-    // ClientDataSource, but not for JSR169/EmbeddedSimpleDataSource
+    // ClientDataSource
     public void testAllDataSources() throws SQLException, Exception
     {
         //Connection dmc = getConnection();
@@ -201,19 +200,6 @@ public class DataSourceTest extends Base
         DataSource ds = dscs;
         assertConnectionOK(expectedValues, "DataSource", ds.getConnection());
         
-        DataSource dssimple = null;
-        // simple datasource is only supported with embedded
-        if (usingEmbedded())
-        {
-            EmbeddedSimpleDataSource realdssimple = 
-                new EmbeddedSimpleDataSource();
-            realdssimple.setDatabaseName(dbName);
-            ds = realdssimple;
-            dssimple = (DataSource)realdssimple;
-            assertConnectionOK(
-                expectedValues, "SimpleDataSource", ds.getConnection());
-        }
-
         if (JDBC.vmSupportsJDBC4()) {
             BasicEmbeddedDataSource40 nds = new BasicEmbeddedDataSource40();
             nds.setDatabaseName(dbName);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
Sat May 11 01:40:09 2013
@@ -56,7 +56,6 @@ import junit.framework.TestSuite;
 import org.apache.derby.jdbc.ClientConnectionPoolDataSourceInterface;
 import org.apache.derby.jdbc.ClientDataSourceInterface;
 import org.apache.derby.jdbc.ClientXADataSourceInterface;
-import org.apache.derby.jdbc.EmbeddedSimpleDataSource;
 import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
 import org.apache.derbyTesting.functionTests.util.SecurityCheck;
 import org.apache.derbyTesting.functionTests.util.TestRoutines;
@@ -1174,19 +1173,6 @@ public class J2EEDataSourceTest extends 
         DataSource ds = dscs;
         assertConnectionOK(expectedValues, "DataSource", ds.getConnection());
         
-        DataSource dssimple = null;
-        // simple datasource is only supported with embedded
-        if (usingEmbedded())
-        {
-            EmbeddedSimpleDataSource realdssimple = 
-                new EmbeddedSimpleDataSource();
-            realdssimple.setDatabaseName(dbName);
-            ds = realdssimple;
-            dssimple = (DataSource)realdssimple;
-            assertConnectionOK(
-                expectedValues, "SimpleDataSource", ds.getConnection());
-        }
-            
         ConnectionPoolDataSource dsp = 
             J2EEDataSource.getConnectionPoolDataSource();      
         

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
Sat May 11 01:40:09 2013
@@ -27,7 +27,7 @@ import java.net.Socket;
 import java.io.File;
 import java.lang.Integer;
 
-import org.apache.derby.jdbc.EmbeddedSimpleDataSource;
+import org.apache.derby.jdbc.EmbeddedDataSource40;
 /**
  * Create and boot the supplied db argument. This auxiliary program is used by
  * {@code BootLockTest.java} to boot a db in a different jvm and subsequently
@@ -48,7 +48,7 @@ public class BootLockMinion {
                            "BootLockMinion.log");
         try
         {
-            EmbeddedSimpleDataSource ds = new EmbeddedSimpleDataSource();
+            EmbeddedDataSource40 ds = new EmbeddedDataSource40();
             ds.setDatabaseName(dbName);
             ds.setCreateDatabase("create");
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java
Sat May 11 01:40:09 2013
@@ -31,7 +31,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.derby.impl.jdbc.EmbedConnection;
-import org.apache.derby.jdbc.Driver30;
+import org.apache.derby.jdbc.Driver40;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
@@ -46,7 +46,7 @@ import org.apache.derbyTesting.junit.Tes
  * 
  */
 public class RollBackWrappingWhenFailOnImportTest extends BaseJDBCTestCase {
-    class MockInternalDriver extends Driver30 {
+    class MockInternalDriver extends Driver40 {
 
         public class MockConnectionFailWhenRollBack extends EmbedConnection {
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
Sat May 11 01:40:09 2013
@@ -306,7 +306,7 @@ public final class SecurityManagerSetup 
 	 * Looks for three items:
 	 * 
 	 * Location of derbyTesting.jar via this class
-	 * Location of derby.jar via org.apache.derby.jdbc.EmbeddedSimpleDataSource
+	 * Location of derby.jar via org.apache.derby.jdbc.EmbeddedDataSource
 	 * Location of derbyclient.jar via org.apache.derby.jdbc.ClientDataSource
 	 * 
 	 * Two options are supported, either all are in jar files or
@@ -399,7 +399,7 @@ public final class SecurityManagerSetup 
         }
         isJars = true;
 		
-		URL derby = getURL("org.apache.derby.jdbc.EmbeddedSimpleDataSource");
+		URL derby = getURL("org.apache.derby.jdbc.EmbeddedDataSource");
         if (derby != null)
 		    classPathSet.setProperty("derbyTesting.codejar", stripJar(derby));
 

Modified: db/derby/code/trunk/java/tools/org/apache/derby/tools/SignatureChecker.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/tools/SignatureChecker.java?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/tools/SignatureChecker.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/tools/SignatureChecker.java Sat May 11
01:40:09 2013
@@ -30,7 +30,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 
 import org.apache.derby.iapi.services.info.JVMInfo;
-import org.apache.derby.jdbc.EmbeddedSimpleDataSource;
+import org.apache.derby.jdbc.EmbeddedDataSource40;
 import org.apache.derby.shared.common.reference.JDBC40Translation;
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 
@@ -432,7 +432,7 @@ public class SignatureChecker
     private Connection  getJ2MEConnection()
         throws SQLException
     {
-        EmbeddedSimpleDataSource    dataSource = new EmbeddedSimpleDataSource();
+        EmbeddedDataSource40    dataSource = new EmbeddedDataSource40();
 
         dataSource.setDatabaseName( _parsedArgs.getJ2meDatabaseName() );
 

Modified: db/derby/code/trunk/tools/jar/extraDBMSclasses.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/extraDBMSclasses.properties?rev=1481248&r1=1481247&r2=1481248&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/extraDBMSclasses.properties (original)
+++ db/derby/code/trunk/tools/jar/extraDBMSclasses.properties Sat May 11 01:40:09 2013
@@ -49,7 +49,6 @@ derby.module.vti.containedRoles=org.apac
 derby.module.core.csds=org.apache.derby.jdbc.EmbeddedDataSource
 derby.module.core.cscpds=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource
 derby.module.core.csxad=org.apache.derby.jdbc.EmbeddedXADataSource
-derby.module.core.csds_simple=org.apache.derby.jdbc.EmbeddedSimpleDataSource
 derby.module.core.csds.jdk16=org.apache.derby.jdbc.EmbeddedDataSource40
 derby.module.core.csds.jdk16n=org.apache.derby.jdbc.BasicEmbeddedDataSource40
 derby.module.core.csxads.jdk16=org.apache.derby.jdbc.EmbeddedXADataSource40



Mime
View raw message