From 38e49cf712cac614349c024af5125955101abb10 Mon Sep 17 00:00:00 2001 From: Kevin Xu Date: Fri, 13 May 2016 15:41:52 +0800 Subject: [PATCH 1/3] Rename required prefix with Traf --- .../src/main/java/T4Messages.properties | 6 +- .../java/org/trafodion/jdbc/t4/Address.java | 2 +- .../jdbc/t4/InitializeDialogueReply.java | 6 +- .../org/trafodion/jdbc/t4/InputOutput.java | 50 +-- .../jdbc/t4/InterfaceConnection.java | 52 +-- .../trafodion/jdbc/t4/InterfaceResultSet.java | 34 +- .../trafodion/jdbc/t4/InterfaceStatement.java | 148 ++++----- .../org/trafodion/jdbc/t4/NCSAddress.java | 22 +- .../jdbc/t4/PreparedStatementManager.java | 2 +- .../java/org/trafodion/jdbc/t4/T4Address.java | 24 +- .../org/trafodion/jdbc/t4/T4Connection.java | 36 +-- .../org/trafodion/jdbc/t4/T4DSProperties.java | 6 +- .../trafodion/jdbc/t4/T4DatabaseMetaData.java | 132 ++++---- .../java/org/trafodion/jdbc/t4/T4Driver.java | 14 +- .../org/trafodion/jdbc/t4/T4Properties.java | 20 +- .../org/trafodion/jdbc/t4/T4ResultSet.java | 12 +- .../org/trafodion/jdbc/t4/T4Statement.java | 20 +- .../org/trafodion/jdbc/t4/T4_Dcs_Cancel.java | 2 +- .../org/trafodion/jdbc/t4/T4_Dcs_Connect.java | 10 +- .../jdbc/t4/TrafT4CallableStatement.java | 58 ++-- .../trafodion/jdbc/t4/TrafT4Connection.java | 108 +++---- ...va => TrafT4ConnectionPoolDataSource.java} | 58 ++-- ...rafT4ConnectionPoolDataSourceFactory.java} | 10 +- ...4DataSource.java => TrafT4DataSource.java} | 60 ++-- ...tory.java => TrafT4DataSourceFactory.java} | 10 +- .../t4/{HPT4Desc.java => TrafT4Desc.java} | 14 +- ...PT4Exception.java => TrafT4Exception.java} | 6 +- .../t4/{HPT4Handle.java => TrafT4Handle.java} | 10 +- ...{HPT4Messages.java => TrafT4Messages.java} | 56 ++-- ...Data.java => TrafT4ParameterMetaData.java} | 52 +-- ...ction.java => TrafT4PooledConnection.java} | 28 +- ...ava => TrafT4PooledConnectionManager.java} | 16 +- .../jdbc/t4/TrafT4PreparedStatement.java | 118 +++---- .../trafodion/jdbc/t4/TrafT4ResultSet.java | 296 +++++++++--------- ...Data.java => TrafT4ResultSetMetaData.java} | 60 ++-- .../trafodion/jdbc/t4/TrafT4Statement.java | 70 ++--- .../java/org/trafodion/jdbc/t4/Utility.java | 24 +- .../jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java | 16 +- .../jdbc/t4/odbc_Dcs_StopSrvr_exc_.java | 8 +- .../jdbc/t4/odbc_SQLSvc_Close_exc_.java | 8 +- .../t4/odbc_SQLSvc_EndTransaction_exc_.java | 8 +- .../jdbc/t4/odbc_SQLSvc_Execute_exc_.java | 10 +- .../jdbc/t4/odbc_SQLSvc_Fetch_exc_.java | 10 +- .../t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java | 6 +- .../odbc_SQLSvc_InitializeDialogue_exc_.java | 6 +- .../jdbc/t4/odbc_SQLSvc_Prepare_exc_.java | 10 +- .../odbc_SQLSvc_SetConnectionOption_exc_.java | 12 +- .../odbc_SQLSvc_TerminateDialogue_exc_.java | 8 +- .../org/trafodion/jdbc/t4/RunAllTests.java | 2 + .../org/trafodion/rest/util/JdbcT4Util.java | 6 +- 50 files changed, 882 insertions(+), 880 deletions(-) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4ConnectionPoolDataSource.java => TrafT4ConnectionPoolDataSource.java} (82%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4ConnectionPoolDataSourceFactory.java => TrafT4ConnectionPoolDataSourceFactory.java} (86%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4DataSource.java => TrafT4DataSource.java} (83%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4DataSourceFactory.java => TrafT4DataSourceFactory.java} (87%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4Desc.java => TrafT4Desc.java} (98%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4Exception.java => TrafT4Exception.java} (86%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4Handle.java => TrafT4Handle.java} (90%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4Messages.java => TrafT4Messages.java} (82%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4ParameterMetaData.java => TrafT4ParameterMetaData.java} (68%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4PooledConnection.java => TrafT4PooledConnection.java} (86%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4PooledConnectionManager.java => TrafT4PooledConnectionManager.java} (93%) rename core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/{HPT4ResultSetMetaData.java => TrafT4ResultSetMetaData.java} (69%) diff --git a/core/conn/jdbcT4/src/main/java/T4Messages.properties b/core/conn/jdbcT4/src/main/java/T4Messages.properties index 24d6fb1cf7..b5abf23aca 100644 --- a/core/conn/jdbcT4/src/main/java/T4Messages.properties +++ b/core/conn/jdbcT4/src/main/java/T4Messages.properties @@ -268,9 +268,9 @@ internal_error_msg=An internal error occurred internal_error_sqlstate=HY000 internal_error_sqlcode=29100 -contact_hp_error_msg=Contact your service provider -contact_hp_error_sqlstate=HY000 -contact_hp_error_sqlcode=29101 +contact_traf_error_msg=Contact your service provider +contact_traf_error_sqlstate=HY000 +contact_traf_error_sqlcode=29101 address_parsing_error_msg=Error while parsing address {0} address_parsing_error_sqlstate=HY000 diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/Address.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/Address.java index d486f57844..d7f106f085 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/Address.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/Address.java @@ -94,7 +94,7 @@ protected boolean validateAddress() throws SQLException { try { m_inetAddrs = InetAddress.getAllByName(IPorName); } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_lookup_error", m_url, e + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_lookup_error", m_url, e .getMessage()); se.initCause(e); throw se; diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InitializeDialogueReply.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InitializeDialogueReply.java index 5deb1599e1..2d57f7b820 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InitializeDialogueReply.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InitializeDialogueReply.java @@ -76,12 +76,12 @@ class InitializeDialogueReply { ic.outContext = new OUT_CONNECTION_CONTEXT_def(); ic.outContext.extractFromByteArray(buf, ic); break; - //throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_28_000", null); + //throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_28_000", null); case odbc_SQLSvc_InitializeDialogue_ParamError_exn_: ParamError = ic.decodeBytes(buf.extractString(), 1); - throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr); + throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr); case odbc_SQLSvc_InitializeDialogue_InvalidConnection_exn_: - throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null); + throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null); default: clientErrorText = "unknown_initialize_dialogue_reply_error"; break; diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InputOutput.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InputOutput.java index 706277843f..56111e9e6e 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InputOutput.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InputOutput.java @@ -260,7 +260,7 @@ synchronized void openIO() throws SQLException { // representitive of the problem // with all addresses. // - SQLException se = HPT4Messages.createSQLException(null, m_locale, "socket_open_error", eFirst + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "socket_open_error", eFirst .getMessage()); se.initCause(eFirst); @@ -373,8 +373,8 @@ synchronized LogicalByteArray doIO(short odbcAPI, LogicalByteArray buffer) throw // We didn't even get the header back, so something is seriously // wrong. // - SQLException se = HPT4Messages.createSQLException(null, m_locale, "problem_with_server_read", null); - SQLException se2 = HPT4Messages.createSQLException(null, m_locale, "header_not_long_enough", null); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "problem_with_server_read", null); + SQLException se2 = TrafT4Messages.createSQLException(null, m_locale, "header_not_long_enough", null); se.setNextException(se2); throw se; @@ -393,8 +393,8 @@ synchronized LogicalByteArray doIO(short odbcAPI, LogicalByteArray buffer) throw buffer.setByteSwap(true); break; default: - SQLException se = HPT4Messages.createSQLException(null, m_locale, "problem_with_server_read", null); - SQLException se2 = HPT4Messages.createSQLException(null, m_locale, "wrong_header_version", String.valueOf(m_rheader.version_)); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "problem_with_server_read", null); + SQLException se2 = TrafT4Messages.createSQLException(null, m_locale, "wrong_header_version", String.valueOf(m_rheader.version_)); se.setNextException(se2); throw se; @@ -402,8 +402,8 @@ synchronized LogicalByteArray doIO(short odbcAPI, LogicalByteArray buffer) throw } if (m_rheader.signature_ != Header.SIGNATURE) { - SQLException se = HPT4Messages.createSQLException(null, m_locale, "problem_with_server_read", null); - SQLException se2 = HPT4Messages.createSQLException(null, m_locale, "wrong_header_signature", String + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "problem_with_server_read", null); + SQLException se2 = TrafT4Messages.createSQLException(null, m_locale, "wrong_header_signature", String .valueOf(Header.SIGNATURE), String.valueOf(m_rheader.signature_)); se.setNextException(se2); @@ -411,7 +411,7 @@ synchronized LogicalByteArray doIO(short odbcAPI, LogicalByteArray buffer) throw } if (m_rheader.error_ != 0) { - SQLException se = HPT4Messages.createSQLException(null, m_locale, "driver_err_error_from_server", String + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "driver_err_error_from_server", String .valueOf(m_rheader.error_), String.valueOf(m_rheader.error_detail_)); throw se; @@ -450,7 +450,7 @@ synchronized void CloseIO(LogicalByteArray buffer) throws SQLException { m_socket.close(); m_socket = null; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(null, m_locale, "session_close_error", e.getMessage()); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "session_close_error", e.getMessage()); se.initCause(e); throw se; } finally { @@ -461,8 +461,8 @@ synchronized void CloseIO(LogicalByteArray buffer) throws SQLException { void TCPIPWriteByteBuffer(ByteBuffer buffer) throws SQLException { if (m_socket == null) { - SQLException se = HPT4Messages.createSQLException(null, m_locale, "socket_write_error", null); - SQLException se2 = HPT4Messages.createSQLException(null, m_locale, "socket_is_closed_error", null); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "socket_write_error", null); + SQLException se2 = TrafT4Messages.createSQLException(null, m_locale, "socket_is_closed_error", null); se.setNextException(se2); throw se; @@ -472,7 +472,7 @@ void TCPIPWriteByteBuffer(ByteBuffer buffer) throws SQLException { m_wbc.write(buffer); m_os.flush(); } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(null, m_locale, "socket_write_error", e.getMessage()); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "socket_write_error", e.getMessage()); se.initCause(e); throw se; @@ -490,8 +490,8 @@ void TCPIPDoWrite(Header hdr, LogicalByteArray buffer, int buffer_index, int buf int data_length = 0; if (m_socket == null) { - SQLException se = HPT4Messages.createSQLException(null, m_locale, "socket_write_error", null); - SQLException se2 = HPT4Messages.createSQLException(null, m_locale, "socket_is_closed_error", null); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "socket_write_error", null); + SQLException se2 = TrafT4Messages.createSQLException(null, m_locale, "socket_is_closed_error", null); se.setNextException(se2); throw se; @@ -508,9 +508,9 @@ void TCPIPDoWrite(Header hdr, LogicalByteArray buffer, int buffer_index, int buf send_nblk(buffer.getBuffer(), buffer_index, data_length); break; default: - SQLException se = HPT4Messages.createSQLException(null, m_locale, "unknown_message_type_error", null); - SQLException se2 = HPT4Messages.createSQLException(null, m_locale, "internal_error", null); - SQLException se3 = HPT4Messages.createSQLException(null, m_locale, "cntact_hp_error", null); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "unknown_message_type_error", null); + SQLException se2 = TrafT4Messages.createSQLException(null, m_locale, "internal_error", null); + SQLException se3 = TrafT4Messages.createSQLException(null, m_locale, "cntact_traf_error", null); se.setNextException(se2); se2.setNextException(se3); @@ -525,8 +525,8 @@ int TCPIPDoRead(Header hdr, LogicalByteArray buffer, int buffer_index) throws SQ int numRead = 0; if (m_socket == null) { - SQLException se = HPT4Messages.createSQLException(null, m_locale, "socket_read_error", null); - SQLException se2 = HPT4Messages.createSQLException(null, m_locale, "socket_is_closed_error", null); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "socket_read_error", null); + SQLException se2 = TrafT4Messages.createSQLException(null, m_locale, "socket_is_closed_error", null); se.setNextException(se2); throw se; @@ -539,9 +539,9 @@ int TCPIPDoRead(Header hdr, LogicalByteArray buffer, int buffer_index) throws SQ // buffer.setLocation(numRead); break; default: - SQLException se = HPT4Messages.createSQLException(null, m_locale, "unknown_message_type_error", null); - SQLException se2 = HPT4Messages.createSQLException(null, m_locale, "internal_error", null); - SQLException se3 = HPT4Messages.createSQLException(null, m_locale, "cntact_hp_error", null); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "unknown_message_type_error", null); + SQLException se2 = TrafT4Messages.createSQLException(null, m_locale, "internal_error", null); + SQLException se3 = TrafT4Messages.createSQLException(null, m_locale, "cntact_traf_error", null); se.setNextException(se2); se2.setNextException(se3); @@ -558,7 +558,7 @@ void send_nblk(byte[] buf, int offset, int len) throws SQLException { m_os.write(buf, offset, len); m_os.flush(); } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(null, m_locale, "socket_write_error", e.getMessage()); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "socket_write_error", e.getMessage()); se.initCause(e); throw se; @@ -602,13 +602,13 @@ int recv_nblk(byte[] buf, int offset) throws SQLException { throw ste; } catch (Exception e) { - SQLException se = HPT4Messages + SQLException se = TrafT4Messages .createSQLException(null, m_locale, "session_close_error", e.getMessage()); se.initCause(e); throw se; } } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(null, m_locale, "socket_read_error", e.getMessage()); + SQLException se = TrafT4Messages.createSQLException(null, m_locale, "socket_read_error", e.getMessage()); se.initCause(e); throw se; diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java index 4c1877faa5..b3c7f037a6 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java @@ -136,7 +136,7 @@ class InterfaceConnection { gcConnections(); if (t4props.getSQLException() != null) { - throw HPT4Messages.createSQLException(t4props_, t4props.getLocale(), "invalid_property", t4props + throw TrafT4Messages.createSQLException(t4props_, t4props.getLocale(), "invalid_property", t4props .getSQLException()); } @@ -357,7 +357,7 @@ private void oldEncryptPassword() throws SQLException { try { authentication = pwd.getBytes("US-ASCII"); } catch (UnsupportedEncodingException uex) { - throw HPT4Messages.createSQLException(t4props_, locale, uex.getMessage(), null); + throw TrafT4Messages.createSQLException(t4props_, locale, uex.getMessage(), null); } if (authentication.length > 0) { @@ -505,7 +505,7 @@ void cancel() throws SQLException { String temp = errorText; t4props_.t4Logger_.logp(Level.FINEST, "InterfaceConnection", "cancel", temp, p); } - throw HPT4Messages.createSQLException(t4props_, locale, "as_cancel_message_error", errorText); + throw TrafT4Messages.createSQLException(t4props_, locale, "as_cancel_message_error", errorText); } // end switch currentTime = (new java.util.Date()).getTime(); @@ -538,9 +538,9 @@ private void initDiag(boolean setTimestamp, boolean downloadCert) throws SQLExce // exceptions. // int sc = se.getErrorCode(); - int s1 = HPT4Messages.createSQLException(t4props_, locale, "socket_open_error", null).getErrorCode(); - int s2 = HPT4Messages.createSQLException(t4props_, locale, "socket_write_error", null).getErrorCode(); - int s3 = HPT4Messages.createSQLException(t4props_, locale, "socket_read_error", null).getErrorCode(); + int s1 = TrafT4Messages.createSQLException(t4props_, locale, "socket_open_error", null).getErrorCode(); + int s2 = TrafT4Messages.createSQLException(t4props_, locale, "socket_write_error", null).getErrorCode(); + int s3 = TrafT4Messages.createSQLException(t4props_, locale, "socket_read_error", null).getErrorCode(); if (sc == s1 || sc == s2 || sc == s3) { if (t4props_.t4Logger_.isLoggable(Level.INFO)) { @@ -585,10 +585,10 @@ private void initDiag(boolean setTimestamp, boolean downloadCert) throws SQLExce if (ex_nr_d == odbc_SQLSvc_InitializeDialogue_exc_.SQL_PASSWORD_EXPIRING || ex_nr_d == odbc_SQLSvc_InitializeDialogue_exc_.SQL_PASSWORD_GRACEPERIOD) { - HPT4Messages.setSQLWarning(this.t4props_, this._t4Conn, idr.SQLError); + TrafT4Messages.setSQLWarning(this.t4props_, this._t4Conn, idr.SQLError); done = true; } else { - HPT4Messages.throwSQLException(t4props_, idr.SQLError); + TrafT4Messages.throwSQLException(t4props_, idr.SQLError); } } } @@ -606,12 +606,12 @@ private void initDiag(boolean setTimestamp, boolean downloadCert) throws SQLExce } if (currentTime >= endTime) { - se1 = HPT4Messages.createSQLException(t4props_, locale, "ids_s1_t00", null); + se1 = TrafT4Messages.createSQLException(t4props_, locale, "ids_s1_t00", null); } else if (tryNum >= retryCount) { - se1 = HPT4Messages.createSQLException(t4props_, locale, "as_connect_message_error", + se1 = TrafT4Messages.createSQLException(t4props_, locale, "as_connect_message_error", "exceeded retry count"); } else { - se1 = HPT4Messages.createSQLException(t4props_, locale, "as_connect_message_error", null); + se1 = TrafT4Messages.createSQLException(t4props_, locale, "as_connect_message_error", null); } throw se1; } @@ -744,7 +744,7 @@ private void DownloadCertificate() throws SQLException { initDiag(true,true); }catch(SQLException e) { if(outContext == null || outContext.certificate == null) { - SQLException he = HPT4Messages.createSQLException(t4props_, this.locale, "certificate_download_error", e.getMessage()); + SQLException he = TrafT4Messages.createSQLException(t4props_, this.locale, "certificate_download_error", e.getMessage()); he.setNextException(e); throw he; } @@ -801,7 +801,7 @@ private void connect() throws SQLException { if (!cr.m_p4_dataSource.equals(t4props_.getServerDataSource())) { Object[] messageArguments = new Object[1]; messageArguments[0] = cr.m_p4_dataSource; - sqlwarning_ = HPT4Messages.createSQLWarning(t4props_, "connected_to_Default_DS", messageArguments); + sqlwarning_ = TrafT4Messages.createSQLWarning(t4props_, "connected_to_Default_DS", messageArguments); } break; case odbc_Dcs_GetObjRefHdl_exc_.odbc_Dcs_GetObjRefHdl_ASTryAgain_exn_: @@ -856,7 +856,7 @@ private void connect() throws SQLException { errorText = errorText + " :" + "Error text = " + cr.m_p1_exception.ErrorText; } - throw HPT4Messages.createSQLException(t4props_, locale, "as_connect_message_error", errorText); + throw TrafT4Messages.createSQLException(t4props_, locale, "as_connect_message_error", errorText); } if (done == false && t4props_.t4Logger_.isLoggable(Level.INFO)) { @@ -872,11 +872,11 @@ private void connect() throws SQLException { SQLException se2; if (currentTime >= endTime) { - se1 = HPT4Messages.createSQLException(t4props_, locale, "ids_s1_t00", null); - se2 = HPT4Messages.createSQLException(t4props_, locale, errorMsg, errorMsg_detail); + se1 = TrafT4Messages.createSQLException(t4props_, locale, "ids_s1_t00", null); + se2 = TrafT4Messages.createSQLException(t4props_, locale, errorMsg, errorMsg_detail); se1.setNextException(se2); } else { - se1 = HPT4Messages.createSQLException(t4props_, locale, errorMsg, errorMsg_detail); + se1 = TrafT4Messages.createSQLException(t4props_, locale, errorMsg, errorMsg_detail); } throw se1; @@ -912,14 +912,14 @@ private void connect() throws SQLException { // @deprecated void isConnectionClosed() throws SQLException { if (isClosed_ == false) { - throw HPT4Messages.createSQLException(t4props_, locale, "invalid_connection", null); + throw TrafT4Messages.createSQLException(t4props_, locale, "invalid_connection", null); } } // @deprecated void isConnectionOpen() throws SQLException { if (isClosed_) { - throw HPT4Messages.createSQLException(t4props_, locale, "invalid_connection", null); + throw TrafT4Messages.createSQLException(t4props_, locale, "invalid_connection", null); } } @@ -1021,7 +1021,7 @@ else if (attr == SQL_ATTR_SUSPEND_UDR_TRANSACTION) { // do the warning processing if (scr_.m_p2.length != 0) { - HPT4Messages.setSQLWarning(conn.props_, conn, scr_.m_p2); + TrafT4Messages.setSQLWarning(conn.props_, conn, scr_.m_p2); } if (t4props_.t4Logger_.isLoggable(Level.FINEST) == true) { Object p[] = T4LoggingUtilities.makeParams(conn.props_, attr, valueNum, valueString); @@ -1035,14 +1035,14 @@ else if (attr == SQL_ATTR_SUSPEND_UDR_TRANSACTION) { String temp = "odbc_SQLSvc_SetConnectionOption_SQLError_exn_ occurred."; t4props_.t4Logger_.logp(Level.FINEST, "InterfaceConnection", "setConnectionAttr", temp, p); } - HPT4Messages.throwSQLException(t4props_, scr_.m_p1.errorList); + TrafT4Messages.throwSQLException(t4props_, scr_.m_p1.errorList); default: if (t4props_.t4Logger_.isLoggable(Level.FINEST) == true) { Object p[] = T4LoggingUtilities.makeParams(conn.props_, attr, valueNum, valueString); String temp = "UnknownException occurred."; t4props_.t4Logger_.logp(Level.FINEST, "InterfaceConnection", "setConnectionAttr", temp, p); } - throw HPT4Messages.createSQLException(conn.props_, locale, "ids_unknown_reply_error", null); + throw TrafT4Messages.createSQLException(conn.props_, locale, "ids_unknown_reply_error", null); } }; @@ -1057,7 +1057,7 @@ void setTransactionIsolation(TrafT4Connection conn, int level) throws SQLExcepti if (level != Connection.TRANSACTION_NONE && level != Connection.TRANSACTION_READ_COMMITTED && level != Connection.TRANSACTION_READ_UNCOMMITTED && level != Connection.TRANSACTION_REPEATABLE_READ && level != Connection.TRANSACTION_SERIALIZABLE) { - throw HPT4Messages.createSQLException(conn.props_, locale, "invalid_transaction_isolation", null); + throw TrafT4Messages.createSQLException(conn.props_, locale, "invalid_transaction_isolation", null); } txnIsolationLevel = level; @@ -1215,7 +1215,7 @@ void close() throws SQLException { void endTransaction(short commitOption) throws SQLException { EndTransactionReply etr_ = null; if (autoCommit && !_t4Conn.isBeginTransaction()) { - throw HPT4Messages.createSQLException(t4props_, locale, "invalid_commit_mode", null); + throw TrafT4Messages.createSQLException(t4props_, locale, "invalid_commit_mode", null); } isConnectionOpen(); @@ -1242,7 +1242,7 @@ void endTransaction(short commitOption) throws SQLException { String temp = "odbc_SQLSvc_EndTransaction_ParamError_exn_ :"; t4props_.t4Logger_.logp(Level.FINEST, "InterfaceConnection", "endTransaction", temp, p); } - throw HPT4Messages.createSQLException(t4props_, locale, "ParamError:" + etr_.m_p1.ParamError, null); + throw TrafT4Messages.createSQLException(t4props_, locale, "ParamError:" + etr_.m_p1.ParamError, null); case odbc_SQLSvc_EndTransaction_exc_.odbc_SQLSvc_EndTransaction_InvalidConnection_exn_: if (t4props_.t4Logger_.isLoggable(Level.FINEST) == true) { Object p[] = T4LoggingUtilities.makeParams(t4props_, commitOption); @@ -1256,7 +1256,7 @@ void endTransaction(short commitOption) throws SQLException { String temp = "odbc_SQLSvc_EndTransaction_SQLError_exn_:" + etr_.m_p1.SQLError; t4props_.t4Logger_.logp(Level.FINEST, "InterfaceConnection", "endTransaction", temp, p); } - HPT4Messages.throwSQLException(t4props_, etr_.m_p1.SQLError); + TrafT4Messages.throwSQLException(t4props_, etr_.m_p1.SQLError); case odbc_SQLSvc_EndTransaction_exc_.odbc_SQLSvc_EndTransaction_SQLInvalidHandle_exn_: if (t4props_.t4Logger_.isLoggable(Level.FINEST) == true) { Object p[] = T4LoggingUtilities.makeParams(t4props_, commitOption); diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceResultSet.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceResultSet.java index 8dbbc2f7f8..2d2390b747 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceResultSet.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceResultSet.java @@ -173,7 +173,7 @@ static int dataLengthFetchPerf(int SQLDataType, int SQLDateTimeCode, int SQLOcte break; case SQLDTCODE_TIME: if (ODBCDataType == java.sql.Types.OTHER) // For - // HPT4Desc.SQLDTCODE_HOUR_TO_FRACTION + // TrafT4Desc.SQLDTCODE_HOUR_TO_FRACTION { allocLength = SQLOctetLength; } else { @@ -250,13 +250,13 @@ Object getFetchString(TrafT4Connection conn, int scale, int SQLDataType, int SQL case SQLDTCODE_TIME: // Need to add code here to check if it's - // HPT4Desc.SQLDTCODE_HOUR_TO_FRACTION + // TrafT4Desc.SQLDTCODE_HOUR_TO_FRACTION if (ODBCDataType != java.sql.Types.OTHER) { retObj = Time.valueOf(tmpStr); break; } else { // Do default processing as it is - // HPT4Desc.SQLDTCODE_HOUR_TO_FRACTION + // TrafT4Desc.SQLDTCODE_HOUR_TO_FRACTION } default: retObj = tmpStr; @@ -311,7 +311,7 @@ Object getFetchString(TrafT4Connection conn, int scale, int SQLDataType, int SQL tmpStr = String.valueOf(Bytes.extractLong(ibuffer, byteIndex, this.ic_.getByteSwap())); break; default: - throw HPT4Messages.createSQLException(conn.props_, conn.getLocale(), "restricted_data_type", null); + throw TrafT4Messages.createSQLException(conn.props_, conn.getLocale(), "restricted_data_type", null); } retObj = new BigDecimal((new BigInteger(tmpStr)), scale); break; @@ -344,7 +344,7 @@ Object getFetchString(TrafT4Connection conn, int scale, int SQLDataType, int SQL case SQLTYPECODE_BITVAR: case SQLTYPECODE_BPINT_UNSIGNED: default: - throw HPT4Messages.createSQLException(conn.props_, conn.getLocale(), "restricted_data_type", null); + throw TrafT4Messages.createSQLException(conn.props_, conn.getLocale(), "restricted_data_type", null); } return retObj; } // end getFetchString @@ -360,7 +360,7 @@ private static String padZero(long i, int len) { // ------------------------------------------------------------------- // get the column value data from Execute2 in String format - static Object getExecute2FetchString(TrafT4Connection conn, HPT4Desc desc, byte[] values, int noNullValue, + static Object getExecute2FetchString(TrafT4Connection conn, TrafT4Desc desc, byte[] values, int noNullValue, int ODBCDataType, boolean useOldDateFormat, boolean swap) throws SQLException { Object retObj; String tmpStr; @@ -452,7 +452,7 @@ static Object getExecute2FetchString(TrafT4Connection conn, HPT4Desc desc, byte[ case SQLDTCODE_TIME: if (ODBCDataType == java.sql.Types.OTHER) // For - // HPT4Desc.SQLDTCODE_HOUR_TO_FRACTION + // TrafT4Desc.SQLDTCODE_HOUR_TO_FRACTION { length = desc.sqlOctetLength_; retObj = new String(Bytes.read_chars(values, noNullValue, length)); @@ -573,7 +573,7 @@ static Object getExecute2FetchString(TrafT4Connection conn, HPT4Desc desc, byte[ case SQLTYPECODE_BITVAR: case SQLTYPECODE_BPINT_UNSIGNED: default: - throw HPT4Messages.createSQLException(conn.props_, conn.getLocale(), "restricted_data_type", null); + throw TrafT4Messages.createSQLException(conn.props_, conn.getLocale(), "restricted_data_type", null); } return retObj; } // end getExecute2FetchString @@ -661,7 +661,7 @@ void setFetchOutputs(TrafT4ResultSet rs, int rowsAffected, boolean endOfData, by } if (columnValue == null) { - throw HPT4Messages + throw TrafT4Messages .createSQLException(rs.connection_.props_, ic_.getLocale(), "null_data", null); } } else { @@ -729,7 +729,7 @@ void setExecute2FetchOutputs(TrafT4ResultSet rs, int rowsAffected, boolean endOf columnValue = getExecute2FetchString(rs.connection_, rs.outputDesc_[columnIndex], values, noNullValueOffset, rs.outputDesc_[columnIndex].dataType_, rs.useOldDateFormat(), this.ic_.getByteSwap()); if (columnValue == null) { - throw HPT4Messages + throw TrafT4Messages .createSQLException(rs.connection_.props_, ic_.getLocale(), "null_data", null); } } // end if else @@ -791,7 +791,7 @@ boolean fetch(String stmtLabel, int maxRowCnt, int queryTimeout, int holdability // do warning processing if (fr.errorList.length != 0) { - HPT4Messages.setSQLWarning(rs.connection_.props_, rs, fr.errorList); + TrafT4Messages.setSQLWarning(rs.connection_.props_, rs, fr.errorList); } //endOfData = (fr.rowsAffected < maxRowCnt) ? true : false; @@ -818,7 +818,7 @@ boolean fetch(String stmtLabel, int maxRowCnt, int queryTimeout, int holdability break; default: - HPT4Messages.throwSQLException(rs.connection_.props_, fr.errorList); + TrafT4Messages.throwSQLException(rs.connection_.props_, fr.errorList); } @@ -865,14 +865,14 @@ void close() throws SQLException { rs_.connection_.props_.t4Logger_.logp(Level.FINEST, "InterfaceResultSet", "close", temp, p); } - HPT4Messages.throwSQLException(rs_.connection_.props_, cry_.m_p1.SQLError); + TrafT4Messages.throwSQLException(rs_.connection_.props_, cry_.m_p1.SQLError); default: if (ic_.t4props_.t4Logger_.isLoggable(Level.FINEST) == true) { Object p[] = T4LoggingUtilities.makeParams(rs_.connection_.props_); String temp = "UnknownException occurred during close."; rs_.connection_.props_.t4Logger_.logp(Level.FINEST, "InterfaceResultSet", "close", temp, p); } - throw HPT4Messages.createSQLException(rs_.connection_.props_, ic_.getLocale(), + throw TrafT4Messages.createSQLException(rs_.connection_.props_, ic_.getLocale(), "ids_unknown_reply_error", null); } // end switch } // end if @@ -885,7 +885,7 @@ void close() throws SQLException { }; // ---------------------------------------------------------------------------- - static Object[] getExecute2Outputs(TrafT4Connection conn, HPT4Desc[] desc, byte[] values, boolean swap) throws SQLException + static Object[] getExecute2Outputs(TrafT4Connection conn, TrafT4Desc[] desc, byte[] values, boolean swap) throws SQLException { Object[] columnArray; @@ -907,13 +907,13 @@ static Object[] getExecute2Outputs(TrafT4Connection conn, HPT4Desc[] desc, byte[ } if ((nullValueOffset != -1 && Bytes.extractShort(values, nullValueOffset, swap) == -1) - || (desc[columnIndex].paramMode_ == HPT4ParameterMetaData.parameterModeIn)) { + || (desc[columnIndex].paramMode_ == TrafT4ParameterMetaData.parameterModeIn)) { columnValue = null; } else { columnValue = getExecute2FetchString(conn, desc[columnIndex], values, noNullValueOffset, desc[columnIndex].dataType_, false, swap); if (columnValue == null) { - throw HPT4Messages.createSQLException(conn.props_, conn.getLocale(), "null_data", null); + throw TrafT4Messages.createSQLException(conn.props_, conn.getLocale(), "null_data", null); } } // end if else diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceStatement.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceStatement.java index e6c7af89fb..153394d858 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceStatement.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceStatement.java @@ -138,7 +138,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue if (paramValue == null) { if (nullValue == -1) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "null_parameter_for_not_null_column", new Integer(paramNumber)); } @@ -172,12 +172,12 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue } tmpBarray = ((String) paramValue).getBytes(charSet); } catch (Exception e) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", charSet); } } // end if (paramValue instanceof String) else { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", "CHAR data should be either bytes or String for column: " + paramNumber); } @@ -203,7 +203,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue } } } else { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_string_parameter", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_string_parameter", "CHAR input data is longer than the length for column: " + paramNumber); } @@ -227,13 +227,13 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue } tmpBarray = ((String) paramValue).getBytes(charSet); } catch (Exception e) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", charSet); } } // end if (paramValue instanceof String) else { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", "VARCHAR data should be either bytes or String for column: " + paramNumber); } @@ -242,7 +242,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue Bytes.insertShort(values, noNullValue, (short) dataLen, this.ic_.getByteSwap()); System.arraycopy(tmpBarray, 0, values, noNullValue + 2, dataLen); } else { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", "VARCHAR input data is longer than the length for column: " + paramNumber); } break; @@ -260,7 +260,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue throw new IllegalArgumentException(); } } catch (IllegalArgumentException iex) { - throw HPT4Messages + throw TrafT4Messages .createSQLException( pstmt.connection_.props_, locale, @@ -274,7 +274,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue } catch (java.io.UnsupportedEncodingException e) { Object[] messageArguments = new Object[1]; messageArguments[0] = e.getMessage(); - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", messageArguments); } break; @@ -283,7 +283,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue try { tmpts = Timestamp.valueOf((String) paramValue); } catch (IllegalArgumentException iex) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", "Timestamp data format is incorrect for column: " + paramNumber + " = " + paramValue); } @@ -295,7 +295,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue } catch (java.io.UnsupportedEncodingException e) { Object[] messageArguments = new Object[1]; messageArguments[0] = e.getMessage(); - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", messageArguments); } dataLen = tmpBarray.length; @@ -326,54 +326,54 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue byte[] tempb1 = tmptime.toString().getBytes("ASCII"); System.arraycopy(tempb1, 0, values, noNullValue, tempb1.length); } catch (IllegalArgumentException iex) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", "Time data format is incorrect for column: " + paramNumber + " = " + paramValue); } catch (java.io.UnsupportedEncodingException e) { Object[] messageArguments = new Object[1]; messageArguments[0] = e.getMessage(); - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", messageArguments); } break; } else { - // HPT4Desc.SQLDTCODE_HOUR_TO_FRACTION data type!!! + // TrafT4Desc.SQLDTCODE_HOUR_TO_FRACTION data type!!! // let the next case structure handle it } - case HPT4Desc.SQLDTCODE_YEAR: - case HPT4Desc.SQLDTCODE_YEAR_TO_MONTH: - case HPT4Desc.SQLDTCODE_MONTH: - case HPT4Desc.SQLDTCODE_MONTH_TO_DAY: - case HPT4Desc.SQLDTCODE_DAY: - case HPT4Desc.SQLDTCODE_HOUR: - case HPT4Desc.SQLDTCODE_HOUR_TO_MINUTE: - case HPT4Desc.SQLDTCODE_MINUTE: - case HPT4Desc.SQLDTCODE_MINUTE_TO_SECOND: - // case HPT4Desc.SQLDTCODE_MINUTE_TO_FRACTION: - case HPT4Desc.SQLDTCODE_SECOND: - // case HPT4Desc.SQLDTCODE_SECOND_TO_FRACTION: - case HPT4Desc.SQLDTCODE_YEAR_TO_HOUR: - case HPT4Desc.SQLDTCODE_YEAR_TO_MINUTE: - case HPT4Desc.SQLDTCODE_MONTH_TO_HOUR: - case HPT4Desc.SQLDTCODE_MONTH_TO_MINUTE: - case HPT4Desc.SQLDTCODE_MONTH_TO_SECOND: - // case HPT4Desc.SQLDTCODE_MONTH_TO_FRACTION: - case HPT4Desc.SQLDTCODE_DAY_TO_HOUR: - case HPT4Desc.SQLDTCODE_DAY_TO_MINUTE: - case HPT4Desc.SQLDTCODE_DAY_TO_SECOND: - // case HPT4Desc.SQLDTCODE_DAY_TO_FRACTION: + case TrafT4Desc.SQLDTCODE_YEAR: + case TrafT4Desc.SQLDTCODE_YEAR_TO_MONTH: + case TrafT4Desc.SQLDTCODE_MONTH: + case TrafT4Desc.SQLDTCODE_MONTH_TO_DAY: + case TrafT4Desc.SQLDTCODE_DAY: + case TrafT4Desc.SQLDTCODE_HOUR: + case TrafT4Desc.SQLDTCODE_HOUR_TO_MINUTE: + case TrafT4Desc.SQLDTCODE_MINUTE: + case TrafT4Desc.SQLDTCODE_MINUTE_TO_SECOND: + // case TrafT4Desc.SQLDTCODE_MINUTE_TO_FRACTION: + case TrafT4Desc.SQLDTCODE_SECOND: + // case TrafT4Desc.SQLDTCODE_SECOND_TO_FRACTION: + case TrafT4Desc.SQLDTCODE_YEAR_TO_HOUR: + case TrafT4Desc.SQLDTCODE_YEAR_TO_MINUTE: + case TrafT4Desc.SQLDTCODE_MONTH_TO_HOUR: + case TrafT4Desc.SQLDTCODE_MONTH_TO_MINUTE: + case TrafT4Desc.SQLDTCODE_MONTH_TO_SECOND: + // case TrafT4Desc.SQLDTCODE_MONTH_TO_FRACTION: + case TrafT4Desc.SQLDTCODE_DAY_TO_HOUR: + case TrafT4Desc.SQLDTCODE_DAY_TO_MINUTE: + case TrafT4Desc.SQLDTCODE_DAY_TO_SECOND: + // case TrafT4Desc.SQLDTCODE_DAY_TO_FRACTION: default: if (paramValue instanceof String) { try { tmpBarray = ((String) paramValue).getBytes("ASCII"); } catch (Exception e) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", "ASCII"); } } else if (paramValue instanceof byte[]) { tmpBarray = (byte[]) paramValue; } else { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_cast_specification", "DATETIME data should be either bytes or String for column: " + paramNumber); } @@ -386,7 +386,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue // Don't know when we need this. padding blanks. Legacy?? Arrays.fill(values, (noNullValue + dataLen), (noNullValue + maxLength), (byte) ' '); } else { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", "DATETIME data longer than column length: " + paramNumber); } break; @@ -399,11 +399,11 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue try { tmpBarray = ((String) paramValue).getBytes("ASCII"); } catch (Exception e) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", "ASCII"); } } else { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_cast_specification", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_cast_specification", "INTERVAL data should be either bytes or String for column: " + paramNumber); } @@ -419,7 +419,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue Arrays.fill(values, (noNullValue + dataLen), (noNullValue + maxLength), (byte) ' '); } } else { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", "INTERVAL data longer than column length: " + paramNumber); } @@ -446,12 +446,12 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue } tmpBarray = ((String) paramValue).getBytes(charSet); } catch (Exception e) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", charSet); } } // end if (paramValue instanceof String) else { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_cast_specification", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_cast_specification", "VARCHAR data should be either bytes or String for column: " + paramNumber); } @@ -466,7 +466,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue } System.arraycopy(tmpBarray, 0, values, (noNullValue + dataOffset), dataLen); } else { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_string_parameter", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_string_parameter", "VARCHAR data longer than column length: " + paramNumber); } break; @@ -580,11 +580,11 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue } catch (java.io.UnsupportedEncodingException e) { Object[] messageArguments = new Object[1]; messageArguments[0] = e.getMessage(); - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "unsupported_encoding", messageArguments); } } catch (NumberFormatException nex) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "invalid_parameter_value", "DECIMAL data format incorrect for column: " + paramNumber + ". Error is: " + nex.getMessage()); } @@ -607,7 +607,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue // DataTruncation is happening. if (numOfZeros < 0) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "data_truncation_exceed", new int[]{dataLen, maxLength}); + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "data_truncation_exceed", new int[]{dataLen, maxLength}); } for (i = 0; i < numOfZeros; i++) { @@ -661,7 +661,7 @@ void convertObjectToSQL2(Locale locale, TrafT4Statement pstmt, Object paramValue ic_.t4props_.t4Logger_.logp(Level.FINEST, "InterfaceStatement", "convertObjectToSQL2", temp, p); } - throw HPT4Messages.createSQLException(pstmt.connection_.props_, locale, "restricted_data_type", null); + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, locale, "restricted_data_type", null); } if (ic_.t4props_.t4Logger_.isLoggable(Level.FINEST) == true) { Object p[] = T4LoggingUtilities @@ -735,7 +735,7 @@ SQL_DataValue_def fillInSQLValues2(Locale locale, TrafT4Statement stmt, int para try { convertObjectToSQL2(locale, stmt, paramValues[row * paramCount + col], paramRowCount, col, dataValue.buffer, row - clientErrors.size()); - } catch (HPT4Exception e) { + } catch (TrafT4Exception e) { if (paramRowCount == 1) // for single rows we need to // throw immediately throw e; @@ -958,40 +958,40 @@ void setRowCount(long rowCount) { } // ------------------------------------------------------------- - static HPT4Desc[] NewDescArray(SQLItemDescList_def desc) { + static TrafT4Desc[] NewDescArray(SQLItemDescList_def desc) { int index; - HPT4Desc[] HPT4DescArray; + TrafT4Desc[] trafT4DescArray; SQLItemDesc_def SQLDesc; if (desc.list == null || desc.list.length == 0) { return null; } - HPT4DescArray = new HPT4Desc[desc.list.length]; + trafT4DescArray = new TrafT4Desc[desc.list.length]; for (index = 0; index < desc.list.length; index++) { SQLDesc = desc.list[index]; boolean nullInfo = (((new Byte(SQLDesc.nullInfo)).shortValue()) == 1) ? true : false; boolean signType = (((new Byte(SQLDesc.signType)).shortValue()) == 1) ? true : false; - HPT4DescArray[index] = new HPT4Desc(SQLDesc.dataType, (short) SQLDesc.datetimeCode, SQLDesc.maxLen, + trafT4DescArray[index] = new TrafT4Desc(SQLDesc.dataType, (short) SQLDesc.datetimeCode, SQLDesc.maxLen, SQLDesc.precision, SQLDesc.scale, nullInfo, SQLDesc.colHeadingNm, signType, SQLDesc.ODBCDataType, SQLDesc.ODBCPrecision, SQLDesc.SQLCharset, SQLDesc.ODBCCharset, SQLDesc.CatalogName, SQLDesc.SchemaName, SQLDesc.TableName, SQLDesc.dataType, SQLDesc.intLeadPrec, SQLDesc.paramMode); } - return HPT4DescArray; + return trafT4DescArray; } // ------------------------------------------------------------- - static HPT4Desc[] NewDescArray(Descriptor2[] descArray) { + static TrafT4Desc[] NewDescArray(Descriptor2[] descArray) { int index; - HPT4Desc[] HPT4DescArray; + TrafT4Desc[] trafT4DescArray; Descriptor2 desc; if (descArray == null || descArray.length == 0) { return null; } - HPT4DescArray = new HPT4Desc[descArray.length]; + trafT4DescArray = new TrafT4Desc[descArray.length]; for (index = 0; index < descArray.length; index++) { desc = descArray[index]; @@ -1005,13 +1005,13 @@ static HPT4Desc[] NewDescArray(Descriptor2[] descArray) { signType = true; } - HPT4DescArray[index] = new HPT4Desc(desc.noNullValue_, desc.nullValue_, desc.version_, desc.dataType_, + trafT4DescArray[index] = new TrafT4Desc(desc.noNullValue_, desc.nullValue_, desc.version_, desc.dataType_, (short) desc.datetimeCode_, desc.maxLen_, (short) desc.precision_, (short) desc.scale_, nullInfo, signType, desc.odbcDataType_, desc.odbcPrecision_, desc.sqlCharset_, desc.odbcCharset_, desc.colHeadingNm_, desc.tableName_, desc.catalogName_, desc.schemaName_, desc.headingName_, desc.intLeadPrec_, desc.paramMode_, desc.dataType_, desc.getRowLength()); } - return HPT4DescArray; + return trafT4DescArray; } // ------------------------------------------------------------- @@ -1049,9 +1049,9 @@ int close() throws SQLException { // ignore the SQLWarning for the static close break; case odbc_SQLSvc_Close_exc_.odbc_SQLSvc_Close_SQLError_exn_: - HPT4Messages.throwSQLException(stmt_.connection_.props_, cry_.m_p1.SQLError); + TrafT4Messages.throwSQLException(stmt_.connection_.props_, cry_.m_p1.SQLError); default: - throw HPT4Messages.createSQLException(stmt_.connection_.props_, ic_.getLocale(), "ids_unknown_reply_error", + throw TrafT4Messages.createSQLException(stmt_.connection_.props_, ic_.getLocale(), "ids_unknown_reply_error", null); } // end switch @@ -1091,10 +1091,10 @@ void prepare(String sql, int queryTimeout, TrafT4PreparedStatement pstmt) throws txId = Bytes.createIntBytes(0, false); if (sqlStmtType_ == TRANSPORT.TYPE_STATS) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, ic_.getLocale(), "infostats_invalid_error", + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, ic_.getLocale(), "infostats_invalid_error", null); } else if (sqlStmtType_ == TRANSPORT.TYPE_CONFIG) { - throw HPT4Messages.createSQLException(pstmt.connection_.props_, ic_.getLocale(), + throw TrafT4Messages.createSQLException(pstmt.connection_.props_, ic_.getLocale(), "config_cmd_invalid_error", null); } @@ -1108,13 +1108,13 @@ void prepare(String sql, int queryTimeout, TrafT4PreparedStatement pstmt) throws switch (pr.returnCode) { case TRANSPORT.SQL_SUCCESS: case TRANSPORT.SQL_SUCCESS_WITH_INFO: - HPT4Desc[] OutputDesc = InterfaceStatement.NewDescArray(pr.outputDesc); - HPT4Desc[] InputDesc = InterfaceStatement.NewDescArray(pr.inputDesc); + TrafT4Desc[] OutputDesc = InterfaceStatement.NewDescArray(pr.outputDesc); + TrafT4Desc[] InputDesc = InterfaceStatement.NewDescArray(pr.inputDesc); pstmt.setPrepareOutputs2(InputDesc, OutputDesc, pr.inputNumberParams, pr.outputNumberParams, pr.inputParamLength, pr.outputParamLength, pr.inputDescLength, pr.outputDescLength); if (pr.errorList != null && pr.errorList.length > 0) { - HPT4Messages.setSQLWarning(stmt_.connection_.props_, pstmt, pr.errorList); + TrafT4Messages.setSQLWarning(stmt_.connection_.props_, pstmt, pr.errorList); } this.stmtHandle_ = pr.stmtHandle; @@ -1124,7 +1124,7 @@ void prepare(String sql, int queryTimeout, TrafT4PreparedStatement pstmt) throws case odbc_SQLSvc_Prepare_exc_.odbc_SQLSvc_Prepare_SQLError_exn_: default: - HPT4Messages.throwSQLException(stmt_.connection_.props_, pr.errorList); + TrafT4Messages.throwSQLException(stmt_.connection_.props_, pr.errorList); } if (ic_.t4props_.t4Logger_.isLoggable(Level.FINEST) == true) { @@ -1325,11 +1325,11 @@ else if (er.returnCode == TRANSPORT.SQL_SUCCESS || er.returnCode == TRANSPORT.SQ } // get the descriptors from the proper location - HPT4Desc[][] desc = null; + TrafT4Desc[][] desc = null; // try from execute data first if (er.outputDesc != null && er.outputDesc.length > 0) { - desc = new HPT4Desc[er.outputDesc.length][]; + desc = new TrafT4Desc[er.outputDesc.length][]; for (int i = 0; i < er.outputDesc.length; i++) { desc[i] = InterfaceStatement.NewDescArray(er.outputDesc[i]); @@ -1337,7 +1337,7 @@ else if (er.returnCode == TRANSPORT.SQL_SUCCESS || er.returnCode == TRANSPORT.SQ } // try from the prepare data else if (stmt.outputDesc_ != null && stmt.outputDesc_.length > 0) { - desc = new HPT4Desc[1][]; + desc = new TrafT4Desc[1][]; desc[0] = stmt.outputDesc_; } @@ -1368,15 +1368,15 @@ else if (stmt.outputDesc_ != null && stmt.outputDesc_.length > 0) { } } if (er.errorList != null) { - HPT4Messages.setSQLWarning(stmt_.connection_.props_, stmt, er.errorList); + TrafT4Messages.setSQLWarning(stmt_.connection_.props_, stmt, er.errorList); } } else { Arrays.fill(stmt.batchRowCount_, -3); // fill with failed - HPT4Messages.throwSQLException(stmt_.connection_.props_, er.errorList); + TrafT4Messages.throwSQLException(stmt_.connection_.props_, er.errorList); } //3164 if (batchException) { - HPT4Messages.throwSQLException(stmt_.connection_.props_, er.errorList); + TrafT4Messages.throwSQLException(stmt_.connection_.props_, er.errorList); } } diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/NCSAddress.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/NCSAddress.java index a23c7e64bd..5e5b7a6912 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/NCSAddress.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/NCSAddress.java @@ -62,7 +62,7 @@ final class NCSAddress extends Address { m_locale = locale; if (addr == null) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_null_error", null); + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_null_error", null); throw se; } @@ -75,16 +75,16 @@ final class NCSAddress extends Address { // m_type = OS_type; if (addr.endsWith(ODBCServerSuffix) == false) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); - SQLException se2 = HPT4Messages.createSQLException(m_t4props, m_locale, "odbc_server_suffix_error", + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); + SQLException se2 = TrafT4Messages.createSQLException(m_t4props, m_locale, "odbc_server_suffix_error", ODBCServerSuffix); se.setNextException(se2); throw se; } if (addr.length() < minODBCServerAddrLen) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); - SQLException se2 = HPT4Messages.createSQLException(m_t4props, m_locale, "min_address_length_error", + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); + SQLException se2 = TrafT4Messages.createSQLException(m_t4props, m_locale, "min_address_length_error", null); se.setNextException(se2); @@ -100,8 +100,8 @@ final class NCSAddress extends Address { interpretAddress(t4props, locale, addr); if ((m_machineName == null && m_ipAddress == null) || m_processName == null || m_portNumber == null) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); - SQLException se2 = HPT4Messages.createSQLException(m_t4props, m_locale, "address_format_1_error", null); + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); + SQLException se2 = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_format_1_error", null); se.setNextException(se2); throw se; @@ -125,8 +125,8 @@ void interpretAddress(T4Properties t4props, Locale locale, String addr) throws S int index2 = addr.lastIndexOf(".", index3); if ((-1 < index1 && index1 < index2 && index2 < index3 && index3 < addr.length()) == false) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); - SQLException se2 = HPT4Messages.createSQLException(m_t4props, m_locale, "address_format_1_error", null); + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); + SQLException se2 = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_format_1_error", null); se.setNextException(se2); throw se; @@ -162,8 +162,8 @@ void interpretNEOAddress(T4Properties t4props, Locale locale, String addr) throw int index2 = addr.indexOf(".", 0); if ((/*-1 < index1 && index1 < index2 &&*/ index2 < index4 && index4 < index3 && index3 < addr.length()) == false) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); - SQLException se2 = HPT4Messages.createSQLException(m_t4props, m_locale, "address_format_1_error", null); + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); + SQLException se2 = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_format_1_error", null); se.setNextException(se2); throw se; diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/PreparedStatementManager.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/PreparedStatementManager.java index 801a4b1bc8..9ca149bb4b 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/PreparedStatementManager.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/PreparedStatementManager.java @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.logging.Level; -public abstract class PreparedStatementManager extends HPT4Handle { +public abstract class PreparedStatementManager extends TrafT4Handle { boolean isStatementCachingEnabled() { if (maxStatements_ < 1) { diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Address.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Address.java index 6cc2085e6f..2bc145c3d9 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Address.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Address.java @@ -66,7 +66,7 @@ final class T4Address extends Address { super(t4props, locale, addr); if (addr == null) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_null_error", null); + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_null_error", null); throw se; } @@ -80,8 +80,8 @@ final class T4Address extends Address { // We don't recognize this address syntax // if (acceptsURL(addr) == false) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); - SQLException se2 = HPT4Messages.createSQLException(m_t4props, m_locale, "unknown_prefix_error", null); + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", addr); + SQLException se2 = TrafT4Messages.createSQLException(m_t4props, m_locale, "unknown_prefix_error", null); se.setNextException(se2); throw se; @@ -157,8 +157,8 @@ Properties getProps() { */ private String extractHostFromUrl(String url) throws SQLException { if (url.length() < minT4ConnectionAddrLen) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", url); - SQLException se2 = HPT4Messages.createSQLException(m_t4props, m_locale, "min_address_length_error", null); + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", url); + SQLException se2 = TrafT4Messages.createSQLException(m_t4props, m_locale, "min_address_length_error", null); se.setNextException(se2); throw se; @@ -173,8 +173,8 @@ private String extractHostFromUrl(String url) throws SQLException { } if (hostEndIndex < 0) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", url); - SQLException se2 = HPT4Messages.createSQLException(m_t4props, m_locale, "address_format_error", url); + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", url); + SQLException se2 = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_format_error", url); se.setNextException(se2); throw se; @@ -182,9 +182,9 @@ private String extractHostFromUrl(String url) throws SQLException { String host = url.substring(hostStartIndex, hostEndIndex); if ((host == null) || (host.length() == 0)) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", url); - SQLException se2 = HPT4Messages.createSQLException(m_t4props, m_locale, "address_format_error", null); - SQLException se3 = HPT4Messages.createSQLException(m_t4props, m_locale, "missing_ip_or_name_error", null); + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", url); + SQLException se2 = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_format_error", null); + SQLException se3 = TrafT4Messages.createSQLException(m_t4props, m_locale, "missing_ip_or_name_error", null); se.setNextException(se2); se2.setNextException(se3); throw se; @@ -232,8 +232,8 @@ private String extractPortFromUrl(String url) throws SQLException { */ private boolean isIPV6(String url) throws SQLException { if (url == null) { - SQLException se = HPT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", url); - SQLException se2 = HPT4Messages.createSQLException(m_t4props, m_locale, "address_format_2_error", null); + SQLException se = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_parsing_error", url); + SQLException se2 = TrafT4Messages.createSQLException(m_t4props, m_locale, "address_format_2_error", null); se.setNextException(se2); throw se; diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Connection.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Connection.java index d1ce34f72f..e9ab242c9f 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Connection.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Connection.java @@ -118,7 +118,7 @@ private void checkConnectionIdleTimeout() throws SQLException { } catch (SQLException sqex) { // ignores } - throw HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "ids_s1_t00", null); + throw TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "ids_s1_t00", null); } } @@ -139,8 +139,8 @@ protected void throwInternalException() throws SQLException { tempP = m_ic.t4props_; } - SQLException se = HPT4Messages.createSQLException(tempP, m_locale, "internal_error", null); - SQLException se2 = HPT4Messages.createSQLException(tempP, m_locale, "contact_hp_error", null); + SQLException se = TrafT4Messages.createSQLException(tempP, m_locale, "internal_error", null); + SQLException se2 = TrafT4Messages.createSQLException(tempP, m_locale, "contact_traf_error", null); se.setNextException(se2); throw se; @@ -228,19 +228,19 @@ InitializeDialogueReply InitializeDialogue(boolean setTimestamp, boolean downloa } catch (SQLException se) { throw se; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "translation_of_parameter_failed", "InitializeDialogueMessage", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "initialize_dialogue_message_error", e.getMessage()); se.initCause(e); @@ -303,17 +303,17 @@ TerminateDialogueReply TerminateDialogue() throws SQLException { catch (SQLException se) { throw se; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "translation_of_parameter_failed", "TerminateDialogMessage", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "terminate_dialogue_message_error", e.getMessage()); se.initCause(e); @@ -360,17 +360,17 @@ SetConnectionOptionReply SetConnectionOption(short connectionOption, int optionV catch (SQLException se) { throw se; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "translation_of_parameter_failed", "SetConnectionOptionReply", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "set_connection_option_message_error", e.getMessage()); se.initCause(e); @@ -406,17 +406,17 @@ EndTransactionReply EndTransaction(short transactionOpt) throws SQLException { catch (SQLException se) { throw se; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "translation_of_parameter_failed", "EndTransactionMessage", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "end_transaction_message_error", + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "end_transaction_message_error", e.getMessage()); se.initCause(e); @@ -483,17 +483,17 @@ GetSQLCatalogsReply GetSQLCatalogs(String stmtLabel, short APIType, String catal catch (SQLException se) { throw se; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "translation_of_parameter_failed", "GetSQLCatalogsMessage", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "get_sql_catalogs_message_error", e.getMessage()); se.initCause(e); diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4DSProperties.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4DSProperties.java index a44d0f3b39..c16ab8e145 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4DSProperties.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4DSProperties.java @@ -33,8 +33,8 @@ *

* Description: The T4DSProperties class contains all the * properties associated with Type 4 data source connection. - * T4DSProperties is inherited by the HPT4DataSource, - * HPT4ConnectionPooledDataSource + * T4DSProperties is inherited by the TrafT4DataSource, + * TrafT4ConnectionPooledDataSource * classes for configuring Type 4 connection properties. *

* The properties passed to the Type 4 driver have this precedence order in @@ -157,7 +157,7 @@ public void setCatalog(String catalog) { * Gets the default catalog that will be used to access SQL objects * referenced in SQL statements if the SQL objects are not fully qualified. * - * @return HPT4 catalog name. + * @return TrafT4 catalog name. * @see #setCatalog(String) */ public String getCatalog() { diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4DatabaseMetaData.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4DatabaseMetaData.java index d691a8226a..c8b46772d6 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4DatabaseMetaData.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4DatabaseMetaData.java @@ -67,7 +67,7 @@ *

*

*/ -public class T4DatabaseMetaData extends HPT4Handle implements java.sql.DatabaseMetaData { +public class T4DatabaseMetaData extends TrafT4Handle implements java.sql.DatabaseMetaData { // ---------------------------------------------------------------------- // First, a variety of minor information about the target database. @@ -3550,7 +3550,7 @@ public java.sql.ResultSet getTableTypes() throws SQLException { connection_.props_.getLogWriter().println(temp); } TrafT4ResultSet resultSet; - HPT4Desc[] outputDesc; + TrafT4Desc[] outputDesc; ObjectArray[] rows; String[] rowValue; @@ -3558,8 +3558,8 @@ public java.sql.ResultSet getTableTypes() throws SQLException { // connection_.getServerHandle().isConnectionOpen(); connection_.isConnectionOpen(); - outputDesc = new HPT4Desc[1]; - outputDesc[0] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc = new TrafT4Desc[1]; + outputDesc[0] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TABLE_TYPE", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); resultSet = new TrafT4ResultSet(this, outputDesc, "", true); @@ -3773,7 +3773,7 @@ public java.sql.ResultSet getColumnPrivileges(String catalog, String schema, Str connection_.isConnectionOpen(); if (table == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_tableName", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_tableName", null); } // @@ -3967,7 +3967,7 @@ public java.sql.ResultSet getBestRowIdentifier(String catalog, String schema, St connection_.isConnectionOpen(); if (table == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_use_of_null", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_use_of_null", null); } @@ -4062,7 +4062,7 @@ public java.sql.ResultSet getVersionColumns(String catalog, String schema, Strin connection_.isConnectionOpen(); if (table == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_use_of_null", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_use_of_null", null); } // @@ -4147,7 +4147,7 @@ public java.sql.ResultSet getPrimaryKeys(String catalog, String schema, String t connection_.isConnectionOpen(); if (table == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_use_of_null", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_use_of_null", null); } // @@ -4262,7 +4262,7 @@ public java.sql.ResultSet getImportedKeys(String catalog, String schema, String connection_.isConnectionOpen(); if (table == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "table_cannot_be_null", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "table_cannot_be_null", null); } // @@ -4377,7 +4377,7 @@ public java.sql.ResultSet getExportedKeys(String catalog, String schema, String connection_.isConnectionOpen(); if (table == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "table_cannot_be_null", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "table_cannot_be_null", null); } // @@ -4502,7 +4502,7 @@ public java.sql.ResultSet getCrossReference(String primaryCatalog, String primar connection_.isConnectionOpen(); if (primaryTable == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "primaryTable_cannot_be_null", null); } // @@ -4514,7 +4514,7 @@ public java.sql.ResultSet getCrossReference(String primaryCatalog, String primar // case. // The same thing applies to the foreign* parameters. if (foreignTable == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "foreigntable_cannot_be_null", null); } @@ -4698,7 +4698,7 @@ public java.sql.ResultSet getIndexInfo(String catalog, String schema, String tab connection_.isConnectionOpen(); if (table == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_use_of_null", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_use_of_null", null); } // @@ -4806,7 +4806,7 @@ private java.sql.ResultSet getGenericCatInfo(String catalog, String schema, Stri connection_.isConnectionOpen(); if (table == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_use_of_null", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_use_of_null", null); } // @@ -4918,27 +4918,27 @@ public java.sql.ResultSet getUDTs(String catalog, String schemaPattern, String t connection_.props_.getLogWriter().println(temp); } TrafT4ResultSet resultSet; - HPT4Desc[] outputDesc; + TrafT4Desc[] outputDesc; ObjectArray[] rows; clearWarnings(); // connection_.getServerHandle().isConnectionOpen(); connection_.isConnectionOpen(); - outputDesc = new HPT4Desc[7]; - outputDesc[0] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc = new TrafT4Desc[7]; + outputDesc[0] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_CAT", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[1] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[1] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_SCHEM", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[2] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[2] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_NAME", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[3] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[3] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "CLASS_NAME", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[4] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[4] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "DATA_TYPE", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[5] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[5] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "REMARKS", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[6] = new HPT4Desc(HPT4Desc.SQLTYPECODE_SMALLINT, (short) 0, 2, (short) 0, (short) 0, false, + outputDesc[6] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_SMALLINT, (short) 0, 2, (short) 0, (short) 0, false, "BASE_TYPE", false, Types.SMALLINT, (short) 0, (short) 0, 0, null, null, null, 130, 0, 0); resultSet = new TrafT4ResultSet(this, outputDesc, "", true); @@ -5272,25 +5272,25 @@ public ResultSet getSuperTypes(String catalog, String schemaPattern, String type connection_.props_.getLogWriter().println(temp); } TrafT4ResultSet resultSet; - HPT4Desc[] outputDesc; + TrafT4Desc[] outputDesc; ObjectArray[] rows; clearWarnings(); // connection_.getServerHandle().isConnectionOpen(); connection_.isConnectionOpen(); - outputDesc = new HPT4Desc[6]; - outputDesc[0] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc = new TrafT4Desc[6]; + outputDesc[0] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_CAT", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[1] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[1] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_SCHEM", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[2] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[2] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_NAME", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[3] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[3] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "SUPERTYPE_CAT", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[4] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[4] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "SUPERTYPE_SCHEM", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[5] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[5] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "SUPERTYPE_NAME", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); resultSet = new TrafT4ResultSet(this, outputDesc, "", true); @@ -5317,21 +5317,21 @@ public ResultSet getSuperTables(String catalog, String schemaPattern, String tab connection_.props_.getLogWriter().println(temp); } TrafT4ResultSet resultSet; - HPT4Desc[] outputDesc; + TrafT4Desc[] outputDesc; ObjectArray[] rows; clearWarnings(); // connection_.getServerHandle().isConnectionOpen(); connection_.isConnectionOpen(); - outputDesc = new HPT4Desc[4]; - outputDesc[0] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc = new TrafT4Desc[4]; + outputDesc[0] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_CAT", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[1] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[1] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_SCHEM", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[2] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[2] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_NAME", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[3] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[3] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "SUPERTABLE_NAME", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); resultSet = new TrafT4ResultSet(this, outputDesc, "", true); @@ -5362,55 +5362,55 @@ public ResultSet getAttributes(String catalog, String schemaPattern, String type connection_.props_.getLogWriter().println(temp); } TrafT4ResultSet resultSet; - HPT4Desc[] outputDesc; + TrafT4Desc[] outputDesc; ObjectArray[] rows; clearWarnings(); // connection_.getServerHandle().isConnectionOpen(); connection_.isConnectionOpen(); - outputDesc = new HPT4Desc[21]; - outputDesc[0] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc = new TrafT4Desc[21]; + outputDesc[0] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_CAT", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[1] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[1] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_SCHEM", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[2] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[2] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "TYPE_NAME", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[3] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[3] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "ATTR_NAME", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[4] = new HPT4Desc(HPT4Desc.SQLTYPECODE_SMALLINT, (short) 0, 2, (short) 0, (short) 0, false, + outputDesc[4] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_SMALLINT, (short) 0, 2, (short) 0, (short) 0, false, "DATA_TYPE", false, Types.SMALLINT, (short) 0, (short) 0, 0, null, null, null, 130, 0, 0); - outputDesc[5] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[5] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "ATTR_TYPE_NAME", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[6] = new HPT4Desc(HPT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, + outputDesc[6] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, "ATTR_SIZE", false, Types.INTEGER, (short) 0, (short) 0, 0, null, null, null, 132, 0, 0); - outputDesc[7] = new HPT4Desc(HPT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, + outputDesc[7] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, "DECIMAL_DIGITS ", false, Types.INTEGER, (short) 0, (short) 0, 0, null, null, null, 132, 0, 0); - outputDesc[8] = new HPT4Desc(HPT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, + outputDesc[8] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, "NUM_PREC_RADIX", false, Types.INTEGER, (short) 0, (short) 0, 0, null, null, null, 132, 0, 0); - outputDesc[9] = new HPT4Desc(HPT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, + outputDesc[9] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, "NULLABLE ", false, Types.INTEGER, (short) 0, (short) 0, 0, null, null, null, 132, 0, 0); - outputDesc[10] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[10] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "REMARKS", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[11] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[11] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "ATTR_DEF", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[12] = new HPT4Desc(HPT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, + outputDesc[12] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, "SQL_DATA_TYPE", false, Types.INTEGER, (short) 0, (short) 0, 0, null, null, null, 132, 0, 0); - outputDesc[13] = new HPT4Desc(HPT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, + outputDesc[13] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, "SQL_DATETIME_SUB", false, Types.INTEGER, (short) 0, (short) 0, 0, null, null, null, 132, 0, 0); - outputDesc[14] = new HPT4Desc(HPT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, + outputDesc[14] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, "CHAR_OCTET_LENGTH", false, Types.INTEGER, (short) 0, (short) 0, 0, null, null, null, 132, 0, 0); - outputDesc[15] = new HPT4Desc(HPT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, + outputDesc[15] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_INTEGER, (short) 0, 4, (short) 0, (short) 0, false, "ORDINAL_POSITION", false, Types.INTEGER, (short) 0, (short) 0, 0, null, null, null, 132, 0, 0); - outputDesc[16] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[16] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "IS_NULLABLE", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[17] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[17] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "SCOPE_CATALOG", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[18] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[18] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "SCOPE_SCHEMA", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[19] = new HPT4Desc(HPT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, + outputDesc[19] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_VARCHAR, (short) 0, 128, (short) 0, (short) 0, false, "SCOPE_TABLE", false, Types.VARCHAR, (short) 0, (short) 0, 0, null, null, null, 100, 0, 0); - outputDesc[20] = new HPT4Desc(HPT4Desc.SQLTYPECODE_SMALLINT, (short) 0, 2, (short) 0, (short) 0, false, + outputDesc[20] = new TrafT4Desc(TrafT4Desc.SQLTYPECODE_SMALLINT, (short) 0, 2, (short) 0, (short) 0, false, "SOURCE_DATA_TYPE", false, Types.SMALLINT, (short) 0, (short) 0, 0, null, null, null, 130, 0, 0); resultSet = new TrafT4ResultSet(this, outputDesc, "", true); @@ -5747,7 +5747,7 @@ private void getSQLCatalogsInfo(InterfaceConnection ic, short catalogAPI, String // do the warning processing if (gcr_.m_p4.length != 0) { - HPT4Messages.setSQLWarning(connection_.props_, this, gcr_.m_p4); + TrafT4Messages.setSQLWarning(connection_.props_, this, gcr_.m_p4); // If there is no description definitions data throw fits. NDCS // bug. @@ -5759,11 +5759,11 @@ private void getSQLCatalogsInfo(InterfaceConnection ic, short catalogAPI, String connection_.props_.t4Logger_.logp(Level.FINER, "T4DatabaseMetaData", "getSQLCatalogsInfo", "SQLDescList null or 0 length", p); } - throw HPT4Messages.createSQLException(connection_.props_, ic.getLocale(), "ids_unknown_reply_error", + throw TrafT4Messages.createSQLException(connection_.props_, ic.getLocale(), "ids_unknown_reply_error", "Empty SQL Desc List returned by NDCS"); } - HPT4Desc[] outputDesc = InterfaceStatement.NewDescArray(gcr_.m_p3); + TrafT4Desc[] outputDesc = InterfaceStatement.NewDescArray(gcr_.m_p3); resultSet_ = new TrafT4ResultSet(this, outputDesc, gcr_.m_p2, true); resultSet_.proxySyntax_ = gcr_.proxySyntax; @@ -5779,19 +5779,19 @@ private void getSQLCatalogsInfo(InterfaceConnection ic, short catalogAPI, String "gcr_.m_p1.exception_nr = odbc_SQLSvc_GetSQLCatalogs_exc_.odbc_SQLSvc_GetSQLCatalogs_SQLError_exn_", p); } - HPT4Messages.throwSQLException(connection_.props_, gcr_.m_p1.SQLError); + TrafT4Messages.throwSQLException(connection_.props_, gcr_.m_p1.SQLError); default: if (connection_.props_.t4Logger_.isLoggable(Level.FINER) == true) { Object p[] = T4LoggingUtilities.makeParams(connection_.props_); connection_.props_.t4Logger_.logp(Level.FINER, "T4DatabaseMetaData", "getSQLCatalogsInfo", "case gcr_.m_p1.exception_nr default", p); } - throw HPT4Messages.createSQLException(connection_.props_, ic.getLocale(), "ids_unknown_reply_error", null); + throw TrafT4Messages.createSQLException(connection_.props_, ic.getLocale(), "ids_unknown_reply_error", null); } }; - void closeErroredConnection(HPT4Exception sme) { + void closeErroredConnection(TrafT4Exception sme) { if (connection_.props_.t4Logger_.isLoggable(Level.FINER) == true) { Object p[] = T4LoggingUtilities.makeParams(connection_.props_, sme); connection_.props_.t4Logger_.logp(Level.FINER, "T4DatabaseMetaData", "closeErroredConneciton", "", p); diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Driver.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Driver.java index a1724aa33c..96ff9b775d 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Driver.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Driver.java @@ -133,11 +133,11 @@ public java.sql.Connection connect(String url, Properties info) throws SQLExcept } if (logger.isLoggable(Level.INFO)) { - logger.entering("HPT4DataSource", "getConnection"); + logger.entering("TrafT4DataSource", "getConnection"); } String key = null; - HPT4DataSource ds = null; + TrafT4DataSource ds = null; if (acceptsURL(url)) { synchronized(this) { @@ -165,21 +165,21 @@ public java.sql.Connection connect(String url, Properties info) throws SQLExcept if (info != null) { initialize(info); if (getSQLException() != null) { - throw HPT4Messages.createSQLException(null, getLocale(), "invalid_property", getSQLException()); + throw TrafT4Messages.createSQLException(null, getLocale(), "invalid_property", getSQLException()); } } if (getMaxPoolSize() != -1) { key = getUrl() + getCatalog() + getSchema() + getUser() + getPassword() + getServerDataSource() + getBlobTableName() + getClobTableName(); - ds = (HPT4DataSource) dsCache_.get(key); + ds = (TrafT4DataSource) dsCache_.get(key); if (ds == null) { - ds = new HPT4DataSource(getProperties()); + ds = new TrafT4DataSource(getProperties()); dsCache_.put(key, ds); } } else { - ds = new HPT4DataSource(getProperties()); + ds = new TrafT4DataSource(getProperties()); } } @@ -342,7 +342,7 @@ public boolean jdbcCompliant() { public T4Driver() { super(); if (logger.isLoggable(Level.INFO)) { - logger.entering("HPT4DataSource", "getConnection"); + logger.entering("TrafT4DataSource", "getConnection"); } } diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java index 49100b4601..917cf45792 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java @@ -45,8 +45,8 @@ *

* Description: The T4Properties class contains all the * properties associated with Type 4 connection. T4Properties is - * inherited directy or indirectly by the T4Driver, HPT4DataSource, - * HPT4ConnectionPooledDataSource + * inherited directy or indirectly by the T4Driver, TrafT4DataSource, + * TrafT4ConnectionPooledDataSource * classes for configuring Type 4 connection properties. *

*

@@ -262,16 +262,16 @@ void initializeLogging() { t4GlobalLogFileHandler.setFormatter(ff1); } } catch (Exception e) { - // SQLException se = HPT4Messages.createSQLException(null, null, + // SQLException se = TrafT4Messages.createSQLException(null, null, // "problem_with_logging", e.getMessage()); // sqlExceptionMessage_ = se.getMessage(); - SQLException se = HPT4Messages.createSQLException(null, null, "problem_with_logging", e.getMessage()); + SQLException se = TrafT4Messages.createSQLException(null, null, "problem_with_logging", e.getMessage()); sqlExceptionMessage_ = se.getMessage(); // RuntimeException rte = new RuntimeException(se.getMessage(), se); // throw rte; // e.printStackTrace(); - // throw HPT4Messages.createSQLException(null, null, + // throw TrafT4Messages.createSQLException(null, null, // "problem_with_logging", e.getMessage()); } } // end initializeLogging @@ -1373,7 +1373,7 @@ void setT4LogLevel(String level) { t4LogLevel = Level.parse(level); } catch (Exception ex) { - SQLException se = HPT4Messages.createSQLException(null, null, "problem_with_logging", ex.getMessage()); + SQLException se = TrafT4Messages.createSQLException(null, null, "problem_with_logging", ex.getMessage()); sqlExceptionMessage_ = se.getMessage(); // throw se; // RuntimeException rte = new RuntimeException(se.getMessage(), @@ -1750,13 +1750,13 @@ void setClobTableName(String clobTableName) throws SQLException { count++; } if (count < 2) { - SQLException se = HPT4Messages.createSQLException(null, null, "no_clobTableName", null); + SQLException se = TrafT4Messages.createSQLException(null, null, "no_clobTableName", null); sqlExceptionMessage_ = se.getMessage(); } clobTableName_ = clobTableName; } else { // If the name is null, let it be null clobTableName_ = null; - // throw HPT4Messages.createSQLException(null, + // throw TrafT4Messages.createSQLException(null, // null,"no_clobTableName",null); } } @@ -1803,7 +1803,7 @@ void setBlobTableName(String blobTableName) throws SQLException { count++; } if (count < 2) { - SQLException se = HPT4Messages.createSQLException(null, null, "no_blobTableName", null); + SQLException se = TrafT4Messages.createSQLException(null, null, "no_blobTableName", null); sqlExceptionMessage_ = se.getMessage(); } blobTableName_ = blobTableName; @@ -1811,7 +1811,7 @@ void setBlobTableName(String blobTableName) throws SQLException { // If the name is null, then let it be null else { blobTableName_ = null; - // throw HPT4Messages.createSQLException(null, null, + // throw TrafT4Messages.createSQLException(null, null, // "no_blobTableName", null); } } diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4ResultSet.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4ResultSet.java index 45410c7ab2..3ef5970f58 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4ResultSet.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4ResultSet.java @@ -82,17 +82,17 @@ FetchReply Fetch(int sqlAsyncEnable, int queryTimeout, int stmtHandle, int stmtC catch (SQLException se) { throw se; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "translation_of_parameter_failed", "FetchMessage", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "fetch_perf_message_error", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "fetch_perf_message_error", e .getMessage()); se.initCause(e); @@ -128,17 +128,17 @@ CloseReply Close() throws SQLException { catch (SQLException se) { throw se; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "translation_of_parameter_failed", "CloseMessage", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "close_message_error", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "close_message_error", e .getMessage()); se.initCause(e); diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Statement.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Statement.java index c32f3b9d3e..8b86127ecc 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Statement.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Statement.java @@ -67,17 +67,17 @@ ExecuteReply Execute(short executeAPI, int sqlAsyncEnable, int inputRowCnt, int } catch (SQLException e) { throw e; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "translation_of_parameter_failed", "ExecuteMessage", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "execute_message_error", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "execute_message_error", e .getMessage()); se.initCause(e); throw se; @@ -100,7 +100,7 @@ GenericReply ExecuteGeneric(short executeAPI, byte[] messageBuffer) throws SQLEx } catch (SQLException se) { throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "execute_message_error", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "execute_message_error", e .getMessage()); se.initCause(e); @@ -134,17 +134,17 @@ PrepareReply Prepare(int sqlAsyncEnable, short stmtType, int sqlStmtType, String } catch (SQLException se) { throw se; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "translation_of_parameter_failed", "PrepareMessage", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "prepare_message_error", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "prepare_message_error", e .getMessage()); se.initCause(e); @@ -169,17 +169,17 @@ CloseReply Close() throws SQLException { } catch (SQLException se) { throw se; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "translation_of_parameter_failed", "CloseMessage", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(m_ic.t4props_, m_locale, "close_message_error", e + SQLException se = TrafT4Messages.createSQLException(m_ic.t4props_, m_locale, "close_message_error", e .getMessage()); se.initCause(e); diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4_Dcs_Cancel.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4_Dcs_Cancel.java index 7357535e90..ecf50aa533 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4_Dcs_Cancel.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4_Dcs_Cancel.java @@ -103,7 +103,7 @@ static CancelReply cancel(T4Properties t4props, InterfaceConnection ic_, int dia catch (SQLException se) { throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(t4props, locale, "as_cancel_message_error", e + SQLException se = TrafT4Messages.createSQLException(t4props, locale, "as_cancel_message_error", e .getMessage()); se.initCause(e); diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4_Dcs_Connect.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4_Dcs_Connect.java index af943484cb..60f3497350 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4_Dcs_Connect.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4_Dcs_Connect.java @@ -55,8 +55,8 @@ static ConnectReply getConnection(T4Properties t4props, InterfaceConnection ic_, Locale locale = ic_.getLocale(); if (inContext == null || userDesc == null) { - SQLException se = HPT4Messages.createSQLException(t4props, locale, "internal_error", null); - SQLException se2 = HPT4Messages.createSQLException(t4props, locale, "contact_hp_error", null); + SQLException se = TrafT4Messages.createSQLException(t4props, locale, "internal_error", null); + SQLException se2 = TrafT4Messages.createSQLException(t4props, locale, "contact_traf_error", null); se.setNextException(se2); throw se; @@ -103,17 +103,17 @@ static ConnectReply getConnection(T4Properties t4props, InterfaceConnection ic_, } catch (SQLException se) { throw se; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(ic_.t4props_, locale, "translation_of_parameter_failed", + SQLException se = TrafT4Messages.createSQLException(ic_.t4props_, locale, "translation_of_parameter_failed", "ConnectMessage", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(ic_.t4props_, locale, "unsupported_encoding", e + SQLException se = TrafT4Messages.createSQLException(ic_.t4props_, locale, "unsupported_encoding", e .getCharsetName()); se.initCause(e); throw se; } catch (Exception e) { - SQLException se = HPT4Messages.createSQLException(t4props, locale, "as_connect_message_error", e + SQLException se = TrafT4Messages.createSQLException(t4props, locale, "as_connect_message_error", e .getMessage()); se.initCause(e); diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4CallableStatement.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4CallableStatement.java index 2a3675ec82..8b75f911c2 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4CallableStatement.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4CallableStatement.java @@ -64,7 +64,7 @@ public Array getArray(int parameterIndex) throws SQLException { connection_.props_.getLogWriter().println(temp); } clearWarnings(); - HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getArray()"); + TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getArray()"); return null; } @@ -121,7 +121,7 @@ public BigDecimal getBigDecimal(int parameterIndex) throws SQLException { try { retValue = new BigDecimal(data); } catch (NumberFormatException e) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cast_specification", null); } return retValue; @@ -314,11 +314,11 @@ public byte[] getBytes(int parameterIndex) throws SQLException { validateGetInvocation(parameterIndex); dataType = inputDesc_[parameterIndex - 1].dataType_; if (dataType != Types.BINARY && dataType != Types.VARBINARY && dataType != Types.LONGVARBINARY) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type", null); } // BINARY, VARBINARY, LONGVARBINARY not supported - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "datatype_not_supported", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "datatype_not_supported", null); } @@ -364,7 +364,7 @@ public Date getDate(int parameterIndex) throws SQLException { dataType = inputDesc_[parameterIndex - 1].dataType_; if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR && dataType != Types.DATE && dataType != Types.TIMESTAMP) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type", null); } // For LOB Support - SB @@ -383,7 +383,7 @@ public Date getDate(int parameterIndex) throws SQLException { retValue = Date.valueOf(dateStr); } } catch (IllegalArgumentException e) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cast_specification", null); } return retValue; @@ -758,7 +758,7 @@ public Object getObject(int parameterIndex) throws SQLException { case Types.TIMESTAMP: return getTimestamp(parameterIndex); default: - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type", null); } } @@ -778,7 +778,7 @@ public Object getObject(int parameterIndex, Map map) throws SQLException { String temp = lf.format(lr); connection_.props_.getLogWriter().println(temp); } - HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getObject()"); + TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getObject()"); return null; } @@ -835,7 +835,7 @@ public Ref getRef(int parameterIndex) throws SQLException { String temp = lf.format(lr); connection_.props_.getLogWriter().println(temp); } - HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getRef()"); + TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getRef()"); return null; } @@ -950,17 +950,17 @@ public String getString(int parameterIndex) throws SQLException { wasNull_ = false; } catch (CharacterCodingException e) { - SQLException se = HPT4Messages.createSQLException(this.connection_.ic_.t4props_, this.connection_ + SQLException se = TrafT4Messages.createSQLException(this.connection_.ic_.t4props_, this.connection_ .getLocale(), "translation_of_parameter_failed", "getLocalString", e.getMessage()); se.initCause(e); throw se; } catch (UnsupportedCharsetException e) { - SQLException se = HPT4Messages.createSQLException(this.connection_.ic_.t4props_, this.connection_ + SQLException se = TrafT4Messages.createSQLException(this.connection_.ic_.t4props_, this.connection_ .getLocale(), "unsupported_encoding", e.getCharsetName()); se.initCause(e); throw se; } catch (UnsupportedEncodingException e) { - SQLException se = HPT4Messages.createSQLException(this.connection_.ic_.t4props_, this.connection_ + SQLException se = TrafT4Messages.createSQLException(this.connection_.ic_.t4props_, this.connection_ .getLocale(), "unsupported_encoding", e.getMessage()); se.initCause(e); throw se; @@ -1015,7 +1015,7 @@ public Time getTime(int parameterIndex) throws SQLException { dataType = inputDesc_[parameterIndex - 1].dataType_; if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR && dataType != Types.TIME && dataType != Types.TIMESTAMP) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type", null); } @@ -1027,7 +1027,7 @@ public Time getTime(int parameterIndex) throws SQLException { wasNull_ = false; retValue = Time.valueOf(timeStr); } catch (IllegalArgumentException e) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cast_specification", null); } return retValue; @@ -1129,7 +1129,7 @@ public Timestamp getTimestamp(int parameterIndex) throws SQLException { dataType = inputDesc_[parameterIndex - 1].dataType_; if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR && dataType != Types.DATE && dataType != Types.TIMESTAMP) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type", null); } @@ -1141,7 +1141,7 @@ public Timestamp getTimestamp(int parameterIndex) throws SQLException { wasNull_ = false; retValue = Timestamp.valueOf(timestampStr); } catch (IllegalArgumentException e) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cast_specification", null); } return retValue; @@ -1239,7 +1239,7 @@ public URL getURL(int parameterIndex) throws SQLException { connection_.props_.getLogWriter().println(temp); } clearWarnings(); - HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getURL()"); + TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getURL()"); return null; } @@ -1958,7 +1958,7 @@ public int[] executeBatch() throws SQLException { } clearWarnings(); - HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "executeBatch()"); + TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "executeBatch()"); return null; } @@ -2032,20 +2032,20 @@ protected void validateGetInvocation(int parameterIndex) throws SQLException { // connection_.getServerHandle().isConnectionOpen(); connection_.isConnectionOpen(); if (isClosed_) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_statement", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_statement", null); } if (inputDesc_ == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "not_a_output_parameter", null); } if (parameterIndex < 1 || parameterIndex > inputDesc_.length) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_parameter_index", null); } if (inputDesc_[parameterIndex - 1].paramMode_ != DatabaseMetaData.procedureColumnInOut && inputDesc_[parameterIndex - 1].paramMode_ != DatabaseMetaData.procedureColumnOut) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "not_a_output_parameter", null); } } @@ -2058,11 +2058,11 @@ protected int validateGetInvocation(String parameterName) throws SQLException { int i; if (isClosed_) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_statement", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_statement", null); } if (inputDesc_ == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "not_a_output_parameter", null); } for (i = 0; i < inputDesc_.length; i++) { @@ -2070,7 +2070,7 @@ protected int validateGetInvocation(String parameterName) throws SQLException { return i + 1; } } - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_parameter_name", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_parameter_name", null); } @@ -2082,10 +2082,10 @@ private int validateSetInvocation(String parameterName) throws SQLException { int i; if (isClosed_) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "stmt_closed", null); + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "stmt_closed", null); } if (inputDesc_ == null) { - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_parameter_index", null); } for (i = 0; i < inputDesc_.length; i++) { @@ -2093,7 +2093,7 @@ private int validateSetInvocation(String parameterName) throws SQLException { return i + 1; } } - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_parameter_name", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_parameter_name", null); } @@ -2242,7 +2242,7 @@ void cpqPrepareCall(String moduleName, int moduleVersion, long moduleTimestamp, stmtName, queryTimeout, holdability); connection_.props_.t4Logger_.logp(Level.FINER, "TrafT4CallableStatement", "cpqPrepareCall", "", p); } - throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "unsupported_feature", + throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "unsupported_feature", new Object[] { "cpqPrepareCall" }); }; diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java index f1d34f9e48..a3a004f6ec 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java @@ -79,7 +79,7 @@ private void validateConnection() throws SQLException { clearWarnings(); if (this.ic_ == null || this.ic_.isClosed()) { - throw HPT4Messages.createSQLException(this.props_, this.getLocale(), "invalid_connection", null); + throw TrafT4Messages.createSQLException(this.props_, this.getLocale(), "invalid_connection", null); } } @@ -119,7 +119,7 @@ public void commit() throws SQLException { public void resetServerIdleTimer() throws SQLException { clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } this.setConnectionAttr(InterfaceConnection.RESET_IDLE_TIMER, 0, "0"); @@ -480,7 +480,7 @@ public CallableStatement prepareCall(String sql) throws SQLException { clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { @@ -500,7 +500,7 @@ public CallableStatement prepareCall(String sql) throws SQLException { addPreparedStatement(this, sql, stmt, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, holdability_); } - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -526,13 +526,13 @@ public CallableStatement prepareCall(String sql, String stmtLabel) throws SQLExc } if (stmtLabel == null || stmtLabel.length() == 0) { - throw HPT4Messages.createSQLException(props_, null, "null_data", null); + throw TrafT4Messages.createSQLException(props_, null, "null_data", null); } if (stmtLabel.startsWith(QUOTE) && stmtLabel.endsWith(QUOTE)) { int len = stmtLabel.length(); if (len == 2) { - throw HPT4Messages.createSQLException(props_, null, "null_data", null); + throw TrafT4Messages.createSQLException(props_, null, "null_data", null); } else { stmtLabel = stmtLabel.substring(1, len - 1); } @@ -544,7 +544,7 @@ public CallableStatement prepareCall(String sql, String stmtLabel) throws SQLExc clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { @@ -564,7 +564,7 @@ public CallableStatement prepareCall(String sql, String stmtLabel) throws SQLExc addPreparedStatement(this, sql, stmt, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, holdability_); } - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -590,7 +590,7 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { @@ -608,7 +608,7 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe if (isStatementCachingEnabled()) { addPreparedStatement(this, sql, stmt, resultSetType, resultSetConcurrency, holdability_); } - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -636,7 +636,7 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { if (isStatementCachingEnabled()) { @@ -654,7 +654,7 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe if (isStatementCachingEnabled()) { addPreparedStatement(this, sql, stmt, resultSetType, resultSetConcurrency, resultSetHoldability); } - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -695,13 +695,13 @@ public PreparedStatement prepareStatement(String sql, String stmtLabel) throws S } if (stmtLabel == null || stmtLabel.length() == 0) { - throw HPT4Messages.createSQLException(props_, null, "null_data", null); + throw TrafT4Messages.createSQLException(props_, null, "null_data", null); } if (stmtLabel.startsWith(QUOTE) && stmtLabel.endsWith(QUOTE)) { int len = stmtLabel.length(); if (len == 2) { - throw HPT4Messages.createSQLException(props_, null, "null_data", null); + throw TrafT4Messages.createSQLException(props_, null, "null_data", null); } else { stmtLabel = stmtLabel.substring(1, len - 1); } @@ -713,7 +713,7 @@ public PreparedStatement prepareStatement(String sql, String stmtLabel) throws S clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { if (isStatementCachingEnabled()) { @@ -732,7 +732,7 @@ public PreparedStatement prepareStatement(String sql, String stmtLabel) throws S addPreparedStatement(this, sql, stmt, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, holdability_); } - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -759,7 +759,7 @@ public PreparedStatement prepareStatement(String sql) throws SQLException { clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { if (isStatementCachingEnabled()) { @@ -778,7 +778,7 @@ public PreparedStatement prepareStatement(String sql) throws SQLException { addPreparedStatement(this, sql, stmt, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, holdability_); } - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -807,13 +807,13 @@ PreparedStatement prepareLobStatement(String sql) throws SQLException { clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { stmt = new TrafT4PreparedStatement(this, sql); stmt.prepare(stmt.sql_, stmt.queryTimeout_, stmt.resultSetHoldability_); - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -840,7 +840,7 @@ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) thr if (autoGeneratedKeys == TrafT4Statement.NO_GENERATED_KEYS) { return prepareStatement(sql); } else { - throw HPT4Messages.createSQLException(props_, getLocale(), "auto_generated_keys_not_supported", null); + throw TrafT4Messages.createSQLException(props_, getLocale(), "auto_generated_keys_not_supported", null); } } @@ -861,7 +861,7 @@ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throw } if (columnIndexes != null && columnIndexes.length > 0) { - throw HPT4Messages.createSQLException(props_, getLocale(), "auto_generated_keys_not_supported", null); + throw TrafT4Messages.createSQLException(props_, getLocale(), "auto_generated_keys_not_supported", null); } else { return prepareStatement(sql); } @@ -888,7 +888,7 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { @@ -906,7 +906,7 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res if (isStatementCachingEnabled()) { addPreparedStatement(this, sql, stmt, resultSetType, resultSetConcurrency, holdability_); } - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -934,7 +934,7 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { @@ -952,7 +952,7 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res if (isStatementCachingEnabled()) { addPreparedStatement(this, sql, stmt, resultSetType, resultSetConcurrency, resultSetHoldability); } - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -975,7 +975,7 @@ public PreparedStatement prepareStatement(String sql, String[] columnNames) thro props_.getLogWriter().println(temp); } if (columnNames != null && columnNames.length > 0) { - throw HPT4Messages.createSQLException(props_, getLocale(), "auto_generated_keys_not_supported", null); + throw TrafT4Messages.createSQLException(props_, getLocale(), "auto_generated_keys_not_supported", null); } else { return prepareStatement(sql); } @@ -997,7 +997,7 @@ public void releaseSavepoint(Savepoint savepoint) throws SQLException { props_.getLogWriter().println(temp); } clearWarnings(); - HPT4Messages.throwUnsupportedFeatureException(props_, getLocale(), "releaseSavepoint()"); + TrafT4Messages.throwUnsupportedFeatureException(props_, getLocale(), "releaseSavepoint()"); } public void rollback() throws SQLException { @@ -1017,7 +1017,7 @@ public void rollback() throws SQLException { } clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } // if (ic_.getTxid() == 0) - XA @@ -1026,7 +1026,7 @@ public void rollback() throws SQLException { // commit the Transaction try { ic_.rollback(); - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -1049,7 +1049,7 @@ public void rollback(Savepoint savepoint) throws SQLException { props_.getLogWriter().println(temp); } clearWarnings(); - HPT4Messages.throwUnsupportedFeatureException(props_, getLocale(), "rollback(Savepoint)"); + TrafT4Messages.throwUnsupportedFeatureException(props_, getLocale(), "rollback(Savepoint)"); } public void setAutoCommit(boolean autoCommit) throws SQLException { @@ -1070,11 +1070,11 @@ public void setAutoCommit(boolean autoCommit) throws SQLException { clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { ic_.setAutoCommit(this, autoCommit); - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -1097,12 +1097,12 @@ public void setCatalog(String catalog) throws SQLException { } clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } if (catalog != null) { try { ic_.setCatalog(this, catalog); - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -1126,13 +1126,13 @@ public void setHoldability(int holdability) throws SQLException { } clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } if (holdability != TrafT4ResultSet.CLOSE_CURSORS_AT_COMMIT) { - throw HPT4Messages.createSQLException(props_, getLocale(), "invalid_holdability", null); + throw TrafT4Messages.createSQLException(props_, getLocale(), "invalid_holdability", null); } holdability_ = holdability; } @@ -1154,12 +1154,12 @@ public void setReadOnly(boolean readOnly) throws SQLException { } clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { // ic_.setReadOnly(readOnly); ic_.setReadOnly(this, readOnly); - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -1197,7 +1197,7 @@ public Savepoint setSavepoint(String name) throws SQLException { props_.getLogWriter().println(temp); } clearWarnings(); - HPT4Messages.throwUnsupportedFeatureException(props_, getLocale(), "setSavepoint"); + TrafT4Messages.throwUnsupportedFeatureException(props_, getLocale(), "setSavepoint"); return null; } @@ -1217,7 +1217,7 @@ public Savepoint setSavepoint() throws SQLException { props_.getLogWriter().println(temp); } clearWarnings(); - HPT4Messages.throwUnsupportedFeatureException(props_, getLocale(), "setSavepoint"); + TrafT4Messages.throwUnsupportedFeatureException(props_, getLocale(), "setSavepoint"); return null; } @@ -1238,11 +1238,11 @@ public void setTransactionIsolation(int level) throws SQLException { } clearWarnings(); if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { ic_.setTransactionIsolation(this, level); - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -1284,7 +1284,7 @@ public void begintransaction() throws SQLException { props_.getLogWriter().println(temp); } if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } try { ic_.beginTransaction(); @@ -1294,7 +1294,7 @@ public void begintransaction() throws SQLException { } else { setAutoCommit(false); } - } catch (HPT4Exception se) { + } catch (TrafT4Exception se) { performConnectionErrorChecks(se); throw se; } @@ -1316,7 +1316,7 @@ public long getCurrentTransaction() throws SQLException { props_.getLogWriter().println(temp); } if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } return ic_.getTxid(); } @@ -1331,7 +1331,7 @@ public void setTransactionToJoin(byte[] txid) throws SQLException { props_.t4Logger_.logp(Level.FINER, "TrafT4Connection", "setTxid", "", p); } if (_isClosed() == true) { - throw HPT4Messages.createSQLException(props_, null, "invalid_connection", null); + throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null); } transactionToJoin = txid; @@ -1506,7 +1506,7 @@ void reuse() throws SQLException { } ic_.reuse(); /* - * try { ic_.enforceT4ConnectionTimeout(this); } catch (HPT4Exception + * try { ic_.enforceT4ConnectionTimeout(this); } catch (TrafT4Exception * se) { //performConnectionErrorChecks(se); //throw se; //ignore - new * property from old MXCS ABD version (now known as NCS) //ignored for * backward compatibility } @@ -1534,11 +1534,11 @@ public PooledConnection getPooledConnection() throws SQLException { if (pc_ != null) { return pc_; } else { - throw HPT4Messages.createSQLException(props_, getLocale(), "null_pooled_connection", null); + throw TrafT4Messages.createSQLException(props_, getLocale(), "null_pooled_connection", null); } } - TrafT4Connection(HPT4DataSource ds, T4Properties t4props) throws SQLException { + TrafT4Connection(TrafT4DataSource ds, T4Properties t4props) throws SQLException { super(t4props); t4props.setConnectionID(Integer.toString(this.hashCode())); @@ -1565,7 +1565,7 @@ public PooledConnection getPooledConnection() throws SQLException { holdability_ = TrafT4ResultSet.CLOSE_CURSORS_AT_COMMIT; } - TrafT4Connection(HPT4PooledConnection poolConn, T4Properties t4props) throws SQLException { + TrafT4Connection(TrafT4PooledConnection poolConn, T4Properties t4props) throws SQLException { super(t4props); t4props.setConnectionID(Integer.toString(this.hashCode())); @@ -1769,7 +1769,7 @@ int getServerMinorVersion() throws SQLException { } - void closeErroredConnection(HPT4Exception se) { + void closeErroredConnection(TrafT4Exception se) { try { if (!erroredConnection) { // don't issue close repeatedly erroredConnection = true; @@ -1829,8 +1829,8 @@ void closeErroredConnection(HPT4Exception se) { Hashtable refToStmt_; Hashtable refToRS_; int holdability_; - HPT4DataSource ds_; - HPT4PooledConnection pc_; + TrafT4DataSource ds_; + TrafT4PooledConnection pc_; T4Driver driver_; WeakReference pRef_; T4Properties props_; diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSource.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ConnectionPoolDataSource.java similarity index 82% rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSource.java rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ConnectionPoolDataSource.java index 39e39dd055..06eb66628f 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSource.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ConnectionPoolDataSource.java @@ -49,11 +49,11 @@ *

* *

- * The HPT4ConnectionPoolDataSource class should be used to + * The TrafT4ConnectionPoolDataSource class should be used to * provide JDBC3.0 connection pooling features. The - * HPT4ConnectionPoolDataSource is used by the application + * TrafT4ConnectionPoolDataSource is used by the application * servers like WSAS to provide connection pooling features to the J2EE - * applications. HPT4ConnectionPoolDataSource.getPooledConnection() + * applications. TrafT4ConnectionPoolDataSource.getPooledConnection() * returns the javax.sql.PooledConnection object. *

* @@ -66,10 +66,10 @@ *

* * @see T4Properties - * @see HPT4DataSource + * @see TrafT4DataSource */ -public class HPT4ConnectionPoolDataSource extends T4DSProperties implements javax.sql.ConnectionPoolDataSource, +public class TrafT4ConnectionPoolDataSource extends T4DSProperties implements javax.sql.ConnectionPoolDataSource, java.io.Serializable, Referenceable { @@ -80,30 +80,30 @@ public class HPT4ConnectionPoolDataSource extends T4DSProperties implements java * * @return A PooledConnection object that is a physical * connection to the NDCS server that this - * HPT4ConnectionPoolDataSource object represents. + * TrafT4ConnectionPoolDataSource object represents. * @throws SQLException * If any NDCS error occurs. */ public PooledConnection getPooledConnection() throws SQLException { if (t4Logger_.isLoggable(Level.FINE) == true) { Object p[] = T4LoggingUtilities.makeParams(null); - t4Logger_.logp(Level.FINE, "HPT4ConnectionPoolDataSource", "getPooledConnection", "", p); + t4Logger_.logp(Level.FINE, "TrafT4ConnectionPoolDataSource", "getPooledConnection", "", p); } if (getLogWriter() != null) { LogRecord lr = new LogRecord(Level.FINE, ""); Object p[] = T4LoggingUtilities.makeParams(null); lr.setParameters(p); - lr.setSourceClassName("HPT4ConnectionPoolDataSource"); + lr.setSourceClassName("TrafT4ConnectionPoolDataSource"); lr.setSourceMethodName("getPooledConnection"); T4LogFormatter lf = new T4LogFormatter(); String temp = lf.format(lr); getLogWriter().println(temp); } - HPT4PooledConnection connect; + TrafT4PooledConnection connect; Properties l_props = super.getProperties(); T4Properties l_t4props = new T4Properties(l_props); - connect = new HPT4PooledConnection(this, l_t4props); + connect = new TrafT4PooledConnection(this, l_t4props); return connect; } @@ -118,26 +118,26 @@ public PooledConnection getPooledConnection() throws SQLException { * Safeguard user password. * @return A PooledConnection object that is a physical * connection to the NDCS server that this - * HPT4ConnectionPoolDataSource object represents. + * TrafT4ConnectionPoolDataSource object represents. * @throws SQLException * If any NDCS error occurs. */ public PooledConnection getPooledConnection(String username, String password) throws SQLException { if (t4Logger_.isLoggable(Level.FINE) == true) { Object p[] = T4LoggingUtilities.makeParams(null, username); - t4Logger_.logp(Level.FINE, "HPT4ConnectionPoolDataSource", "getPooledConnection", "", p); + t4Logger_.logp(Level.FINE, "TrafT4ConnectionPoolDataSource", "getPooledConnection", "", p); } if (getLogWriter() != null) { LogRecord lr = new LogRecord(Level.FINE, ""); Object p[] = T4LoggingUtilities.makeParams(null, username); lr.setParameters(p); - lr.setSourceClassName("HPT4ConnectionPoolDataSource"); + lr.setSourceClassName("TrafT4ConnectionPoolDataSource"); lr.setSourceMethodName("getPooledConnection"); T4LogFormatter lf = new T4LogFormatter(); String temp = lf.format(lr); getLogWriter().println(temp); } - HPT4PooledConnection connect; + TrafT4PooledConnection connect; setUser(username); setPassword(password); @@ -155,14 +155,14 @@ public PooledConnection getPooledConnection(String username, String password) th public Reference getReference() throws NamingException { if (t4Logger_ != null && t4Logger_.isLoggable(Level.FINE) == true) { Object p[] = T4LoggingUtilities.makeParams(null); - t4Logger_.logp(Level.FINE, "HPT4ConnectionPoolDataSource", "getReference", "", p); + t4Logger_.logp(Level.FINE, "TrafT4ConnectionPoolDataSource", "getReference", "", p); } try { if (getLogWriter() != null) { LogRecord lr = new LogRecord(Level.FINE, ""); Object p[] = T4LoggingUtilities.makeParams(null); lr.setParameters(p); - lr.setSourceClassName("HPT4ConnectionPoolDataSource"); + lr.setSourceClassName("TrafT4ConnectionPoolDataSource"); lr.setSourceMethodName("getReference"); T4LogFormatter lf = new T4LogFormatter(); String temp = lf.format(lr); @@ -172,7 +172,7 @@ public Reference getReference() throws NamingException { // ignore } - Reference ref = new Reference(this.getClass().getName(), "org.trafodion.jdbc.t4.HPT4ConnectionPoolDataSourceFactory", + Reference ref = new Reference(this.getClass().getName(), "org.trafodion.jdbc.t4.TrafT4ConnectionPoolDataSourceFactory", null); ref = addReferences(ref); ref.add(new StringRefAddr("propertyCycle", Integer.toString(propertyCycle_))); @@ -189,14 +189,14 @@ public Reference getReference() throws NamingException { public void setPropertyCycle(int propertyCycle) { if (t4Logger_.isLoggable(Level.FINE) == true) { Object p[] = T4LoggingUtilities.makeParams(null); - t4Logger_.logp(Level.FINE, "HPT4ConnectionPoolDataSource", "setPropertyCycle", "", p); + t4Logger_.logp(Level.FINE, "TrafT4ConnectionPoolDataSource", "setPropertyCycle", "", p); } try { if (getLogWriter() != null) { LogRecord lr = new LogRecord(Level.FINE, ""); Object p[] = T4LoggingUtilities.makeParams(null, propertyCycle); lr.setParameters(p); - lr.setSourceClassName("HPT4ConnectionPoolDataSource"); + lr.setSourceClassName("TrafT4ConnectionPoolDataSource"); lr.setSourceMethodName("setPropertyCycle"); T4LogFormatter lf = new T4LogFormatter(); String temp = lf.format(lr); @@ -217,14 +217,14 @@ public void setPropertyCycle(int propertyCycle) { public int getPropertyCycle() { if (t4Logger_.isLoggable(Level.FINE) == true) { Object p[] = T4LoggingUtilities.makeParams(null); - t4Logger_.logp(Level.FINE, "HPT4ConnectionPoolDataSource", "getPropertyCycle", "", p); + t4Logger_.logp(Level.FINE, "TrafT4ConnectionPoolDataSource", "getPropertyCycle", "", p); } try { if (getLogWriter() != null) { LogRecord lr = new LogRecord(Level.FINE, ""); Object p[] = T4LoggingUtilities.makeParams(null); lr.setParameters(p); - lr.setSourceClassName("HPT4ConnectionPoolDataSource"); + lr.setSourceClassName("TrafT4ConnectionPoolDataSource"); lr.setSourceMethodName("getPropertyCycle"); T4LogFormatter lf = new T4LogFormatter(); String temp = lf.format(lr); @@ -262,16 +262,16 @@ void setupLogFileHandler() { /** * Creates a pooled connection object. * - * @see #HPT4ConnectionPoolDataSource(Properties) + * @see #TrafT4ConnectionPoolDataSource(Properties) * @see T4Properties */ - public HPT4ConnectionPoolDataSource() { + public TrafT4ConnectionPoolDataSource() { super(); if (getT4LogLevel() != Level.OFF) setupLogFileHandler(); if (t4Logger_.isLoggable(Level.FINE) == true) { Object p[] = T4LoggingUtilities.makeParams(null); - t4Logger_.logp(Level.FINE, "HPT4ConnectionPoolDataSource", "HPT4ConnectionPoolDataSource", + t4Logger_.logp(Level.FINE, "TrafT4ConnectionPoolDataSource", "TrafT4ConnectionPoolDataSource", "Note, super called before this.", p); } try { @@ -279,7 +279,7 @@ public HPT4ConnectionPoolDataSource() { LogRecord lr = new LogRecord(Level.FINE, ""); Object p[] = T4LoggingUtilities.makeParams(null); lr.setParameters(p); - lr.setSourceClassName("HPT4ConnectionPoolDataSource"); + lr.setSourceClassName("TrafT4ConnectionPoolDataSource"); lr.setSourceMethodName(""); T4LogFormatter lf = new T4LogFormatter(); String temp = lf.format(lr); @@ -295,16 +295,16 @@ public HPT4ConnectionPoolDataSource() { * * @param props * properties for the Type 4 connection - * @see #HPT4ConnectionPoolDataSource() + * @see #TrafT4ConnectionPoolDataSource() * @link T4Properties */ - public HPT4ConnectionPoolDataSource(Properties props) { + public TrafT4ConnectionPoolDataSource(Properties props) { super(props); if (getT4LogLevel() != Level.OFF) setupLogFileHandler(); if (t4Logger_.isLoggable(Level.FINE) == true) { Object p[] = T4LoggingUtilities.makeParams(null, props); - t4Logger_.logp(Level.FINE, "HPT4ConnectionPoolDataSource", "HPT4ConnectionPoolDataSource", + t4Logger_.logp(Level.FINE, "TrafT4ConnectionPoolDataSource", "TrafT4ConnectionPoolDataSource", "Note, super called before this.", p); } try { @@ -312,7 +312,7 @@ public HPT4ConnectionPoolDataSource(Properties props) { LogRecord lr = new LogRecord(Level.FINE, ""); Object p[] = T4LoggingUtilities.makeParams(null, props); lr.setParameters(p); - lr.setSourceClassName("HPT4ConnectionPoolDataSource"); + lr.setSourceClassName("TrafT4ConnectionPoolDataSource"); lr.setSourceMethodName(""); T4LogFormatter lf = new T4LogFormatter(); String temp = lf.format(lr); diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSourceFactory.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ConnectionPoolDataSourceFactory.java similarity index 86% rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSourceFactory.java rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ConnectionPoolDataSourceFactory.java index 3f875392b8..05237692e9 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ConnectionPoolDataSourceFactory.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ConnectionPoolDataSourceFactory.java @@ -30,17 +30,17 @@ import javax.naming.RefAddr; import javax.naming.Reference; -public class HPT4ConnectionPoolDataSourceFactory implements javax.naming.spi.ObjectFactory { - public HPT4ConnectionPoolDataSourceFactory() { +public class TrafT4ConnectionPoolDataSourceFactory implements javax.naming.spi.ObjectFactory { + public TrafT4ConnectionPoolDataSourceFactory() { } public Object getObjectInstance(Object refobj, Name name, Context nameCtx, Hashtable env) throws Exception { Reference ref = (Reference) refobj; - HPT4ConnectionPoolDataSource ds; + TrafT4ConnectionPoolDataSource ds; RefAddr refAddr; String tmp; - if (ref.getClassName().equals("org.trafodion.jdbc.t4.HPT4ConnectionPoolDataSource")) { + if (ref.getClassName().equals("org.trafodion.jdbc.t4.TrafT4ConnectionPoolDataSource")) { Properties props = new Properties(); for (Enumeration enum2 = ref.getAll(); enum2.hasMoreElements();) { RefAddr tRefAddr = (RefAddr) enum2.nextElement(); @@ -48,7 +48,7 @@ public Object getObjectInstance(Object refobj, Name name, Context nameCtx, Hasht String content = (String) tRefAddr.getContent(); props.setProperty(type, content); } - ds = new HPT4ConnectionPoolDataSource(props); + ds = new TrafT4ConnectionPoolDataSource(props); /* * tmp = props.getProperty("initialPoolSize"); if (tmp != null) { * try { ds.setInitialPoolSize(Integer.parseInt(tmp)); } catch diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4DataSource.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4DataSource.java similarity index 83% rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4DataSource.java rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4DataSource.java index f0e0c8fbb6..3ec9e93917 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4DataSource.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4DataSource.java @@ -51,13 +51,13 @@ *

* *

- * The HPT4DataSource class can provide connection pooling and + * The TrafT4DataSource class can provide connection pooling and * statement pooling features. *

* * 
- * <b>Setting properties for the HPT4DataSource in the Type 4 driver</b>
- *    HPT4DataSource ds = new HPT4DataSource();
+ * <b>Setting properties for the TrafT4DataSource in the Type 4 driver</b>
+ *    TrafT4DataSource ds = new TrafT4DataSource();
  *   ds.setUrl("jdbc:t4jdbc://<NDCS host>:<NDCS port>/:");
  *   ds.setCatalog("your catalog");
  *   ds.setSchema("your schema");
@@ -82,7 +82,7 @@
  *
* * 
- * <b>Programmatically registering HPT4DataSource with JDNI</b>
+ * <b>Programmatically registering TrafT4DataSource with JDNI</b>
  * 	java.util.Hashtable env = new java.util.Hashtable();
  *      env.put(Context.INITIAL_CONTEXT_FACTORY, "Factory class name here");
  *      javax.naming.Context ctx = new javax.naming.InitialContext(env);
@@ -104,7 +104,7 @@
  * 
  * @see T4Properties
  */
-public class HPT4DataSource extends T4DSProperties implements javax.sql.DataSource, java.io.Serializable, Referenceable
+public class TrafT4DataSource extends T4DSProperties implements javax.sql.DataSource, java.io.Serializable, Referenceable
 
 {
 	/**
@@ -117,15 +117,15 @@ public class HPT4DataSource extends T4DSProperties implements javax.sql.DataSour
 	 */
 	synchronized public Connection getConnection() throws SQLException {
 		if (logger.isLoggable(Level.FINER)) {
-			logger.entering("HPT4DataSource", "getConnection");
+			logger.entering("TrafT4DataSource", "getConnection");
 		}
 
 		Connection conn;
 		TrafT4Connection t4Conn;
-		HPT4ConnectionPoolDataSource pds;
+		TrafT4ConnectionPoolDataSource pds;
 
 		if (getSQLException() != null) {
-			throw HPT4Messages.createSQLException(null, getLocale(), "invalid_property", getSQLException());
+			throw TrafT4Messages.createSQLException(null, getLocale(), "invalid_property", getSQLException());
 		}
 
 		if (getMaxPoolSize() == -1) {
@@ -135,8 +135,8 @@ synchronized public Connection getConnection() throws SQLException {
 				t4Conn = (TrafT4Connection) poolManager.getConnection();
 			} else {
 
-				pds = new HPT4ConnectionPoolDataSource(getProperties());
-				poolManager = new HPT4PooledConnectionManager(pds, getT4LogLevel());
+				pds = new TrafT4ConnectionPoolDataSource(getProperties());
+				poolManager = new TrafT4PooledConnectionManager(pds, getT4LogLevel());
 				t4Conn = (TrafT4Connection) poolManager.getConnection();
 			}
 		}
@@ -145,7 +145,7 @@ synchronized public Connection getConnection() throws SQLException {
 		conn = t4Conn;
 
 		if (logger.isLoggable(Level.FINER)) {
-			logger.exiting("HPT4DataSource", "getConnection", conn);
+			logger.exiting("TrafT4DataSource", "getConnection", conn);
 		}
 
 		return conn;
@@ -165,7 +165,7 @@ synchronized public Connection getConnection() throws SQLException {
 	 */
 	synchronized public Connection getConnection(String username, String password) throws SQLException {
 		if (logger.isLoggable(Level.FINER)) {
-			logger.entering("HPT4DataSource", "getConnection", new Object[] { this, username });
+			logger.entering("TrafT4DataSource", "getConnection", new Object[] { this, username });
 		}
 
 		Connection conn;
@@ -176,7 +176,7 @@ synchronized public Connection getConnection(String username, String password) t
 		conn = getConnection();
 
 		if (logger.isLoggable(Level.FINER)) {
-			logger.exiting("HPT4DataSource", "getConnection", conn);
+			logger.exiting("TrafT4DataSource", "getConnection", conn);
 		}
 
 		return conn;
@@ -188,7 +188,7 @@ synchronized public Connection getConnection(String username, String password) t
 	 */
 	public Reference getReference() throws NamingException {
 
-		Reference ref = new Reference(this.getClass().getName(), "org.trafodion.jdbc.t4.HPT4DataSourceFactory", null);
+		Reference ref = new Reference(this.getClass().getName(), "org.trafodion.jdbc.t4.TrafT4DataSourceFactory", null);
 		return addReferences(ref);
 	}
 
@@ -206,14 +206,14 @@ public void setLogWriter(PrintWriter out) throws SQLException {
 		super.setLogWriter(out);
 		if (t4Logger_.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(null, out);
-			t4Logger_.logp(Level.FINE, "HPT4DataSource", "setLogWriter",
+			t4Logger_.logp(Level.FINE, "TrafT4DataSource", "setLogWriter",
 					"Note, this constructor was called before the previous constructor", p);
 		}
 		if (getLogWriter() != null) {
 			LogRecord lr = new LogRecord(Level.FINE, "");
 			Object p[] = T4LoggingUtilities.makeParams(null, out);
 			lr.setParameters(p);
-			lr.setSourceClassName("HPT4DataSource");
+			lr.setSourceClassName("TrafT4DataSource");
 			lr.setSourceMethodName("setLogWriter");
 			T4LogFormatter lf = new T4LogFormatter();
 			String temp = lf.format(lr);
@@ -228,14 +228,14 @@ public void setLogWriter(PrintWriter out) throws SQLException {
 	void setPoolManager(Context nameCtx, String dataSourceName) throws Exception {
 		if (t4Logger_.isLoggable(Level.FINER) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(null, nameCtx, dataSourceName);
-			t4Logger_.logp(Level.FINER, "HPT4DataSource", "setPoolManager", "", p);
+			t4Logger_.logp(Level.FINER, "TrafT4DataSource", "setPoolManager", "", p);
 		}
 		Object pds;
 
 		try {
 			pds = nameCtx.lookup(dataSourceName);
-			if (pds instanceof HPT4ConnectionPoolDataSource) {
-				poolManager = new HPT4PooledConnectionManager((HPT4ConnectionPoolDataSource) pds, getT4LogLevel());
+			if (pds instanceof TrafT4ConnectionPoolDataSource) {
+				poolManager = new TrafT4PooledConnectionManager((TrafT4ConnectionPoolDataSource) pds, getT4LogLevel());
 			}
 		} catch (javax.naming.NameNotFoundException nnfe) {
 		}
@@ -266,18 +266,18 @@ void setupLogFileHandler() {
 	// --------------------------------------------------------
 
 	/**
-	 * Contructor for the HPT4DataSource object.
+	 * Contructor for the TrafT4DataSource object.
 	 * 
-	 * @see #HPT4DataSource(java.util.Properties)
+	 * @see #TrafT4DataSource(java.util.Properties)
 	 */
-	public HPT4DataSource() {
+	public TrafT4DataSource() {
 		super();
 		if (getT4LogLevel() != Level.OFF) {
 			setupLogFileHandler();
 		}
 		if (t4Logger_.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(null);
-			t4Logger_.logp(Level.FINE, "HPT4DataSource", "",
+			t4Logger_.logp(Level.FINE, "TrafT4DataSource", "",
 					"Note, this constructor was called before the previous constructor", p);
 		}
 		try {
@@ -285,7 +285,7 @@ public HPT4DataSource() {
 				LogRecord lr = new LogRecord(Level.FINE, "");
 				Object p[] = T4LoggingUtilities.makeParams(null);
 				lr.setParameters(p);
-				lr.setSourceClassName("HPT4DataSource");
+				lr.setSourceClassName("TrafT4DataSource");
 				lr.setSourceMethodName("");
 				T4LogFormatter lf = new T4LogFormatter();
 				String temp = lf.format(lr);
@@ -298,23 +298,23 @@ public HPT4DataSource() {
 	}
 
 	/**
-	 * Contructor for the HPT4DataSource object.
+	 * Contructor for the TrafT4DataSource object.
 	 * 
 	 * @param info
 	 *            Contains all the Type 4 properties in a name,
 	 * value
 	 *            pair.
-	 * @see #HPT4DataSource()
+	 * @see #TrafT4DataSource()
 	 * @see java.util.Properties
 	 */
-	public HPT4DataSource(Properties info) {
+	public TrafT4DataSource(Properties info) {
 		super(info);
 		if (getT4LogLevel() != Level.OFF) {
 			setupLogFileHandler();
 		}
 		if (t4Logger_.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(null);
-			t4Logger_.logp(Level.FINE, "HPT4DataSource", "",
+			t4Logger_.logp(Level.FINE, "TrafT4DataSource", "",
 					"Note, this constructor was called before the previous constructor", p);
 		}
 		try {
@@ -322,7 +322,7 @@ public HPT4DataSource(Properties info) {
 				LogRecord lr = new LogRecord(Level.FINE, "");
 				Object p[] = T4LoggingUtilities.makeParams(null);
 				lr.setParameters(p);
-				lr.setSourceClassName("HPT4DataSource");
+				lr.setSourceClassName("TrafT4DataSource");
 				lr.setSourceMethodName("");
 				T4LogFormatter lf = new T4LogFormatter();
 				String temp = lf.format(lr);
@@ -347,7 +347,7 @@ public String getNameType() {
 	}
 
 	// fields
-	HPT4PooledConnectionManager poolManager;
+	TrafT4PooledConnectionManager poolManager;
 
 	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
 		// TODO Auto-generated method stub
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4DataSourceFactory.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4DataSourceFactory.java
similarity index 87%
rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4DataSourceFactory.java
rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4DataSourceFactory.java
index 1b7a8dac5d..a1b34080a8 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4DataSourceFactory.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4DataSourceFactory.java
@@ -30,16 +30,16 @@
 import javax.naming.RefAddr;
 import javax.naming.Reference;
 
-public class HPT4DataSourceFactory implements javax.naming.spi.ObjectFactory {
-	public HPT4DataSourceFactory() {
+public class TrafT4DataSourceFactory implements javax.naming.spi.ObjectFactory {
+	public TrafT4DataSourceFactory() {
 	}
 
 	public Object getObjectInstance(Object refobj, Name name, Context nameCtx, Hashtable env) throws Exception {
 		Reference ref = (Reference) refobj;
-		HPT4DataSource ds;
+		TrafT4DataSource ds;
 		String dataSourceName = null;
 
-		if (ref.getClassName().equals("org.trafodion.jdbc.t4.HPT4DataSource")) {
+		if (ref.getClassName().equals("org.trafodion.jdbc.t4.TrafT4DataSource")) {
 			Properties props = new Properties();
 			for (Enumeration enum2 = ref.getAll(); enum2.hasMoreElements();) {
 				RefAddr tRefAddr = (RefAddr) enum2.nextElement();
@@ -48,7 +48,7 @@ public Object getObjectInstance(Object refobj, Name name, Context nameCtx, Hasht
 				props.setProperty(type, content);
 			}
 
-			ds = new HPT4DataSource(props);
+			ds = new TrafT4DataSource(props);
 			dataSourceName = ds.getDataSourceName();
 
 			if (dataSourceName != null) {
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Desc.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Desc.java
similarity index 98%
rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Desc.java
rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Desc.java
index 1eec5a327a..65ce6eabfe 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Desc.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Desc.java
@@ -26,7 +26,7 @@
 import java.sql.Types;
 import java.util.Locale;
 
-class HPT4Desc {
+class TrafT4Desc {
 
 	String getColumnClassName() throws SQLException {
 		switch (dataType_) {
@@ -136,14 +136,14 @@ void checkValidNumericConversion(Locale locale) throws SQLException {
 			break;
 		default:
 			System.out.println("Data type is " + dataType_);
-			throw HPT4Messages.createSQLException(null, locale, "restricted_data_type", null);
+			throw TrafT4Messages.createSQLException(null, locale, "restricted_data_type", null);
 		}
 		return;
 	} // end checkValidNumericConversion
 
 	// ---------------------------------------------------------------
 	// Constructors
-	HPT4Desc(int dataType, short datetimeCode, int maxLen, short precision, short scale, boolean nullInfo,
+	TrafT4Desc(int dataType, short datetimeCode, int maxLen, short precision, short scale, boolean nullInfo,
 			String colName, boolean signType, int odbcDataType, short odbcPrecision, int sqlCharset, int odbcCharset,
 			String catalogName, String schemaName, String tableName, int fsDataType, int intLeadPrec, int paramMode) {
 		catalogName_ = catalogName;
@@ -382,12 +382,12 @@ void checkValidNumericConversion(Locale locale) throws SQLException {
 		fsDataType_ = fsDataType;
 		intLeadPrec_ = intLeadPrec;
 		paramMode_ = paramMode;
-	} // end HPT4Desc
+	} // end TrafT4Desc
 
 	// ---------------------------------------------------------------
 	// Constructors
 
-	HPT4Desc(
+	TrafT4Desc(
 			int noNullValue // Descriptor2 only
 			,
 			int nullValue // Descriptor2 only
@@ -426,7 +426,7 @@ void checkValidNumericConversion(Locale locale) throws SQLException {
 
 		maxLen_ = maxLen;
 
-	} // end HPT4Desc
+	} // end TrafT4Desc
 
 	// ---------------------------------------------------------------
 	/***************************************************************************
@@ -539,4 +539,4 @@ String getCharacterSetName() throws SQLException {
 	int rowLength_;
 	int maxLen_;
 
-} // end class HPT4Desc
+} // end class TrafT4Desc
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Exception.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Exception.java
similarity index 86%
rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Exception.java
rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Exception.java
index 10c8d18fac..04061952ed 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Exception.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Exception.java
@@ -23,10 +23,10 @@
 
 import java.sql.SQLException;
 
-class HPT4Exception extends SQLException {
+class TrafT4Exception extends SQLException {
 	protected String messageId;
 
-	public HPT4Exception(String reason, String SQLState, int vendorCode, String msgId) {
+	public TrafT4Exception(String reason, String SQLState, int vendorCode, String msgId) {
 		super(reason, SQLState, vendorCode);
 		if (msgId == null) {
 			messageId = "";
@@ -35,4 +35,4 @@ public HPT4Exception(String reason, String SQLState, int vendorCode, String msgI
 		}
 	}
 
-} // end class HPT4Exception
+} // end class TrafT4Exception
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Handle.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Handle.java
similarity index 90%
rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Handle.java
rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Handle.java
index 10a62b9a04..9333081795 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Handle.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Handle.java
@@ -24,7 +24,7 @@
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 
-public abstract class HPT4Handle {
+public abstract class TrafT4Handle {
 	SQLWarning sqlWarning_;
 
 	public void clearWarnings() throws SQLException {
@@ -36,7 +36,7 @@ public SQLWarning getWarnings() throws SQLException {
 	}
 
 	void setSQLWarning(T4Properties t4props, String messageId, Object[] messageArguments) {
-		SQLWarning sqlWarningLeaf = HPT4Messages.createSQLWarning(t4props, messageId, messageArguments);
+		SQLWarning sqlWarningLeaf = TrafT4Messages.createSQLWarning(t4props, messageId, messageArguments);
 		if (sqlWarning_ == null) {
 			sqlWarning_ = sqlWarningLeaf;
 		} else {
@@ -57,8 +57,8 @@ void setSqlWarning(SQLWarning sqlWarning) {
 	// This calls the abstract method closeErroredConnection()
 	//returns true if a connection error occured
 	boolean performConnectionErrorChecks(SQLException se) {
-		if (se instanceof HPT4Exception) {
-			HPT4Exception sqlmx_e = (HPT4Exception) se;
+		if (se instanceof TrafT4Exception) {
+			TrafT4Exception sqlmx_e = (TrafT4Exception) se;
 			if (sqlmx_e.messageId.equals(ERROR_SOCKET_WRITE_ERROR) || sqlmx_e.messageId.equals(ERROR_SOCKET_READ_ERROR)
 					|| sqlmx_e.messageId.equals(ERROR_SOCKET_IS_CLOSED_ERROR)
 					|| sqlmx_e.messageId.equals(ERROR_INVALID_CONNECTION) || sqlmx_e.messageId.equals(ERROR_IDS_08_S01)
@@ -72,7 +72,7 @@ boolean performConnectionErrorChecks(SQLException se) {
 		return false;
 	}
 
-	abstract void closeErroredConnection(HPT4Exception se);
+	abstract void closeErroredConnection(TrafT4Exception se);
 
 	static final String ERROR_IDS_08_S01 = new String("ids_08_s01");
 	static final String ERROR_INVALID_CONNECTION = new String("invalid_connection");
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Messages.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Messages.java
similarity index 82%
rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Messages.java
rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Messages.java
index cf58470bc9..312ce27955 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4Messages.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Messages.java
@@ -30,7 +30,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-class HPT4Messages {
+class TrafT4Messages {
 	static Logger getMessageLogger(T4Properties t4props) {
 		return (t4props != null) ? t4props.t4Logger_ : T4Properties.t4GlobalLogger;
 	}
@@ -40,7 +40,7 @@ static SQLWarning createSQLWarning(T4Properties t4props, String messageId, Objec
 
 		if (log != null && log.isLoggable(Level.WARNING)) {
 			Object p[] = T4LoggingUtilities.makeParams(t4props, messageId, messageArguments);
-			log.logp(Level.WARNING, "HPT4Messages", "createSQLWarning", "", p);
+			log.logp(Level.WARNING, "TrafT4Messages", "createSQLWarning", "", p);
 		}
 
 		Locale currentLocale = t4props == null ? null : t4props.getLocale();
@@ -95,7 +95,7 @@ static SQLWarning createSQLWarning(T4Properties t4props, String messageId, Objec
 		return ret;
 	}
 
-	static void setSQLWarning(T4Properties t4props, HPT4Handle handle, SQLWarningOrError[] we1) {
+	static void setSQLWarning(T4Properties t4props, TrafT4Handle handle, SQLWarningOrError[] we1) {
 		Logger log = getMessageLogger(t4props);
 
 		int curErrorNo;
@@ -110,7 +110,7 @@ static void setSQLWarning(T4Properties t4props, HPT4Handle handle, SQLWarningOrE
 			if (log != null && log.isLoggable(Level.WARNING)) {
 				Object p[] = new Object[] { t4props, "Text: " + we1[curErrorNo].text,
 						"SQLState: " + we1[curErrorNo].sqlState, "SQLCode: " + we1[curErrorNo].sqlCode };
-				log.logp(Level.WARNING, "HPT4Messages", "setSQLWarning", "", p);
+				log.logp(Level.WARNING, "TrafT4Messages", "setSQLWarning", "", p);
 			}
 
 			sqlWarningLeaf = new SQLWarning(we1[curErrorNo].text, we1[curErrorNo].sqlState, we1[curErrorNo].sqlCode);
@@ -119,7 +119,7 @@ static void setSQLWarning(T4Properties t4props, HPT4Handle handle, SQLWarningOrE
 		return;
 	}
 
-	static void setSQLWarning(T4Properties t4props, HPT4Handle handle, ERROR_DESC_LIST_def sqlWarning) {
+	static void setSQLWarning(T4Properties t4props, TrafT4Handle handle, ERROR_DESC_LIST_def sqlWarning) {
 		Logger log = getMessageLogger(t4props);
 
 		int curErrorNo;
@@ -137,7 +137,7 @@ static void setSQLWarning(T4Properties t4props, HPT4Handle handle, ERROR_DESC_LI
 				Object p[] = new Object[] { t4props, "Text: " + error_desc_def[curErrorNo].errorText,
 						"SQLState: " + error_desc_def[curErrorNo].sqlstate,
 						"SQLCode: " + error_desc_def[curErrorNo].sqlcode };
-				log.logp(Level.WARNING, "HPT4Messages", "setSQLWarning", "", p);
+				log.logp(Level.WARNING, "TrafT4Messages", "setSQLWarning", "", p);
 			}
 
 			sqlWarningLeaf = new SQLWarning(error_desc_def[curErrorNo].errorText, error_desc_def[curErrorNo].sqlstate,
@@ -148,12 +148,12 @@ static void setSQLWarning(T4Properties t4props, HPT4Handle handle, ERROR_DESC_LI
 	} // end setSQLWarning
 
 	// ------------------------------------------------------------------------------------------------
-	static void throwSQLException(T4Properties t4props, ERROR_DESC_LIST_def SQLError) throws HPT4Exception {
+	static void throwSQLException(T4Properties t4props, ERROR_DESC_LIST_def SQLError) throws TrafT4Exception {
 		Logger log = getMessageLogger(t4props);
 		Locale locale = (t4props != null) ? t4props.getLocale() : Locale.getDefault();
 
-		HPT4Exception sqlException = null;
-		HPT4Exception sqlExceptionHead = null;
+		TrafT4Exception sqlException = null;
+		TrafT4Exception sqlExceptionHead = null;
 		int curErrorNo;
 
 		if (SQLError.length == 0) {
@@ -165,7 +165,7 @@ static void throwSQLException(T4Properties t4props, ERROR_DESC_LIST_def SQLError
 				Object p[] = new Object[] { t4props, "Text: " + SQLError.buffer[curErrorNo].errorText,
 						"SQLState: " + SQLError.buffer[curErrorNo].sqlstate,
 						"SQLCode: " + SQLError.buffer[curErrorNo].sqlcode };
-				log.logp(Level.SEVERE, "HPT4Messages", "throwSQLException", "", p);
+				log.logp(Level.SEVERE, "TrafT4Messages", "throwSQLException", "", p);
 			}
 
 			if (SQLError.buffer[curErrorNo].errorCodeType == TRANSPORT.ESTIMATEDCOSTRGERRWARN) {
@@ -173,9 +173,9 @@ static void throwSQLException(T4Properties t4props, ERROR_DESC_LIST_def SQLError
 				// NCS said it was an SQL error, but it really wasn't it was a
 				// NCS resource governing error
 				//
-				sqlException = HPT4Messages.createSQLException(t4props, locale, "resource_governing", null);
+				sqlException = TrafT4Messages.createSQLException(t4props, locale, "resource_governing", null);
 			} else {
-				sqlException = new HPT4Exception(SQLError.buffer[curErrorNo].errorText,
+				sqlException = new TrafT4Exception(SQLError.buffer[curErrorNo].errorText,
 						SQLError.buffer[curErrorNo].sqlstate, SQLError.buffer[curErrorNo].sqlcode, null);
 			}
 			if (curErrorNo == 0) {
@@ -189,12 +189,12 @@ static void throwSQLException(T4Properties t4props, ERROR_DESC_LIST_def SQLError
 	}
 
 	// ------------------------------------------------------------------------------------------------
-	static void throwSQLException(T4Properties t4props, SQLWarningOrError[] we1) throws HPT4Exception {
+	static void throwSQLException(T4Properties t4props, SQLWarningOrError[] we1) throws TrafT4Exception {
 		Logger log = getMessageLogger(t4props);
 		Locale locale = (t4props != null) ? t4props.getLocale() : Locale.getDefault();
 
-		HPT4Exception sqlException = null;
-		HPT4Exception sqlExceptionHead = null;
+		TrafT4Exception sqlException = null;
+		TrafT4Exception sqlExceptionHead = null;
 		int curErrorNo;
 
 		if (we1.length == 0) {
@@ -205,10 +205,10 @@ static void throwSQLException(T4Properties t4props, SQLWarningOrError[] we1) thr
 			if (log != null && log.isLoggable(Level.SEVERE)) {
 				Object p[] = new Object[] { t4props, "Text: " + we1[curErrorNo].text,
 						"SQLState: " + we1[curErrorNo].sqlState, "SQLCode: " + we1[curErrorNo].sqlCode };
-				log.logp(Level.SEVERE, "HPT4Messages", "throwSQLException", "", p);
+				log.logp(Level.SEVERE, "TrafT4Messages", "throwSQLException", "", p);
 			}
 
-			sqlException = new HPT4Exception(we1[curErrorNo].text, we1[curErrorNo].sqlState, we1[curErrorNo].sqlCode,
+			sqlException = new TrafT4Exception(we1[curErrorNo].text, we1[curErrorNo].sqlState, we1[curErrorNo].sqlCode,
 					null);
 			if (curErrorNo == 0) {
 				sqlExceptionHead = sqlException;
@@ -221,7 +221,7 @@ static void throwSQLException(T4Properties t4props, SQLWarningOrError[] we1) thr
 	} // end throwSQLException
 
 	// ------------------------------------------------------------------------------------------------
-	static HPT4Exception createSQLException(T4Properties t4props, Locale msgLocale, String messageId, Object mA1,
+	static TrafT4Exception createSQLException(T4Properties t4props, Locale msgLocale, String messageId, Object mA1,
 			Object mA2) {
 
 		Object[] mAs = new Object[2];
@@ -234,7 +234,7 @@ static HPT4Exception createSQLException(T4Properties t4props, Locale msgLocale,
 	} // end createSQLException
 
 	// ------------------------------------------------------------------------------------------------
-	static HPT4Exception createSQLException(T4Properties t4props, Locale msgLocale, String messageId,
+	static TrafT4Exception createSQLException(T4Properties t4props, Locale msgLocale, String messageId,
 			Object messageArgument) {
 		Object[] mAs = new Object[1];
 
@@ -245,13 +245,13 @@ static HPT4Exception createSQLException(T4Properties t4props, Locale msgLocale,
 	} // end createSQLException
 
 	// ------------------------------------------------------------------------------------------------
-	static HPT4Exception createSQLException(T4Properties t4props, Locale msgLocale, String messageId,
+	static TrafT4Exception createSQLException(T4Properties t4props, Locale msgLocale, String messageId,
 			Object[] messageArguments) {
 		Logger log = getMessageLogger(t4props);
 
 		if (log != null && log.isLoggable(Level.SEVERE)) {
 			Object p[] = T4LoggingUtilities.makeParams(t4props, messageId, messageArguments);
-			log.logp(Level.SEVERE, "HPT4Messages", "createSQLException", "", p);
+			log.logp(Level.SEVERE, "TrafT4Messages", "createSQLException", "", p);
 		}
 		
 		Locale currentLocale = t4props == null ? null : t4props.getLocale();
@@ -281,7 +281,7 @@ static HPT4Exception createSQLException(T4Properties t4props, Locale msgLocale,
 				sqlcode = -1;
 
 			}
-			return new HPT4Exception(message, sqlState, sqlcode, messageId);
+			return new TrafT4Exception(message, sqlState, sqlcode, messageId);
 		} catch (MissingResourceException e) {
 			// If the resource bundle is not found, concatenate the messageId
 			// and the parameters
@@ -301,24 +301,24 @@ static HPT4Exception createSQLException(T4Properties t4props, Locale msgLocale,
 				}
 			} // end if
 
-			return new HPT4Exception(message, "HY000", -1, messageId);
+			return new TrafT4Exception(message, "HY000", -1, messageId);
 		} // end catch
 	} // end createSQLException
 
 	// ------------------------------------------------------------------------------------------------
-	static void throwUnsupportedFeatureException(T4Properties t4props, Locale locale, String s) throws HPT4Exception {
+	static void throwUnsupportedFeatureException(T4Properties t4props, Locale locale, String s) throws TrafT4Exception {
 		Object[] messageArguments = new Object[1];
 
 		messageArguments[0] = s;
-		throw HPT4Messages.createSQLException(t4props, locale, "unsupported_feature", messageArguments);
+		throw TrafT4Messages.createSQLException(t4props, locale, "unsupported_feature", messageArguments);
 	} // end throwUnsupportedFeatureException
 
 	// ------------------------------------------------------------------------------------------------
-	static void throwDeprecatedMethodException(T4Properties t4props, Locale locale, String s) throws HPT4Exception {
+	static void throwDeprecatedMethodException(T4Properties t4props, Locale locale, String s) throws TrafT4Exception {
 		Object[] messageArguments = new Object[1];
 
 		messageArguments[0] = s;
-		throw HPT4Messages.createSQLException(t4props, locale, "deprecated_method", messageArguments);
+		throw TrafT4Messages.createSQLException(t4props, locale, "deprecated_method", messageArguments);
 	} // end throwDeprecatedMethodException
 
-} // end class HPT4Messages
+} // end class TrafT4Messages
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ParameterMetaData.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ParameterMetaData.java
similarity index 68%
rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ParameterMetaData.java
rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ParameterMetaData.java
index b8b3422086..461d144ef3 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ParameterMetaData.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ParameterMetaData.java
@@ -24,11 +24,11 @@
 import java.sql.SQLException;
 import java.util.logging.Level;
 
-public class HPT4ParameterMetaData implements java.sql.ParameterMetaData {
+public class TrafT4ParameterMetaData implements java.sql.ParameterMetaData {
 
 	public String getParameterClassName(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 		return inputDesc[param - 1].getColumnClassName();
 	}
@@ -39,21 +39,21 @@ public int getParameterCount() throws SQLException {
 
 	public int getParameterMode(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 		return inputDesc[param - 1].paramMode_;
 	}
 
 	public int getParameterType(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 		return inputDesc[param - 1].dataType_;
 	}
 
 	public String getParameterTypeName(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].getColumnTypeName(props.getLocale());
@@ -61,7 +61,7 @@ public String getParameterTypeName(int param) throws SQLException {
 
 	public int getPrecision(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].precision_;
@@ -69,7 +69,7 @@ public int getPrecision(int param) throws SQLException {
 
 	public int getScale(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].scale_;
@@ -77,7 +77,7 @@ public int getScale(int param) throws SQLException {
 
 	public int isNullable(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].isNullable_;
@@ -85,7 +85,7 @@ public int isNullable(int param) throws SQLException {
 
 	public boolean isSigned(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 		return inputDesc[param - 1].isSigned_;
 	}
@@ -97,7 +97,7 @@ public int getRowLength() throws SQLException {
 		// this is the same for all params
 		// only if we have no input params will we throw an error
 		if (inputDesc.length == 0) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[0].rowLength_;
@@ -105,7 +105,7 @@ public int getRowLength() throws SQLException {
 
 	public int getDisplaySize(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].displaySize_;
@@ -113,7 +113,7 @@ public int getDisplaySize(int param) throws SQLException {
 
 	public int getFSDataType(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].fsDataType_;
@@ -121,7 +121,7 @@ public int getFSDataType(int param) throws SQLException {
 
 	public int getMaxLength(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].maxLen_;
@@ -129,7 +129,7 @@ public int getMaxLength(int param) throws SQLException {
 
 	public int getNoNullOffset(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].noNullValue_;
@@ -137,7 +137,7 @@ public int getNoNullOffset(int param) throws SQLException {
 
 	public int getNullOffset(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].nullValue_;
@@ -145,7 +145,7 @@ public int getNullOffset(int param) throws SQLException {
 
 	public int getOdbcCharset(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].odbcCharset_;
@@ -153,7 +153,7 @@ public int getOdbcCharset(int param) throws SQLException {
 
 	public int getSqlCharset(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].sqlCharset_;
@@ -161,7 +161,7 @@ public int getSqlCharset(int param) throws SQLException {
 
 	public int getSqlDataType(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].sqlDataType_;
@@ -169,7 +169,7 @@ public int getSqlDataType(int param) throws SQLException {
 
 	public int getSqlDatetimeCode(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].sqlDatetimeCode_;
@@ -177,7 +177,7 @@ public int getSqlDatetimeCode(int param) throws SQLException {
 
 	public int getSqlOctetLength(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].sqlOctetLength_;
@@ -185,7 +185,7 @@ public int getSqlOctetLength(int param) throws SQLException {
 
 	public int getSqlPrecision(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].sqlPrecision_;
@@ -202,7 +202,7 @@ public int getSqlPrecision(int param) throws SQLException {
 	 */
 	public int getSqlTypeCode(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].dataType_;
@@ -213,24 +213,24 @@ public int getSqlTypeCode(int param) throws SQLException {
 	 */
 	public int getSqlLength(int param) throws SQLException {
 		if (param > inputDesc.length) {
-			throw HPT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
+			throw TrafT4Messages.createSQLException(props, props.getLocale(), "invalid_desc_index", null);
 		}
 
 		return inputDesc[param - 1].maxLen_;
 	}
 
-	HPT4ParameterMetaData(TrafT4PreparedStatement stmt, HPT4Desc[] inputDesc) {
+	TrafT4ParameterMetaData(TrafT4PreparedStatement stmt, TrafT4Desc[] inputDesc) {
 		this.props = stmt.connection_.props_;
 		this.inputDesc = inputDesc;
 
 		if (props.t4Logger_.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(stmt.connection_.props_, stmt, inputDesc);
-			stmt.connection_.props_.t4Logger_.logp(Level.FINE, "HPT4ParameterMetaData", "", "", p);
+			stmt.connection_.props_.t4Logger_.logp(Level.FINE, "TrafT4ParameterMetaData", "", "", p);
 		}
 	}
 
 	T4Properties props;
-	HPT4Desc[] inputDesc;
+	TrafT4Desc[] inputDesc;
 	public Object unwrap(Class iface) throws SQLException {
 		// TODO Auto-generated method stub
 		return null;
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4PooledConnection.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnection.java
similarity index 86%
rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4PooledConnection.java
rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnection.java
index 719d59af9e..edacd1e880 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4PooledConnection.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnection.java
@@ -32,20 +32,20 @@
 import javax.sql.ConnectionEventListener;
 import javax.sql.StatementEventListener;
 
-public class HPT4PooledConnection implements javax.sql.PooledConnection {
+public class TrafT4PooledConnection implements javax.sql.PooledConnection {
 
 	public void addConnectionEventListener(ConnectionEventListener listener) {
 		try {
 			if (connection_ != null && connection_.props_.t4Logger_.isLoggable(Level.FINE) == true) {
 				Object p[] = T4LoggingUtilities.makeParams(connection_.props_, listener);
-				connection_.props_.t4Logger_.logp(Level.FINE, "HPT4PooledConnecton", "addConnectionEventListener", "",
+				connection_.props_.t4Logger_.logp(Level.FINE, "TrafT4PooledConnecton", "addConnectionEventListener", "",
 						p);
 			}
 			if (connection_ != null && connection_.props_.getLogWriter() != null) {
 				LogRecord lr = new LogRecord(Level.FINE, "");
 				Object p[] = T4LoggingUtilities.makeParams(connection_.props_, listener);
 				lr.setParameters(p);
-				lr.setSourceClassName("HPT4PooledConnection");
+				lr.setSourceClassName("TrafT4PooledConnection");
 				lr.setSourceMethodName("addConnectionEventListener");
 				T4LogFormatter lf = new T4LogFormatter();
 				String temp = lf.format(lr);
@@ -63,13 +63,13 @@ public void addConnectionEventListener(ConnectionEventListener listener) {
 	public void close() throws SQLException {
 		if (connection_ != null && connection_.props_.t4Logger_.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(connection_.props_);
-			connection_.props_.t4Logger_.logp(Level.FINE, "HPT4PooledConnecton", "close", "", p);
+			connection_.props_.t4Logger_.logp(Level.FINE, "TrafT4PooledConnecton", "close", "", p);
 		}
 		if (connection_ != null && connection_.props_.getLogWriter() != null) {
 			LogRecord lr = new LogRecord(Level.FINE, "");
 			Object p[] = T4LoggingUtilities.makeParams(connection_.props_);
 			lr.setParameters(p);
-			lr.setSourceClassName("HPT4PooledConnection");
+			lr.setSourceClassName("TrafT4PooledConnection");
 			lr.setSourceMethodName("close");
 			T4LogFormatter lf = new T4LogFormatter();
 			String temp = lf.format(lr);
@@ -90,20 +90,20 @@ public void close() throws SQLException {
 	public Connection getConnection() throws SQLException {
 		if (connection_ != null && connection_.props_.t4Logger_.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(connection_.props_);
-			connection_.props_.t4Logger_.logp(Level.FINE, "HPT4PooledConnecton", "getConnection", "", p);
+			connection_.props_.t4Logger_.logp(Level.FINE, "TrafT4PooledConnecton", "getConnection", "", p);
 		}
 		if (connection_ != null && connection_.props_.getLogWriter() != null) {
 			LogRecord lr = new LogRecord(Level.FINE, "");
 			Object p[] = T4LoggingUtilities.makeParams(connection_.props_);
 			lr.setParameters(p);
-			lr.setSourceClassName("HPT4PooledConnection");
+			lr.setSourceClassName("TrafT4PooledConnection");
 			lr.setSourceMethodName("getConnection");
 			T4LogFormatter lf = new T4LogFormatter();
 			String temp = lf.format(lr);
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_ || connection_ == null) {
-			throw HPT4Messages.createSQLException(connection_.props_, locale_, "invalid_connection", null);
+			throw TrafT4Messages.createSQLException(connection_.props_, locale_, "invalid_connection", null);
 		}
 		if (LogicalConnectionInUse_) {
 			connection_.close(false, false);
@@ -117,14 +117,14 @@ public void removeConnectionEventListener(ConnectionEventListener listener) {
 		try {
 			if (connection_ != null && connection_.props_.t4Logger_.isLoggable(Level.FINE) == true) {
 				Object p[] = T4LoggingUtilities.makeParams(connection_.props_, listener);
-				connection_.props_.t4Logger_.logp(Level.FINE, "HPT4PooledConnecton", "removeConnectionEventListener",
+				connection_.props_.t4Logger_.logp(Level.FINE, "TrafT4PooledConnecton", "removeConnectionEventListener",
 						"", p);
 			}
 			if (connection_ != null && connection_.props_.getLogWriter() != null) {
 				LogRecord lr = new LogRecord(Level.FINE, "");
 				Object p[] = T4LoggingUtilities.makeParams(connection_.props_, listener);
 				lr.setParameters(p);
-				lr.setSourceClassName("HPT4PooledConnection");
+				lr.setSourceClassName("TrafT4PooledConnection");
 				lr.setSourceMethodName("removeConnectionEventListener");
 				T4LogFormatter lf = new T4LogFormatter();
 				String temp = lf.format(lr);
@@ -181,7 +181,7 @@ void sendConnectionErrorEvent(SQLException ex) throws SQLException {
 	}
 
 	// Constructor
-	HPT4PooledConnection(HPT4ConnectionPoolDataSource pds, T4Properties t4props) throws SQLException {
+	TrafT4PooledConnection(TrafT4ConnectionPoolDataSource pds, T4Properties t4props) throws SQLException {
 		super();
 
 		T4Properties t4LocalProps;
@@ -199,13 +199,13 @@ void sendConnectionErrorEvent(SQLException ex) throws SQLException {
 		try {
 			if (connection_ != null && connection_.props_.t4Logger_.isLoggable(Level.FINE) == true) {
 				Object p[] = T4LoggingUtilities.makeParams(connection_.props_, pds, t4props);
-				connection_.props_.t4Logger_.logp(Level.FINE, "HPT4PooledConnecton", "", "", p);
+				connection_.props_.t4Logger_.logp(Level.FINE, "TrafT4PooledConnecton", "", "", p);
 			}
 			if (connection_ != null && connection_.props_.getLogWriter() != null) {
 				LogRecord lr = new LogRecord(Level.FINE, "");
 				Object p[] = T4LoggingUtilities.makeParams(connection_.props_, pds, t4props);
 				lr.setParameters(p);
-				lr.setSourceClassName("HPT4PooledConnection");
+				lr.setSourceClassName("TrafT4PooledConnection");
 				lr.setSourceMethodName("");
 				T4LogFormatter lf = new T4LogFormatter();
 				String temp = lf.format(lr);
@@ -222,7 +222,7 @@ TrafT4Connection getTrafT4ConnectionReference() {
 
 	private LinkedList listenerList_;
 	private boolean isClosed_ = false;
-	private HPT4ConnectionPoolDataSource pds_;
+	private TrafT4ConnectionPoolDataSource pds_;
 	private TrafT4Connection connection_;
 	private Locale locale_;
 	private boolean LogicalConnectionInUse_ = false;
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4PooledConnectionManager.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
similarity index 93%
rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4PooledConnectionManager.java
rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
index 0657b92980..e31cd9d359 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4PooledConnectionManager.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PooledConnectionManager.java
@@ -39,18 +39,18 @@
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.PooledConnection;
 
-public class HPT4PooledConnectionManager implements javax.sql.ConnectionEventListener {
+public class TrafT4PooledConnectionManager implements javax.sql.ConnectionEventListener {
 
 	public void connectionClosed(ConnectionEvent event) {
 		if (T4Properties.t4GlobalLogger.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(null, event);
-			T4Properties.t4GlobalLogger.logp(Level.FINE, "HPT4PooledConnectionManager", "connectionClosed", "", p);
+			T4Properties.t4GlobalLogger.logp(Level.FINE, "TrafT4PooledConnectionManager", "connectionClosed", "", p);
 		}
 		if (out_ != null) {
 			LogRecord lr = new LogRecord(Level.FINE, "");
 			Object p[] = T4LoggingUtilities.makeParams(null, event);
 			lr.setParameters(p);
-			lr.setSourceClassName("HPT4PooledConnectionManager");
+			lr.setSourceClassName("TrafT4PooledConnectionManager");
 			lr.setSourceMethodName("connectionClosed");
 			T4LogFormatter lf = new T4LogFormatter();
 			String temp = lf.format(lr);
@@ -133,7 +133,7 @@ public Connection getConnection() throws SQLException {
 						} // cleanup, ignore any errors
 					}
 				} else {
-					throw HPT4Messages.createSQLException(null, null, "max_pool_size_reached", null);
+					throw TrafT4Messages.createSQLException(null, null, "max_pool_size_reached", null);
 				}
 			} else {
 				pc = (PooledConnection) free_.get(0);
@@ -201,7 +201,7 @@ private void createInitialPool(int initialPoolSize) throws SQLException {
 				created++;
 			}
 		} catch (SQLException se) {
-			SQLException head = HPT4Messages.createSQLException(null, null, "initial_pool_creation_error", "" + limit);
+			SQLException head = TrafT4Messages.createSQLException(null, null, "initial_pool_creation_error", "" + limit);
 			head.setNextException(se);
 			throw head;
 		} finally {
@@ -224,7 +224,7 @@ void setLogWriter(PrintWriter out) {
 		out_ = out;
 	}
 
-	HPT4PooledConnectionManager(HPT4ConnectionPoolDataSource pds, Level traceLevel) throws SQLException {
+	TrafT4PooledConnectionManager(TrafT4ConnectionPoolDataSource pds, Level traceLevel) throws SQLException {
 		String className = getClass().getName();
 		pds_ = pds;
 		inUse_ = Collections.synchronizedList(new LinkedList());
@@ -315,7 +315,7 @@ private void cleanUp() {
 					try {
 						/*
 						 * System.out.println("Closing connection : " + (
-						 * (HPT4Connection) ( (HPT4PooledConnection)
+						 * (TrafT4Connection) ( (TrafT4PooledConnection)
 						 * pc).getConnection()).getDialogueId());
 						 */
 						pc.close();
@@ -351,7 +351,7 @@ private void cleanUp() {
 				while (it_.hasNext()) {
 					try {
 						PooledConnection tempPC = (PooledConnection) it_.next();
-						InterfaceConnection ic = ((HPT4PooledConnection) tempPC).getTrafT4ConnectionReference().ic_;
+						InterfaceConnection ic = ((TrafT4PooledConnection) tempPC).getTrafT4ConnectionReference().ic_;
 						if (ic != null) {
 							T4Connection tconn = ic.getT4Connection();
 							if (tconn != null) {
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
index 0d4fe289b4..15e420b1c2 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4PreparedStatement.java
@@ -227,7 +227,7 @@ public boolean execute() throws SQLException {
 		// * If LOB is involved with autocommit enabled we throw an exception
 		// *******************************************************************
 		if (isAnyLob_ && (connection_.getAutoCommit())) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_lob_commit_state", null);
 		}
 		if (inputDesc_ != null) {
@@ -271,27 +271,27 @@ public int[] executeBatch() throws SQLException, BatchUpdateException {
 
 		try {
 			clearWarnings();
-			HPT4Exception se;
+			TrafT4Exception se;
 			Object[] valueArray = null;
 
 			if (inputDesc_ == null) {
-				se = HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				se = TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"batch_command_failed", null);
 				throw new BatchUpdateException(se.getMessage(), se.getSQLState(), new int[0]);
 			}
 			if (sqlStmtType_ == TRANSPORT.TYPE_SELECT) {
-				se = HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				se = TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"select_in_batch_not_supported", null);
 				throw new BatchUpdateException(se.getMessage(), se.getSQLState(), new int[0]);
 			}
 			if (connection_._isClosed()) {
-				se = HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_connection",
+				se = TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_connection",
 						null);
 				connection_.closeErroredConnection(se);
 				throw new BatchUpdateException(se.getMessage(), se.getSQLState(), new int[0]);
 			}
 			if (isAnyLob_ && (connection_.getAutoCommit())) {
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"invalid_lob_commit_state", null);
 			}
 
@@ -312,7 +312,7 @@ public int[] executeBatch() throws SQLException, BatchUpdateException {
 
 			} catch (SQLException e) {
 				BatchUpdateException be;
-				se = HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				se = TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"batch_command_failed", null);
 				if (batchRowCount_ == null) // we failed before execute
 				{
@@ -355,7 +355,7 @@ public ResultSet executeQuery() throws SQLException {
 
 		validateExecuteInvocation();
 		if (sqlStmtType_ != TRANSPORT.TYPE_SELECT) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "non_select_invalid",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "non_select_invalid",
 					null);
 		}
 
@@ -401,7 +401,7 @@ public long executeUpdate64() throws SQLException {
 		validateExecuteInvocation();
 		// if (sqlStmtType_ == TRANSPORT.TYPE_SELECT)
 		if (sqlStmtType_ == TRANSPORT.TYPE_SELECT && (ist_.stmtIsLock != true)) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "select_invalid", null);
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "select_invalid", null);
 		}
 
 		if (usingRawRowset_ == false) {
@@ -422,7 +422,7 @@ public long executeUpdate64() throws SQLException {
 		// * If LOB is involved with autocommit enabled we throw an exception
 		// *******************************************************************
 		if (isAnyLob_ && (connection_.getAutoCommit())) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_lob_commit_state", null);
 		}
 
@@ -451,7 +451,7 @@ public ResultSetMetaData getMetaData() throws SQLException {
 		}
 
 		if (outputDesc_ != null) {
-			return new HPT4ResultSetMetaData(this, outputDesc_);
+			return new TrafT4ResultSetMetaData(this, outputDesc_);
 		} else {
 			return null;
 		}
@@ -473,7 +473,7 @@ public ParameterMetaData getParameterMetaData() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (inputDesc_ != null) {
-			return new HPT4ParameterMetaData(this, inputDesc_);
+			return new TrafT4ParameterMetaData(this, inputDesc_);
 		} else {
 			return null;
 		}
@@ -496,7 +496,7 @@ public void setArray(int parameterIndex, Array x) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		validateSetInvocation(parameterIndex);
-		HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "setArray()");
+		TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "setArray()");
 	}
 
 	public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException {
@@ -539,7 +539,7 @@ public void setAsciiStream(int parameterIndex, InputStream x, int length) throws
 			} catch (java.io.IOException e) {
 				Object[] messageArguments = new Object[1];
 				messageArguments[0] = e.getMessage();
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
 						messageArguments);
 			}
 
@@ -548,12 +548,12 @@ public void setAsciiStream(int parameterIndex, InputStream x, int length) throws
 			} catch (java.io.UnsupportedEncodingException e) {
 				Object[] messageArguments = new Object[1];
 				messageArguments[0] = e.getMessage();
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"unsupported_encoding", messageArguments);
 			}
 			break;
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_datatype_for_column", null);
 		}
 	}
@@ -620,7 +620,7 @@ public void setBinaryStream(int parameterIndex, InputStream x, int length) throw
 		case Types.INTEGER:
 		case Types.SMALLINT:
 		case Types.TINYINT:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_datatype_for_column", null);
 		case Types.CHAR:
 		case Types.VARCHAR:
@@ -638,7 +638,7 @@ public void setBinaryStream(int parameterIndex, InputStream x, int length) throw
 			} catch (java.io.IOException e) {
 				Object[] messageArguments = new Object[1];
 				messageArguments[0] = e.getMessage();
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
 						messageArguments);
 			}
 			addParamValue(parameterIndex, buffer2);
@@ -651,7 +651,7 @@ public void setBinaryStream(int parameterIndex, InputStream x, int length) throw
 			} catch (java.io.IOException e) {
 				Object[] messageArguments = new Object[1];
 				messageArguments[0] = e.getMessage();
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
 						messageArguments);
 			}
 
@@ -695,7 +695,7 @@ public void setBlob(int parameterIndex, Blob x) throws SQLException {
 		
 			
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_datatype_for_column", null);
 		}
 	}
@@ -778,7 +778,7 @@ public void setBytes(int parameterIndex, byte[] x) throws SQLException {
 			addParamValue(parameterIndex, tmpArray);
 			break;
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 	}
@@ -815,7 +815,7 @@ public void setCharacterStream(int parameterIndex, Reader reader, int length) th
 		case Types.INTEGER:
 		case Types.SMALLINT:
 		case Types.TINYINT:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_datatype_for_column", null);
 
 		default:
@@ -825,7 +825,7 @@ public void setCharacterStream(int parameterIndex, Reader reader, int length) th
 				if (valuePos < 1) {
 					Object[] messageArguments = new Object[1];
 					messageArguments[0] = "No data to read from the Reader";
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
 							messageArguments);
 				}
 
@@ -838,7 +838,7 @@ public void setCharacterStream(int parameterIndex, Reader reader, int length) th
 			} catch (java.io.IOException e) {
 				Object[] messageArguments = new Object[1];
 				messageArguments[0] = e.getMessage();
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
 						messageArguments);
 			}
 			addParamValue(parameterIndex, new String(value));
@@ -886,10 +886,10 @@ public void setClob(int parameterIndex, Clob x) throws SQLException {
 		case Types.DOUBLE:
 		case Types.FLOAT:
 		case Types.NUMERIC:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_datatype_for_column", null);
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 	}
@@ -916,7 +916,7 @@ public void setDate(int parameterIndex, Date x) throws SQLException {
 		dataType = inputDesc_[parameterIndex - 1].dataType_;
 		if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR
 				&& dataType != Types.DATE && dataType != Types.TIMESTAMP) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 		if (x != null) {
@@ -955,7 +955,7 @@ public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLExceptio
 		dataType = inputDesc_[parameterIndex - 1].dataType_;
 		if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR
 				&& dataType != Types.DATE && dataType != Types.TIME && dataType != Types.TIMESTAMP) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 		// Ignore the cal, since SQL would expect it to store it in the local
@@ -1147,7 +1147,7 @@ public void setObject(int parameterIndex, Object x) throws SQLException {
 		} else if (x instanceof BigInteger) {
 			setBigDecimal(parameterIndex, new BigDecimal((BigInteger) x));
 		} else {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"object_type_not_supported", null);
 		}
 	}
@@ -1237,7 +1237,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale
 						setDate(parameterIndex, Date.valueOf(x.toString()));
 					}
 				} catch (IllegalArgumentException iex) {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"invalid_parameter_value", x.toString());
 				}
 				break;
@@ -1303,7 +1303,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale
 					} else if (x instanceof String) {
 						addParamValue(parameterIndex, x);
 					} else {
-						throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+						throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 								"conversion_not_allowed", null);
 					}
 					break;
@@ -1315,7 +1315,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale
 			case Types.JAVA_OBJECT:
 			case Types.STRUCT:
 			default:
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"object_type_not_supported", null);
 			}
 		}
@@ -1338,7 +1338,7 @@ public void setRef(int i, Ref x) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		validateSetInvocation(i);
-		HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "setRef()");
+		TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "setRef()");
 	}
 
 	public void setShort(int parameterIndex, short x) throws SQLException {
@@ -1398,7 +1398,7 @@ public void setString(int parameterIndex, String x) throws SQLException {
 		case Types.DATALINK:
 		case Types.JAVA_OBJECT:
 		case Types.REF:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"datatype_not_supported", null);
 		case Types.BIGINT:
 		case Types.INTEGER:
@@ -1423,7 +1423,7 @@ public void setString(int parameterIndex, String x) throws SQLException {
 			setObject(parameterIndex, x, dataType);
 			break;
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"fetch_output_inconsistent", null);
 		}
 
@@ -1451,7 +1451,7 @@ public void setTime(int parameterIndex, Time x) throws SQLException {
 		dataType = inputDesc_[parameterIndex - 1].dataType_;
 		if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR
 				&& dataType != Types.TIME && dataType != Types.TIMESTAMP) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 		if (x != null) {
@@ -1490,7 +1490,7 @@ public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLExceptio
 		dataType = inputDesc_[parameterIndex - 1].dataType_;
 		if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR
 				&& dataType != Types.TIME && dataType != Types.TIMESTAMP) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 		// Ignore the cal, since SQL would expect it to store it in the local
@@ -1530,7 +1530,7 @@ public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {
 		dataType = inputDesc_[parameterIndex - 1].dataType_;
 		if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR
 				&& dataType != Types.DATE && dataType != Types.TIME && dataType != Types.TIMESTAMP) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 		if (x != null) {
@@ -1577,7 +1577,7 @@ public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws S
 		dataType = inputDesc_[parameterIndex - 1].dataType_;
 		if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR
 				&& dataType != Types.DATE && dataType != Types.TIME && dataType != Types.TIMESTAMP) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 		// Ignore the cal, since SQL would expect it to store it in the local
@@ -1634,7 +1634,7 @@ public void setUnicodeStream(int parameterIndex, InputStream x, int length) thro
 			case Types.INTEGER:
 			case Types.BIGINT:
 			case Types.TINYINT:
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"invalid_datatype_for_column", null);
 			default:
 				try {
@@ -1642,7 +1642,7 @@ public void setUnicodeStream(int parameterIndex, InputStream x, int length) thro
 				} catch (java.io.IOException e) {
 					Object[] messageArguments = new Object[1];
 					messageArguments[0] = e.getMessage();
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
 							messageArguments);
 				}
 				try {
@@ -1651,7 +1651,7 @@ public void setUnicodeStream(int parameterIndex, InputStream x, int length) thro
 				} catch (java.io.UnsupportedEncodingException e) {
 					Object[] messageArguments = new Object[1];
 					messageArguments[0] = e.getMessage();
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"unsupported_encoding", messageArguments);
 				}
 				break;
@@ -1675,7 +1675,7 @@ public void setURL(int parameterIndex, URL x) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		validateSetInvocation(parameterIndex);
-		HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "setURL()");
+		TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "setURL()");
 	} // end setURL
 
 	// -------------------------------------------------------------------------------------------
@@ -1721,7 +1721,7 @@ protected void validateExecuteInvocation() throws SQLException {
 		}
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "stmt_closed", null);
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "stmt_closed", null);
 		}
 		// connection_.getServerHandle().isConnectionOpen();
 		connection_.isConnectionOpen();
@@ -1732,7 +1732,7 @@ protected void validateExecuteInvocation() throws SQLException {
 			}
 		}
 		if (paramRowCount_ > 0 && usingRawRowset_ == false) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"function_sequence_error", null);
 		}
 
@@ -1756,7 +1756,7 @@ private void checkIfAllParamsSet() throws SQLException {
 				Object[] messageArguments = new Object[2];
 				messageArguments[0] = new Integer(paramNumber + 1);
 				messageArguments[1] = new Integer(paramRowCount_ + 1);
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "parameter_not_set",
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "parameter_not_set",
 						messageArguments);
 			}
 		}
@@ -1768,20 +1768,20 @@ private void validateSetInvocation(int parameterIndex) throws SQLException {
 			connection_.props_.t4Logger_.logp(Level.FINER, "TrafT4PreparedStatement", "validateSetInvocation", "", p);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "stmt_closed", null);
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "stmt_closed", null);
 		}
 		// connection_.getServerHandle().isConnectionOpen();
 		connection_.isConnectionOpen();
 		if (inputDesc_ == null) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_parameter_index", null);
 		}
 		if (parameterIndex < 1 || parameterIndex > inputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_parameter_index", null);
 		}
 		if (inputDesc_[parameterIndex - 1].paramMode_ == DatabaseMetaData.procedureColumnOut) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "is_a_output_parameter",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "is_a_output_parameter",
 					null);
 		}
 	}
@@ -1863,7 +1863,7 @@ void logicalClose() throws SQLException {
 
 	// ----------------------------------------------------------------------------------
 	// Method used by JNI Layer to update the results of Prepare
-	void setPrepareOutputs(HPT4Desc[] inputDesc, HPT4Desc[] outputDesc, int inputParamCount, int outputParamCount)
+	void setPrepareOutputs(TrafT4Desc[] inputDesc, TrafT4Desc[] outputDesc, int inputParamCount, int outputParamCount)
 			throws SQLException {
 		if (connection_.props_.t4Logger_.isLoggable(Level.FINER) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(connection_.props_, inputDesc, outputDesc, inputParamCount,
@@ -1883,7 +1883,7 @@ void setPrepareOutputs(HPT4Desc[] inputDesc, HPT4Desc[] outputDesc, int inputPar
 	} // end setPrepareOutputs
 
 	// ----------------------------------------------------------------------------------
-	void setPrepareOutputs2(HPT4Desc[] inputDesc, HPT4Desc[] outputDesc, int inputParamCount, int outputParamCount,
+	void setPrepareOutputs2(TrafT4Desc[] inputDesc, TrafT4Desc[] outputDesc, int inputParamCount, int outputParamCount,
 			int inputParamsLength, int outputParamsLength, int inputDescLength, int outputDescLength)
 			throws SQLException {
 		if (connection_.props_.t4Logger_.isLoggable(Level.FINER) == true) {
@@ -1955,7 +1955,7 @@ void reuse(TrafT4Connection connection, int resultSetType, int resultSetConcurre
 		}
 		if (resultSetType != ResultSet.TYPE_FORWARD_ONLY && resultSetType != ResultSet.TYPE_SCROLL_INSENSITIVE
 				&& resultSetType != ResultSet.TYPE_SCROLL_SENSITIVE) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_resultset_type", null);
 		}
 		if (resultSetType == ResultSet.TYPE_SCROLL_SENSITIVE) {
@@ -1965,7 +1965,7 @@ void reuse(TrafT4Connection connection, int resultSetType, int resultSetConcurre
 			resultSetType_ = resultSetType;
 		}
 		if (resultSetConcurrency != ResultSet.CONCUR_READ_ONLY && resultSetConcurrency != ResultSet.CONCUR_UPDATABLE) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_resultset_concurrency", null);
 		}
 		resultSetConcurrency_ = resultSetConcurrency;
@@ -2093,10 +2093,10 @@ public void close(boolean hardClose) throws SQLException {
 		connection_.isConnectionOpen();
 		sqlStmtType_ = ist_.getSqlStmtType(sql);
 		if (sqlStmtType_ == TRANSPORT.TYPE_STATS) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"infostats_invalid_error", null);
 		} else if (sqlStmtType_ == TRANSPORT.TYPE_CONFIG) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"config_cmd_invalid_error", null);
 		}
 		ist_.setTransactionStatus(connection_, sql);
@@ -2134,10 +2134,10 @@ public void close(boolean hardClose) throws SQLException {
 		connection_.isConnectionOpen();
 		sqlStmtType_ = ist_.getSqlStmtType(sql);
 		if (sqlStmtType_ == TRANSPORT.TYPE_STATS) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"infostats_invalid_error", null);
 		} else if (sqlStmtType_ == TRANSPORT.TYPE_CONFIG) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"config_cmd_invalid_error", null);
 		}
 		ist_.setTransactionStatus(connection_, sql);
@@ -2230,7 +2230,7 @@ public void setFetchSize(int rows) throws SQLException {
 		}
 
 		if (rows < 0) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_fetchSize_value", null);
 		}
 		if (rows > 0) {
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
index b08d53928e..cfbea75c17 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
@@ -60,7 +60,7 @@
 // This class partially implements the result set class as defined in 
 // java.sql.ResultSet.  
 // ----------------------------------------------------------------------------
-public class TrafT4ResultSet extends HPT4Handle implements java.sql.ResultSet {
+public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet {
 
 	// java.sql.ResultSet interface methods
 	public boolean absolute(int row) throws SQLException {
@@ -83,15 +83,15 @@ public boolean absolute(int row) throws SQLException {
 
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (getType() == ResultSet.TYPE_FORWARD_ONLY) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
 					null);
 		}
 		if (row == 0) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_row_number",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_row_number",
 					null);
 		}
 
@@ -144,11 +144,11 @@ public void afterLast() throws SQLException {
 		}
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (getType() == ResultSet.TYPE_FORWARD_ONLY) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
 					null);
 		}
 		last();
@@ -174,11 +174,11 @@ public void beforeFirst() throws SQLException {
 		}
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (getType() == ResultSet.TYPE_FORWARD_ONLY) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
 					null);
 		}
 
@@ -191,7 +191,7 @@ public void beforeFirst() throws SQLException {
 
         // Method not implemented
 	public void cancelRowUpdates() throws SQLException {
-             throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+             throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
                   "cancelRowUpdates - not supported", null);
 	}
 
@@ -235,7 +235,7 @@ synchronized public void close() throws SQLException {
 
         // Method not implemented
 	public void deleteRow() throws SQLException {
-            throw HPT4Messages.createSQLException(connection_.props_, 
+            throw TrafT4Messages.createSQLException(connection_.props_, 
                                                   connection_.getLocale(),
                                                   "deleteRow - not supported", 
                                                   null);
@@ -259,7 +259,7 @@ public int findColumn(String columnName) throws SQLException {
 		int i;
 
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		for (i = 0; i < outputDesc_.length; i++) {
@@ -267,7 +267,7 @@ public int findColumn(String columnName) throws SQLException {
 				return i + 1;
 			}
 		}
-		throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_name", null);
+		throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_name", null);
 	}
 
 	public boolean first() throws SQLException {
@@ -289,11 +289,11 @@ public boolean first() throws SQLException {
 
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (getType() == ResultSet.TYPE_FORWARD_ONLY) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
 					null);
 		}
 
@@ -327,7 +327,7 @@ public Array getArray(int columnIndex) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		validateGetInvocation(columnIndex);
-		HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getArray()");
+		TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getArray()");
 		return null;
 	}
 
@@ -390,14 +390,14 @@ public InputStream getAsciiStream(int columnIndex) throws SQLException {
 				} catch (java.io.UnsupportedEncodingException e) {
 					Object[] messageArguments = new Object[1];
 					messageArguments[0] = e.getMessage();
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"unsupported_encoding", messageArguments);
 				}
 			} else {
 				return null;
 			}
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 
@@ -457,7 +457,7 @@ public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
 				try {
 					d = new Double(data);
 				} catch (NumberFormatException e1) {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"invalid_cast_specification", null);
 				}
 				retValue = new BigDecimal(d.doubleValue());
@@ -572,7 +572,7 @@ public InputStream getBinaryStream(int columnIndex) throws SQLException {
 				return null;
 			}
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 	}
@@ -628,7 +628,7 @@ public boolean getBoolean(int columnIndex) throws SQLException {
 				try {
 					shortValue = getShort(columnIndex);
 				} catch (NumberFormatException e) {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"invalid_cast_specification", null);
 				}
 				switch (shortValue) {
@@ -637,7 +637,7 @@ public boolean getBoolean(int columnIndex) throws SQLException {
 				case 1:
 					return true;
 				default:
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"numeric_out_of_range", null);
 				}
 			}
@@ -695,7 +695,7 @@ public byte getByte(int columnIndex) throws SQLException {
 				try {
 					d = new Double(data);
 				} catch (NumberFormatException e1) {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"invalid_cast_specification", null);
 				}
 				d1 = d.doubleValue();
@@ -706,7 +706,7 @@ public byte getByte(int columnIndex) throws SQLException {
 						setSQLWarning(null, "data_truncation", null);
 					}
 				} else {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"numeric_out_of_range", null);
 				}
 			}
@@ -777,14 +777,14 @@ public byte[] getBytes(int columnIndex) throws SQLException {
 				} else if (x instanceof String) {
 					return ((String) x).getBytes();
 				} else {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"invalid_cast_specification", null);
 				}
 			}
 
 
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 	}
@@ -847,7 +847,7 @@ public Reader getCharacterStream(int columnIndex) throws SQLException {
 				return null;
 			}
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 
@@ -888,7 +888,7 @@ public int getConcurrency() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (stmt_ != null) {
@@ -915,7 +915,7 @@ public String getCursorName() throws SQLException {
 		}
 
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (spj_rs_ && stmtLabel_ != null) {
@@ -968,7 +968,7 @@ public Date getDate(int columnIndex) throws SQLException {
 		dataType = outputDesc_[columnIndex - 1].dataType_;
 		if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR
 				&& dataType != Types.DATE && dataType != Types.TIMESTAMP) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 
@@ -998,7 +998,7 @@ public Date getDate(int columnIndex) throws SQLException {
 					setSQLWarning(null, "data_truncation", null);
 
 				} catch (IllegalArgumentException ex) {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"invalid_cast_specification", null);
 				}
 			}
@@ -1142,7 +1142,7 @@ public double getDouble(int columnIndex) throws SQLException {
 			try {
 				return Double.parseDouble(data);
 			} catch (NumberFormatException e1) {
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"invalid_cast_specification", null);
 			}
 		} else {
@@ -1185,7 +1185,7 @@ public int getFetchDirection() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		return fetchDirection_;
@@ -1207,7 +1207,7 @@ public int getFetchSize() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		return fetchSize_;
@@ -1238,7 +1238,7 @@ public float getFloat(int columnIndex) throws SQLException {
 		if (data >= Float.NEGATIVE_INFINITY && data <= Float.POSITIVE_INFINITY) {
 			return (float) data;
 		} else {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "numeric_out_of_range",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "numeric_out_of_range",
 					null);
 		}
 	}
@@ -1291,7 +1291,7 @@ public int getInt(int columnIndex) throws SQLException {
 				try {
 					d = new Double(data).doubleValue();
 				} catch (NumberFormatException e1) {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"invalid_cast_specification", null);
 				}
 
@@ -1301,7 +1301,7 @@ public int getInt(int columnIndex) throws SQLException {
 						setSQLWarning(null, "data_truncation", null);
 					}
 				} else {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"numeric_out_of_range", null);
 				}
 			}
@@ -1370,7 +1370,7 @@ public long getLong(int columnIndex) throws SQLException {
 							setSQLWarning(null, "data_truncation", null);
 						}
 					} else {
-						throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+						throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 								"numeric_out_of_range", null);
 					}
 				} catch (NumberFormatException e2) {
@@ -1378,7 +1378,7 @@ public long getLong(int columnIndex) throws SQLException {
 					try {
 						d = new Double(data).doubleValue();
 					} catch (NumberFormatException e1) {
-						throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+						throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 								"invalid_cast_specification", null);
 					}
 
@@ -1389,7 +1389,7 @@ public long getLong(int columnIndex) throws SQLException {
 							setSQLWarning(null, "data_truncation", null);
 						}
 					} else {
-						throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+						throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 								"numeric_out_of_range", null);
 					}
 				}
@@ -1436,10 +1436,10 @@ public ResultSetMetaData getMetaData() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
-		return new HPT4ResultSetMetaData(this, outputDesc_);
+		return new TrafT4ResultSetMetaData(this, outputDesc_);
 	}
 
 	public Object getObject(int columnIndex) throws SQLException {
@@ -1550,7 +1550,7 @@ public Object getObject(int columnIndex) throws SQLException {
 		case Types.OTHER:
 			return getString(columnIndex);
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 	}
@@ -1572,7 +1572,7 @@ public Object getObject(int columnIndex, Map map) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		validateGetInvocation(columnIndex);
-		HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getObject()");
+		TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getObject()");
 		return null;
 	}
 
@@ -1632,7 +1632,7 @@ public Ref getRef(int columnIndex) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		validateGetInvocation(columnIndex);
-		HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getRef()");
+		TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getRef()");
 		return null;
 	}
 
@@ -1673,7 +1673,7 @@ public int getRow() throws SQLException {
 		}
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (isBeforeFirst_ || isAfterLast_ || onInsertRow_) {
@@ -1717,7 +1717,7 @@ public short getShort(int columnIndex) throws SQLException {
 				try {
 					d = new Double(data).doubleValue();
 				} catch (NumberFormatException e1) {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"invalid_cast_specification", null);
 				}
 
@@ -1729,7 +1729,7 @@ public short getShort(int columnIndex) throws SQLException {
 						setSQLWarning(null, "data_truncation", null);
 					}
 				} else {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"numeric_out_of_range", null);
 				}
 			}
@@ -1776,7 +1776,7 @@ public Statement getStatement() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		return stmt_;
@@ -1899,7 +1899,7 @@ public String getString(int columnIndex) throws SQLException {
 				try {
 					data = new String((byte[]) x, "ASCII");
 				} catch (Exception e) {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"unsupported_encoding", "ASCII");
 				}
 			} else {
@@ -1927,38 +1927,38 @@ public String getString(int columnIndex) throws SQLException {
 				break;
 			case InterfaceResultSet.SQLTYPECODE_DATETIME: {
 				switch (outputDesc_[columnIndex - 1].sqlDatetimeCode_) {
-				case HPT4Desc.SQLDTCODE_YEAR:
-				case HPT4Desc.SQLDTCODE_YEAR_TO_MONTH:
-				case HPT4Desc.SQLDTCODE_MONTH:
-				case HPT4Desc.SQLDTCODE_MONTH_TO_DAY:
-				case HPT4Desc.SQLDTCODE_DAY:
-				case HPT4Desc.SQLDTCODE_HOUR:
-				case HPT4Desc.SQLDTCODE_HOUR_TO_MINUTE:
-				case HPT4Desc.SQLDTCODE_MINUTE:
-				case HPT4Desc.SQLDTCODE_MINUTE_TO_SECOND:
-					// case HPT4Desc.SQLDTCODE_MINUTE_TO_FRACTION:
-				case HPT4Desc.SQLDTCODE_SECOND:
-					// case HPT4Desc.SQLDTCODE_SECOND_TO_FRACTION:
-				case HPT4Desc.SQLDTCODE_YEAR_TO_HOUR:
-				case HPT4Desc.SQLDTCODE_YEAR_TO_MINUTE:
-				case HPT4Desc.SQLDTCODE_MONTH_TO_HOUR:
-				case HPT4Desc.SQLDTCODE_MONTH_TO_MINUTE:
-				case HPT4Desc.SQLDTCODE_MONTH_TO_SECOND:
-					// case HPT4Desc.SQLDTCODE_MONTH_TO_FRACTION:
-				case HPT4Desc.SQLDTCODE_DAY_TO_HOUR:
-				case HPT4Desc.SQLDTCODE_DAY_TO_MINUTE:
-				case HPT4Desc.SQLDTCODE_DAY_TO_SECOND:
-					// case HPT4Desc.SQLDTCODE_DAY_TO_FRACTION:
-				case HPT4Desc.SQLDTCODE_HOUR_TO_FRACTION:
+				case TrafT4Desc.SQLDTCODE_YEAR:
+				case TrafT4Desc.SQLDTCODE_YEAR_TO_MONTH:
+				case TrafT4Desc.SQLDTCODE_MONTH:
+				case TrafT4Desc.SQLDTCODE_MONTH_TO_DAY:
+				case TrafT4Desc.SQLDTCODE_DAY:
+				case TrafT4Desc.SQLDTCODE_HOUR:
+				case TrafT4Desc.SQLDTCODE_HOUR_TO_MINUTE:
+				case TrafT4Desc.SQLDTCODE_MINUTE:
+				case TrafT4Desc.SQLDTCODE_MINUTE_TO_SECOND:
+					// case TrafT4Desc.SQLDTCODE_MINUTE_TO_FRACTION:
+				case TrafT4Desc.SQLDTCODE_SECOND:
+					// case TrafT4Desc.SQLDTCODE_SECOND_TO_FRACTION:
+				case TrafT4Desc.SQLDTCODE_YEAR_TO_HOUR:
+				case TrafT4Desc.SQLDTCODE_YEAR_TO_MINUTE:
+				case TrafT4Desc.SQLDTCODE_MONTH_TO_HOUR:
+				case TrafT4Desc.SQLDTCODE_MONTH_TO_MINUTE:
+				case TrafT4Desc.SQLDTCODE_MONTH_TO_SECOND:
+					// case TrafT4Desc.SQLDTCODE_MONTH_TO_FRACTION:
+				case TrafT4Desc.SQLDTCODE_DAY_TO_HOUR:
+				case TrafT4Desc.SQLDTCODE_DAY_TO_MINUTE:
+				case TrafT4Desc.SQLDTCODE_DAY_TO_SECOND:
+					// case TrafT4Desc.SQLDTCODE_DAY_TO_FRACTION:
+				case TrafT4Desc.SQLDTCODE_HOUR_TO_FRACTION:
 					break;
 				default:
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"object_type_not_supported", null);
 				}
 			}
 				break;
 			default:
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"object_type_not_supported", null);
 			}
 		}
@@ -1971,7 +1971,7 @@ public String getString(int columnIndex) throws SQLException {
 		case Types.JAVA_OBJECT:
 		case Types.STRUCT:
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"object_type_not_supported", null);
 		}
 		return data;
@@ -2020,7 +2020,7 @@ public Time getTime(int columnIndex) throws SQLException {
 		dataType = outputDesc_[columnIndex - 1].dataType_;
 		if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR
 				&& dataType != Types.TIME && dataType != Types.TIMESTAMP) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 		data = getLocalString(columnIndex);
@@ -2031,7 +2031,7 @@ public Time getTime(int columnIndex) throws SQLException {
 					timestamp = Timestamp.valueOf(data);
 					retValue = new Time(timestamp.getTime());
 				} catch (IllegalArgumentException e) {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"invalid_cast_specification", null);
 				}
 				break;
