db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1372404 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/sql/dictionary/ impl/jdbc/ jdbc/
Date Mon, 13 Aug 2012 12:54:27 GMT
Author: kahatlen
Date: Mon Aug 13 12:54:27 2012
New Revision: 1372404

URL: http://svn.apache.org/viewvc?rev=1372404&view=rev
Log:
DERBY-5883: Simplify JSR-169 implementation class tree

Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement169.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement169.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet169.java
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java?rev=1372404&r1=1372403&r2=1372404&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
Mon Aug 13 12:54:27 2012
@@ -35,7 +35,6 @@ import org.apache.derby.iapi.services.sa
 import org.apache.derby.catalog.DependableFinder;
 import org.apache.derby.catalog.Dependable;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.impl.sql.depend.BasicDependencyManager;
 
 /**
  * This is the implementation of ViewDescriptor. Users of View descriptors

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java?rev=1372404&r1=1372403&r2=1372404&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
Mon Aug 13 12:54:27 2012
@@ -47,7 +47,7 @@ import java.util.Calendar;
  * Local implementation.
  *
  */
-public abstract class EmbedCallableStatement extends EmbedPreparedStatement
+public class EmbedCallableStatement extends EmbedPreparedStatement
 	implements CallableStatement
 {
 	/*

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java?rev=1372404&r1=1372403&r2=1372404&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
Mon Aug 13 12:54:27 2012
@@ -79,7 +79,7 @@ import org.apache.derby.iapi.util.Interr
    <LI> JSR169
    </UL>
  */
-public abstract class EmbedPreparedStatement
+public class EmbedPreparedStatement
 	extends EmbedStatement
 	implements EnginePreparedStatement
 {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java?rev=1372404&r1=1372403&r2=1372404&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Mon Aug
13 12:54:27 2012
@@ -92,7 +92,7 @@ import org.apache.derby.iapi.util.Interr
    </UL>
  */
 
-public abstract class EmbedResultSet extends ConnectionChild 
+public class EmbedResultSet extends ConnectionChild
     implements EngineResultSet, Comparable {
 
 	// cursor movement

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml?rev=1372404&r1=1372403&r2=1372404&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml Mon Aug 13 12:54:27
2012
@@ -51,10 +51,9 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${jsr169compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/jdbc/*.java"/>
-	  <exclude name="${derby.dir}/impl/jdbc/*169.java"/>
 	  <exclude name="${derby.dir}/impl/jdbc/*20.java"/>
 	  <exclude name="${derby.dir}/impl/jdbc/*30.java"/>
 	  <exclude name="${derby.dir}/impl/jdbc/*40.java"/>
@@ -66,26 +65,6 @@
    </javac>
     <copy file="metadata.properties" tofile="${out.dir}/org/apache/derby/impl/jdbc/metadata.properties"/>
     </target>
-  	<target name="compile_jsr169_opt">
-  	    <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="${jsr169compile.classpath}"/>
-        </classpath>
-        <include name="${derby.dir}/impl/jdbc/*169.java"/>
-    </javac>
-  	</target>
   <target name="compile_jdbc3" depends="compile_jsr169">
     <javac
       source="1.5"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java?rev=1372404&r1=1372403&r2=1372404&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java Mon Aug 13 12:54:27
2012
@@ -105,7 +105,7 @@ public class Driver169 extends InternalD
 		throws SQLException
 
 		{
-			return new EmbedPreparedStatement169(conn, stmt, forMetaData,
+			return new EmbedPreparedStatement(conn, stmt, forMetaData,
 				resultSetType, resultSetConcurrency, resultSetHoldability,
 				autoGeneratedKeys, columnIndexes, columnNames);
 		}
@@ -120,7 +120,7 @@ public class Driver169 extends InternalD
 				int resultSetHoldability)
 		throws SQLException
     {
-       return new EmbedCallableStatement169(conn,stmt, resultSetType,
+        return new EmbedCallableStatement(conn,stmt, resultSetType,
             resultSetConcurrency, resultSetHoldability);
     }
 
@@ -129,7 +129,7 @@ public class Driver169 extends InternalD
 		newEmbedResultSet(EmbedConnection conn, ResultSet results, boolean forMetaData, EmbedStatement
statement, boolean isAtomic)
 	throws SQLException
 	{
-	    return new EmbedResultSet169(conn, results, forMetaData, statement, isAtomic);
+        return new EmbedResultSet(conn, results, forMetaData, statement, isAtomic);
 	}
 
     /**



Mime
View raw message