You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/05 23:39:38 UTC

[07/22] incubator-trafodion git commit: Incorporated more review changes.

Incorporated more review changes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/716b92e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/716b92e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/716b92e3

Branch: refs/heads/master
Commit: 716b92e3d5f30a35487c39ae3f2e21b7d1bd710f
Parents: c5543bd
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Sun May 1 11:13:29 2016 -0600
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Sun May 1 11:13:29 2016 -0600

----------------------------------------------------------------------
 .../asciidoc/_chapters/properties_overview.adoc | 21 ++++++++--------
 .../src/asciidoc/_chapters/tracing_logging.adoc | 25 +++-----------------
 2 files changed, 13 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/716b92e3/docs/jdbct4ref_guide/src/asciidoc/_chapters/properties_overview.adoc
----------------------------------------------------------------------
diff --git a/docs/jdbct4ref_guide/src/asciidoc/_chapters/properties_overview.adoc b/docs/jdbct4ref_guide/src/asciidoc/_chapters/properties_overview.adoc
index b44f0c9..7632e52 100644
--- a/docs/jdbct4ref_guide/src/asciidoc/_chapters/properties_overview.adoc
+++ b/docs/jdbct4ref_guide/src/asciidoc/_chapters/properties_overview.adoc
@@ -85,7 +85,7 @@ connections made through the ConnectionPoolDataSource object.) | -1 (Do not crea
 [cols="25%,55%,30%",options="header" ]
 |===
 | Property Name                          | Description | Default Value
-| `<<T4LogFile, T4LogFile>>`             | Sets the name of the logging file for the Type 4 driver. | The name is defined by the following pattern: `%h/hpt4jdbc%u.log`
+| `<<T4LogFile, T4LogFile>>`             | Sets the name of the logging file for the Type 4 driver. | The name is defined by the following pattern: `%h/t4jdbc%u.log`
 | `<<T4LogLevel, T4LogLevel>>`           | Sets the logging levels that control logging output for the Type 4 driver. | OFF
 |===
 
@@ -114,7 +114,7 @@ description, the particular property applies to the DataSource object,
 |===
 | Property Name                          | Description                                                                | Default Value
 | `<<catalog, catalog>>`                 | Sets the default catalog used to access SQL objects referenced in SQL
-statements if the SQL objects are not fully qualified. | None. Must be "Seabase" in the current release.
+statements if the SQL objects are not fully qualified. | None. Must be "TRAFODION" in the current release.
 | `<<connectionTimeout, connectionTimeout>>` | Sets the number of seconds a connection can be idle before the connection is physically closed by DCS. |
 -1 (Use the ConnTimeout value set on the server data source.)
 | `<<password, password>>`               | Sets the password value for passing to the database. Can also change the password. | Empty string.
@@ -162,13 +162,13 @@ property file is passed as a java command-line parameter. The format to
 enter the properties file in the command line is:
 
 ```
--Dhpt4jdbc.properties=<path of the properties file on disk>`
+-Dt4jdbc.properties=<path of the properties file on disk>`
 ```
 
 *Example*
 
 ```
--Dhpt4jdbc.properties=C:\temp\t4props\myprops.properties
+-Dt4jdbc.properties=C:\temp\t4props\myprops.properties
 ```
 
 To create the file, use the editor of your choice on your workstation to
@@ -189,11 +189,11 @@ To configure a `DataSource` connection, the properties file might contain
 property names and values as indicated in the following list:
 
 ```
-url=jdbc:hpt4jdbc://<primary IP addr or host name of database>:37800/
+url=jdbc:t4jdbc://<primary IP addr or host name of database>:23400/
 user=database_username
 password=mypassword
 description=<a string>
-catalog=Seabase
+catalog=TRAFODION
 schema=myschema
 maxPoolSize=20
 minPoolSize=5
@@ -201,7 +201,6 @@ maxStatements=20
 loginTimeout=15
 initialPoolSize=10
 connectionTimeout=10
-serverDataSource=server_data_source
 T4LogLevel=OFF
 T4LogFile=/mylogdirectory/mylogfile
 ```
@@ -210,7 +209,7 @@ T4LogFile=/mylogdirectory/mylogfile
 === Setting Properties in the Command Line
 
 When a Type 4 driver property is specified on the command line through
-the java `-D` option, the property must include the prefix: `hpt4jdbc`.
+the java `-D` option, the property must include the prefix: `t4jdbc`.
 
 This notation, which includes the period (.), ensures that all the Type
 4 driver property names are unique for a Java application.
@@ -220,7 +219,7 @@ This notation, which includes the period (.), ensures that all the Type
 The maxStatements property becomes:
 
 ```
--Dhpt4jdbc.maxStatements=10
+-Dt4jdbc.maxStatements=10
 ```
 
 [[precedence-of-property-specifications]]
@@ -237,9 +236,9 @@ order of precedence:
 method of `DriverManager` class.
 
 3.  Set the property in a properties file specified by the
-`hpt4jdbc.properties` property.
+`t4jdbc.properties` property.
 
-4.  Set the `-Dhpt4jdbc.property_name=<property value>` in the java command line.
+4.  Set the `-Dt4jdbc.property_name=<property value>` in the java command line.
 
 For more information, see order of precedence for properties specified
 in various ways for use with the Driver Manager.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/716b92e3/docs/jdbct4ref_guide/src/asciidoc/_chapters/tracing_logging.adoc
----------------------------------------------------------------------
diff --git a/docs/jdbct4ref_guide/src/asciidoc/_chapters/tracing_logging.adoc b/docs/jdbct4ref_guide/src/asciidoc/_chapters/tracing_logging.adoc
index 0d7cb9b..c52384e 100644
--- a/docs/jdbct4ref_guide/src/asciidoc/_chapters/tracing_logging.adoc
+++ b/docs/jdbct4ref_guide/src/asciidoc/_chapters/tracing_logging.adoc
@@ -81,25 +81,6 @@ following additional information:
 * Finer control over the amount and type of logging information
 * Error and warning messages
 
-[[accessing-the-type-4-driver-logging-facility]]
-=== Accessing the Type 4 Driver Logging Facility
-
-The Type 4 Driver Logging facility is based on the `java.util.logging`
-package. The Type 4 driver instantiates a `java.util.logging.Logger` class
-and names the logger `org.trafodion.jdbc.t4.logger`.
-
-Your JDBC program can access the Type 4 driver logger directly by
-calling the `java.util.logging.Logger` static method `getLogger(String)`.
-
-*example*
-
-[source, java]
-----
-String t4Logger =
-   java.util.logging.Logger.getLogger( "org.trafodion.jdbc.t4.logger" ) ;
-----
-
-<<<
 [[controlling-type-4-driver-logging-output]]
 === Controlling Type 4 Driver Logging Output
 
@@ -143,7 +124,7 @@ sequence-number ~ time-stamp ~ thread-id
 | `connection-id`   | If applicable, a unique ID for the connection associated with the message.
 | `server-id`       | If applicable, information about the connectivity server associated with the message. The _server-id_ is of the form: +
  +
-`TCP:node-name.server-name/port-number:HPODBC` +
+`TCP:node-name.server-name/port-number:ODBC` +
  +
 where +
  +
@@ -153,7 +134,7 @@ where +
  +
 *Example* +
  +
-`TCP:\banshee-tcp.$Z0133/46003:HPODBC`
+`TCP:\banshee-tcp.$Z0133/46003:ODBC`
 | `dialogue-id`     | If applicable, the `dialogue-id` used for the DCS connection.
 | `class`           | If applicable, the name of the class that issued the logging request.
 | `method`          | If applicable, the name of the method that issued the logging request.
@@ -177,7 +158,7 @@ zeros (0) to allow for readable formatting.
 +
 ```
 00000036 ~ Dec 8, 2006 10:05:55 AM PST ~ 10 ~ 4508606 ~ null
-    ~ null ~ HPT4Messages.createSQLException("en_US",
+    ~ null ~ T4Messages.createSQLException("en_US",
     "socket_write_error", "null") ~
 ```