@@ -2049,13 +2049,13 @@ public Time getTime(int columnIndex) throws SQLException {
 						timestamp = Timestamp.valueOf(data);
 						retValue = new Time(timestamp.getTime());
 					} catch (IllegalArgumentException ex) {
-						throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+						throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 								"invalid_cast_specification", null);
 					}
 				}
 				break;
 			default:
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"restricted_data_type", null);
 			}
 			return retValue;
@@ -2158,7 +2158,7 @@ public Timestamp getTimestamp(int columnIndex) throws SQLException {
 		dataType = outputDesc_[columnIndex - 1].dataType_;
 		if (dataType != Types.CHAR && dataType != Types.VARCHAR && dataType != Types.LONGVARCHAR
 				&& dataType != Types.DATE && dataType != Types.TIME && dataType != Types.TIMESTAMP) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "restricted_data_type",
 					null);
 		}
 		data = getLocalString(columnIndex);
@@ -2169,7 +2169,7 @@ public Timestamp getTimestamp(int columnIndex) throws SQLException {
 					dateValue = Date.valueOf(data);
 					retValue = new Timestamp(dateValue.getTime());
 				} catch (IllegalArgumentException e) {
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"invalid_cast_specification", null);
 				}
 				break;
@@ -2200,7 +2200,7 @@ public Timestamp getTimestamp(int columnIndex) throws SQLException {
 							retValue = new Timestamp(timeValue.getTime());
 							retValue.setNanos(nano);
 						} catch (IllegalArgumentException e2) {
-							throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+							throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 									"invalid_cast_specification", null);
 						}
 
