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 ka...@apache.org on 2010/03/23 11:53:42 UTC
svn commit: r926526 - in /db/derby/code/trunk/java:
engine/org/apache/derby/iapi/reference/ engine/org/apache/derby/impl/jdbc/
engine/org/apache/derby/impl/sql/compile/
engine/org/apache/derby/impl/sql/conn/ tools/org/apache/derby/impl/tools/ij/
Author: kahatlen
Date: Tue Mar 23 10:53:42 2010
New Revision: 926526
URL: http://svn.apache.org/viewvc?rev=926526&view=rev
Log:
DERBY-2438: Remove the JDBC20Translation interface
All the constants in this interface are now available in the default
compile classpath, so remove this indirection.
Removed:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java?rev=926526&r1=926525&r2=926526&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java Tue Mar 23 10:53:42 2010
@@ -21,32 +21,21 @@
package org.apache.derby.impl.jdbc;
-import org.apache.derby.iapi.reference.JDBC20Translation;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.sql.ResultSet;
-import org.apache.derby.iapi.sql.execute.ExecCursorTableReference;
-
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.impl.jdbc.Util;
-import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
-import org.apache.derby.iapi.sql.conn.StatementContext;
import org.apache.derby.iapi.types.DataValueDescriptor;
-import java.sql.Statement;
import java.sql.SQLException;
-import java.sql.Types;
/* ---- New jdbc 2.0 types ----- */
import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
import java.sql.Ref;
import java.math.BigDecimal;
-import java.net.URL;
/**
* This class extends the EmbedResultSet class in order to support new
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java?rev=926526&r1=926525&r2=926526&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java Tue Mar 23 10:53:42 2010
@@ -27,10 +27,6 @@ import org.apache.derby.iapi.services.sa
import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.error.StandardException;
-
-import org.apache.derby.iapi.types.BitDataValue;
-import org.apache.derby.iapi.types.DataValueFactory;
import org.apache.derby.iapi.types.TypeId;
import org.apache.derby.iapi.types.DataTypeDescriptor;
@@ -39,9 +35,6 @@ import org.apache.derby.iapi.sql.compile
import org.apache.derby.iapi.reference.ClassName;
-import java.sql.Types;
-import org.apache.derby.iapi.reference.JDBC20Translation;
-
/**
* This class implements TypeCompiler for the SQL BIT datatype.
*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java?rev=926526&r1=926525&r2=926526&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java Tue Mar 23 10:53:42 2010
@@ -27,10 +27,6 @@ import org.apache.derby.iapi.services.sa
import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.error.StandardException;
-
-import org.apache.derby.iapi.types.BitDataValue;
-import org.apache.derby.iapi.types.DataValueFactory;
import org.apache.derby.iapi.types.TypeId;
import org.apache.derby.iapi.types.DataTypeDescriptor;
@@ -39,8 +35,6 @@ import org.apache.derby.iapi.sql.compile
import org.apache.derby.iapi.reference.ClassName;
-import java.sql.Types;
-import org.apache.derby.iapi.reference.JDBC20Translation;
/**
* This class implements TypeCompiler for the SQL LOB types.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java?rev=926526&r1=926525&r2=926526&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java Tue Mar 23 10:53:42 2010
@@ -21,9 +21,6 @@
package org.apache.derby.impl.sql.conn;
-import org.apache.derby.iapi.reference.JDBC20Translation;
-import org.apache.derby.iapi.reference.JDBC30Translation;
-
import org.apache.derby.iapi.sql.conn.LanguageConnectionFactory;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
import org.apache.derby.iapi.sql.compile.CompilerContext;
@@ -31,8 +28,6 @@ import org.apache.derby.iapi.sql.compile
import org.apache.derby.iapi.sql.LanguageFactory;
import org.apache.derby.impl.sql.GenericStatement;
-import org.apache.derby.impl.sql.conn.CachedStatement;
-
import org.apache.derby.iapi.services.uuid.UUIDFactory;
import org.apache.derby.iapi.services.compiler.JavaFactory;
import org.apache.derby.iapi.services.loader.ClassFactory;
@@ -48,14 +43,10 @@ import org.apache.derby.iapi.error.Stand
import org.apache.derby.iapi.sql.compile.NodeFactory;
import org.apache.derby.iapi.sql.compile.Parser;
-import org.apache.derby.iapi.sql.Activation;
-
-import org.apache.derby.iapi.store.access.AccessFactory;
import org.apache.derby.iapi.services.property.PropertyFactory;
import org.apache.derby.iapi.sql.Statement;
import org.apache.derby.iapi.sql.compile.OptimizerFactory;
-import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.types.DataValueFactory;
import org.apache.derby.iapi.sql.execute.ExecutionFactory;
import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
@@ -65,7 +56,6 @@ import org.apache.derby.iapi.services.sa
import org.apache.derby.iapi.services.monitor.Monitor;
import org.apache.derby.iapi.services.monitor.ModuleControl;
import org.apache.derby.iapi.services.monitor.ModuleSupportable;
-import org.apache.derby.iapi.services.monitor.ModuleFactory;
import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.cache.CacheFactory;
@@ -76,13 +66,11 @@ import org.apache.derby.iapi.services.ca
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.iapi.services.property.PropertySetCallback;
-import org.apache.derby.iapi.services.i18n.LocaleFinder;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.iapi.reference.EngineType;
import java.util.Properties;
-import java.util.Locale;
import java.util.Dictionary;
import java.io.Serializable;
import org.apache.derby.iapi.util.IdUtil;
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj?rev=926526&r1=926525&r2=926526&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj Tue Mar 23 10:53:42 2010
@@ -34,8 +34,6 @@ PARSER_BEGIN(ij)
package org.apache.derby.impl.tools.ij;
-import org.apache.derby.iapi.reference.JDBC20Translation;
-
import org.apache.derby.tools.JDBCDisplayUtil;
@@ -65,6 +63,7 @@ import java.util.Enumeration;
import java.util.Locale;
import java.util.List;
import java.util.ArrayList;
+import javax.transaction.xa.XAResource;
/**
@@ -3562,42 +3561,42 @@ throws SQLException
{
<XA_ENDRSCAN>
{
- return JDBC20Translation.XA_ENDRSCAN;
+ return XAResource.TMENDRSCAN;
}
|
<XA_FAIL>
{
- return JDBC20Translation.XA_FAIL;
+ return XAResource.TMFAIL;
}
|
<XA_JOIN>
{
- return JDBC20Translation.XA_JOIN;
+ return XAResource.TMJOIN;
}
|
<XA_NOFLAGS>
{
- return JDBC20Translation.XA_NOFLAGS;
+ return XAResource.TMNOFLAGS;
}
|
<XA_RESUME>
{
- return JDBC20Translation.XA_RESUME;
+ return XAResource.TMRESUME;
}
|
<XA_STARTRSCAN>
{
- return JDBC20Translation.XA_STARTRSCAN;
+ return XAResource.TMSTARTRSCAN;
}
|
<XA_SUCCESS>
{
- return JDBC20Translation.XA_SUCCESS;
+ return XAResource.TMSUCCESS;
}
|
<XA_SUSPEND>
{
- return JDBC20Translation.XA_SUSPEND;
+ return XAResource.TMSUSPEND;
}
}