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/24 18:53:03 UTC
[1/2] incubator-trafodion git commit: New JDBCT4 Programmer's Guide.
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 927ab50bf -> d66659cd7
New JDBCT4 Programmer's Guide.
Also fixed issues in the provision guide, clarified the download page, and
fixed mistakes related to the {project-name} in examples.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/db1c2e9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/db1c2e9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/db1c2e9c
Branch: refs/heads/master
Commit: db1c2e9c1f88399415d9f49edb43a513a57ef0d1
Parents: c41b39b
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Thu May 19 00:09:26 2016 -0600
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Thu May 19 00:09:26 2016 -0600
----------------------------------------------------------------------
.../src/asciidoc/_chapters/jdbct4.adoc | 9 +++--
.../src/asciidoc/_chapters/odbc_windows.adoc | 6 ++--
.../src/asciidoc/_chapters/commands.adoc | 4 +--
.../src/asciidoc/_chapters/activate.adoc | 2 +-
.../src/asciidoc/_chapters/enable_security.adoc | 12 +++----
.../src/asciidoc/_chapters/introduction.adoc | 26 +++++++-------
.../src/asciidoc/_chapters/prepare.adoc | 10 +++---
.../src/asciidoc/_chapters/requirements.adoc | 6 ++--
.../src/asciidoc/_chapters/script_install.adoc | 38 ++++++++++----------
.../src/asciidoc/_chapters/script_remove.adoc | 8 ++---
.../src/asciidoc/_chapters/script_upgrade.adoc | 26 +++++++-------
.../src/asciidoc/_chapters/sql_statements.adoc | 6 ++--
docs/src/site/markdown/documentation.md | 2 ++
docs/src/site/markdown/download.md | 6 ++--
docs/src/site/resources/css/site.css | 2 +-
pom.xml | 1 +
16 files changed, 83 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc b/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
index e6261ca..3714472 100644
--- a/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
@@ -266,13 +266,12 @@ sample programs that are included with the {project-name} JDBC Type-4 driver.
Build and run the StatementSample test program to verify the JDBC Type-4 driver installation.
```
-C:\Development Tools\{project-name} JDBCT4\samples>cd StatementSample
+C:\Development Tools\Trafodion JDBCT4\samples>cd StatementSample
-C:\Development Tools\{project-name} JDBCT4\samples\StatementSample>%JAVA_HOME%\bin\javac -classpath ..\..\lib\jdbcT4.jar *.java ..\common\*.java
+C:\Development Tools\Trafodion JDBCT4\samples\StatementSample>%JAVA_HOME%\bin\javac -classpath ..\..\lib\jdbcT4.jar *.java ..\common\*.java
Note: ..\common\sampleUtils.java uses or overrides a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
-v
-C:\Development Tools\{project-name} JDBCT4\samples\StatementSample>%JAVA_HOME%\bin\java -classpath ..\..\lib\jdbcT4.jar;..;. -Dt4jdbc.properties=..\t4jdbc.properties StatementSample
+C:\Development Tools\Trafodion JDBCT4\samples\StatementSample>%JAVA_HOME%\bin\java -classpath ..\..\lib\jdbcT4.jar -Dt4jdbc.properties=..\t4jdbc.properties StatementSample
Mar 16, 2016 9:36:54 PM common.sampleUtils getPropertiesConnection
INFO: DriverManager.getConnection(url, props) passed
@@ -341,7 +340,7 @@ Column 12 - -100.12,-100.12
End of Data
-C:\Development Tools\{project-name} JDBCT4\samples\StatementSample>
+C:\Development Tools\Trafodion JDBCT4\samples\StatementSample>
```
<<<
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc b/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc
index 1ed67a3..48435ff 100644
--- a/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc
@@ -54,7 +54,7 @@ The ODBC client installation file, `TFODBC64-*.exe`, which installs or links to
| This client component… | Does this…
| Microsoft ODBC Driver Manager | Manages access to ODBC drivers for applications. The driver manager loads and unloads drivers and passes calls for ODBC functions to the
correct driver.
-| {project-name} ODBC driver | Implements ODBC function calls to enable an ODBC client application to access the {project-name} database.
+| Trafodion ODBC driver | Implements ODBC function calls to enable an ODBC client application to access the {project-name} database.
| Microsoft ODBC Administrator | Adds, configures, and removes ODBC data sources on client workstations.
|===
@@ -64,7 +64,7 @@ during installation:
[cols="40%l,60%",options="header"]
|===
| Default Installation Directory | Client Operating System
-| C:\Program Files\{project-name}\TRAF | ODBC _version_ Windows 64-bit
+| C:\Program Files\Trafodion\TRAF | ODBC _version_ Windows 64-bit
|===
=== Start the InstallShield wizard
@@ -78,7 +78,7 @@ Please refer to <<win_odbc_interactive_mode,Interactive Mode Installation>> belo
1. Double-click the `TFODBC64-*.exe` distribution file to start the InstallShield wizard.
2. On the *Welcome* page, click *Next*.
3. Read and select the *I accept the agreement* radio button. Click *Next*.
-4. On the *Destination Folder* page, click *Install* to select the default location: `C:\Program Files\{project-name}\TRAF ODBC _version_\`
+4. On the *Destination Folder* page, click *Install* to select the default location: `C:\Program Files\Trafodion\TRAF ODBC _version_\`
+
This location is the installation directory for ODBC header and help files. All other ODBC files are installed in `%SYSTEMROOT%\system32`.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/command_interface/src/asciidoc/_chapters/commands.adoc
----------------------------------------------------------------------
diff --git a/docs/command_interface/src/asciidoc/_chapters/commands.adoc b/docs/command_interface/src/asciidoc/_chapters/commands.adoc
index dacf0ef..81a7e65 100644
--- a/docs/command_interface/src/asciidoc/_chapters/commands.adoc
+++ b/docs/command_interface/src/asciidoc/_chapters/commands.adoc
@@ -355,7 +355,7 @@ SQL> CONNECT
User Name: user1
Password:
-Connected to {project-name}
+Connected to Trafodion
```
* This command creates a new connection to the {project-name} database from the current or existing TrafCI session:
@@ -1156,7 +1156,7 @@ SQL> LABEL MyNewLabel
* This command creates a label using a quoted string:
+
```
-SQL> LABEL "{project-name} Label"
+SQL> LABEL "Trafodion Label"
```
<<<
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
index 1e5017a..6b56fba 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/activate.adoc
@@ -36,7 +36,7 @@ The following table provides an overview of the different {project-name} managem
[cols="40%,20%l,20%l,20%l",options="header"]
|===
| Component | Start | Stop | Status
-| *All of {project-name}* | sqstart | sqstop | sqcheck
+| *All of {project-name}* | sqstart | sqstop | sqcheck
| *RMS Server* | rmsstart | rmsstop | rmscheck
| *REST Server* | reststart | reststop | -
| *LOB Server* | lobstart | lobstop | -
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
index f46d825..a44a88f 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
@@ -206,12 +206,12 @@ Options:
--status Returns status of authentication enablement
```
-[cols="30%l,90%",options="header"]
+[cols="30%,90%",options="header"]
|===
| Option | Description
-| --file | If specified, then `filename` is copied to `$MY_SQROOT/`. Users working in their own private environment can refer to a
+| `--file` | If specified, then `filename` is copied to `$MY_SQROOT/`. Users working in their own private environment can refer to a
site-specific configuration file from a central location.
-| --on | `traf_authentication_setup` invokes <<enable-security-ldapconfigcheck,ldapconfigcheck>> to verify the configuration file is
+| `--on` | `traf_authentication_setup` invokes <<enable-security-ldapconfigcheck,ldapconfigcheck>> to verify the configuration file is
syntactically correct. It also invokes <<enable-security-ldapcheck,ldapcheck>> to verify that a connection can be made to an LDAP server. +
+
If both checks pass, the script sets the environment variable `TRAFODION_ENABLE_AUTHENTICATION` to `YES` in the file `$MY_SQROOT/sqenvcom.sh`,
@@ -221,15 +221,15 @@ The last step is to enable authorization by creating privilege-related metadata
The list of privilege-related metadata tables, users, roles, and component privileges are logged in `$MY_SQROOT/logs/authEnable.log`. +
+
Specifying `--on` requires that a valid `.traf_authentication_config` file exists and the {project-name} metadata initialized.
-| --off | If specified, then `traf_authentication_setup` sets the environment variable `TRAFODION_ENABLE_AUTHENTICATION` to `NO` in
+| `--off` | If specified, then `traf_authentication_setup` sets the environment variable `TRAFODION_ENABLE_AUTHENTICATION` to `NO` in
`$MY_SQROOT/sqenvcom.sh` and propagates the file to all the nodes in the cluster. +
+
The last step is to disable authorization by removing any privilege-related metadata and permissions with a call to the database.
The results of this operation is logged in `$MY_SQROOT/logs/authEnable.log`.
-| --setup | Use this option if the {project-name} metadata has not been initialized. This option enables authentication but does not call the database
+| `--setup` | Use this option if the {project-name} metadata has not been initialized. This option enables authentication but does not call the database
to create privilege-related metadata tables. Later, when {project-name} metadata is initialized, privilege-related metadata tables and default permissions
are automatically created.
-| --status | Reports the value of the environment variable `TRAFODION_ENABLE_AUTHENTICATION` in `$MY_SQROOT/sqenvcom.sh` on the current node and
+| `--status` | Reports the value of the environment variable `TRAFODION_ENABLE_AUTHENTICATION` in `$MY_SQROOT/sqenvcom.sh` on the current node and
reports the status of security features in the database.
|===
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
index 6df64fd..ae2a33e 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
@@ -178,17 +178,17 @@ The following shows help for the {project-name} Installer.
```
./trafodion_install --help
-This script will install {project-name}. It will create a configuration
+This script will install Trafodion. It will create a configuration
file (if one has not been created), setup of the environment needed
-for {project-name}, configure HBase with Hbase-trx and co-processors needed,
-and install a specified {project-name} build.
+for Trafodion, configure HBase with Hbase-trx and co-processors needed,
+and install a specified Trafodion build.
Options:
--help Print this message and exit
--accept_license If provided, the user agrees to accept all the
- provisions in the {project-name} license. This allows
+ provisions in the Trafodion license. This allows
for automation by skipping the display and prompt of
- the {project-name} license.
+ the Trafodion license.
--config_file If provided, all install prompts will be
taken from this file and not prompted for.
```
@@ -322,13 +322,13 @@ Next, you edit `my_config` to contain the following:
# @@@ END COPYRIGHT @@@
#====================================================
-# {project-name} Configuration File
+# Trafodion Configuration File
# This file contains default values for the installer.
# Users can also edit this file and provide values for all parameters
# and then specify this file on the run line of trafodion_install.
# Example:
-# ./trafodion_install --config_file <{project-name}-config-file>
+# ./trafodion_install --config_file <Trafodion-config-file>
# WARNING: This mode is for advanced users!
#
#=====================================================
@@ -340,7 +340,7 @@ Next, you edit `my_config` to contain the following:
export SUSE_LINUX="false"
-# The working directory where {project-name} installer untars files, etc.
+# The working directory where Trafodion installer untars files, etc.
# do not change this unless you really know what you are doing
export TRAF_WORKDIR="/usr/lib/trafodion"
@@ -353,10 +353,10 @@ export DCS_SERVERS_PARM="8"
# "true" if this is an upgrade
export UPGRADE_TRAF="false"
-# {project-name} userid, This is the userid the {project-name} instance will run under
+# Trafodion userid, This is the userid the Trafodion instance will run under
export TRAF_USER="trafodion"
-# {project-name} userid's password
+# Trafodion userid's password
export TRAF_USER_PASSWORD="traf123"
# a blank separated list of nodes in your cluster
@@ -384,7 +384,7 @@ export JAVA_HOME="/usr/java/jdk1.7.0_67-cloudera"
# will be installed from the internet
export EPEL_RPM=""
-# full path of the {project-name} package tar file
+# full path of the Trafodion package tar file
export TRAF_PACKAGE="/home/centos/trafodion-download/apache-trafodion-1.3.0-incubating-bin.tar.gz"
# if TRAF_PACKAGE wasn't specified then these two values must be specified
@@ -417,7 +417,7 @@ export HBASE_GROUP="hbase"
# The hadoop HBase service name
export HBASE="hbase"
-# full path of where to install {project-name} to
+# full path of where to install Trafodion to
# Example is used below. If $HOME_DIR or $TRAF_USER have been changed
# then this will need to be changed.
# On an upgrade, it is recommend to choose a different directory.
@@ -426,7 +426,7 @@ export HBASE="hbase"
# By doing this the previous version will remain and allow for an easier rollback.
export SQ_ROOT="/home/trafodion/apache-trafodion-1.3.0-incubating-bin"
-# Start {project-name} after install completes
+# Start Trafodion after install completes
export START="Y"
# initialize trafodion after starting
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
index b9f63c4..86cea37 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
@@ -71,10 +71,10 @@ chmod 600 $HOME/.ssh/config
After running these commands, do the following:
-* Copy the content of the `$HOME/.ssh/id_rsa.pub` file (public key) and append it to the
+* If necessary, create the `$HOME/.ssh` directory on the other nodes in your cluster and secure it private to yourself (`chmod 700`).
+* If necessary, create the `$HOME/.ssh/authorized_keys` file on the other nodes in your cluster. Secure it with `chmod 600 $HOME/.ssh/authorized_keys`.
+* Copy the content of the `$HOME/.ssh/authorized_keys` file on the Provisioning Master Node and append the to the
`$HOME/.ssh/authorized_keys` file on the other nodes in your cluster.
-* Copy the `$HOME/.ssh/id_rsa` file (private key) from the current node to the `$HOME/.ssh` directory on the other nodes in the cluster.
-* Secure `$HOME/.ssh/id_rsa` on all nodes as private to yourself (`chmod 700`).
* `ssh` to the other nodes in the cluster. Answer `y` to the prompt asking you whether to continue the connection.
This adds the node to the `$HOME/.ssh/known_hosts` file completing the passwordless ssh setup.
@@ -249,7 +249,7 @@ http://apache.cs.utah.edu/incubator/celix/celix-1.0.0.incubating/celix-1.0.0.inc
```
$ mkdir $HOME/trafodion-download
$ cd $HOME/trafodion-download
-$ Download the {project-name} Installer binaries
+$ # Download the Trafodion Installer binaries
$ wget http://apache.cs.utah.edu/incubator/trafodion/trafodion-1.3.0.incubating/apache-trafodion-installer-1.3.0-incubating-bin.tar.gz
Resolving http://apache.cs.utah.edu... 192.168.1.56
Connecting to http://apache.cs.utah.edu|192.168.1.56|:80... connected.
@@ -265,7 +265,7 @@ Saving to: "apache-trafodion-installer-1.3.0-incubating-bin.tar.gz"
<<<
```
-$ # Download the {project-name} Server binaries
+$ # Download the Trafodion Server binaries
$ wget http://apache.cs.utah.edu/incubator/trafodion/trafodion-1.3.0.incubating/apache-trafodion-1.3.0-incubating-bin.tar.gz
Resolving http://apache.cs.utah.edu... 192.168.1.56
Connecting to http://apache.cs.utah.edu|192.168.1.56|:80... connected.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
index 949d6fa..3ae8c43 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
@@ -98,6 +98,7 @@ Please verify these requirements on each node you will install {project-name} on
• `/etc/hosts` is set up for fully-qualified node names (FQDN). +
• `/etc/resolv.conf` is configured to use a name server. |
• `hostname --fqdn` shows the fully-qualified node name, if any. +
+• The fully-qualified node name is part of the `/etc/hosts` file. +
• `host -T <FQDN>` (responds if using a DNS server, times out otherwise) +
• Simply ssh among nodes using `ssh <FQDN>`.
| Port Availability | The Linux Kernel Firewall (`iptables`) has either been disabled or <<ip-ports,ports required by {project-name}>> have been opened. |
@@ -324,7 +325,7 @@ NOTE: These changes are performed by the {project-name} Installer, if used.
`/etc/security/limits.d/trafodion.conf` on each node in the cluster must contain the following settings:
```
-# {project-name} settings
+# Trafodion settings
trafodion soft core unlimited
trafodion hard core unlimited
trafodion soft memlock unlimited
@@ -333,9 +334,6 @@ trafodion soft nofile 32768
trafodion hard nofile 65536
trafodion soft nproc 100000
trafodion hard nproc 100000
-hbase soft nofile 8192
-trafodion soft nofile 8192
-trafodion hard nofile 65535
```
<<<
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
index 44afd49..79c8460 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
@@ -87,7 +87,7 @@ $ ./trafodion_install --config_file my
***INFO: Working directory: /usr/lib/trafodion
************************************
- {project-name} Configuration File Check
+ Trafodion Configuration File Check
************************************
@@ -103,14 +103,14 @@ $ ./trafodion_install --config_file my
***INFO: Testing sudo access on trafodion-1
***INFO: Testing sudo access on trafodion-2
***DEBUG: trafodionFullName=trafodion_server-1.3.0.tgz
-***INFO: {project-name} version = 1.3.0
+***INFO: Trafodion version = 1.3.0
***DEBUG: HBase's java_exec=/usr/jdk64/jdk1.7.0_67/bin/java
******************************
TRAFODION SETUP
******************************
-***INFO: Starting {project-name} environment setup (2016-02-16-21-12-31)
+***INFO: Starting Trafodion environment setup (2016-02-16-21-12-31)
=== 2016-02-16-21-12-31 ===
# @@@ START COPYRIGHT @@@
#
@@ -142,7 +142,7 @@ BY TYPING "ACCEPT" YOU AGREE TO THE TERMS OF THIS AGREEMENT: ***INFO: testing su
trafodion-1
trafodion-2
***INFO: Total number of nodes = 2
-***INFO: Starting {project-name} Package Setup (2016-02-16-21-12-35)
+***INFO: Starting Trafodion Package Setup (2016-02-16-21-12-35)
***INFO: Installing required packages
***INFO: Log file located in /var/log/trafodion
***INFO: ... EPEL rpm
@@ -155,7 +155,7 @@ trafodion-2
.
.
***INFO: trafodion user added successfully
-***INFO: {project-name} environment setup completed
+***INFO: Trafodion environment setup completed
***INFO: creating sqconfig file
***INFO: Reserving DCS ports
@@ -194,7 +194,7 @@ You can monitor the SQ shell log file : /home/trafodion/apache-trafodion-1.3.0-i
Startup time 0 hour(s) 1 minute(s) 9 second(s)
-Apache {project-name} Conversational Interface 1.3.0
+Apache Trafodion Conversational Interface 1.3.0
Copyright (c) 2015 Apache Software Foundation
>> initialize trafodion;
--- SQL operation complete.
@@ -266,14 +266,14 @@ $ ./trafodion_install
***INFO: Working directory: /usr/lib/trafodion
*******************************
- {project-name} Configuration Setup
+ Trafodion Configuration Setup
*******************************
***INFO: Please press [Enter] to select defaults.
Enter trafodion password, default is [traf123]: traf123
Enter list of nodes (blank separated), default []: trafodion-1 trafodion-2
-Enter {project-name} userid's home directory prefix, default is [/home]: /home
+Enter Trafodion userid's home directory prefix, default is [/home]: /home
Specify full path to EPEL RPM (including .rpm), default is None:
***INFO: Will attempt to download RPM if EPEL is not installed on all nodes.
Specify location of Java 1.7.0_65 or higher (JDK), default is []: /usr/java/jdk1.7.0_67-cloudera
@@ -288,10 +288,10 @@ Enter directory to install trafodion to, default is [/home/trafodion/apache-traf
Total number of client connections per node, default [16]: 8
Enable simple LDAP security (Y/N), default is N: N
***INFO: Configuration file: /etc/trafodion/trafodion_config
-***INFO: {project-name} configuration setup complete
+***INFO: Trafodion configuration setup complete
************************************
- {project-name} Configuration File Check
+ Trafodion Configuration File Check
************************************
@@ -310,14 +310,14 @@ Are you sure you want to continue connecting (yes/no)? yes
***INFO: Testing sudo access on trafodion-1
***INFO: Testing sudo access on trafodion-2
***DEBUG: trafodionFullName=trafodion_server-1.3.0.tgz
-***INFO: {project-name} version = 1.3.0
+***INFO: Trafodion version = 1.3.0
***DEBUG: HBase's java_exec=/usr/java/jdk1.7.0_67-cloudera/bin/java
******************************
TRAFODION SETUP
******************************
-***INFO: Starting {project-name} environment setup (2016-02-15-07-09-58)
+***INFO: Starting Trafodion environment setup (2016-02-15-07-09-58)
=== 2016-02-15-07-09-58 ===
# @@@ START COPYRIGHT @@@
#
@@ -344,7 +344,7 @@ BY TYPING "ACCEPT" YOU AGREE TO THE TERMS OF THIS AGREEMENT:ACCEPT
trafodion-1
trafodion-2
***INFO: Total number of nodes = 2
-***INFO: Starting {project-name} Package Setup (2016-02-15-07-11-09)
+***INFO: Starting Trafodion Package Setup (2016-02-15-07-11-09)
***INFO: Installing required packages
***INFO: Log file located in /var/log/trafodion
***INFO: ... pdsh on node trafodion-1
@@ -357,8 +357,8 @@ trafodion-2
.
.
***INFO: modifying limits in /usr/lib/trafodion/trafodion.conf on all nodes
-***INFO: create {project-name} userid "trafodion"
-***INFO: {project-name} userid's (trafodion) home directory: /home/trafodion
+***INFO: create Trafodion userid "trafodion"
+***INFO: Trafodion userid's (trafodion) home directory: /home/trafodion
***INFO: testing sudo access
Generating public/private rsa key pair.
Created directory '/home/trafodion/.ssh'.
@@ -384,7 +384,7 @@ The key's randomart image is:
trafodion-1
trafodion-2
***INFO: trafodion user added successfully
-***INFO: {project-name} environment setup completed
+***INFO: Trafodion environment setup completed
***INFO: creating sqconfig file
***INFO: Reserving DCS ports
@@ -407,7 +407,7 @@ trafodion-2
***INFO: waiting for HDFS to exit safemode
Safe mode is OFF
***INFO: Setting HDFS ACLs for snapshot scan support
-***INFO: {project-name} Mods ran successfully.
+***INFO: Trafodion Mods ran successfully.
******************************
TRAFODION START
@@ -442,7 +442,7 @@ Creating folders for storing certificates
***INFO: copying /home/trafodion/sqcert directory to all nodes
***INFO: copying install to all nodes
-***INFO: starting {project-name} instance
+***INFO: starting Trafodion instance
Checking orphan processes.
Removing old mpijob* files from /home/trafodion/apache-trafodion-1.3.0-incubating-bin/tmp
@@ -468,7 +468,7 @@ You can monitor the SQ shell log file : /home/trafodion/apache-trafodion-1.3.0-i
Startup time 0 hour(s) 1 minute(s) 9 second(s)
-Apache {project-name} Conversational Interface 1.3.0
+Apache Trafodion Conversational Interface 1.3.0
Copyright (c) 2015 Apache Software Foundation
>> initialize trafodion;
--- SQL operation complete.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
index 0491f3a..70d8faa 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
@@ -93,10 +93,10 @@ The `trafodion_uninstaller` completely removes {project-name}.
```
[admin@trafodion-1 ~]$ cd $HOME/trafodion-installer/installer
[admin@trafodion-1 installer]$ ./trafodion_uninstaller
-Do you want to uninstall {project-name} (Everything will be removed)? (Y/N) y
+Do you want to uninstall Trafodion (Everything will be removed)? (Y/N) y
***INFO: testing sudo access
***INFO: NOTE, rpms that were installed will not be removed.
-***INFO: stopping {project-name} instance
+***INFO: stopping Trafodion instance
SQ environment is not up.
Going to execute ckillall
@@ -109,10 +109,10 @@ pdsh@trafodion-1: trafodion-1: ssh exited with exit code 1
pdsh@trafodion-1: trafodion-2: ssh exited with exit code 1
pdsh@trafodion-1: trafodion-1: ssh exited with exit code 1
pdsh@trafodion-1: trafodion-2: ssh exited with exit code 1
-***INFO remove the {project-name} userid and group
+***INFO remove the Trafodion userid and group
***INFO: removing all files from /home/trafodion/apache-trafodion-1.3.0-incubating-bin
***INFO: removing all files from /usr/lib/trafodion and /var/log/trafodion
***INFO: removing all files from /etc/trafodion
-***INFO: {project-name} uninstall complete.
+***INFO: Trafodion uninstall complete.
[admin@trafodion-1 installer]$
```
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
index a79fa51..b407713 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
@@ -85,7 +85,7 @@ stopped $zlobsrv1
Shutting down (normal) the SQ environment!
Wed Feb 17 05:12:40 UTC 2016
Processing cluster.conf on local host trafodion-1
-[$Z000KAE] Shell/shell Version 1.0.1 Apache_{project-name} Release 1.3.0 (Build release [1.3.0-0-g5af956f_Bld2], date 20160112_1927)
+[$Z000KAE] Shell/shell Version 1.0.1 Apache_Trafodion Release 1.3.0 (Build release [1.3.0-0-g5af956f_Bld2], date 20160112_1927)
ps
```
@@ -191,9 +191,9 @@ $ ./trafodion_install --config_file $HOME/trafodion-configuration/my_config_2.0
***INFO: Testing ssh on trafodion-2
***INFO: Testing sudo access on trafodion-1
***INFO: Testing sudo access on trafodion-2
-***INFO: {project-name} scanner will not be run.
+***INFO: Trafodion scanner will not be run.
***DEBUG: trafodionFullName=trafodion_server-2.0.0.tgz
-***INFO: {project-name} version = 2.0.0
+***INFO: Trafodion version = 2.0.0
***DEBUG: HBase's java_exec=/usr/jdk64/jdk1.7.0_67/bin/java
******************************
@@ -201,7 +201,7 @@ $ ./trafodion_install --config_file $HOME/trafodion-configuration/my_config_2.0
******************************
***INFO: Installing required RPM packages
-***INFO: Starting {project-name} Package Setup (2016-02-17-05-33-29)
+***INFO: Starting Trafodion Package Setup (2016-02-17-05-33-29)
***INFO: Installing required packages
***INFO: Log file located in /var/log/trafodion
***INFO: ... pdsh on node trafodion-1
@@ -223,7 +223,7 @@ You can monitor the SQ shell log file : /home/trafodion/apache-trafodion-2.0.0-i
Startup time 0 hour(s) 1 minute(s) 9 second(s)
-Apache {project-name} Conversational Interface 1.3.0
+Apache Trafodion Conversational Interface 1.3.0
Copyright (c) 2015 Apache Software Foundation
>>Metadata Upgrade: started
@@ -307,7 +307,7 @@ $ ./trafodion_install
***INFO: Working directory: /usr/lib/trafodion
*******************************
- {project-name} Configuration Setup
+ Trafodion Configuration Setup
*******************************
***INFO: Please press [Enter] to select defaults.
@@ -323,14 +323,14 @@ Enter HDFS username, default is [hdfs]:
Enter HBase username, default is [hbase]:
Enter HBase group, default is [hbase]:
Enter directory to install trafodion to, default is [/home/trafodion/apache-trafodion-1.3.0-incubating-bin]: /home/centos/apache-trafodion-2.0.0-incubating-bin
-Start {project-name} after install (Y/N), default is Y:
+Start Trafodion after install (Y/N), default is Y:
Total number of client connections per node, default [16]: 8
Enable simple LDAP security (Y/N), default is N:
***INFO: Configuration file: /etc/trafodion/trafodion_config
-***INFO: {project-name} configuration setup complete
+***INFO: Trafodion configuration setup complete
************************************
- {project-name} Configuration File Check
+ Trafodion Configuration File Check
************************************
@@ -348,9 +348,9 @@ Enable simple LDAP security (Y/N), default is N:
***INFO: Checking cloudera Version
***INFO: nameOfVersion=cdh5.3.0
***INFO: HADOOP_PATH=/usr/lib/hbase/lib
-***INFO: {project-name} scanner will not be run.
+***INFO: Trafodion scanner will not be run.
***DEBUG: trafodionFullName=trafodion_server-1.3.0.tgz
-***INFO: {project-name} version = 1.3.0
+***INFO: Trafodion version = 1.3.0
***DEBUG: HBase's java_exec=/usr/java/jdk1.7.0_67-cloudera/bin/java
******************************
@@ -358,7 +358,7 @@ Enable simple LDAP security (Y/N), default is N:
******************************
***INFO: Installing required RPM packages
-***INFO: Starting {project-name} Package Setup (2016-02-17-08-16-11)
+***INFO: Starting Trafodion Package Setup (2016-02-17-08-16-11)
***INFO: Installing required packages
***INFO: Log file located in /var/log/trafodion
***INFO: ... pdsh on node trafodion-1
@@ -400,7 +400,7 @@ You can monitor the SQ shell log file : /home/trafodion/apache-trafodion-2.0.0-i
Startup time 0 hour(s) 1 minute(s) 9 second(s)
-Apache {project-name} Conversational Interface 1.3.0
+Apache Trafodion Conversational Interface 1.3.0
Copyright (c) 2015 Apache Software Foundation
>>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
----------------------------------------------------------------------
diff --git a/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc b/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
index c498c82..86028fa 100644
--- a/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
+++ b/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
@@ -4532,8 +4532,8 @@ displays a list of all objects, including user, system, and external objects.
* This GET HBASE OBJECTS statement displays the {project-name} user objects in HBase:
+
```
-{project-name} Conversational Interface 1.1.0
-(c) Copyright 2014 Hewlett-Packard Development Company, LP.
+Trafodion Conversational Interface 1.1.0
+(c) Copyright 2015 Apache Software Foundation
>>get user hbase objects;
@@ -5351,7 +5351,7 @@ To issue an INVOKE statement, one of the following must be true:
+
```
SQL> invoke trafodion.seabase.t;
--- Definition of {project-name} table TRAFODION.SEABASE.T
+-- Definition of Trafodion table TRAFODION.SEABASE.T
-- Definition current Wed Mar 5 10:36:06 2014
(
A INT NO DEFAULT NOT NULL NOT DROPPABLE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/src/site/markdown/documentation.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/documentation.md b/docs/src/site/markdown/documentation.md
index 75d7646..388dcb4 100644
--- a/docs/src/site/markdown/documentation.md
+++ b/docs/src/site/markdown/documentation.md
@@ -24,6 +24,7 @@ Trafodion Code Examples | [wiki](https://cwiki.apa
Trafodion Command Interface Guide | [Web Book](docs/command_interface/index.html), [PDF](docs/command_interface/Trafodion_Command_Interface_Guide.pdf)
Trafodion Control Query Default (CQD) Reference Guide | [Web Book](docs/cqd_reference/index.html), [PDF](docs/cqd_interface/Trafodion_CQD_Reference_Guide.pdf)
Trafodion Database Connectivity Services Guide | [Web Book](docs/dcs_reference/index.html), [API](docs/dcs_reference/apidocs/index.html)
+Trafodion JDBC Type 4 Programmer's Reference Guide | [Web Book](docs/jdbct4ref_guide/index.html), [PDF](docs/jdbct4ref_guide/Trafodion_JDBCT4_Reference_Guide.pdf)
Trafodion Load and Transform Guide | [Web Book](docs/load_transform/index.html), [PDF](docs/load_transform/Trafodion_Load_Transform_Guide.pdf)
Trafodion Messages Guide | [Web Book](docs/messages_guide/index.html), [PDF](docs/messages_guide/Trafodion_Messages_Guide.pdf)
Trafodion Manageability | [wiki](https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability)
@@ -42,6 +43,7 @@ Trafodion Client Installation Guide | [Web Book](docs/2.0.0/cl
Trafodion Command Interface Guide | [Web Book](docs/2.0.0/command_interface/index.html), [PDF](docs/2.0.0/command_interface/Trafodion_Command_Interface_Guide.pdf)
Trafodion Control Query Default (CQD) Reference Guide | [Web Book](docs/2.0.0/cqd_reference/index.html), [PDF](docs/2.0.0/cqd_interface/Trafodion_CQD_Reference_Guide.pdf)
Trafodion Database Connectivity Services Guide | [Web Book](docs/2.0.0/dcs_reference/index.html), [API](docs/2.0.0/dcs_reference/apidocs/index.html)
+Trafodion JDBC Type 4 Programmer's Reference Guide | [Web Book](docs/2.0.0/jdbct4ref_guide/index.html), [PDF](docs/2.0.0./jdbct4ref_guide/Trafodion_JDBCT4_Reference_Guide.pdf)
Trafodion Load and Transform Guide | [Web Book](docs/2.0.0/load_transform/index.html), [PDF](docs/2.0.0/load_transform/Trafodion_Load_Transform_Guide.pdf)
Trafodion Messages Guide | [Web Book](docs/2.0.0/messages_guide/index.html), [PDF](docs/2.0.0/messages_guide/Trafodion_Messages_Guide.pdf)
Trafodion odb User Guide | [Web Book](docs/2.0.0/odb/index.html), [PDF](docs/2.0.0/odb/Trafodion_odb_User_Guide.pdf)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/src/site/markdown/download.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/download.md b/docs/src/site/markdown/download.md
index 356e568..9af6cfa 100644
--- a/docs/src/site/markdown/download.md
+++ b/docs/src/site/markdown/download.md
@@ -12,11 +12,13 @@
limitations under the
License.
-->
-This page describes how you download and install a Trafodion evaluation environment. Other information:
+This page describes how you download and install a Trafodion evaluation environment.
+
+Other information:
* [Trafodion Provision Guide](http://trafodion.incubator.apache.org/docs/provisioning_guide/index.html): Complete provisioning documentation.
* [Trafodion Contributor Guide](https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Contributor+Guide):
-How to set up a Trafodion development environment.
+How to set up a Trafodion build and development environment. (Use if you intend to help develop the Trafodion source code.)
# Download
The Trafodion end-user environment is installed using the Trafodion Installer, which operates on Trafodion binaries only.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/docs/src/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/css/site.css b/docs/src/site/resources/css/site.css
index e28a4a4..c57a29b 100644
--- a/docs/src/site/resources/css/site.css
+++ b/docs/src/site/resources/css/site.css
@@ -36,7 +36,7 @@
.logo-right {
position: absolute;
- right: 200px;
+ right: 150px;
}
.color-highlight {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db1c2e9c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 426d2e7..9298358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
<module>docs/odb_user</module>
<module>docs/spj_guide</module>
<module>docs/sql_reference</module>
+ <module>docs/jdbct4ref_guide</module>
</modules>
<build>
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1949] PR 492
New JDBCT4 Programmer's Guide
Posted by db...@apache.org.
Merge [TRAFODION-1949] PR 492 New JDBCT4 Programmer's Guide
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d66659cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d66659cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d66659cd
Branch: refs/heads/master
Commit: d66659cd7b60748b30f7e88367dfde4c19f01b13
Parents: 927ab50 db1c2e9
Author: Dave Birdsall <db...@apache.org>
Authored: Tue May 24 18:51:53 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue May 24 18:51:53 2016 +0000
----------------------------------------------------------------------
.../src/asciidoc/_chapters/jdbct4.adoc | 9 +++--
.../src/asciidoc/_chapters/odbc_windows.adoc | 6 ++--
.../src/asciidoc/_chapters/commands.adoc | 4 +--
.../src/asciidoc/_chapters/activate.adoc | 2 +-
.../src/asciidoc/_chapters/enable_security.adoc | 12 +++----
.../src/asciidoc/_chapters/introduction.adoc | 26 +++++++-------
.../src/asciidoc/_chapters/prepare.adoc | 10 +++---
.../src/asciidoc/_chapters/requirements.adoc | 6 ++--
.../src/asciidoc/_chapters/script_install.adoc | 38 ++++++++++----------
.../src/asciidoc/_chapters/script_remove.adoc | 8 ++---
.../src/asciidoc/_chapters/script_upgrade.adoc | 26 +++++++-------
.../src/asciidoc/_chapters/sql_statements.adoc | 6 ++--
docs/src/site/markdown/documentation.md | 2 ++
docs/src/site/markdown/download.md | 6 ++--
docs/src/site/resources/css/site.css | 2 +-
pom.xml | 1 +
16 files changed, 83 insertions(+), 81 deletions(-)
----------------------------------------------------------------------