@@ -2208,7 +2208,7 @@ public Timestamp getTimestamp(int columnIndex) throws SQLException {
 				}
 				break;
 			default:
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"restricted_data_type", null);
 			}
 			return retValue;
@@ -2305,7 +2305,7 @@ public int getType() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (stmt_ != null) {
@@ -2342,7 +2342,7 @@ public InputStream getUnicodeStream(int columnIndex) throws SQLException {
 			} catch (java.io.UnsupportedEncodingException e) {
 				Object[] messageArguments = new Object[1];
 				messageArguments[0] = e.getMessage();
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"unsupported_encoding", messageArguments);
 			}
 		} else {
@@ -2386,7 +2386,7 @@ public URL getURL(int columnIndex) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		validateGetInvocation(columnIndex);
-		HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getURL()");
+		TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getURL()");
 		return null;
 	}
 
@@ -2410,12 +2410,12 @@ public URL getURL(String columnName) throws SQLException {
 	}
 
 	public byte[] getRawBytes(int columnIndex) throws SQLException {
-		HPT4Desc desc;
+		TrafT4Desc desc;
 		byte[] ret;
 
 		if (!keepRawBuffer_) // if you dont set the property, we will not
 			// support the call
-			HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getRawBytes()");
+			TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "getRawBytes()");
 
 		validateGetInvocation(columnIndex); // verify columnIndex and that we
 		// are not closed
