[06/44] incubator-trafodion git commit: Refact package name

[db...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a83dc2/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TCallableStatement.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TCallableStatement.java b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TCallableStatement.java
deleted file mode 100644
index 9607775..0000000
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TCallableStatement.java
+++ /dev/null
@@ -1,1100 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-/* -*-java-*-
- * Filename    : TCallableStatement.java
- * Description :
- *
- * --------------------------------------------------------------------
- */
-
-package org.trafodion.jdbc.t2;
-
-import java.sql.*;
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Map;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.Date;
-
-import org.trafodion.jdbc.t2.SQLMXStatement;
-
-public class TCallableStatement extends TPreparedStatement implements
-		java.sql.CallableStatement {
-	public Array getArray(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getArray(" + parameterIndex + ")");
-		Array retValue;
-
-		retValue = ((CallableStatement) stmt_).getArray(parameterIndex);
-		return retValue;
-	}
-
-	public BigDecimal getBigDecimal(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getBigDecimal(" + parameterIndex + ")");
-		BigDecimal retValue;
-
-		retValue = ((CallableStatement) stmt_).getBigDecimal(parameterIndex);
-		return retValue;
-	}
-
-	@Deprecated
-	public BigDecimal getBigDecimal(int parameterIndex, int scale)
-			throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getBigDecimal(" + parameterIndex + ","
-					+ scale + ")");
-		BigDecimal retValue;
-
-		retValue = ((CallableStatement) stmt_).getBigDecimal(parameterIndex,
-				scale);
-		return retValue;
-	}
-
-	public Blob getBlob(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getBlob(" + parameterIndex + ")");
-		Blob retValue;
-
-		retValue = ((CallableStatement) stmt_).getBlob(parameterIndex);
-		return retValue;
-	}
-
-	public boolean getBoolean(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getBoolean(" + parameterIndex + ")");
-		boolean retValue;
-
-		retValue = ((CallableStatement) stmt_).getBoolean(parameterIndex);
-		return retValue;
-	}
-
-	public byte getByte(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getByte(" + parameterIndex + ")");
-		byte retValue;
-
-		retValue = ((CallableStatement) stmt_).getByte(parameterIndex);
-		return retValue;
-	}
-
-	public byte[] getBytes(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getBytes(" + parameterIndex + ")");
-		byte[] retValue;
-
-		retValue = ((CallableStatement) stmt_).getBytes(parameterIndex);
-		return retValue;
-	}
-
-	public Clob getClob(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getClob(" + parameterIndex + ")");
-		Clob retValue;
-
-		retValue = ((CallableStatement) stmt_).getClob(parameterIndex);
-		return retValue;
-	}
-
-	public java.sql.Date getDate(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getDate(" + parameterIndex + ")");
-		java.sql.Date retValue;
-
-		retValue = ((CallableStatement) stmt_).getDate(parameterIndex);
-		return retValue;
-	}
-
-	public java.sql.Date getDate(int parameterIndex, Calendar cal)
-			throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getDate(" + parameterIndex + "," + cal
-					+ ")");
-		java.sql.Date retValue;
-
-		retValue = ((CallableStatement) stmt_).getDate(parameterIndex, cal);
-		return retValue;
-	}
-
-	public double getDouble(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getDouble(" + parameterIndex + ")");
-		double retValue;
-
-		retValue = ((CallableStatement) stmt_).getDouble(parameterIndex);
-		return retValue;
-	}
-
-	public float getFloat(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getFloat(" + parameterIndex + ")");
-		float retValue;
-
-		retValue = ((CallableStatement) stmt_).getFloat(parameterIndex);
-		return retValue;
-	}
-
-	public int getInt(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getInt(" + parameterIndex + ")");
-		int retValue;
-
-		retValue = ((CallableStatement) stmt_).getInt(parameterIndex);
-		return retValue;
-	}
-
-	public long getLong(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getLong(" + parameterIndex + ")");
-		long retValue;
-
-		retValue = ((CallableStatement) stmt_).getLong(parameterIndex);
-		return retValue;
-	}
-
-	public Object getObject(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getObject(" + parameterIndex + ")");
-		Object retValue;
-
-		retValue = ((CallableStatement) stmt_).getObject(parameterIndex);
-		return retValue;
-	}
-
-	public Object getObject(int parameterIndex, Map<String, Class<?>> map)
-			throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getObject(" + parameterIndex + "," + map
-					+ ")");
-		Object retValue;
-
-		retValue = ((CallableStatement) stmt_).getObject(parameterIndex, map);
-		return retValue;
-	}
-
-	public Ref getRef(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getRef(" + parameterIndex + ")");
-		Ref retValue;
-
-		retValue = ((CallableStatement) stmt_).getRef(parameterIndex);
-		return retValue;
-	}
-
-	public short getShort(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getShort(" + parameterIndex + ")");
-		short retValue;
-
-		retValue = ((CallableStatement) stmt_).getShort(parameterIndex);
-		return retValue;
-	}
-
-	public String getString(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getString(" + parameterIndex + ")");
-		String retValue;
-
-		retValue = ((CallableStatement) stmt_).getString(parameterIndex);
-		return retValue;
-	}
-
-	public Time getTime(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getTime(" + parameterIndex + ")");
-		Time retValue;
-
-		retValue = ((CallableStatement) stmt_).getTime(parameterIndex);
-		return retValue;
-	}
-
-	public Time getTime(int parameterIndex, Calendar cal) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getTime(" + parameterIndex + "," + cal
-					+ ")");
-		Time retValue;
-
-		retValue = ((CallableStatement) stmt_).getTime(parameterIndex, cal);
-		return retValue;
-	}
-
-	public Timestamp getTimestamp(int parameterIndex) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getTimestamp(" + parameterIndex + ")");
-		Timestamp retValue;
-
-		retValue = ((CallableStatement) stmt_).getTimestamp(parameterIndex);
-		return retValue;
-	}
-
-	public Timestamp getTimestamp(int parameterIndex, Calendar cal)
-			throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getTimestamp(" + parameterIndex + ","
-					+ cal + ")");
-		Timestamp retValue;
-
-		retValue = ((CallableStatement) stmt_)
-				.getTimestamp(parameterIndex, cal);
-		return retValue;
-	}
-
-	public void registerOutParameter(int parameterIndex, int sqlType)
-			throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "registerOutParameter(" + parameterIndex
-					+ "," + sqlType + ")");
-		((CallableStatement) stmt_).registerOutParameter(parameterIndex,
-				sqlType);
-	}
-
-	public void registerOutParameter(String parameterName, int sqlType)
-			throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "registerOutParameter(" + parameterName
-					+ "," + sqlType + ")");
-		((CallableStatement) stmt_)
-				.registerOutParameter(parameterName, sqlType);
-	}
-
-	public void registerOutParameter(int parameterIndex, int sqlType, int scale)
-			throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "registerOutParameter(" + parameterIndex
-					+ "," + sqlType + "," + scale + ")");
-		((CallableStatement) stmt_).registerOutParameter(parameterIndex,
-				sqlType, scale);
-	}
-
-	public void registerOutParameter(int parameterIndex, int sqlType,
-			String typeName) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "registerOutParameter(" + parameterIndex
-					+ "," + sqlType + "," + typeName + ")");
-		if (out_ != null)
-			out_.println(getTraceId() + "getArray(" + parameterIndex + ")");
-		((CallableStatement) stmt_).registerOutParameter(parameterIndex,
-				sqlType, typeName);
-	}
-
-	public boolean wasNull() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "wasNull()");
-		boolean retValue;
-
-		retValue = ((CallableStatement) stmt_).wasNull();
-		return retValue;
-	}
-
-	public boolean execute() throws SQLException {
-		boolean retValue;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "execute()");
-		}
-
-		retValue = ((CallableStatement) stmt_).execute();
-		return retValue;
-	}
-
-	public int[] executeBatch() throws SQLException {
-		int[] result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "executeBatch()");
-		}
-
-		result = ((CallableStatement) stmt_).executeBatch();
-		return result;
-	}
-
-	public ResultSet executeQuery() throws SQLException {
-		ResultSet result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "executeQuery()");
-		}
-
-		result = ((CallableStatement) stmt_).executeQuery();
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "executeQuery() returns ResultSet ["
-					+ System.identityHashCode(result) + "]");
-		}
-
-		return result;
-	}
-
-	public int executeUpdate() throws SQLException {
-		int result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "executeUpdate()");
-		}
-
-		result = ((CallableStatement) stmt_).executeUpdate();
-		return 1;
-	}
-
-	public Array getArray(String str) throws SQLException {
-		Array result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getArray(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getArray(str);
-		return result;
-	}
-
-	public BigDecimal getBigDecimal(String str) throws SQLException {
-		BigDecimal result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getBigDecimal(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getBigDecimal(str);
-		return result;
-	}
-
-	public Blob getBlob(String str) throws SQLException {
-		Blob result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getBlob(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getBlob(str);
-		return result;
-	}
-
-	public boolean getBoolean(String str) throws SQLException {
-		boolean result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getBoolean(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getBoolean(str);
-		return true;
-	}
-
-	public byte getByte(String str) throws SQLException {
-		byte result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getByte(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getByte(str);
-		return result;
-	}
-
-	public byte[] getBytes(String str) throws SQLException {
-		byte[] result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getBytes(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getBytes(str);
-		return result;
-	}
-
-	public Clob getClob(String str) throws SQLException {
-		Clob result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getClob(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getClob(str);
-		return result;
-	}
-
-	public java.sql.Date getDate(String str) throws SQLException {
-		java.sql.Date result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getDate(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getDate(str);
-		return result;
-	}
-
-	public java.sql.Date getDate(String str, Calendar calendar)
-			throws SQLException {
-		java.sql.Date result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getDate(" + str + ", " + calendar + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getDate(str, calendar);
-		return result;
-	}
-
-	public double getDouble(String str) throws SQLException {
-		double result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getDouble(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getDouble(str);
-		return result;
-	}
-
-	public float getFloat(String str) throws SQLException {
-		float result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getFloat(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getFloat(str);
-		return result;
-	}
-
-	public int getInt(String str) throws SQLException {
-		int result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getInt(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getInt(str);
-		return result;
-	}
-
-	public long getLong(String str) throws SQLException {
-		long result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getLong(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getLong(str);
-		return result;
-	}
-
-	public Object getObject(String str) throws SQLException {
-		Object result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getObject(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getObject(str);
-		return result;
-	}
-
-	public Object getObject(String str, Map<String, Class<?>> map)
-			throws SQLException {
-		Object result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getObject(" + str + ", " + map + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getObject(str, map);
-		return result;
-	}
-
-	public Ref getRef(String str) throws SQLException {
-		Ref result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getRef(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getRef(str);
-		return result;
-	}
-
-	public short getShort(String str) throws SQLException {
-		short result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getShort(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getShort(str);
-		return result;
-	}
-
-	public String getString(String str) throws SQLException {
-		String result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getString(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getString(str);
-		return result;
-	}
-
-	public Time getTime(String str) throws SQLException {
-		Time result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getTime(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getTime(str);
-		return result;
-	}
-
-	public Time getTime(String str, Calendar calendar) throws SQLException {
-		Time result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getTime(" + str + calendar + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getTime(str, calendar);
-		return result;
-	}
-
-	public Timestamp getTimestamp(String str) throws SQLException {
-		Timestamp result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getTimestamp(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getTimestamp(str);
-		return result;
-	}
-
-	public Timestamp getTimestamp(String str, Calendar calendar)
-			throws SQLException {
-		Timestamp result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getTimestamp(" + str + ", " + calendar
-					+ ")");
-		}
-
-		result = ((CallableStatement) stmt_).getTimestamp(str, calendar);
-		return result;
-	}
-
-	public URL getURL(int param) throws SQLException {
-		URL result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getURL(" + param + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getURL(param);
-		return result;
-	}
-
-	public URL getURL(String str) throws SQLException {
-		URL result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "getURL(" + str + ")");
-		}
-
-		result = ((CallableStatement) stmt_).getURL(str);
-		return result;
-	}
-
-	public void registerOutParameter(String str, int param, String str2)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "registerOutParameter(" + str + ", "
-					+ param + ", " + str2 + ")");
-		}
-
-		((CallableStatement) stmt_).registerOutParameter(str, param, str2);
-	}
-
-	public void registerOutParameter(String str, int param, int param2)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "registerOutParameter(" + str + ", "
-					+ param + ", " + param2 + ")");
-		}
-
-		((CallableStatement) stmt_).registerOutParameter(str, param, param2);
-	}
-
-	public void setAsciiStream(String str, InputStream inputStream, int param)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setAsciiStream(" + str + ", "
-					+ inputStream + ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setAsciiStream(str, inputStream, param);
-	}
-
-	public void setBigDecimal(String str, BigDecimal bigDecimal)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setBigDeciaml(" + str + ", " + bigDecimal
-					+ ")");
-		}
-
-		((CallableStatement) stmt_).setBigDecimal(str, bigDecimal);
-	}
-
-	public void setBigDecimal(int param, BigDecimal bigDecimal)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setBigDecimal(" + param + ", "
-					+ bigDecimal + ")");
-		}
-
-		((CallableStatement) stmt_).setBigDecimal(param, bigDecimal);
-	}
-
-	public void setBinaryStream(String str, InputStream inputStream, int param)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setBinaryStream(" + str + ", "
-					+ inputStream + ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setBinaryStream(str, inputStream, param);
-	}
-
-	public void setBoolean(String str, boolean param) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setBoolean(" + str + ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setBoolean(str, param);
-	}
-
-	public void setByte(String str, byte param) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setByte(" + str + ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setByte(str, param);
-	}
-
-	public void setBytes(String str, byte[] values) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setBytes(" + str + ", " + values + ")");
-		}
-
-		((CallableStatement) stmt_).setBytes(str, values);
-	}
-
-	public void setCharacterStream(String str, Reader reader, int param)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setCharacterStream(" + str + ", " + reader
-					+ ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setCharacterStream(str, reader, param);
-	}
-
-	public void setDate(String str, java.sql.Date date) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setDate(" + str + ", " + date + ")");
-		}
-
-		((CallableStatement) stmt_).setDate(str, date);
-	}
-
-	public void setDate(String str, java.sql.Date date, Calendar calendar)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setDate(" + str + ", " + date + ", "
-					+ calendar + ")");
-		}
-
-		((CallableStatement) stmt_).setDate(str, date, calendar);
-	}
-
-	public void setDouble(String str, double param) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setDouble(" + str + ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setDouble(str, param);
-	}
-
-	public void setFloat(String str, float param) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setFloat(" + str + ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setFloat(str, param);
-	}
-
-	public void setInt(String str, int param) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setInt(" + str + ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setInt(str, param);
-	}
-
-	public void setLong(String str, long param) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setLong(" + str + ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setLong(str, param);
-	}
-
-	public void setNull(String str, int param) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setNull(" + str + ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setNull(str, param);
-	}
-
-	public void setNull(String str, int param, String str2) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setNull(" + str + ", " + param + ", "
-					+ str2 + ")");
-		}
-
-		((CallableStatement) stmt_).setNull(str, param, str2);
-	}
-
-	public void setObject(String str, Object obj) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setObject(" + str + ", " + obj + ")");
-		}
-
-		((CallableStatement) stmt_).setObject(str, obj);
-	}
-
-	public void setObject(String str, Object obj, int param)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setObject(" + str + ", " + obj + ", "
-					+ param + ")");
-		}
-
-		((CallableStatement) stmt_).setObject(str, obj, param);
-	}
-
-	public void setObject(String str, Object obj, int param, int param3)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setObject(" + str + ", " + obj + ", "
-					+ param + ", " + param3 + ")");
-		}
-
-		((CallableStatement) stmt_).setObject(str, obj, param, param3);
-	}
-
-	public void setShort(String str, short param) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setShort(" + str + ", " + param + ")");
-		}
-
-		((CallableStatement) stmt_).setShort(str, param);
-	}
-
-	public void setString(String str, String str1) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setString(" + str + ", " + str1 + ")");
-		}
-
-		((CallableStatement) stmt_).setString(str, str1);
-	}
-
-	public void setTime(String str, Time time) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setTime(" + str + ", " + time + ")");
-		}
-
-		((CallableStatement) stmt_).setTime(str, time);
-	}
-
-	public void setTime(String str, Time time, Calendar calendar)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setTime(" + str + ", " + time + ", "
-					+ calendar + ")");
-		}
-
-		((CallableStatement) stmt_).setTime(str, time, calendar);
-	}
-
-	public void setTimestamp(String str, Timestamp timestamp)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setTimestamp(" + str + ", " + timestamp
-					+ ")");
-		}
-
-		((CallableStatement) stmt_).setTimestamp(str, timestamp);
-	}
-
-	public void setTimestamp(String str, Timestamp timestamp, Calendar calendar)
-			throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setTimestamp(" + str + ", " + timestamp
-					+ ", " + calendar + ")");
-		}
-
-		((CallableStatement) stmt_).setTimestamp(str, timestamp, calendar);
-	}
-
-	public void setURL(String str, URL uRL) throws SQLException {
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setURL(" + str + ", " + uRL + ")");
-		}
-
-		((CallableStatement) stmt_).setURL(str, uRL);
-	}
-
-	// Constructors with access specifier as "default"
-	public TCallableStatement(CallableStatement stmt, PrintWriter out) {
-	super(stmt,out);
-	}
-
-
-	public RowId getRowId(int parameterIndex) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public RowId getRowId(String parameterName) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void setRowId(String parameterName, RowId x) throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setNString(String parameterName, String value)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setNCharacterStream(String parameterName, Reader value,
-			long length) throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setNClob(String parameterName, NClob value) throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setClob(String parameterName, Reader reader, long length)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setBlob(String parameterName, InputStream inputStream,
-			long length) throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setNClob(String parameterName, Reader reader, long length)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public NClob getNClob(int parameterIndex) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public NClob getNClob(String parameterName) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void setSQLXML(String parameterName, SQLXML xmlObject)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public SQLXML getSQLXML(int parameterIndex) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public SQLXML getSQLXML(String parameterName) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getNString(int parameterIndex) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getNString(String parameterName) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Reader getNCharacterStream(int parameterIndex) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Reader getNCharacterStream(String parameterName) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Reader getCharacterStream(int parameterIndex) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Reader getCharacterStream(String parameterName) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void setBlob(String parameterName, Blob x) throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setClob(String parameterName, Clob x) throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setAsciiStream(String parameterName, InputStream x, long length)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setBinaryStream(String parameterName, InputStream x, long length)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setCharacterStream(String parameterName, Reader reader,
-			long length) throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setAsciiStream(String parameterName, InputStream x)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setBinaryStream(String parameterName, InputStream x)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setCharacterStream(String parameterName, Reader reader)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setNCharacterStream(String parameterName, Reader value)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setClob(String parameterName, Reader reader)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setBlob(String parameterName, InputStream inputStream)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setNClob(String parameterName, Reader reader)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public Object getObject(int parameterIndex, Class type)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Object getObject(String parameterName, Class type)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a83dc2/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClob.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClob.java b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClob.java
deleted file mode 100644
index e64ba32..0000000
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClob.java
+++ /dev/null
@@ -1,154 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-/* -*-java-*-
- * Filename    : TClob.java
- * Description :
- *
- * --------------------------------------------------------------------
- */
-
-package org.trafodion.jdbc.t2;
-
-import java.sql.*;
-import java.io.*;
-import java.util.Date;
-
-public class TClob implements java.sql.Clob
-{
-	public InputStream getAsciiStream() throws SQLException
-	{
-		if (out_ != null)
-		    out_.println(getTraceId() + "getAsciiStream()");
-		return new TLobInputStream(clob_.getAsciiStream(), out_);
-	}
-
-	public Reader getCharacterStream() throws SQLException
-	{
-		if (out_ != null)
-		    out_.println(getTraceId() + "getCharacterStream()");
-		return new TClobReader(clob_.getCharacterStream(), out_);
-	}
-
-	public String getSubString(long pos, int length) throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "getSubString(" + pos + ", " + length +")");
-		return clob_.getSubString(pos, length);
-	}
-
-	public long length() throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "length()");
-		return clob_.length();
-	}
-
-	public long position(Clob searchstr, long start) throws SQLException
-	{	
-		if (out_ != null)
-			out_.println(getTraceId() + "position(" + searchstr + ", " + start + ")");
-		return clob_.position(searchstr, start);
-	}
-
-	public long position(String searchstr,long start) throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "position(\"" + searchstr + "\", " + start + ")");
-		return clob_.position(searchstr, start);
-	}
-	
-	public OutputStream setAsciiStream(long pos) throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "setAsciiStream("+ pos + ")");
-		return new TLobOutputStream(clob_.setAsciiStream(pos), out_);
-	}
-
-	public Writer setCharacterStream(long pos) throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "setCharacterStream("+ pos + ")");
-		return new TClobWriter(clob_.setCharacterStream(pos), out_);
-	}
-
-	public int setString(long pos, String str) throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "setString(" + pos + ", <String>)");
-		return clob_.setString(pos, str);
-	}
-
-	public int setString(long pos, String str, int offset, int len)
-              throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "setString(" + pos + ", <String>, " + offset + ", "
-							+ len + ")");
-		return clob_.setString(pos, str, offset, len);
-	}
-
-	public void truncate(long len) throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "truncate("+ len + ")");
-		clob_.truncate(len);
-	}
-
-	// Constructors with access specifier as "default"
-    TClob(Clob clob, PrintWriter out)
-    {
-        clob_ = clob;
-        out_ = out;
-        
-    }
-	public void setTraceId(String traceId_) {
-		this.traceId_ = traceId_;
-	}
-
-	public String getTraceId() {
-		String className = null;
-		if (clob_ != null)
-            className = clob_.getClass().getName();
-
-        // Build up jdbcTrace output entry
-		setTraceId(org.trafodion.jdbc.t2.T2Driver.traceText
-			+ org.trafodion.jdbc.t2.T2Driver.dateFormat.format(new Date())
-			+ "]:[" + Thread.currentThread() + "]:["
-			+ System.identityHashCode(clob_) +  "]:"
-			+ className.substring(org.trafodion.jdbc.t2.T2Driver.REMOVE_PKG_NAME,className.length()) 
-			+ "."); 
-		return traceId_;
-	}
-	//fields
-	Clob clob_;
-	PrintWriter out_;
-	private String traceId_;
-
-	public void free() throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public Reader getCharacterStream(long pos, long length) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a83dc2/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClobReader.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClobReader.java b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClobReader.java
deleted file mode 100644
index 25aa148..0000000
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClobReader.java
+++ /dev/null
@@ -1,135 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-/* -*-java-*-
- * Filename    : TClobReader.java
- * Description :
- *
- * --------------------------------------------------------------------
- */
-
-package org.trafodion.jdbc.t2;
-
-import java.sql.*;
-import java.io.*;
-import java.util.Date;
-
-public class TClobReader extends java.io.Reader
-{
-	public void close() throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"close()");
-		cr_.close();
-	}
-
-	public void mark(int readlimit) throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"mark("+ readlimit + ")");
-		cr_.mark(readlimit);
-	}
-
-	public boolean markSupported()
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"markSupported()");
-		return cr_.markSupported();
-	}
-
-	public int read() throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"read()");
-		return cr_.read();
-	}
-
-	public int read(char[] cbuf)
-         throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"read(" + cbuf + ")");
-		return cr_.read(cbuf);
-	}
-
-	public int read(char[] cbuf,
-                int off,
-                int len)
-         throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"read(" + cbuf + ", " + off + ", " + len + ")");
-		return cr_.read(cbuf, off, len);
-	}
-
-	public boolean ready() throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"ready()");
-		return cr_.ready();
-	}
-
-	public void reset() throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"reset()");
-		cr_.reset();
-	}
-
-	public long skip(long n)
-          throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"skip(" + n + ")");
-		return cr_.skip(n);
-	}
-	
-	// Constructors with access specifier as "default"
-    TClobReader(Reader cr, PrintWriter out)
-    {
-        
-        
-        cr_ = cr;
-        out_ = out;
-        
-    }
-	public void setTraceId(String traceId_) {
-		this.traceId_ = traceId_;
-	}
-
-	public String getTraceId() {
-		String className = null;
-		if (cr_ != null)
-            className = cr_.getClass().getName();
-
-        // Build up jdbcTrace output entry
-		setTraceId(org.trafodion.jdbc.t2.T2Driver.traceText
-			+ org.trafodion.jdbc.t2.T2Driver.dateFormat.format(new Date()) 
-			+ "]:[" + Thread.currentThread() + "]:["
-			+ System.identityHashCode(cr_) +  "]:"
-			+ className.substring(org.trafodion.jdbc.t2.T2Driver.REMOVE_PKG_NAME,className.length()) 
-			+ ".");
-		return traceId_;
-	}
-	//fields
-	Reader cr_;
-	PrintWriter out_;
-	private String traceId_;
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a83dc2/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClobWriter.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClobWriter.java b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClobWriter.java
deleted file mode 100644
index f4bb4b3..0000000
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TClobWriter.java
+++ /dev/null
@@ -1,123 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-/* -*-java-*-
- * Filename    : TClobWriter.java
- * Description :
- *
- * --------------------------------------------------------------------
- */
-package org.trafodion.jdbc.t2;
-
-import java.sql.*;
-import java.io.*;
-import java.util.Date;
-
-public class TClobWriter extends java.io.Writer
-{
-	public void close() throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"close()");
-		cw_.close();
-	}
-
-	public void flush()
-           throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"flush()");
-		cw_.flush();
-	}
-
-	public void write(char c) throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"write(" + c + ")");
-		cw_.write(c);
-	}
-
-	public void write(char[] cbuf)
-         throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"write(" + cbuf + ")");
-		cw_.write(cbuf);
-	}
-
-	public void write(char[] cbuf,
-                int off,
-                int len)
-         throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"write(" + cbuf + ", " + off + ", " + len + ")");
-		cw_.write(cbuf, off, len);
-	}
-
-	public void write(String str) throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"write(" + str.getClass().getName() + ")");
-		cw_.write(str);
-	}
-	
-	public void write(String str,
-                int off,
-                int len)
-         throws IOException
-	{
-		if (out_ != null)
-			out_.println(getTraceId()+"write(" + str.getClass().getName() + ", " + off + ", " + len + ")");
-		cw_.write(str, off, len);
-	}
-
-	// Constructors with access specifier as "default"
-    TClobWriter(Writer cw, PrintWriter out)
-    {
-        
-        
-        cw_ = cw;
-        out_ = out;
-        
-    }
-	public void setTraceId(String traceId_) {
-		this.traceId_ = traceId_;
-	}
-
-	public String getTraceId() {
-		String className = null;
-		if (cw_ != null)
-            className = cw_.getClass().getName();
-
-        // Build up jdbcTrace output entry
-		setTraceId(org.trafodion.jdbc.t2.T2Driver.traceText
-			+ org.trafodion.jdbc.t2.T2Driver.dateFormat.format(new Date()) 
-			+ "]:[" + Thread.currentThread() + "]:["
-			+ System.identityHashCode(cw_) +  "]:"
-			+ className.substring(org.trafodion.jdbc.t2.T2Driver.REMOVE_PKG_NAME,className.length()) 
-			+ ".");
-		return traceId_;
-	}
-	//fields
-	Writer cw_;
-	PrintWriter out_;
-	private String traceId_;
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a83dc2/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnection.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnection.java b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnection.java
deleted file mode 100644
index 503afc3..0000000
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnection.java
+++ /dev/null
@@ -1,625 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-/* -*-java-*-
- * Filename    : TConnection.java
- * Description :
- *
- * --------------------------------------------------------------------
- */
-
-package org.trafodion.jdbc.t2;
-
-import java.sql.*;
-import javax.sql.PooledConnection;
-
-import org.trafodion.jdbc.t2.SQLMXStatement;
-
-import java.util.Map;
-import java.io.PrintWriter;
-import java.util.Date;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-
-public class TConnection implements java.sql.Connection {
-
-	// java.sql.Connection interface methods
-	public void close() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "close()");
-		connection_.close();
-	}
-
-	public void clearWarnings() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "clearWarnings()");
-		connection_.clearWarnings();
-	}
-
-	public void commit() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "commit()");
-		connection_.commit();
-	}
-
-	public Statement createStatement() throws SQLException {
-		Statement stmt;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "createStatement()");
-
-		stmt = connection_.createStatement();
-
-		if (out_ != null)
-			out_.println(getTraceId() + "createStatement() returns Statement ["
-					+ ((SQLMXStatement)((TStatement)stmt).stmt_).getStmtLabel_() + "]");
-
-		return new TStatement(stmt, out_);
-	}
-
-	public Statement createStatement(int resultSetType, int resultSetConcurrency)
-			throws SQLException {
-		Statement stmt = null;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "createStatement(" + resultSetType + ","
-					+ resultSetConcurrency + ")");
-
-		stmt = connection_.createStatement(resultSetType, resultSetConcurrency);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "createStatement(" + resultSetType + ","
-					+ resultSetConcurrency + ") returns Statement ["
-					+ ((SQLMXStatement)((TStatement)stmt).stmt_).getStmtLabel_()  + "]");
-
-		return new TStatement(stmt, out_);
-	}
-
-	public Statement createStatement(int resultSetType,
-			int resultSetConcurrency, int resultSetHoldability)
-			throws SQLException {
-		Statement stmt = null;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "createStatement(" + resultSetType + ","
-					+ resultSetConcurrency + "," + resultSetHoldability + ")");
-
-		stmt = connection_.createStatement(resultSetType, resultSetConcurrency,
-				resultSetHoldability);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "createStatement(" + resultSetType + ","
-					+ resultSetConcurrency + "," + resultSetHoldability
-					+ ") returns Statement ["
-					+ ((SQLMXStatement)((TStatement)stmt).stmt_).getStmtLabel_()  + "]");
-
-		return new TStatement(stmt, out_);
-	}
-
-	public boolean getAutoCommit() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getAutoCommit()");
-		boolean retValue;
-
-		retValue = connection_.getAutoCommit();
-		return retValue;
-	}
-
-	public String getCatalog() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getCatalog()");
-		String retValue;
-
-		retValue = connection_.getCatalog();
-		return retValue;
-	}
-
-	public int getHoldability() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getCatalog()");
-		int retValue;
-
-		retValue = connection_.getHoldability();
-		return retValue;
-	}
-
-	public DatabaseMetaData getMetaData() throws SQLException {
-		DatabaseMetaData metaData;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "getMetaData()");
-
-		metaData = connection_.getMetaData();
-
-		if (out_ != null)
-			out_.println(getTraceId() + "getMetaData() returns DatabaseMetaData ["
-					+ System.identityHashCode(metaData) + "]");
-
-		return new TDatabaseMetaData(metaData, this, out_);
-	}
-
-	public int getTransactionIsolation() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getTransactionIsolation()");
-		int retValue;
-
-		retValue = connection_.getTransactionIsolation();
-		return retValue;
-	}
-
-	// JDK 1.2
-	public java.util.Map<String, Class<?>> getTypeMap() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getTypeMap()");
-		Map<String, Class<?>> retValue;
-
-		retValue = connection_.getTypeMap();
-		return retValue;
-	}
-
-	public SQLWarning getWarnings() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "getWarnings()");
-		SQLWarning retValue;
-
-		retValue = connection_.getWarnings();
-		return retValue;
-	}
-
-	public boolean isClosed() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "isClosed()");
-		boolean retValue;
-
-		retValue = connection_.isClosed();
-		return retValue;
-	}
-
-	public boolean isReadOnly() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "isReadOnly()");
-		boolean retValue;
-
-		retValue = connection_.isReadOnly();
-		return retValue;
-	}
-
-	public String nativeSQL(String sql) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "nativeSQL(\"" + sql + "\")");
-		String retValue;
-
-		retValue = connection_.nativeSQL(sql);
-		return retValue;
-	}
-
-	public CallableStatement prepareCall(String sql) throws SQLException {
-		CallableStatement stmt;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareCall(\"" + sql + "\")");
-
-		stmt = connection_.prepareCall(sql);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareCall(\"" + sql
-					+ "\") returns CallableStatement ["
-					+ ((SQLMXStatement)((TCallableStatement)stmt).stmt_).getStmtLabel_() + "]");
-
-		return new TCallableStatement(stmt, out_);
-	}
-
-	public CallableStatement prepareCall(String sql, int resultSetType,
-			int resultSetConcurrency) throws SQLException {
-		CallableStatement stmt;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareCall(\"" + sql + "\","
-					+ resultSetType + "," + resultSetConcurrency + ")");
-
-		stmt = connection_
-				.prepareCall(sql, resultSetType, resultSetConcurrency);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareCall(\"" + sql + "\","
-					+ resultSetType + "," + resultSetConcurrency
-					+ ") returns CallableStatement ["
-					+ ((SQLMXStatement)((TCallableStatement)stmt).stmt_).getStmtLabel_()  + "]");
-
-		return new TCallableStatement(stmt, out_);
-	}
-
-	public CallableStatement prepareCall(String sql, int resultSetType,
-			int resultConcurrency, int resultHoldability) throws SQLException {
-		CallableStatement stmt;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareCall(\"" + sql + "\","
-					+ resultSetType + "," + resultConcurrency + ","
-					+ resultHoldability + ")");
-
-		stmt = connection_.prepareCall(sql, resultSetType, resultConcurrency,
-				resultHoldability);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareCall(\"" + sql + "\","
-					+ resultSetType + "," + resultConcurrency + ","
-					+ resultHoldability + ") returns CallableStatement ["
-					+ ((SQLMXStatement)((TCallableStatement)stmt).stmt_).getStmtLabel_() + "]");
-
-		return new TCallableStatement(stmt, out_);
-	}
-
-	public PreparedStatement prepareStatement(String sql) throws SQLException {
-		PreparedStatement stmt;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql + "\")");
-
-		stmt = connection_.prepareStatement(sql);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql
-					+ "\") returns PreparedStatement ["
-					+ ((SQLMXStatement)((TPreparedStatement)stmt).stmt_).getStmtLabel_()+ "]");
-
-		return new TPreparedStatement(stmt, out_);
-	}
-
-	public PreparedStatement prepareStatement(String sql, int resultSetType,
-			int resultSetConcurrency) throws SQLException {
-		PreparedStatement stmt;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql + "\","
-					+ resultSetType + "," + resultSetConcurrency + ")");
-
-		stmt = connection_.prepareStatement(sql, resultSetType,
-				resultSetConcurrency);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql + "\","
-					+ resultSetType + "," + resultSetConcurrency
-					+ ") returns PreparedStatement ["
-					+ ((SQLMXStatement)((TPreparedStatement)stmt).stmt_).getStmtLabel_()  + "]");
-
-		return new TPreparedStatement(stmt, out_);
-	}
-
-	public PreparedStatement prepareStatement(String sql, String[] columnNames)
-			throws SQLException {
-		PreparedStatement stmt;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql + "\")");
-
-		stmt = connection_.prepareStatement(sql, columnNames);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql
-					+ "\") returns PreparedStatement ["
-					+ ((SQLMXStatement)((TPreparedStatement)stmt).stmt_).getStmtLabel_() + "]");
-
-		return new TPreparedStatement(stmt, out_);
-	}
-
-	public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
-			throws SQLException {
-		PreparedStatement stmt;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql + "\","
-					+ autoGeneratedKeys + ")");
-
-		stmt = connection_.prepareStatement(sql, autoGeneratedKeys);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql + "\","
-					+ autoGeneratedKeys + ") returns PreparedStatement ["
-					+ ((SQLMXStatement)((TPreparedStatement)stmt).stmt_).getStmtLabel_()  + "]");
-
-		return new TPreparedStatement(stmt, out_);
-	}
-
-	public PreparedStatement prepareStatement(String sql, int[] columnIndexes)
-			throws SQLException {
-		PreparedStatement stmt;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql + "\","
-					+ columnIndexes + ")");
-
-		stmt = connection_.prepareStatement(sql, columnIndexes);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql + "\","
-					+ columnIndexes + ") returns PreparedStatement ["
-					+ ((SQLMXStatement)((TPreparedStatement)stmt).stmt_).getStmtLabel_() + "]");
-
-		return new TPreparedStatement(stmt, out_);
-	}
-
-	public PreparedStatement prepareStatement(String sql, int resultSetType,
-			int resultSetConcurrency, int resultSetHoldability)
-			throws SQLException {
-		PreparedStatement stmt;
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql + "\","
-					+ resultSetType + "," + resultSetConcurrency + ","
-					+ resultSetHoldability + ")");
-
-		stmt = connection_.prepareStatement(sql, resultSetType,
-				resultSetConcurrency, resultSetHoldability);
-
-		if (out_ != null)
-			out_.println(getTraceId() + "prepareStatement(\"" + sql + "\","
-					+ resultSetType + "," + resultSetConcurrency + ","
-					+ resultSetHoldability + ") returns PreparedStatement ["
-					+ ((SQLMXStatement)((TPreparedStatement)stmt).stmt_).getStmtLabel_() + "]");
-
-		return new TPreparedStatement(stmt, out_);
-	}
-
-	public void releaseSavepoint(Savepoint savepoint) throws SQLException {
-		if (out_ != null) {
-			out_.println(getTraceId() + "releaseSavepoint (" + savepoint + ")");
-		}
-
-		connection_.releaseSavepoint(savepoint);
-	}
-
-	public void rollback() throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "rollback()");
-		connection_.rollback();
-	}
-
-	public void rollback(Savepoint savepoint) throws SQLException {
-		if (out_ != null) {
-			out_.println(getTraceId() + "rollback (" + savepoint + ")");
-		}
-
-		connection_.rollback(savepoint);
-	}
-
-	public void setAutoCommit(boolean autoCommit) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "setAutoCommit(" + autoCommit + ")");
-		connection_.setAutoCommit(autoCommit);
-	}
-
-	public void setCatalog(String catalog) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "setCatalog(\"" + catalog + "\")");
-		connection_.setCatalog(catalog);
-	}
-
-	public void setHoldability(int holdability) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "setHoldability(\"" + holdability + "\")");
-		connection_.setHoldability(holdability);
-	}
-
-	public void setReadOnly(boolean readOnly) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "setReadOnly(" + readOnly + ")");
-		connection_.setReadOnly(readOnly);
-	}
-
-	public Savepoint setSavepoint() throws SQLException {
-		Savepoint result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setSavepoint()");
-		}
-
-		result = connection_.setSavepoint();
-		return result;
-	}
-
-	public Savepoint setSavepoint(String name) throws SQLException {
-		Savepoint result;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "setSavepoint(\"" + name + "\")");
-		}
-
-		result = connection_.setSavepoint(name);
-		return result;
-	}
-
-	public void setTransactionIsolation(int level) throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "setTransactionIsolation(" + level + ")");
-		connection_.setTransactionIsolation(level);
-	}
-
-	// JDK 1.2
-	public void setTypeMap(java.util.Map<String, Class<?>> map)
-			throws SQLException {
-		if (out_ != null)
-			out_.println(getTraceId() + "setTypeMap(" + map + ")");
-		connection_.setTypeMap(map);
-	}
-
-	public PreparedStatement cpqPrepareStatement(String moduleName,
-			int moduleVersion, long moduleTimestamp, String stmtName,
-			boolean isSelect) throws SQLException {
-		PreparedStatement stmt;
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "cpqPrepareStatement(\"" + moduleName
-					+ "\"," + moduleTimestamp + ", \"" + stmtName + "\", \""
-					+ isSelect + ")");
-		}
-
-		if (connection_ instanceof org.trafodion.jdbc.t2.SQLMXConnection) {
-			stmt = ((org.trafodion.jdbc.t2.SQLMXConnection) connection_)
-					.cpqPrepareStatement(moduleName, moduleVersion,
-							moduleTimestamp, stmtName, isSelect);
-		} else {
-			stmt = null;
-		}
-
-		if (out_ != null) {
-			out_.println(getTraceId() + "cpqPrepareStatement(\"" + moduleName
-					+ "\"," + moduleTimestamp + ", \"" + stmtName + "\", \""
-					+ isSelect + ") returns PreparedStatement ["
-					+ ((SQLMXStatement)((TPreparedStatement)stmt).stmt_).getStmtLabel_() + "]");
-		}
-
-		return new TPreparedStatement(stmt, out_);
-	}
-
-	// Constructors with access specifier as "default"
-	public TConnection(Connection connection, PrintWriter out)
-			throws SQLException {
-		
-		connection_ = connection;
-		out_ = out;
-		
-	}
-	public void setTraceId(String traceId_) {
-		this.traceId_ = traceId_;
-	}
-
-	public String getTraceId() {
-		String className = null;
-		if (connection_ != null)
-			className = connection_.getClass().getName();
-
-		// Build up template portion of jdbcTrace output. Pre-appended to
-		// jdbcTrace entries.
-		// jdbcTrace:[XXXX]:[Thread[X,X,X]]:[XXXXXXXX]:ClassName.
-		setTraceId(org.trafodion.jdbc.t2.T2Driver.traceText
-				+ org.trafodion.jdbc.t2.T2Driver.dateFormat.format(new Date())
-				+ "]:["
-				+ Thread.currentThread()
-				+ "]:["
-				+ System.identityHashCode(connection_)
-				+ "]:"
-				+ className.substring(
-						org.trafodion.jdbc.t2.T2Driver.REMOVE_PKG_NAME, className
-								.length()) + ".");
-
-		return traceId_;
-	}
-	// Fields
-	Connection connection_;
-	private String traceId_;
-	PrintWriter out_;
-
-	public Object unwrap(Class iface) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean isWrapperFor(Class iface) throws SQLException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public Clob createClob() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Blob createBlob() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public NClob createNClob() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public SQLXML createSQLXML() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean isValid(int timeout) throws SQLException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public void setClientInfo(String name, String value)
-			throws SQLClientInfoException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setClientInfo(Properties properties)
-			throws SQLClientInfoException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public String getClientInfo(String name) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Properties getClientInfo() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Array createArrayOf(String typeName, Object[] elements)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Struct createStruct(String typeName, Object[] attributes)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void setSchema(String schema) throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void abort(Executor executor) throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setNetworkTimeout(Executor executor, int milliseconds)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public int getNetworkTimeout() throws SQLException {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-        public String getSchema() throws SQLException {
-		// TODO Auto-generated method stub
-              return null;
-        }
-}
- 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a83dc2/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnectionPoolDataSource.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnectionPoolDataSource.java b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnectionPoolDataSource.java
deleted file mode 100644
index 98d7c20..0000000
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnectionPoolDataSource.java
+++ /dev/null
@@ -1,224 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-/* -*-java-*-
- * Filename    : TConnectionPoolDataSource.java
- * Description :
- *
- * --------------------------------------------------------------------
- */
-
-package org.trafodion.jdbc.t2;
-
-import java.io.PrintWriter;
-import java.sql.*;
-import javax.sql.*;
-import java.util.Properties;
-import javax.naming.Referenceable;
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import java.util.Date;
-import javax.naming.StringRefAddr;
-import java.util.logging.Logger;
-
-
-
-public class TConnectionPoolDataSource implements javax.sql.ConnectionPoolDataSource, java.io.Serializable, Referenceable
-
-{
-	// javax.sql.ConnectionPoolDataSource interface methods
-	public PooledConnection getPooledConnection() throws SQLException
-	{	
-		PooledConnection pc;
-		if (cpDS_ != null)
-		{
-			if (out_ != null)
-				out_.println(getTraceId() + "getPooledConnection()");
-
-			pc = cpDS_.getPooledConnection();
-
-			if (out_ != null)
-				out_.println(getTraceId() + "getPooledConnection() returns PooledConnection [" + System.identityHashCode(pc) + "]");
-
-			return new TPooledConnection(pc, out_);
-		}
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-	
-	public PooledConnection getPooledConnection(String username, String password) throws SQLException
-	{
-		PooledConnection pc;
-		if (cpDS_ != null)
-		{
-			if (out_ != null)
-				out_.println(getTraceId() + "getPooledConnection(\"" + username + "\", \"****\")");			
-
-			pc = cpDS_.getPooledConnection(username, password);
-
-			if (out_ != null)
-				out_.println(getTraceId() + "getPooledConnection(\"" + username 
-					+ "\", \"****\") returns PooledConnection [" + System.identityHashCode(pc) + "]");			
-
-			return new TPooledConnection(pc, out_);
-		}
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-
-	public int getLoginTimeout() throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "getLoginTimeout()");			
-		int	retValue;
-
-		if (cpDS_ != null)
-		{
-			retValue = cpDS_.getLoginTimeout();
-			return retValue;
-		}
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-	
-	public PrintWriter getLogWriter() throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "getLogWriter()");			
-		PrintWriter	retValue;
-
-		if (cpDS_ != null)
-		{
-			retValue = cpDS_.getLogWriter();
-			return retValue;
-		}
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-
-	public void setLoginTimeout(int seconds) throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "setLoginTimeout("+ seconds + ")");			
-		if (cpDS_ != null)
-			cpDS_.setLoginTimeout(seconds);
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-
-	public void setLogWriter(PrintWriter out) throws SQLException
-	{
-		out_ = out;
-		if (out_ != null)
-			out_.println(getTraceId() + "setLogWriter("+ out + ")");			
-		if (cpDS_ != null)
-			cpDS_.setLogWriter(out);
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-	
-	public Reference getReference() throws NamingException
-	{
-	
-		if (out_ != null)
-			out_.println(getTraceId() + "getReference()");			
-		Reference ref;
-		
-		ref = new Reference(this.getClass().getName(), "org.trafodion.jdbc.t2.TConnectionPoolDataSourceFactory", null);
-		ref.add(new StringRefAddr("description", description_));
-		ref.add(new StringRefAddr("traceDataSource", traceDataSource_));
-		return ref;
-
-	}
-
-	// Get-Set Property methods
-	public void setDescription(String description)
-	{
-		description_ = description;
-	}
-
-	public String getDescription()
-	{
-		return description_;
-	}
-
-	public void setTraceDataSource(String traceDataSource)
-	{
-		traceDataSource_ = traceDataSource;
-	}
-	
-	public String getTraceDataSource()
-	{
-		return traceDataSource_;
-	}
-	
-	TConnectionPoolDataSource(String traceDataSource, ConnectionPoolDataSource cpDS)
-	{
-		String className = null;
-
-		traceDataSource_ = traceDataSource;
-		cpDS_	= cpDS;
-		if (cpDS_ != null)
-			className = cpDS_.getClass().getName();
-
-		// Build up jdbcTrace output entry
-		setTraceId(org.trafodion.jdbc.t2.T2Driver.traceText
-			+ org.trafodion.jdbc.t2.T2Driver.dateFormat.format(new Date()) 
-			+ "]:[" + Thread.currentThread() + "]:["
-			+ System.identityHashCode(cpDS_) +  "]:" 
-			+ className.substring(org.trafodion.jdbc.t2.T2Driver.REMOVE_PKG_NAME,className.length()) 
-			+ ".");
-	}
-
-	public TConnectionPoolDataSource()
-	{
-	}
-	public void setTraceId(String traceId_) {
-		this.traceId_ = traceId_;
-	}
-
-	public String getTraceId() {
-		
-
-		// Build up jdbcTrace output entry
-		setTraceId(org.trafodion.jdbc.t2.T2Driver.traceText
-			+ org.trafodion.jdbc.t2.T2Driver.dateFormat.format(new Date()) 
-			+ "]:[" + Thread.currentThread() + "]:["
-			+ System.identityHashCode(this) +  "]:" 
-			+ getClass().getName().substring(org.trafodion.jdbc.t2.T2Driver.REMOVE_PKG_NAME,getClass().getName().length()) 
-			+ ".");
-		return traceId_;
-	}
-	// fields
-	PrintWriter	out_;
-	String		traceDataSource_;
-	ConnectionPoolDataSource	cpDS_;
-	private String		traceId_;
-	String		dataSourceName_;
-	String		description_;
-
-	// serialVersionUID set to resolve javax -Xlint:serial definition warning.
-	private static final long serialVersionUID = 4L;
-
-	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a83dc2/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnectionPoolDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnectionPoolDataSourceFactory.java b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnectionPoolDataSourceFactory.java
deleted file mode 100644
index 88f45d5..0000000
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TConnectionPoolDataSourceFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-/* -*-java-*-
- * Filename    : TConnectionPoolDataSourceFactory.java
- * Description : 
- *
- */
-
-package org.trafodion.jdbc.t2;
-
-import java.util.Hashtable;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.Context;
-import javax.naming.Reference;
-import javax.naming.RefAddr;
-import javax.sql.ConnectionPoolDataSource;
-
-public class TConnectionPoolDataSourceFactory implements javax.naming.spi.ObjectFactory 
-{
-	public TConnectionPoolDataSourceFactory() 
-	{}
-
-	public Object getObjectInstance(Object refobj,
-				Name name,
-				Context nameCtx,
-				Hashtable env) throws Exception
-	{
-		String traceDataSource;
-		Reference ref = (Reference)refobj;
-		ConnectionPoolDataSource tcpDS;
-		TConnectionPoolDataSource cpDS;
-		RefAddr		refAddr;
-		
-		if (ref.getClassName().equals("org.trafodion.jdbc.t2.TConnectionPoolDataSource"))
-		{
-        	refAddr = ref.get("traceDataSource");
-			if (refAddr != null)
-			{
-				traceDataSource = (String)(refAddr.getContent());
-				tcpDS = (ConnectionPoolDataSource)nameCtx.lookup(traceDataSource);
-				cpDS = new TConnectionPoolDataSource(traceDataSource, tcpDS);
-				return cpDS; 
-			}
-			else
-			{
-				cpDS = new TConnectionPoolDataSource();
-				return cpDS;
-			}
-		}
-		return null;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a83dc2/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TDataSource.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TDataSource.java b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TDataSource.java
deleted file mode 100644
index 07aa01b..0000000
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TDataSource.java
+++ /dev/null
@@ -1,237 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-/* -*-java-*-
- * Filename    : TDataSource.java
- * Description :
- *
- * --------------------------------------------------------------------
- */
-
-
-package org.trafodion.jdbc.t2;
-
-import java.io.PrintWriter;
-import java.sql.*;
-import javax.sql.DataSource;
-import java.util.Properties;
-import javax.naming.Referenceable;
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.naming.StringRefAddr;
-import java.util.Date;
-import java.util.logging.Logger;
-
-
-public class TDataSource implements javax.sql.DataSource, java.io.Serializable, Referenceable
-
-{
-	// javax.sql.DataSource interface methods
-	public Connection getConnection() throws SQLException
-	{		
-		Connection	connect;
-
-		if (ds_ != null)
-		{
-			if (out_ != null)
-				out_.println(getTraceId() + "getConnection()");	
-
-			connect = ds_.getConnection();
-
-			if (out_ != null)
-				out_.println(getTraceId() + "getConnection() returns Connection [" + System.identityHashCode(connect) + "]");	
-
-			return new TConnection(connect, out_);
-		}
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-	
-	public Connection getConnection(String username, String Password) throws SQLException
-	{
-		Connection	connect;
-		if (ds_ != null)
-		{
-			if (out_ != null)
-				out_.println(getTraceId() + "getConnection(\"" + username + "\", \"****\")");			
-
-			connect = ds_.getConnection();
-
-			if (out_ != null)
-				out_.println(getTraceId() + "getConnection(\"" + username + "\", \"****\") returns Connection [" + System.identityHashCode(connect) + "]");			
-
-			return new TConnection(connect, out_);
-		}
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-
-	public int getLoginTimeout() throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "getLoginTimeout()");			
-		int	retValue;
-
-		if (ds_ != null)
-		{
-			retValue = ds_.getLoginTimeout();
-			return retValue;
-		}
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-	
-	public PrintWriter getLogWriter() throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "getLogWriter()");			
-		PrintWriter	retValue;
-
-		if (ds_ != null)
-		{
-			retValue = ds_.getLogWriter();
-			return retValue;
-		}
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-
-	public void setLoginTimeout(int seconds) throws SQLException
-	{
-		if (out_ != null)
-			out_.println(getTraceId() + "setLoginTimeout("+ seconds + ")");			
-		if (ds_ != null)
-			ds_.setLoginTimeout(seconds);
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-
-	public void setLogWriter(PrintWriter out) throws SQLException
-	{
-		out_ = out;
-		if (out_ != null) 
-		{
-			out_.println(org.trafodion.jdbc.t2.T2Driver.printTraceVproc);
-			out_.println(getTraceId() + "setLogWriter("+ out + ")");			
-		}
-
-		if (ds_ != null)
-			ds_.setLogWriter(out);
-		else
-			throw new SQLException("Trace Data Source" + traceDataSource_ + "Not found");
-	}
-	
-	public Reference getReference() throws NamingException
-	{
-	
-		if (out_ != null)
-			out_.println(getTraceId() + "getReference()");			
-		Reference ref;
-		
-		ref = new Reference(this.getClass().getName(), "org.trafodion.jdbc.t2.TDataSourceFactory", null);
-		ref.add(new StringRefAddr("description", description_));
-		ref.add(new StringRefAddr("traceDataSource", traceDataSource_));
-		return ref;
-
-	}
-
-	// Get-Set Property methods
-	public void setDescription(String description)
-	{
-		description_ = description;
-	}
-
-	public String getDescription()
-	{
-		return description_;
-	}
-
-	public void setTraceDataSource(String traceDataSource)
-	{
-		traceDataSource_ = traceDataSource;
-	}
-	
-	public String getTraceDataSource()
-	{
-		return traceDataSource_;
-	}
-	
-	TDataSource(String traceDataSource, DataSource ds)
-	{
-		String className = null;
-
-		traceDataSource_ = traceDataSource;
-		ds_	= ds;
-		if (ds_ != null)
-			className = ds_.getClass().getName();
-
-		// Build up jdbcTrace output entry
-		setTraceId(org.trafodion.jdbc.t2.T2Driver.traceText
-			+ org.trafodion.jdbc.t2.T2Driver.dateFormat.format(new Date()) 
-			+ "]:[" + Thread.currentThread() + "]:["
-			+ System.identityHashCode(ds_) +  "]:" 
-			+ className.substring(org.trafodion.jdbc.t2.T2Driver.REMOVE_PKG_NAME,className.length()) 
-			+ ".");
-	}
-
-	public TDataSource()
-	{
-		
-	}
-	public void setTraceId(String traceId_) {
-		this.traceId_ = traceId_;
-	}
-
-	public String getTraceId() {
-		// Build up jdbcTrace output entry
-		setTraceId(org.trafodion.jdbc.t2.T2Driver.traceText
-			+ org.trafodion.jdbc.t2.T2Driver.dateFormat.format(new Date()) 
-			+ "]:[" + Thread.currentThread() + "]:["
-			+ System.identityHashCode(this) +  "]:" 
-			+ getClass().getName().substring(org.trafodion.jdbc.t2.T2Driver.REMOVE_PKG_NAME,getClass().getName().length()) 
-			+ ".");
-		return traceId_;
-	}
-	// fields
-	PrintWriter	out_;
-	String		traceDataSource_;
-	DataSource	ds_;
-	private String		traceId_;
-	String		description_;
-
-	// serialVersionUID set to resolve JDK5.0 javax -Xlint:serial definition warning.
-	private static final long serialVersionUID = 2L;
-
-
-	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Object unwrap(Class iface) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean isWrapperFor(Class iface) throws SQLException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/51a83dc2/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TDataSourceFactory.java b/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TDataSourceFactory.java
deleted file mode 100644
index a44d167..0000000
--- a/core/conn/jdbc_type2/src/main/java/org/trafodion/jdbc/t2/TDataSourceFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-/* -*-java-*-
- * Filename    : TDataSourceFactory.java
- * Description : 
- *
- * --------------------------------------------------------------------
- */
-
-package org.trafodion.jdbc.t2;
-
-import java.util.Hashtable;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.Context;
-import javax.naming.Reference;
-import javax.naming.RefAddr;
-import javax.sql.DataSource;
-
-public class TDataSourceFactory implements javax.naming.spi.ObjectFactory 
-{
-	public TDataSourceFactory() 
-	{}
-
-	public Object getObjectInstance(Object refobj,
-				Name name,
-				Context nameCtx,
-				Hashtable env) throws Exception
-	{
-		String traceDataSource;
-		Reference ref = (Reference)refobj;
-		DataSource tds;
-		TDataSource ds;
-		RefAddr		refAddr;
-		
-		if (ref.getClassName().equals("org.trafodion.jdbc.t2.TDataSource"))
-		{
-        	refAddr = ref.get("traceDataSource");
-			if (refAddr != null)
-			{
-				traceDataSource = (String)(refAddr.getContent());
-				tds = (DataSource)nameCtx.lookup(traceDataSource);
-				ds = new TDataSource(traceDataSource, tds);
-				return ds; 
-			}
-			else
-			{
-				ds = new TDataSource();
-				return ds;
-			}
-		}
-		return null;
-	}
-}