@@ -2471,7 +2471,7 @@ public byte[] getNextFetchBuffer() throws SQLException {
 	// ------------------------------------------------------------------
         // Method not implemented
 	public void insertRow() throws SQLException {
-           throw HPT4Messages.createSQLException(connection_.props_, 
+           throw TrafT4Messages.createSQLException(connection_.props_, 
                                                  connection_.getLocale(),
                                                  "insertRow - not supported", 
                                                  null);
@@ -2493,7 +2493,7 @@ public boolean isAfterLast() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		return isAfterLast_;
@@ -2515,7 +2515,7 @@ public boolean isBeforeFirst() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		return isBeforeFirst_;
@@ -2537,7 +2537,7 @@ public boolean isFirst() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if ((getType() == ResultSet.TYPE_FORWARD_ONLY) && (getConcurrency() == ResultSet.CONCUR_UPDATABLE)) {
@@ -2571,7 +2571,7 @@ public boolean isLast() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		/*
@@ -2612,11 +2612,11 @@ public boolean last() throws SQLException {
 		}
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (getType() == ResultSet.TYPE_FORWARD_ONLY) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
 					null);
 		}
 
@@ -2656,7 +2656,7 @@ public void moveToCurrentRow() throws SQLException {
 		}
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (!onInsertRow_) {
@@ -2673,7 +2673,7 @@ public void moveToCurrentRow() throws SQLException {
 
         // Method not implemented
 	public void moveToInsertRow() throws SQLException {
-           throw HPT4Messages.createSQLException(connection_.props_, 
+           throw TrafT4Messages.createSQLException(connection_.props_, 
                                                  connection_.getLocale(),
                                                  "moveToInsertRow - not supported", 
                                                  null);
@@ -2703,7 +2703,7 @@ public boolean next() throws SQLException {
 
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 
@@ -2783,11 +2783,11 @@ public boolean previous() throws SQLException {
 		boolean validRow = false;
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (getType() == ResultSet.TYPE_FORWARD_ONLY) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
 					null);
 		}
 
@@ -2809,7 +2809,7 @@ public boolean previous() throws SQLException {
 
         // Method not implemented
 	public void refreshRow() throws SQLException {
-           throw HPT4Messages.createSQLException(connection_.props_, 
+           throw TrafT4Messages.createSQLException(connection_.props_, 
                                                  connection_.getLocale(),
                                                  "refreshRow - not supported", 
                                                  null);
@@ -2836,11 +2836,11 @@ public boolean relative(int row) throws SQLException {
 
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (getType() == ResultSet.TYPE_FORWARD_ONLY) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "forward_only_cursor",
 					null);
 		}
 		
@@ -2871,7 +2871,7 @@ public boolean relative(int row) throws SQLException {
 
         // Method not implemented
 	public boolean rowDeleted() throws SQLException {
-           throw HPT4Messages.createSQLException(connection_.props_, 
+           throw TrafT4Messages.createSQLException(connection_.props_, 
                                                  connection_.getLocale(),
                                                  "rowDeleted - not supported", 
                                                   null);
@@ -2879,7 +2879,7 @@ public boolean rowDeleted() throws SQLException {
 
         // Method not implemented
 	public boolean rowInserted() throws SQLException {
-           throw HPT4Messages.createSQLException(connection_.props_, 
+           throw TrafT4Messages.createSQLException(connection_.props_, 
                                                  connection_.getLocale(),
                                                  "rowInserted - not supported", 
                                                   null);
@@ -2887,7 +2887,7 @@ public boolean rowInserted() throws SQLException {
 
         // Method not implemented
 	public boolean rowUpdated() throws SQLException {
-           throw HPT4Messages.createSQLException(connection_.props_, 
+           throw TrafT4Messages.createSQLException(connection_.props_, 
                                                  connection_.getLocale(),
                                                  "rowUpdated - not supported", 
                                                   null);
@@ -2909,7 +2909,7 @@ public void setFetchDirection(int direction) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		switch (direction) {
@@ -2921,7 +2921,7 @@ public void setFetchDirection(int direction) throws SQLException {
 			fetchDirection_ = ResultSet.FETCH_FORWARD;
 			break;
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_fetch_direction", null);
 		}
 	}
@@ -2942,11 +2942,11 @@ public void setFetchSize(int rows) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (rows < 0) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_fetch_size",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_fetch_size",
 					null);
 		} else if (rows == 0) {
 			fetchSize_ = DEFAULT_FETCH_SIZE;
@@ -2971,7 +2971,7 @@ public void updateArray(int columnIndex, Array x) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		validateUpdInvocation(columnIndex);
-		HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "updateArray()");
+		TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "updateArray()");
 	}
 
 	public void updateArray(String columnName, Array x) throws SQLException {
@@ -3022,7 +3022,7 @@ public void updateAsciiStream(int columnIndex, InputStream x, int length) throws
 		} catch (java.io.IOException e) {
 			Object[] messageArguments = new Object[1];
 			messageArguments[0] = e.getMessage();
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
 					messageArguments);
 		}
 		try {
@@ -3030,7 +3030,7 @@ public void updateAsciiStream(int columnIndex, InputStream x, int length) throws
 		} catch (java.io.UnsupportedEncodingException e) {
 			Object[] messageArguments = new Object[1];
 			messageArguments[0] = e.getMessage();
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "unsupported_encoding",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "unsupported_encoding",
 					messageArguments);
 		}
 	}
@@ -3121,7 +3121,7 @@ public void updateBinaryStream(int columnIndex, InputStream x, int length) throw
 		} catch (java.io.IOException e) {
 			Object[] messageArguments = new Object[1];
 			messageArguments[0] = e.getMessage();
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
 					messageArguments);
 		}
 		getCurrentRow().updateArrayElement(columnIndex, value);
@@ -3283,7 +3283,7 @@ public void updateCharacterStream(int columnIndex, Reader reader, int length) th
 			if (valuePos < 1) {
 				Object[] messageArguments = new Object[1];
 				messageArguments[0] = "No data to read from the Reader";
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
 						messageArguments);
 			}
 
@@ -3298,7 +3298,7 @@ public void updateCharacterStream(int columnIndex, Reader reader, int length) th
 		} catch (java.io.IOException e) {
 			Object[] messageArguments = new Object[1];
 			messageArguments[0] = e.getMessage();
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "io_exception",
 					messageArguments);
 		}
 		getCurrentRow().updateArrayElement(columnIndex, new String(value));
@@ -3642,7 +3642,7 @@ public void updateRef(int columnIndex, Ref x) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		validateUpdInvocation(columnIndex);
-		HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "updateRef()");
+		TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "updateRef()");
 	}
 
 	public void updateRef(String columnName, Ref x) throws SQLException {
@@ -3666,7 +3666,7 @@ public void updateRef(String columnName, Ref x) throws SQLException {
 
         // Method not implemented
 	public void updateRow() throws SQLException {
-           throw HPT4Messages.createSQLException(connection_.props_, 
+           throw TrafT4Messages.createSQLException(connection_.props_, 
                                                  connection_.getLocale(),
                                                  "updateRow - not supported", null);
 	}
@@ -3839,7 +3839,7 @@ public boolean wasNull() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		return wasNull_;
@@ -3861,7 +3861,7 @@ void setColumnName(int columnIndex, String columnName) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (columnIndex < 1 || columnIndex > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
 					null);
 		}
 		outputDesc_[columnIndex - 1].name_ = columnName;
@@ -3919,7 +3919,7 @@ private int validateGetInvocation(String columnName) throws SQLException {
 		}
 		int i;
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		for (i = 0; i < outputDesc_.length; i++) {
@@ -3927,7 +3927,7 @@ private int validateGetInvocation(String columnName) throws SQLException {
 				return i + 1;
 			}
 		}
-		throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_name", null);
+		throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_name", null);
 	}
 
 	private void validateGetInvocation(int columnIndex) throws SQLException {
@@ -3946,11 +3946,11 @@ private void validateGetInvocation(int columnIndex) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_cursor_state",
 					null);
 		}
 		if (columnIndex < 1 || columnIndex > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
 					null);
 		}
 	}
@@ -3976,7 +3976,7 @@ private int validateUpdInvocation(String columnName) throws SQLException {
 		}
 		int i;
 		if (getConcurrency() == ResultSet.CONCUR_READ_ONLY) {
-			throw HPT4Messages
+			throw TrafT4Messages
 					.createSQLException(connection_.props_, connection_.getLocale(), "read_only_concur", null);
 		}
 		for (i = 0; i < outputDesc_.length; i++) {
@@ -3984,7 +3984,7 @@ private int validateUpdInvocation(String columnName) throws SQLException {
 				return i + 1;
 			}
 		}
-		throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_name", null);
+		throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_name", null);
 	}
 
 	private void validateUpdInvocation(int columnIndex) throws SQLException {
@@ -4003,11 +4003,11 @@ private void validateUpdInvocation(int columnIndex) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (getConcurrency() == ResultSet.CONCUR_READ_ONLY) {
-			throw HPT4Messages
+			throw TrafT4Messages
 					.createSQLException(connection_.props_, connection_.getLocale(), "read_only_concur", null);
 		}
 		if (columnIndex < 1 || columnIndex > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
 					null);
 		}
 	}
@@ -4031,10 +4031,10 @@ private ObjectArray getCurrentRow() throws SQLException {
 			return insertRow_;
 		} else {
 			if (isBeforeFirst_) {
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "cursor_is_before_first_row", null);
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "cursor_is_before_first_row", null);
 			}
 			if (isAfterLast_) {
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "cursor_after_last_row", null);
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "cursor_after_last_row", null);
 			}
 			return (ObjectArray) cachedRows_.get(currentRow_ - 1);
 		}
@@ -4078,7 +4078,7 @@ void getKeyColumns() throws SQLException {
 		String columnName;
 
 		if (noKeyFound_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "no_primary_key", null);
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "no_primary_key", null);
 		}
 
 		try {
@@ -4111,7 +4111,7 @@ void getKeyColumns() throws SQLException {
 				if (rowCount == 0) {
 					noKeyFound_ = true;
 					stmt_.resultSetConcurrency_ = ResultSet.CONCUR_READ_ONLY;
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"no_primary_key", null);
 				}
 
@@ -4141,7 +4141,7 @@ void getKeyColumns() throws SQLException {
 				if (colNo > columnCount) {
 					noKeyFound_ = true;
 					stmt_.resultSetConcurrency_ = ResultSet.CONCUR_READ_ONLY;
-					throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"no_primary_key", null);
 				}
 			}
@@ -4376,7 +4376,7 @@ int getFSDataType(int ColumnCount) throws SQLException { // 0 -based
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (ColumnCount >= outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
 					null);
 		} else {
 			return outputDesc_[ColumnCount].fsDataType_;
@@ -4399,7 +4399,7 @@ int getSQLDataType(int ColumnCount) throws SQLException { // 0 -based
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (ColumnCount >= outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
 					null);
 		} else {
 			return outputDesc_[ColumnCount].sqlDataType_;
@@ -4422,7 +4422,7 @@ int getPrecision(int ColumnCount) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (ColumnCount >= outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
 					null);
 		} else {
 			return outputDesc_[ColumnCount].precision_;
@@ -4445,7 +4445,7 @@ int getScale(int ColumnCount) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (ColumnCount >= outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
 					null);
 		} else {
 			return outputDesc_[ColumnCount].scale_;
@@ -4468,7 +4468,7 @@ int getSqlDatetimeCode(int ColumnCount) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (ColumnCount >= outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
 					null);
 		} else {
 			return outputDesc_[ColumnCount].sqlDatetimeCode_;
@@ -4495,7 +4495,7 @@ int getSqlOctetLength(int ColumnCount) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (ColumnCount >= outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
 					null);
 		} else {
 			return outputDesc_[ColumnCount].sqlOctetLength_;
@@ -4518,7 +4518,7 @@ boolean getSigned(int ColumnCount) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 		if (ColumnCount >= outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_column_index",
 					null);
 		} else {
 			return outputDesc_[ColumnCount].isSigned_;
@@ -4560,18 +4560,18 @@ private String getLocalString(int columnIndex) throws SQLException {
 
 						wasNull_ = false;
 					} catch (CharacterCodingException e) {
-						SQLException se = HPT4Messages.createSQLException(this.connection_.ic_.t4props_,
+						SQLException se = TrafT4Messages.createSQLException(this.connection_.ic_.t4props_,
 								this.connection_.getLocale(), "translation_of_parameter_failed", "getLocalString", e
 										.getMessage());
 						se.initCause(e);
 						throw se;
 					} catch (UnsupportedCharsetException e) {
-						SQLException se = HPT4Messages.createSQLException(this.connection_.ic_.t4props_,
+						SQLException se = TrafT4Messages.createSQLException(this.connection_.ic_.t4props_,
 								this.connection_.getLocale(), "unsupported_encoding", e.getCharsetName());
 						se.initCause(e);
 						throw se;
 					} catch (UnsupportedEncodingException e) {
-						SQLException se = HPT4Messages.createSQLException(this.connection_.ic_.t4props_,
+						SQLException se = TrafT4Messages.createSQLException(this.connection_.ic_.t4props_,
 								this.connection_.getLocale(), "unsupported_encoding", e.getMessage());
 						se.initCause(e);
 						throw se;
@@ -4613,17 +4613,17 @@ public boolean useOldDateFormat() {
 		return useOldDateFormat_;
 	}
 
-	void closeErroredConnection(HPT4Exception sme) {
+	void closeErroredConnection(TrafT4Exception sme) {
 		connection_.closeErroredConnection(sme);
 	}
 
 	// Constructors - used in TrafT4Statement
-	TrafT4ResultSet(TrafT4Statement stmt, HPT4Desc[] outputDesc) throws SQLException {
+	TrafT4ResultSet(TrafT4Statement stmt, TrafT4Desc[] outputDesc) throws SQLException {
 		this(stmt, outputDesc, stmt.stmtLabel_, false);
 	}
 
 	// Constructors - used for SPJ ResultSets
-	TrafT4ResultSet(TrafT4Statement stmt, HPT4Desc[] outputDesc, String stmt_label, boolean spj_result_set)
+	TrafT4ResultSet(TrafT4Statement stmt, TrafT4Desc[] outputDesc, String stmt_label, boolean spj_result_set)
 			throws SQLException {
 		if (stmt.connection_.props_.t4Logger_.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(stmt.connection_.props_, stmt, outputDesc, stmt_label,
@@ -4672,7 +4672,7 @@ void closeErroredConnection(HPT4Exception sme) {
 	// Constructor - used in T4DatabaseMetaData
 	// ResultSet is not created on Java side in
 	// T4DatanaseMetaData due to threading issues
-	TrafT4ResultSet(T4DatabaseMetaData dbMetaData, HPT4Desc[] outputDesc, String stmtLabel, boolean oldDateFormat)
+	TrafT4ResultSet(T4DatabaseMetaData dbMetaData, TrafT4Desc[] outputDesc, String stmtLabel, boolean oldDateFormat)
 			throws SQLException {
 		if (dbMetaData.connection_.props_.t4Logger_.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(dbMetaData.connection_.props_, dbMetaData, outputDesc, 0,
@@ -4726,7 +4726,7 @@ private void checkJavaVersion() {
 
 	// Fields
 	InterfaceResultSet irs_;
-	HPT4Desc[] outputDesc_;
+	TrafT4Desc[] outputDesc_;
 	TrafT4Statement stmt_;
 	TrafT4Connection connection_;
 	boolean isClosed_;
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ResultSetMetaData.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSetMetaData.java
similarity index 69%
rename from core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ResultSetMetaData.java
rename to core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSetMetaData.java
index d1f1f7ee48..5b4d4cd29e 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/HPT4ResultSetMetaData.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSetMetaData.java
@@ -24,12 +24,12 @@
 import java.sql.SQLException;
 import java.util.logging.Level;
 
-public class HPT4ResultSetMetaData implements java.sql.ResultSetMetaData {
+public class TrafT4ResultSetMetaData implements java.sql.ResultSetMetaData {
 
 	// begin required methods
 	public String getCatalogName(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].catalogName_;
@@ -37,7 +37,7 @@ public String getCatalogName(int column) throws SQLException {
 
 	public String getColumnClassName(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].getColumnClassName();
@@ -49,7 +49,7 @@ public int getColumnCount() throws SQLException {
 
 	public int getColumnDisplaySize(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].displaySize_;
@@ -57,7 +57,7 @@ public int getColumnDisplaySize(int column) throws SQLException {
 
 	public String getColumnLabel(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 
@@ -67,7 +67,7 @@ public String getColumnLabel(int column) throws SQLException {
 
 	public String getColumnName(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].name_;
@@ -75,7 +75,7 @@ public String getColumnName(int column) throws SQLException {
 
 	public int getColumnType(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].dataType_;
@@ -83,7 +83,7 @@ public int getColumnType(int column) throws SQLException {
 
 	public String getColumnTypeName(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].getColumnTypeName(connection_.getLocale());
@@ -91,7 +91,7 @@ public String getColumnTypeName(int column) throws SQLException {
 
 	public int getPrecision(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].precision_;
@@ -99,7 +99,7 @@ public int getPrecision(int column) throws SQLException {
 
 	public int getScale(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].scale_;
@@ -107,7 +107,7 @@ public int getScale(int column) throws SQLException {
 
 	public String getSchemaName(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].schemaName_;
@@ -115,7 +115,7 @@ public String getSchemaName(int column) throws SQLException {
 
 	public String getTableName(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].tableName_;
@@ -123,7 +123,7 @@ public String getTableName(int column) throws SQLException {
 
 	public boolean isAutoIncrement(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].isAutoIncrement_;
@@ -131,7 +131,7 @@ public boolean isAutoIncrement(int column) throws SQLException {
 
 	public boolean isCaseSensitive(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].isCaseSensitive_;
@@ -139,7 +139,7 @@ public boolean isCaseSensitive(int column) throws SQLException {
 
 	public boolean isCurrency(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].isCurrency_;
@@ -151,7 +151,7 @@ public boolean isDefinitelyWritable(int column) throws SQLException {
 
 	public int isNullable(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].isNullable_;
@@ -163,7 +163,7 @@ public boolean isReadOnly(int column) throws SQLException {
 
 	public boolean isSearchable(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].isSearchable_;
@@ -171,7 +171,7 @@ public boolean isSearchable(int column) throws SQLException {
 
 	public boolean isSigned(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].isSigned_;
@@ -187,7 +187,7 @@ public boolean isWritable(int column) throws SQLException {
 
 	public int getFSDataType(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].fsDataType_;
@@ -195,7 +195,7 @@ public int getFSDataType(int column) throws SQLException {
 
 	public int getMaxLength(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].maxLen_;
@@ -203,7 +203,7 @@ public int getMaxLength(int column) throws SQLException {
 
 	public int getOdbcCharset(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].odbcCharset_;
@@ -213,7 +213,7 @@ public int getRowLength() throws SQLException {
 		// this is the same for all params
 		// only if we have no input params will we throw an error
 		if (outputDesc_.length == 0) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.props_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.props_.getLocale(),
 					"invalid_desc_index", null);
 		}
 
@@ -222,7 +222,7 @@ public int getRowLength() throws SQLException {
 
 	public int getSqlCharset(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].sqlCharset_;
@@ -230,7 +230,7 @@ public int getSqlCharset(int column) throws SQLException {
 
 	public int getSqlPrecision(int column) throws SQLException {
 		if (column > outputDesc_.length) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].sqlPrecision_;
@@ -250,7 +250,7 @@ public int getSqlDatetimeCode(int param) throws SQLException {
 	 */
 	public String cpqGetCharacterSet(int column) throws SQLException {
 		if ((column > outputDesc_.length) || (column <= 0)) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_desc_index",
 					null);
 		}
 		return outputDesc_[column - 1].getCharacterSetName();
@@ -270,10 +270,10 @@ public int getSqlLength(int param) throws SQLException {
 		return stmt_.ist_.pr_.outputDesc[param - 1].maxLen_;
 	} // end getSqlTypeCode
 
-	HPT4ResultSetMetaData(TrafT4Statement stmt, HPT4Desc[] outputDesc) {
+	TrafT4ResultSetMetaData(TrafT4Statement stmt, TrafT4Desc[] outputDesc) {
 		if (stmt.connection_.props_.t4Logger_.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(stmt.connection_.props_, stmt, outputDesc);
-			stmt.connection_.props_.t4Logger_.logp(Level.FINE, "HPT4ResultSetMetaData", "", "", p);
+			stmt.connection_.props_.t4Logger_.logp(Level.FINE, "TrafT4ResultSetMetaData", "", "", p);
 		}
 
 		connection_ = stmt.connection_;
@@ -281,10 +281,10 @@ public int getSqlLength(int param) throws SQLException {
 		stmt_ = stmt;
 	}
 
-	HPT4ResultSetMetaData(TrafT4ResultSet resultSet, HPT4Desc[] outputDesc) {
+	TrafT4ResultSetMetaData(TrafT4ResultSet resultSet, TrafT4Desc[] outputDesc) {
 		if (resultSet.connection_.props_.t4Logger_.isLoggable(Level.FINE) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(resultSet.connection_.props_, resultSet, outputDesc);
-			resultSet.connection_.props_.t4Logger_.logp(Level.FINE, "HPT4ResultSetMetaData", "", "", p);
+			resultSet.connection_.props_.t4Logger_.logp(Level.FINE, "TrafT4ResultSetMetaData", "", "", p);
 		}
 
 		resultSet_ = resultSet;
@@ -295,7 +295,7 @@ public int getSqlLength(int param) throws SQLException {
 
 	TrafT4ResultSet resultSet_;
 	TrafT4Connection connection_;
-	HPT4Desc[] outputDesc_;
+	TrafT4Desc[] outputDesc_;
 	TrafT4Statement stmt_;
 	public Object unwrap(Class iface) throws SQLException {
 		// TODO Auto-generated method stub
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
index d28746f995..9e16f22552 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
@@ -42,7 +42,7 @@
  * the java.sql.Statement interface.
  * 

  */
-public class TrafT4Statement extends HPT4Handle implements java.sql.Statement {
+public class TrafT4Statement extends TrafT4Handle implements java.sql.Statement {
 	// java.sql.Statement interface Methods
 
 	public void addBatch(String sql) throws SQLException {
@@ -265,7 +265,7 @@ public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
 		if (autoGeneratedKeys == TrafT4Statement.NO_GENERATED_KEYS) {
 			ret = execute(sql);
 		} else {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"auto_generated_keys_not_supported", null);
 		}
 		return ret;
@@ -293,7 +293,7 @@ public boolean execute(String sql, int[] columnIndexes) throws SQLException {
 		} else if (columnIndexes.length == 0) {
 			ret = execute(sql);
 		} else {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"auto_generated_keys_not_supported", null);
 		}
 		return ret;
@@ -321,7 +321,7 @@ public boolean execute(String sql, String[] columnNames) throws SQLException {
 		} else if (columnNames.length == 0) {
 			ret = execute(sql);
 		} else {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"auto_generated_keys_not_supported", null);
 		}
 		return ret;
@@ -359,7 +359,7 @@ public int[] executeBatch() throws SQLException, BatchUpdateException {
 				String sql = (String) batchCommands_.get(i);
 
 				if (sql == null) {
-					se = HPT4Messages.createSQLException(connection_.props_, this.ist_.ic_.getLocale(),
+					se = TrafT4Messages.createSQLException(connection_.props_, this.ist_.ic_.getLocale(),
 							"batch_command_failed", "Invalid SQL String");
 					throw new BatchUpdateException(se.getMessage(), se.getSQLState(), new int[0]);
 				}
@@ -367,15 +367,15 @@ public int[] executeBatch() throws SQLException, BatchUpdateException {
 				sqlStmtType_ = ist_.getSqlStmtType(sql);
 
 				if (sqlStmtType_ == TRANSPORT.TYPE_SELECT) {
-					se = HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					se = TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"select_in_batch_not_supported", null);
 					throw new BatchUpdateException(se.getMessage(), se.getSQLState(), new int[0]);
 				} else if (sqlStmtType_ == TRANSPORT.TYPE_STATS) {
-					se = HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					se = TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"infostats_invalid_error", null);
 					throw new BatchUpdateException(se.getMessage(), se.getSQLState(), new int[0]);
 				} else if (sqlStmtType_ == TRANSPORT.TYPE_CONFIG) {
-					se = HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+					se = TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 							"config_cmd_invalid_error", null);
 					throw new BatchUpdateException(se.getMessage(), se.getSQLState(), new int[0]);
 				}
@@ -415,7 +415,7 @@ public int[] executeBatch() throws SQLException, BatchUpdateException {
 
 				BatchUpdateException be;
 
-				se = HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+				se = TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 						"batch_command_failed", null);
 				be = new BatchUpdateException(se.getMessage(), se.getSQLState(), batchRowCount_);
 				be.setNextException(e);
@@ -460,7 +460,7 @@ public ResultSet executeQuery(String sql) throws SQLException {
 
 		validateExecDirectInvocation(sql);
 		if (sqlStmtType_ != TRANSPORT.TYPE_SELECT && sqlStmtType_ != TRANSPORT.TYPE_STATS) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "non_select_invalid",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "non_select_invalid",
 					null);
 		}
 		try {
@@ -508,7 +508,7 @@ public long executeUpdate64(String sql) throws SQLException {
 		validateExecDirectInvocation(sql);
 		// 7708
 		if (sqlStmtType_ == TRANSPORT.TYPE_SELECT && (ist_.stmtIsLock != true)) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "select_invalid", null);
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "select_invalid", null);
 		}
 		try {
 			ist_.execute(TRANSPORT.SRVR_API_SQLEXECDIRECT, 0, 0, null, queryTimeout_, sql_, this);
@@ -548,7 +548,7 @@ public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException
 		if (autoGeneratedKeys == TrafT4Statement.NO_GENERATED_KEYS) {
 			ret = executeUpdate(sql);
 		} else {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"auto_generated_keys_not_supported", null);
 		}
 		return ret;
@@ -576,7 +576,7 @@ public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
 		} else if (columnIndexes.length == 0) {
 			ret = executeUpdate(sql);
 		} else {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"auto_generated_keys_not_supported", null);
 		}
 		return ret;
@@ -604,7 +604,7 @@ public int executeUpdate(String sql, String[] columnNames) throws SQLException {
 		} else if (columnNames.length == 0) {
 			ret = executeUpdate(sql);
 		} else {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"auto_generated_keys_not_supported", null);
 		}
 		return ret;
@@ -682,7 +682,7 @@ public ResultSet getGeneratedKeys() throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 
-		throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+		throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 				"auto_generated_keys_not_supported", null);
 	}
 
@@ -905,7 +905,7 @@ public long getUpdateCount64() throws SQLException {
 		}
 
 		if (ist_ == null) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_statement_handle", null);
 		}
 
@@ -1029,7 +1029,7 @@ public void setFetchDirection(int direction) throws SQLException {
 			fetchDirection_ = ResultSet.FETCH_FORWARD;
 			break;
 		default:
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_fetch_direction", null);
 		}
 	}
@@ -1051,7 +1051,7 @@ public void setFetchSize(int rows) throws SQLException {
 		}
 
 		if (rows < 0) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_fetch_size",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_fetch_size",
 					null);
 		} else if (rows == 0) {
 			fetchSize_ = TrafT4ResultSet.DEFAULT_FETCH_SIZE;
@@ -1077,7 +1077,7 @@ public void setMaxFieldSize(int max) throws SQLException {
 		}
 
 		if (max < 0) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_maxFieldSize_value", null);
 		}
 		maxFieldSize_ = max;
@@ -1100,7 +1100,7 @@ public void setMaxRows(int max) throws SQLException {
 		}
 
 		if (max < 0) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_maxRows_value",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_maxRows_value",
 					null);
 		}
 		maxRows_ = max;
@@ -1122,10 +1122,10 @@ public void setQueryTimeout(int seconds) throws SQLException {
 			connection_.props_.getLogWriter().println(temp);
 		}
 
-		//HPT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "setQueryTimeout()");
+		//TrafT4Messages.throwUnsupportedFeatureException(connection_.props_, connection_.getLocale(), "setQueryTimeout()");
 		
 		if (seconds < 0) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_queryTimeout_value", null);
 		}
 		queryTimeout_ = seconds;
@@ -1181,7 +1181,7 @@ void validateExecDirectInvocation() throws SQLException {
 		ist_.setRowCount(-1);
 		clearWarnings();
 		if (isClosed_) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_statement",
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_statement",
 					null);
 		}
 		try {
@@ -1213,7 +1213,7 @@ void internalClose() throws SQLException {
 		}
 	}
 
-	private void setResultSet(HPT4Desc[] outputDesc) throws SQLException {
+	private void setResultSet(TrafT4Desc[] outputDesc) throws SQLException {
 		if (connection_.props_.t4Logger_.isLoggable(Level.FINER) == true) {
 			Object p[] = T4LoggingUtilities.makeParams(connection_.props_, outputDesc);
 			connection_.props_.t4Logger_.logp(Level.FINER, "TrafT4Statement", "setResultSet", "", p);
@@ -1235,7 +1235,7 @@ public void setTransactionToJoin(byte[] txid) throws SQLException {
 		this.transactionToJoin = txid;
 	}
 
-	void setMultipleResultSets(int num_result_sets, HPT4Desc[][] output_descriptors, String[] stmt_labels,
+	void setMultipleResultSets(int num_result_sets, TrafT4Desc[][] output_descriptors, String[] stmt_labels,
 			String[] proxySyntax) throws SQLException {
 		if (num_result_sets < 1)
 			return;
@@ -1243,7 +1243,7 @@ void setMultipleResultSets(int num_result_sets, HPT4Desc[][] output_descriptors,
 		resultSet_ = new TrafT4ResultSet[num_result_sets];
 		num_result_sets_ = num_result_sets;
 		for (int i = 0; i < num_result_sets; i++) {
-			HPT4Desc[] desc = output_descriptors[i];
+			TrafT4Desc[] desc = output_descriptors[i];
 			if (desc == null) {
 				resultSet_[i] = null;
 			} else {
@@ -1254,7 +1254,7 @@ void setMultipleResultSets(int num_result_sets, HPT4Desc[][] output_descriptors,
 	}
 
 	// ----------------------------------------------------------------------------------
-	void setExecute2Outputs(byte[] values, short rowsAffected, boolean endOfData, String[] proxySyntax, HPT4Desc[] desc)
+	void setExecute2Outputs(byte[] values, short rowsAffected, boolean endOfData, String[] proxySyntax, TrafT4Desc[] desc)
 			throws SQLException {
 		num_result_sets_ = 1;
 		result_set_offset = 0;
@@ -1406,7 +1406,7 @@ void setExecute2Outputs(byte[] values, short rowsAffected, boolean endOfData, St
 
 		if (resultSetType != ResultSet.TYPE_FORWARD_ONLY && resultSetType != ResultSet.TYPE_SCROLL_INSENSITIVE
 				&& resultSetType != ResultSet.TYPE_SCROLL_SENSITIVE) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_resultset_type", null);
 		}
 
@@ -1418,13 +1418,13 @@ void setExecute2Outputs(byte[] values, short rowsAffected, boolean endOfData, St
 			resultSetType_ = resultSetType;
 		}
 		if (resultSetConcurrency != ResultSet.CONCUR_READ_ONLY && resultSetConcurrency != ResultSet.CONCUR_UPDATABLE) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_resultset_concurrency", null);
 		}
 
 		if ((resultSetHoldability != 0) && (resultSetHoldability != ResultSet.CLOSE_CURSORS_AT_COMMIT)
 				&& (resultSetHoldability != ResultSet.HOLD_CURSORS_OVER_COMMIT)) {
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_holdability",
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_holdability",
 					null);
 		}
 
@@ -1471,7 +1471,7 @@ void setExecute2Outputs(byte[] values, short rowsAffected, boolean endOfData, St
 
 		if (resultSetType != ResultSet.TYPE_FORWARD_ONLY && resultSetType != ResultSet.TYPE_SCROLL_INSENSITIVE
 				&& resultSetType != ResultSet.TYPE_SCROLL_SENSITIVE) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_resultset_type", null);
 		}
 
@@ -1483,13 +1483,13 @@ void setExecute2Outputs(byte[] values, short rowsAffected, boolean endOfData, St
 			resultSetType_ = resultSetType;
 		}
 		if (resultSetConcurrency != ResultSet.CONCUR_READ_ONLY && resultSetConcurrency != ResultSet.CONCUR_UPDATABLE) {
-			throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
+			throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(),
 					"invalid_resultset_concurrency", null);
 		}
 
 		if ((resultSetHoldability != 0) && (resultSetHoldability != ResultSet.CLOSE_CURSORS_AT_COMMIT)
 				&& (resultSetHoldability != ResultSet.HOLD_CURSORS_OVER_COMMIT)) {
-				throw HPT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_holdability",
+				throw TrafT4Messages.createSQLException(connection_.props_, connection_.getLocale(), "invalid_holdability",
 					null);
 		}
 
@@ -1555,7 +1555,7 @@ public void setRoundingMode(String roundingMode) {
 		roundingMode_ = Utility.getRoundingMode(roundingMode);
 	}
 
-	void closeErroredConnection(HPT4Exception sme) {
+	void closeErroredConnection(TrafT4Exception sme) {
 		connection_.closeErroredConnection(sme);
 	}
 
@@ -1625,7 +1625,7 @@ public int getStmtHandle() {
 
 	int roundingMode_ = BigDecimal.ROUND_HALF_EVEN;
 
-	HPT4Desc[] inputDesc_, outputDesc_;
+	TrafT4Desc[] inputDesc_, outputDesc_;
 
 	short operationID_;
 	byte[] operationBuffer_;
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/Utility.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/Utility.java
index a3224d75f4..7099fa78f5 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/Utility.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/Utility.java
@@ -105,7 +105,7 @@ static void checkFloatBoundary(Locale locale, BigDecimal inbd) throws SQLExcepti
 		double indbl = inbd.doubleValue();
 		// double abdbl = inbd.abs().doubleValue(); Need to do MIN check as well
 		if (indbl > (double) Float.MAX_VALUE) {
-			throw HPT4Messages.createSQLException(null, locale, "numeric_out_of_range", inbd.toString());
+			throw TrafT4Messages.createSQLException(null, locale, "numeric_out_of_range", inbd.toString());
 		}
 	} // end checkFloatBoundary
 
@@ -126,7 +126,7 @@ static void checkDoubleBoundary(Locale locale, BigDecimal inbd) throws SQLExcept
 		// need to check min as well
 		// BigDecimal minbd = new BigDecimal(Double.MIN_VALUE);
 		if ((inbd.compareTo(maxbd) > 0)) {
-			throw HPT4Messages.createSQLException(null, locale, "numeric_out_of_range", inbd.toString());
+			throw TrafT4Messages.createSQLException(null, locale, "numeric_out_of_range", inbd.toString());
 		}
 
 	} // end checkDoubleBoundary
@@ -146,7 +146,7 @@ static void checkDoubleBoundary(Locale locale, BigDecimal inbd) throws SQLExcept
 	static void checkIntegerBoundary(Locale locale, BigDecimal inbd) throws SQLException {
 		long inlong = inbd.longValue();
 		if ((inlong > Integer.MAX_VALUE) || (inlong < Integer.MIN_VALUE)) {
-			throw HPT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
+			throw TrafT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
 		}
 	} // end checkIntegerBoundary
 
@@ -167,7 +167,7 @@ static void checkSignedLongBoundary(Locale locale, BigDecimal inbd) throws SQLEx
 		BigDecimal maxbd = new BigDecimal(Long.MAX_VALUE);
 		maxbd = maxbd.add(maxbd);
 		if ((inlong < 0) || (inbd.compareTo(maxbd) > 0)) {
-			throw HPT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
+			throw TrafT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
 		}
 	} // end checkIntegerBoundary
 
@@ -187,7 +187,7 @@ static void checkSignedShortBoundary(Locale locale, BigDecimal inbd) throws SQLE
 		long inlong = inbd.longValue();
 		long maxushort = (Short.MAX_VALUE * 2) + 1;
 		if ((inlong < 0) || (inlong > maxushort)) {
-			throw HPT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
+			throw TrafT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
 		}
 	} // end checkIntegerBoundary
 
@@ -207,7 +207,7 @@ static void checkUnsignedIntegerBoundary(Locale locale, BigDecimal inbd) throws
 		long inlong = inbd.longValue();
 		long maxuint = ((long) Integer.MAX_VALUE * 2L) + 1L;
 		if ((inlong < 0) || (inlong > maxuint)) {
-			throw HPT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
+			throw TrafT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
 		}
 	} // end checkIntegerBoundary
 
@@ -226,7 +226,7 @@ static void checkUnsignedIntegerBoundary(Locale locale, BigDecimal inbd) throws
 	static void checkTinyintBoundary(Locale locale, BigDecimal inbd) throws SQLException {
 		long inlong = inbd.longValue();
 		if ((inlong > Byte.MAX_VALUE) || (inlong < Byte.MIN_VALUE)) {
-			throw HPT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
+			throw TrafT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
 		}
 	} // end checkTinyintBoundary
 
@@ -245,7 +245,7 @@ static void checkTinyintBoundary(Locale locale, BigDecimal inbd) throws SQLExcep
 	static void checkShortBoundary(Locale locale, BigDecimal inbd) throws SQLException {
 		long inlong = inbd.longValue();
 		if ((inlong > Short.MAX_VALUE) || (inlong < Short.MIN_VALUE)) {
-			throw HPT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
+			throw TrafT4Messages.createSQLException(null, locale, "numeric_out_of_range", String.valueOf(inlong));
 		}
 	} // end checkShortBoundary
 
@@ -296,7 +296,7 @@ static BigDecimal getBigDecimalValue(Locale locale, Object paramValue) throws SQ
 			 * BigDecimal.valueOf(((DataWrapper)paramValue).longValue);
 			 */
 		} else {
-			throw HPT4Messages.createSQLException(null, locale, "object_type_not_supported", paramValue);
+			throw TrafT4Messages.createSQLException(null, locale, "object_type_not_supported", paramValue);
 		}
 		return tmpbd;
 	} // end getBigDecimalValue
@@ -319,7 +319,7 @@ static void checkDecimalBoundary(Locale locale, BigDecimal inbd, int precision)
 			BigDecimal maxbd = new BigDecimal(Math.pow(10, precision));
 			BigDecimal minbd = maxbd.negate();
 			if ((inbd.compareTo(maxbd) >= 0) || (inbd.compareTo(minbd) < 0)) {
-				throw HPT4Messages.createSQLException(null, locale, "numeric_out_of_range", inbd.toString());
+				throw TrafT4Messages.createSQLException(null, locale, "numeric_out_of_range", inbd.toString());
 			}
 		}
 	} // end checkBigDecimalBoundary
@@ -350,7 +350,7 @@ static void checkScale(BigDecimal tmpbd, int scale) throws SQLException
 					Object[] messageArguments = new Object[1];
 					messageArguments[0] = new String("A numeric overflow occurred during an arithmetic computation " +
 							"or data conversion.");
-					throw HPT4Messages.createSQLWarning(null, "8411", messageArguments);
+					throw TrafT4Messages.createSQLWarning(null, "8411", messageArguments);
 				}
 				catch (SQLWarning e)
 				{
@@ -449,7 +449,7 @@ static void checkDecimalTruncation(int parameterIndex, Locale locale, BigDecimal
 	 */
 	static void checkLongBoundary(Locale locale, BigDecimal inbd) throws SQLException {
 		if ((inbd.compareTo(long_maxbd) > 0) || (inbd.compareTo(long_minbd) < 0)) {
-			throw HPT4Messages.createSQLException(null, locale, "numeric_out_of_range", inbd.toString());
+			throw TrafT4Messages.createSQLException(null, locale, "numeric_out_of_range", inbd.toString());
 		}
 	} // end checkBigDecimalBoundary
 
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java
index 564fe5b343..a641e8ad17 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java
@@ -37,7 +37,7 @@ class odbc_Dcs_GetObjRefHdl_exc_ {
 	// error cases, so the following variable will contain
 	// any error text generated by this JDBC driver.
 	// Note, this variable is not part of the message, but it
-	// represents a value stored in the HPT4Messages_*.properties file.
+	// represents a value stored in the TrafT4Messages_*.properties file.
 	//
 
 	String clientErrorText;
@@ -67,13 +67,13 @@ void extractFromByteArray(LogicalByteArray buffer1, InterfaceConnection ic) thro
 		case TRANSPORT.CEE_SUCCESS:
 			break;
 		case odbc_Dcs_GetObjRefHdl_ASParamError_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ErrorText);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ErrorText);
 		case odbc_Dcs_GetObjRefHdl_LogonUserFailure_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_unable_to_logon", "");
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_unable_to_logon", "");
 		case odbc_Dcs_GetObjRefHdl_ASNotAvailable_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_dcs_srvr_not_available", ErrorText);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_dcs_srvr_not_available", ErrorText);
 		case odbc_Dcs_GetObjRefHdl_DSNotAvailable_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_ds_not_available", new T4Properties()
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_ds_not_available", new T4Properties()
 					.getServerDataSource());
 		case odbc_Dcs_GetObjRefHdl_PortNotAvailable_exn_:
 		case odbc_Dcs_GetObjRefHdl_ASTryAgain_exn_:
@@ -85,11 +85,11 @@ void extractFromByteArray(LogicalByteArray buffer1, InterfaceConnection ic) thro
 			clientErrorText = "ids_port_not_available";
 			break;
 		case odbc_Dcs_GetObjRefHdl_InvalidUser_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_28_000", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_28_000", null);
 		case odbc_Dcs_GetObjRefHdl_ASTimeout_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_s1_t00", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_s1_t00", null);
 		default:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "unknown_connect_error", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "unknown_connect_error", null);
 		}
 	}
 }
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_Dcs_StopSrvr_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_Dcs_StopSrvr_exc_.java
index 44b6796532..6c36de42c5 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_Dcs_StopSrvr_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_Dcs_StopSrvr_exc_.java
@@ -41,7 +41,7 @@ class odbc_Dcs_StopSrvr_exc_ {
 	// error cases, so the following variable will contain
 	// any error text generated by this JDBC driver.
 	// Note, this variable is not part of the message, but it
-	// represents a value stored in the HPT4Messages_*.properties file.
+	// represents a value stored in the TrafT4Messages_*.properties file.
 	//
 
 	String clientErrorText;
@@ -74,13 +74,13 @@ void extractFromByteArray(LogicalByteArray buffer1, InterfaceConnection ic) thro
 		case odbcas_ASSvc_StopSrvr_ProcessStopError_exn_:
 		case odbcas_ASSvc_StopSrvr_SrvrInUseByAnotherClient_exn_:
 			ErrorText = ic.decodeBytes(buffer1.extractString(), 1);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ErrorText);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ErrorText);
 		case odbcas_ASSvc_StopSrvr_ASNotAvailable_exn_:
 			ErrorText = ic.decodeBytes(buffer1.extractString(), 1);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_dcs_srvr_not_available", ErrorText);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_dcs_srvr_not_available", ErrorText);
 
 		default:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "unknown_error", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "unknown_error", null);
 		} // end switch
 	} // end extractFromByteArray
 } // end odbc_Dcs_StopSrvr_exc_
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Close_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Close_exc_.java
index 619beceea7..ebd7e8c55d 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Close_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Close_exc_.java
@@ -57,13 +57,13 @@ void extractFromByteArray(LogicalByteArray buf, String addr, InterfaceConnection
 		case odbc_SQLSvc_Close_ParamError_exn_:
 			ParamError = ic.decodeBytes(buf.extractString(), 1);
 			;
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
 		case odbc_SQLSvc_Close_InvalidConnection_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
 		case odbc_SQLSvc_Close_TransactionError_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_transaction_error", temp1, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_transaction_error", temp1, addr);
 		default:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
 		}
 	}
 }
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_EndTransaction_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_EndTransaction_exc_.java
index f46d161cb2..2f1aed4153 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_EndTransaction_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_EndTransaction_exc_.java
@@ -74,13 +74,13 @@ void extractFromByteArray(LogicalByteArray buffer1, String addr, InterfaceConnec
 			break;
 		case odbc_SQLSvc_EndTransaction_ParamError_exn_:
 			ParamError = ic.decodeBytes(buffer1.extractString(), 1);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
 		case odbc_SQLSvc_EndTransaction_InvalidConnection_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
 		case odbc_SQLSvc_EndTransaction_SQLInvalidHandle_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_transaction_error", temp1, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_transaction_error", temp1, addr);
 		default:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
 		} // end switch
 	} // end extractFromByteArray
 
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Execute_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Execute_exc_.java
index ebf444e991..ea23bd087d 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Execute_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Execute_exc_.java
@@ -66,7 +66,7 @@ void extractFromByteArray(LogicalByteArray buf, String addr, InterfaceConnection
 		case odbc_SQLSvc_Execute_SQLStillExecuting_exn_:
 			break;
 		case odbc_SQLSvc_Execute_SQLQueryCancelled_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_s1_008", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_s1_008", null);
 		case odbc_SQLSvc_Execute_SQLError_exn_:
 			SQLError = new ERROR_DESC_LIST_def();
 			SQLError.extractFromByteArray(buf, ic);
@@ -77,13 +77,13 @@ void extractFromByteArray(LogicalByteArray buf, String addr, InterfaceConnection
 			break;
 		case odbc_SQLSvc_Execute_ParamError_exn_:
 			ParamError = ic.decodeBytes(buf.extractString(), 1);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
 		case odbc_SQLSvc_Execute_InvalidConnection_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
 		case odbc_SQLSvc_Execute_TransactionError_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_transaction_error", temp1, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_transaction_error", temp1, addr);
 		default:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
 		}
 	}
 }
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Fetch_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Fetch_exc_.java
index b125b5d1cd..970aece39d 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Fetch_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Fetch_exc_.java
@@ -67,20 +67,20 @@ void extractFromByteArray(LogicalByteArray buffer1, String addr, InterfaceConnec
 		case odbc_SQLSvc_Fetch_SQLNoDataFound_exn_:
 			break;
 		case odbc_SQLSvc_Fetch_SQLQueryCancelled_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_s1_008", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_s1_008", null);
 		case odbc_SQLSvc_Fetch_SQLError_exn_:
 			SQLError = new ERROR_DESC_LIST_def();
 			SQLError.extractFromByteArray(buffer1, ic);
 			break;
 		case odbc_SQLSvc_Fetch_ParamError_exn_:
 			ParamError = ic.decodeBytes(buffer1.extractString(), 1);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
 		case odbc_SQLSvc_Fetch_InvalidConnection_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
 		case odbc_SQLSvc_Fetch_TransactionError_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_transaction_error", temp1, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_transaction_error", temp1, addr);
 		default:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
 		}
 	} // end extractFromByteArray
 
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java
index c48c67f25d..78bf2b84ec 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java
@@ -87,13 +87,13 @@ void extractFromByteArray(LogicalByteArray buffer1, String addr, InterfaceConnec
 			break;
 		case odbc_SQLSvc_GetSQLCatalogs_ParamError_exn_:
 			ParamError = ic.decodeBytes(buffer1.extractString(), 1);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
 		case odbc_SQLSvc_GetSQLCatalogs_SQLInvalidHandle_exn_:
 			break;
 		case odbc_SQLSvc_GetSQLCatalogs_InvalidConnection_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
 		default:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
 		}
 	} // end extractFromByteArray
 
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_InitializeDialogue_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_InitializeDialogue_exc_.java
index 0488eefea8..1eb43e1004 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_InitializeDialogue_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_InitializeDialogue_exc_.java
@@ -61,12 +61,12 @@ void extractFromByteArray(LogicalByteArray buf, String addr, InterfaceConnection
 			SQLError.extractFromByteArray(buf, ic);
 			break;
 		case odbc_SQLSvc_InitializeDialogue_InvalidUser_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_28_000", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_28_000", null);
 		case odbc_SQLSvc_InitializeDialogue_ParamError_exn_:
 			ParamError = ic.decodeBytes(buf.extractString(), 1);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
 		case odbc_SQLSvc_InitializeDialogue_InvalidConnection_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
 
 		default:
 			clientErrorText = "unknown_initialize_dialogue_reply_error";
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Prepare_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Prepare_exc_.java
index 62d056aaf8..03749783b6 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Prepare_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_Prepare_exc_.java
@@ -51,18 +51,18 @@ void extractFromByteArray(LogicalByteArray buf, String addr, InterfaceConnection
 		case odbc_SQLSvc_Prepare_SQLStillExecuting_exn_:
 			break;
 		case odbc_SQLSvc_Prepare_SQLQueryCancelled_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_s1_008", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_s1_008", null);
 		case odbc_SQLSvc_Prepare_SQLError_exn_:
 			break;
 		case odbc_SQLSvc_Prepare_ParamError_exn_:
 			sqlError = ic.decodeBytes(buf.extractString(), 1);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", sqlError, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", sqlError, addr);
 		case odbc_SQLSvc_Prepare_InvalidConnection_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
 		case odbc_SQLSvc_Prepare_TransactionError_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_transaction_error", temp0, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_transaction_error", temp0, addr);
 		default:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0);
 		}
 	}
 }
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_SetConnectionOption_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_SetConnectionOption_exc_.java
index 192e527c8a..5dfde732e7 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_SetConnectionOption_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_SetConnectionOption_exc_.java
@@ -52,19 +52,19 @@ void extractFromByteArray(LogicalByteArray buf, String addr, InterfaceConnection
 		case odbc_SQLSvc_SetConnectionOption_SQLError_exn_:
 			SQLError = new ERROR_DESC_LIST_def();
 			SQLError.extractFromByteArray(buf, ic);
-			HPT4Messages.throwSQLException(ic.t4props_, SQLError);
+			TrafT4Messages.throwSQLException(ic.t4props_, SQLError);
 		case odbc_SQLSvc_SetConnectionOption_ParamError_exn_:
 			ParamError = ic.decodeBytes(buf.extractString(), 1);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
 		case odbc_SQLSvc_SetConnectionOption_InvalidConnection_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
 		case odbc_SQLSvc_SetConnectionOption_SQLInvalidHandle_exn_:
 			// SQLInvalidHandle
-			// throw HPT4Messages.createSQLException(null, locale, "ids_08_s01",
+			// throw TrafT4Messages.createSQLException(null, locale, "ids_08_s01",
 			// null);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "autocommit_txn_in_progress", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "autocommit_txn_in_progress", null);
 		default:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
 		}
 	}
 }
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_TerminateDialogue_exc_.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_TerminateDialogue_exc_.java
index 6242b6e9ea..471ccd1672 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_TerminateDialogue_exc_.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/odbc_SQLSvc_TerminateDialogue_exc_.java
@@ -49,18 +49,18 @@ void extractFromByteArray(LogicalByteArray buffer1, String addr, InterfaceConnec
 			break;
 		case odbc_SQLSvc_TerminateDialogue_SQLError_exn_:
 			if (exception_detail == 25000) {
-				throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_25_000", null);
+				throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_25_000", null);
 			}
 			SQLError = new ERROR_DESC_LIST_def();
 			SQLError.extractFromByteArray(buffer1, ic);
 			break;
 		case odbc_SQLSvc_TerminateDialogue_ParamError_exn_:
 			ParamError = ic.decodeBytes(buffer1.extractString(), 1);
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_program_error", ParamError, addr);
 		case odbc_SQLSvc_TerminateDialogue_InvalidConnection_exn_:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_08_s01", null);
 		default:
-			throw HPT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
+			throw TrafT4Messages.createSQLException(null, ic.getLocale(), "ids_unknown_reply_error", temp0, temp1);
 		}
 	}
 }
diff --git a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/RunAllTests.java b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/RunAllTests.java
index 0de5f33c94..b72ef9a6b9 100644
--- a/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/RunAllTests.java
+++ b/core/conn/jdbcT4/src/test/java/org/trafodion/jdbc/t4/RunAllTests.java
@@ -1,3 +1,5 @@
+package org.trafodion.jdbc.t4;
+
 /*
 * @@@ START COPYRIGHT @@@                                                     
 *
diff --git a/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java b/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
index 2145d3136e..497a8c7bb4 100644
--- a/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
+++ b/core/rest/src/main/java/org/trafodion/rest/util/JdbcT4Util.java
@@ -50,14 +50,14 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.trafodion.rest.Constants;
 import org.trafodion.jdbc.t4.TrafT4Connection;
 import org.trafodion.jdbc.t4.TrafT4PreparedStatement;
-import org.trafodion.jdbc.t4.HPT4DataSource;
+import org.trafodion.jdbc.t4.TrafT4DataSource;
 
 public final class JdbcT4Util
 {
 	private static final Log LOG = LogFactory.getLog(JdbcT4Util.class);
     private Configuration conf;
     private NetworkConfiguration netConf;
-	private HPT4DataSource cpds = null;
+	private TrafT4DataSource cpds = null;
  
 	static	{
 		try {
@@ -72,7 +72,7 @@ public final class JdbcT4Util
 	public void init(Configuration conf,NetworkConfiguration netConf) throws SQLException {
 		this.conf = conf;
 		this.netConf = netConf;
-	   	cpds = new HPT4DataSource();
+	   	cpds = new TrafT4DataSource();
 		String url = Constants.T4_DRIVER_URL + "//" + netConf.getHostName() + ":" + conf.getInt(Constants.DCS_MASTER_PORT,Constants.DEFAULT_DCS_MASTER_PORT) + "/:";
 		cpds.setURL(url);
 		cpds.setMinPoolSize(conf.getInt(Constants.T4_DRIVER_MIN_POOL_SIZE,Constants.DEFAULT_T4_DRIVER_MIN_POOL_SIZE));

From f8f1f487000e815efb2592899f6e217bdd06e165 Mon Sep 17 00:00:00 2001
From: Kevin Xu 
Date: Fri, 20 May 2016 08:30:17 +0800
Subject: [PATCH 2/3] For Trafci which not care about version

---
 core/conn/jdbcT4/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/conn/jdbcT4/Makefile b/core/conn/jdbcT4/Makefile
index 828416cf1a..908a14fd11 100644
--- a/core/conn/jdbcT4/Makefile
+++ b/core/conn/jdbcT4/Makefile
@@ -31,6 +31,7 @@ build_all: LICENSE NOTICE
 	cp target/jdbcT4-${TRAFODION_VER}.jar ${MY_SQROOT}/export/lib
 	mkdir -p ../clients
 	mv target/jdbcT4-${TRAFODION_VER}.zip ../clients
+	ln -sf ${MY_SQROOT}/export/lib/jdbcT4-${TRAFODION_VER}.jar ${MY_SQROOT}/export/lib/jdbcT4.jar
 
 clean:
 	-$(MAVEN) clean | grep ERROR

From 283190e1c0f404a29de36b8fd04fea2080b5ed7f Mon Sep 17 00:00:00 2001
From: Kevin Xu 
Date: Fri, 20 May 2016 11:01:29 +0800
Subject: [PATCH 3/3] Along with jdbcT4 rename changes

---
 .../org/trafodion/dcs/util/JdbcT4Util.java    | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java b/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
index dd28c2c4e8..dfd2895adf 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/JdbcT4Util.java
@@ -22,42 +22,30 @@
 **********************************************************************/
 package org.trafodion.dcs.util;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.*;
-import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.math.BigDecimal;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.HelpFormatter;
-import org.codehaus.jettison.json.JSONArray;
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONObject;
+import org.apache.commons.cli.Options;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.trafodion.dcs.util.DcsConfiguration;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONObject;
 import org.trafodion.dcs.Constants;
 import org.trafodion.jdbc.t4.TrafT4Connection;
+import org.trafodion.jdbc.t4.TrafT4DataSource;
 import org.trafodion.jdbc.t4.TrafT4PreparedStatement;
-import org.trafodion.jdbc.t4.HPT4DataSource;
 
 public final class JdbcT4Util
 {
     private static final Log LOG = LogFactory.getLog(JdbcT4Util.class);
     private Configuration conf;
     private DcsNetworkConfiguration netConf;
-    private HPT4DataSource cpds = null;
+    private TrafT4DataSource cpds = null;
  
     static    {
         try {
@@ -72,7 +60,7 @@ public final class JdbcT4Util
     public void init(Configuration conf,DcsNetworkConfiguration netConf) throws SQLException {
         this.conf = conf;
         this.netConf = netConf;
-           cpds = new HPT4DataSource();
+           cpds = new TrafT4DataSource();
         String url = Constants.T4_DRIVER_URL + "//" + netConf.getHostName() + ":" + conf.getInt(Constants.DCS_MASTER_PORT,Constants.DEFAULT_DCS_MASTER_PORT) + "/:";
         cpds.setURL(url);
         cpds.setMinPoolSize(conf.getInt(Constants.T4_DRIVER_MIN_POOL_SIZE,Constants.DEFAULT_T4_DRIVER_MIN_POOL_SIZE));