trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [1/2] incubator-trafodion git commit: Added the Trafodion logo to the website and all documents. Please rebuild both 1.3 and 2.0 versions.
Date Wed, 24 Feb 2016 18:41:05 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 5033416c4 -> f712ccbb7


Added the Trafodion logo to the website and all documents. Please rebuild
both 1.3 and 2.0 versions.

Also updated download page, incorporated Carol's changes to the
quick-start page, and rearranged the website to highlight download,
quickstart, and documentation pages.


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

Branch: refs/heads/master
Commit: 445e927d0a8c8b2e13197bfa277bd7f1a86b386e
Parents: 83304c2
Author: Gunnar Tapper <gtapper@esgyn.local>
Authored: Tue Feb 23 10:30:00 2016 -0700
Committer: Gunnar Tapper <gtapper@esgyn.local>
Committed: Tue Feb 23 10:30:00 2016 -0700

----------------------------------------------------------------------
 docs/client_install/src/asciidoc/index.adoc     |   3 +-
 docs/command_interface/pom.xml                  |   2 +
 docs/command_interface/src/asciidoc/index.adoc  |   5 +-
 docs/messages_guide/pom.xml                     |   2 +
 docs/messages_guide/src/asciidoc/index.adoc     |   5 +-
 docs/odb_user/pom.xml                           |   2 +
 docs/odb_user/src/asciidoc/index.adoc           |   5 +-
 .../src/asciidoc/_chapters/prepare.adoc         |  31 +---
 docs/provisioning_guide/src/asciidoc/index.adoc |   3 +-
 docs/shared/trafodion-logo.jpg                  | Bin 0 -> 28850 bytes
 docs/sql_reference/pom.xml                      |   2 +
 docs/sql_reference/src/asciidoc/index.adoc      |   5 +-
 docs/src/site/markdown/download.md              | 148 +++++++++++++++++--
 docs/src/site/markdown/quickstart.md            |  95 +++++++++++-
 .../resources/images/logos/trafodion-logo.jpg   | Bin 0 -> 18953 bytes
 docs/src/site/site.xml                          |  99 +++++++------
 16 files changed, 317 insertions(+), 90 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/client_install/src/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/index.adoc b/docs/client_install/src/asciidoc/index.adoc
index f4001b2..f59af1d 100644
--- a/docs/client_install/src/asciidoc/index.adoc
+++ b/docs/client_install/src/asciidoc/index.adoc
@@ -21,7 +21,7 @@
 * @@@ END COPYRIGHT @@@ 
 ////
 
-= Trafodion Client Installation Guide
+= Client Installation Guide
 :doctype: book
 :numbered:
 :toc: left
@@ -32,6 +32,7 @@
 :experimental:
 :source-language: text
 :revnumber: {project-version}
+:title-logo-image: ../../../shared/trafodion-logo.jpg
 
 :images: ../images
 :sourcedir: ../../resources/source

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/command_interface/pom.xml
----------------------------------------------------------------------
diff --git a/docs/command_interface/pom.xml b/docs/command_interface/pom.xml
index 37732c1..5d24b1d 100644
--- a/docs/command_interface/pom.xml
+++ b/docs/command_interface/pom.xml
@@ -201,6 +201,8 @@
               <sourceHighlighter>coderay</sourceHighlighter>
               <outputDirectory>${basedir}/target</outputDirectory>
               <attributes>
+                <project-version>${env.TRAFODION_VER}</project-version>
+                <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
                 <icons>font</icons>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/command_interface/src/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/docs/command_interface/src/asciidoc/index.adoc b/docs/command_interface/src/asciidoc/index.adoc
index ac125ba..c39e642 100644
--- a/docs/command_interface/src/asciidoc/index.adoc
+++ b/docs/command_interface/src/asciidoc/index.adoc
@@ -21,8 +21,7 @@
 * @@@ END COPYRIGHT @@@ 
 ////
 
-= Trafodion Command Interface Guide
-Version 1.3.0, January 2016
+= Command Interface Guide
 :doctype: book
 :numbered:
 :toc: left
@@ -32,6 +31,8 @@ Version 1.3.0, January 2016
 :iconsdir: icons
 :experimental:
 :source-language: text
+:revnumber: {project-version}
+:title-logo-image: ../../../shared/trafodion-logo.jpg
 
 :images: ../images
 :leveloffset: 1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/messages_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/messages_guide/pom.xml b/docs/messages_guide/pom.xml
index f0fd81f..e3d3e27 100644
--- a/docs/messages_guide/pom.xml
+++ b/docs/messages_guide/pom.xml
@@ -200,6 +200,8 @@
               <sourceHighlighter>coderay</sourceHighlighter>
               <outputDirectory>${basedir}/target</outputDirectory>
               <attributes>
+                <project-version>${env.TRAFODION_VER}</project-version>
+                <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
                 <icons>font</icons>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/messages_guide/src/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/index.adoc b/docs/messages_guide/src/asciidoc/index.adoc
index 3322c0d..7bd23e8 100644
--- a/docs/messages_guide/src/asciidoc/index.adoc
+++ b/docs/messages_guide/src/asciidoc/index.adoc
@@ -21,8 +21,7 @@
 * @@@ END COPYRIGHT @@@ 
 ////
 
-= Trafodion Messages Guide
-Version 1.3.0, January 2016
+= Messages Guide
 :doctype: book
 :numbered:
 :toc: left
@@ -32,6 +31,8 @@ Version 1.3.0, January 2016
 :iconsdir: icons
 :experimental:
 :source-language: text
+:revnumber: {project-version}
+:title-logo-image: ../../../shared/trafodion-logo.jpg
 
 :images: ../images
 :sourcedir: ../../resources/source

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/odb_user/pom.xml
----------------------------------------------------------------------
diff --git a/docs/odb_user/pom.xml b/docs/odb_user/pom.xml
index 7dded2d..c154229 100644
--- a/docs/odb_user/pom.xml
+++ b/docs/odb_user/pom.xml
@@ -200,6 +200,8 @@
               <sourceHighlighter>coderay</sourceHighlighter>
               <outputDirectory>${basedir}/target</outputDirectory>
               <attributes>
+                <project-version>${env.TRAFODION_VER}</project-version>
+                <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
                 <icons>font</icons>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/odb_user/src/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/docs/odb_user/src/asciidoc/index.adoc b/docs/odb_user/src/asciidoc/index.adoc
index 4f6eb8b..84ae2f9 100644
--- a/docs/odb_user/src/asciidoc/index.adoc
+++ b/docs/odb_user/src/asciidoc/index.adoc
@@ -21,8 +21,7 @@
 * @@@ END COPYRIGHT @@@ 
 ////
 
-= Trafodion odb User Guide
-Version 1.3.0, January 2016
+= odb User Guide
 :doctype: book
 :numbered:
 :leveloffset: 1
@@ -33,6 +32,8 @@ Version 1.3.0, January 2016
 :iconsdir: icons
 :experimental:
 :source-language: text
+:revnumber: {project-version}
+:title-logo-image: ../../../shared/trafodion-logo.jpg
 
 // Define variables used in the document.
 :images: ../images

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/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 fced39c..2df5383 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/prepare.adoc
@@ -191,40 +191,17 @@ If none of these situations exist, then we highly recommend that you
use the Tra
 You perform this step as a user with `root` or `sudo` access.
 
 Install the packages listed in <<requirements-software-packages,Software Packages>>
above on all nodes in the cluster. Note the special
-handling for `log4c&#43;&#43;`. See <<prepare-build-and-install-log4cplusplus,
Build and Install log4c++>> below for more information.
+handling for `log4c&#43;&#43;`. See <<prepare-install-log4cplusplus, Install
log4c++>> below for more information.
 
 <<<
-[[prepare-build-and-install-log4cplusplus]]
-=== Build and Install log4c++
+[[prepare-install-log4cplusplus]]
+=== Install log4c++
 
 You perform this step as a user with `root` or `sudo` access.
 
 This step is required regardless of the <<introduction-provisioning-options,Provisioning
Options>> used.
 
-1. Perform the following steps on the Provisioning Master Node.
-+
-```
-# Download required packages
-sudo yum -y install rpm-build apr-devel apr-util-devel doxygen gcc gcc-c++
-
-# Download the log4c++ source rpm
-wget ftp://ftp.rpmfind.net/linux/fedora-secondary/development/rawhide/source/SRPMS/l/log4cxx-0.10.0-13.fc18.src.rpm
-
-# Install the log4c++ source rpm
-sudo rpm -ivv log4cxx-0.10.0-13.fc18.src.rpm
-
-# Build the log4c++ rpm
-sudo rpmbuild -ba /root/rpmbuild/SPECS/log4cxx.spec
-
-# Install the log4c++ rpm
-sudo rpm -U /root/rpmbuild/RPMS/x86_64/log4cxx-0.10.0-13.el6.x86_64.rpm
-
-# Copy the log4c++ rpm to the local directory
-sudo cp /root/rpmbuild/RPMS/x86_64/log4cxx-0.10.0-13.el6.x86_64.rpm .
-
-# Change owner of the local log4c++ rpm
-sudo chown <your-id> log4cxx-0.10.0-13.el6.x86_64.rpm
-```
+1. Download the log4c&#43;&#43; RPM from the Trafodion http://trafodion.incubator.apache.org/download.html[Download]
page.
 
 2. Copy and Install the log4c&#43;&#43; RPM on All Nodes
 +

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/provisioning_guide/src/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/index.adoc b/docs/provisioning_guide/src/asciidoc/index.adoc
index 6ad37ca..0cf21ce 100644
--- a/docs/provisioning_guide/src/asciidoc/index.adoc
+++ b/docs/provisioning_guide/src/asciidoc/index.adoc
@@ -21,7 +21,7 @@
 * @@@ END COPYRIGHT @@@ 
 ////
 
-= Trafodion Provisioning Guide
+= Provisioning Guide
 :doctype: book
 :numbered:
 :toc: left
@@ -32,6 +32,7 @@
 :experimental:
 :source-language: text
 :revnumber: {project-version}
+:title-logo-image: ../../../shared/trafodion-logo.jpg
 
 :images: ../images
 :leveloffset: 1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/shared/trafodion-logo.jpg
----------------------------------------------------------------------
diff --git a/docs/shared/trafodion-logo.jpg b/docs/shared/trafodion-logo.jpg
new file mode 100644
index 0000000..3446ccf
Binary files /dev/null and b/docs/shared/trafodion-logo.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/sql_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/sql_reference/pom.xml b/docs/sql_reference/pom.xml
index 628004a..6e91e6b 100644
--- a/docs/sql_reference/pom.xml
+++ b/docs/sql_reference/pom.xml
@@ -204,6 +204,8 @@
               <sourceHighlighter>coderay</sourceHighlighter>
               <outputDirectory>${basedir}/target</outputDirectory>
               <attributes>
+                <project-version>${env.TRAFODION_VER}</project-version>
+                <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
                 <icons>font</icons>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/sql_reference/src/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/docs/sql_reference/src/asciidoc/index.adoc b/docs/sql_reference/src/asciidoc/index.adoc
index 81afc63..f874749 100644
--- a/docs/sql_reference/src/asciidoc/index.adoc
+++ b/docs/sql_reference/src/asciidoc/index.adoc
@@ -21,8 +21,7 @@
 * @@@ END COPYRIGHT @@@ 
 ////
 
-= Trafodion SQL Reference Manual
-Version 1.3.0, January 2016
+= SQL Reference Manual
 :doctype: book
 :numbered:
 :toc: left
@@ -32,6 +31,8 @@ Version 1.3.0, January 2016
 :iconsdir: icons
 :experimental:
 :source-language: text
+:revnumber: {project-version}
+:title-logo-image: ../../../shared/trafodion-logo.jpg
 
 :images: ../images
 :leveloffset: 1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/src/site/markdown/download.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/download.md b/docs/src/site/markdown/download.md
index 7fa7e58..55eebe3 100644
--- a/docs/src/site/markdown/download.md
+++ b/docs/src/site/markdown/download.md
@@ -12,28 +12,156 @@
   limitations under the 
   License.
 -->
-This page describes how you download and install the Trafodion product environment.  Please
refer to [Trafodion Contributor Guide](https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Contributor+Guide)
if you want to set up a Trafodion development environment (which includes the installation
of a stand-alone Hadoop environment) based on the Trafodion source code.
+This page describes how you download and install a Trafodion evaluation environment. Other
information:
 
-# Prerequisite
-Trafodion is installed as an add-on to an existing Hadoop environment. Currently, one of
the following environments are required:
-
-* Cloudera CDH 5.2
-* Cloudera CDH 5.3
-* Hortonworks HDP 2.2.
-
-We're actively working on removing this restriction.
+* [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.
 
 # Download
 The Trafodion end-user environment is installed using the Trafodion Installer, which operates
on Trafodion binaries only.
 
 ## 1.3.0 Binaries
 
+* [log4c++ RPM](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/log4cxx-0.10.0-13.el6.x86_64.rpm)
 * [Trafodion Installer](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-installer-1.3.0-incubating-bin.tar.gz)
 * [Trafodion Server](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-1.3.0-incubating-bin.tar.gz)
 * [Trafodion Clients](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-clients-1.3.0-incubating-bin.tar.gz)
 
 # Install
-Please refer to the [Trafodion Provisioning Guide](docs/provisioning_guide/index.html) for
instructions.
 
+The following steps installs a Trafodion evaluation on a 64-bit RHEL/CentOS Hadoop environment
running on of the following
+Hadoop distributions:
+
+## Prerequisites
+Trafodion is installed as an add-on to an existing Hadoop environment. Currently, one of
the following Hadoop distributions is **required**:
+
+* Cloudera CDH 5.2
+* Cloudera CDH 5.3
+* Hortonworks HDP 2.2
+
+The following Hadoop services **must be** in a STARTED state and fully functional.
+
+* HDFS
+* YARN with MRv2
+* ZooKeeper
+* HBase
+* Hive (optional)
+
+## Create Provisioning User
+
+Create a Linux user on the Hadoop system that you're installing Trafodion on with the following
characteristics:
+
+* Privileges to run **`sudo`** with **`root`** access levels.
+* Passwordless ssh access from the Provisioning Node to all other nodes in the cluster.
+* Not named **`trafodion`**.
+
+Perform the remaining steps in this procedure using the Provisioning User.
+
+## Download Binaries
+
+Download all binaries listed above except the **Trafodion Clients** into a diretory of your
choosing
+
+**Example**
+
+```
+mkdir $HOME/trafodion
+mkdir $HOME/trafodion/downloads
+cd $HOME/trafodion/downloads
+wget <log4c++ RPM>
+wget <Trafodion Installer>
+wget <Trafodion Server>
+```
+
+## Install log4c++
+
+Use **`yum install`** to install the `log4c++` RPM on all nodes on all nodes in your Hadoop
cluster.
+
+## Unpack Trafodion Installer
+
+Use **`tar -zxf`** to unpack the Trafodion Installer.
+
+**Example**
+
+```
+cd $HOME/trafodion/downloads
+tar -zxf apache-trafodion-installer-1.3.0-incubating-bin.tar.gz -C $HOME/trafodion
+```
+
+## Create Configuration File
+
+The Trafodion Installer uses a configuration file that describes your Hadoop environment.
+
+**Copy Configuration Template File**
+
+```
+cd $HOME/trafodion/installer
+cp trafodion_config_default my_config
+```
+
+**Edit Configuration File**
+
+Use the embedded guidance in the configuration file to define each of these settings:
+
+|-------------------|----------------------------------------------|-------------------|--------------------------------|--------------------------------
+**`LOCAL_WORKDIR`** | **`TRAF_USER_PASSWORD`** (change if desired) | **`NODE_LIST`**   |
**`node_count`**               | **`MY_NODES`**
+**`JAVA_HOME`**     | **`TRAF_PACKAGE`**                           | **`HADOOP_TYPE`** |
**`URL`**                      | **`ADMIN`**
+**`PASSWORD`**      | **`CLUSTER_NAME`**                           | **`SQ_ROOT`**     |
**`START`** (set to **`"Y"`**) | **`INIT_TRAFODION`** (set to **`"Y"`**)
+
+## Run `trafodion_install`
+
+You'll use the Trafodion Installer (**`trafodion_install`**) to create the Trafodion Runtime
User (**`trafodion`**), 
+modify your system and Hadoop environment, restart ZooKeeper, HDFS, and HBAse to activate
configuration changes, 
+and install/starts Trafodion.
+
+**Example**
+
+```
+cd $HOME/trafodion/installer
+./trafodion_install --accept_license --config_file my_config
+```
+
+The Trafodion Installer performs all the operations required to install and start Trafodion.
Type **`initialize trafodion;`** 
+when the **`trafci`** prompt (**`>>`**) appears.
+
+**Example**
+
+```
+Apache Trafodion Conversational Interface 1.3.0
+Copyright (c) 2015 Apache Software Foundation
+>> initialize trafodion;
+--- SQL operation complete.
+>>
+
+End of MXCI Session
+
+***INFO: Installation completed successfully.
+```
+
+## Verify Installation
+
+Perform this step as the **`trafodion`** user.
+
+First, check the status of the Trafodion environment.
+
+**Example**
+
+```
+sudo su trafodion
+swstatus
+```
+
+Second, run a simple smoke test using **`sqlci`**. Use the following commands:
 
+```
+sqlci
+>> get schemas;
+>> create table table1 (a int);
+>> invoke table1;
+>> insert into table1 values (1), (2), (3), (4);
+>> select * from table1;
+>> drop table table1;
+>> exit;
+```
 
+The Trafodion installation is complete. Next, follow the steps in [Quick Start](quickstart.html)
to get started with Trafodion.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/src/site/markdown/quickstart.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/quickstart.md b/docs/src/site/markdown/quickstart.md
index 2a8e1f4..22fbc66 100644
--- a/docs/src/site/markdown/quickstart.md
+++ b/docs/src/site/markdown/quickstart.md
@@ -12,4 +12,97 @@
   limitations under the 
   License.
 -->
-This page will describe how to get going with Trafodion.
\ No newline at end of file
+This page describes how to get going with Trafodion. 
+
+**NOTE**: You need to install, configure, and start Trafodion before using the instructions
on this page.  See [Install Instructions](download.html#install) on the [Download](download.html)
page or the [Provisioning Guide](docs/provisioning_guide/index.html). 
+
+# Basic Queries
+
+Once you've started Trafodion, you're ready to do your first query. There are a couple of
easy ways to create and enter Trafodion queries, but the fastest is to run **sqlci** or **trafci**
from the Linux prompt on the server where you started Trafodion.
+
+You can run **sqlci** or **trafci** directly from a Linux prompt.  At the sqlci or trafci
prompt, you can type SQL statements such as:
+
+    create schema test_schema;
+    set schema test_schema;
+    create table test_table (c1 int not null, c2 int not null, primary key (c1));
+    insert into test_table values (1,1);
+    insert into test_table values (2,2);
+    select * from test_table where c2 = 2;
+
+and so on.  Be sure to clean up when you're done.
+
+    drop table test_table;
+    drop schema test_schema cascade;
+
+For a longer simple script that uses a few more Trafodion features, try the following, which
should complete without errors:
+
+    -------------------------------------------
+    --
+    --  Acid test script to make sure SQL has installed
+    --
+    ------------------------------------------
+
+    create schema test_sandbox_schema;
+
+    set schema test_sandbox_schema;
+
+    create table t (c1 int not null, c2 int not null, primary key (c1));
+
+    insert into t values (1,1);
+    insert into t values (2,3);
+    insert into t values (3,2);
+
+    -- Now group two statements with a single transaction
+    begin work;
+    insert into t values (4,5);
+    insert into t values (5,2);
+    commit work;
+
+    insert into t values (7,3);
+
+    select * from t order by c2;
+
+    create index tix on t (c2);
+
+    create view tview as select c1, c2 from t where c2 > 3;
+
+    select * from tview where c2 < 3;
+    select * from tview where c2 > 2;
+
+    update statistics for table t on every column;
+
+    explain select * from t order by c2;
+    select * from t order by c2;
+
+    drop view tview;
+    drop table t;
+    drop schema test_sandbox_schema cascade;
+
+
+This sort of script validates that Trafodion has been installed correctly, but does not generate
significant load on the system.   To generate more load, refer to sample applications such
as the OpenCart demo.  For information on how to set up and run the OpenCart demo with Trafodion,
see [Trafodion Additional Documentation] (https://cwiki.apache.org/confluence/display/TRAFODION/Documentation/
"Additional Trafodion Documentation").
+
+As you gain experience, you can refer to the [Trafodion SQL Reference Manual] (/docs/sql_reference/index.html)
for additional SQL syntax.
+
+# Connect with HBase
+
+Trafodion interfaces and queries can reference both HBase data and Trafodion data in the
same queries, including comparing, joining and analyzing the data.  For information on how
to access native HBase tables, see the Trafodion SQL Reference Manual's [Using Trafodion SQL
to Access HBase tables] (/docs/sql_reference/index.html#using_trafodion_sql_to_access_hbase_tables)
section.
+
+# Connect with Hive
+
+Trafodion interfaces and queries can reference both HIVE data and Trafodion data in the same
queries, including comparing, joining and analyzing the data.  For information on how to access
tables in Hive, see the Trafodion SQL Reference Manual's [Using Trafodion SQL to Access Hive
tables] (/docs/sql_reference/index.html#using_trafodion_sql_to_access_hive_tables) section.
+
+# Import Test Data
+
+Once you have entered a few basic SQL statements with Trafodion, you might consider adding
data in bulk using one of the many load tools available.  See the [Trafodion odb User Guide]
(/docs/odb/index.html) for usage examples for one such tool.
+
+# Connect Database Tools
+
+Trafodion provides connectivity services so that applications, tools, and other external
clients can use Trafodion to access data.  See the [Trafodion Client Installation Guide] (http://trafodion.apache.org/docs/client_install/index.html)
for information on how to connect external tools and clients, and see the [Trafodion Database
Connectivity Guide] (/docs/dcs_reference/index.html) for information on Database Connectivity
services.
+
+# More Information
+
+For more information, refer to the [Trafodion Documentation Page] (documentation.html) for
starting points.  There is also a lot more information on the [Trafodion website] (http://trafodion.incubator.apache.org)
and [Trafodion Wiki] (https://cwiki.apache.org/confluence/display/TRAFODION/Apache+Trafodion+Home)
that you might refer to as you explore Trafodion.
+
+If you have questions or suggestions or just want to share what you've learned about Trafodion,
you can contact a community of Trafodion users via the [Trafodion User Group mailing list](http://mail-archives.apache.org/mod_mbox/incubator-trafodion-user/)
or other [Project Mailing Lists] (http://trafodion.apache.org/mail-lists.html)
+
+Have fun with Trafodion!
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/src/site/resources/images/logos/trafodion-logo.jpg
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/logos/trafodion-logo.jpg b/docs/src/site/resources/images/logos/trafodion-logo.jpg
new file mode 100644
index 0000000..b1a1796
Binary files /dev/null and b/docs/src/site/resources/images/logos/trafodion-logo.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/445e927d/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 5564a72..01fb82a 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -33,9 +33,8 @@
 
   <bannerLeft>
     <!-- Apache Trafodion, but with "Trafodion" highlighted -->
-    <name><![CDATA[
-      Apache <span class="color-highlight">Trafodion</span>
-      ]]>
+    <name>
+       <![CDATA[<img src="images/logos/trafodion-logo.jpg" alt="Trafodion Logo">]]>
     </name>
     <href>index.html</href>
   </bannerLeft>
@@ -54,9 +53,7 @@
       <brand>
         <!-- Brand text in top-left part of the site -->
         <name>
-          <![CDATA[
-          Apache <span class="color-highlight">Trafodion</span>
-          ]]>
+          <![CDATA[Apache <span class="color-highlight">Trafodion</span>]]>
         </name>
         <href>index.html</href>
       </brand>
@@ -65,10 +62,8 @@
       <toc>top</toc>
       <tocTopMax>9</tocTopMax>
       <bottomNav maxSpan="8" >
-        <column>About</column>
-        <column>Using</column>
+        <column>Project</column>
         <column>Features</column>
-        <column>Contributing</column>
       </bottomNav>
       <bottomDescription>
         <![CDATA[
@@ -97,31 +92,58 @@
             <body />
           </sections>
         </index>
-        <architecture-overview><shortTitle>Architecture Overview</shortTitle></architecture-overview>
-        <documentation><shortTitle>Documentation Library</shortTitle></documentation>
-        <download><shortTitle>Download</shortTitle></download>
-        <enable-secure-trafodion><shortTitle>Enabling Security Features in Trafodion</shortTitle></enable-secure-trafodion>
+        <architecture-overview>
+          <shortTitle>Architecture Overview</shortTitle>
+        </architecture-overview>
+        <documentation>
+          <shortTitle>Documentation Library</shortTitle>
+        </documentation>
+        <download>
+          <shortTitle>Download</shortTitle>
+           <!-- Use H1 headings only for the TOC -->
+           <tocTopFlatten>false</tocTopFlatten>
+        </download>
         <faq>
           <toc>top</toc>
           <shortTitle>Frequently Asked Questions</shortTitle>
           <!-- Use H1 headings only for the TOC -->
           <tocTopFlatten>false</tocTopFlatten>
         </faq>
-        <issue-tracking><toc>false</toc></issue-tracking>
-        <ldapcheck><shortTitle>ldapcheck</shortTitle></ldapcheck>
-        <ldapconfigcheck><shortTitle>ldapconfigcheck</shortTitle></ldapconfigcheck>
-        <license><shortTitle>License</shortTitle><toc>false</toc></license>
-        <mail-lists><shortTitle>Mailing Lists</shortTitle><toc>false</toc></mail-lists>
-        <management><shortTitle>Managing Trafodion</shortTitle><toc>false</toc></management>
-        <new-features><shortTitle>New Features</shortTitle></new-features>
-        <performance><shortTitle>Performance</shortTitle></performance>
-        <presentations><shortTitle>Presentations</shortTitle><toc>false</toc></presentations>
+        <issue-tracking>
+          <toc>false</toc>
+        </issue-tracking>
+        <license>
+          <shortTitle>License</shortTitle>
+          <toc>false</toc>
+        </license>
+        <mail-lists>
+          <shortTitle>Mailing Lists</shortTitle>
+          <toc>false</toc>
+        </mail-lists>
+        <management>
+          <shortTitle>Managing Trafodion</shortTitle>
+          <toc>false</toc>
+        </management>
+        <new-features>
+          <shortTitle>New Features</shortTitle>
+        </new-features>
+        <performance>
+          <shortTitle>Performance</shortTitle>
+        </performance>
+        <presentations>
+          <shortTitle>Presentations</shortTitle>
+          <toc>false</toc>
+        </presentations>
         <port-assignment>
           <toc>false</toc>
           <shortTitle>Port Assignment</shortTitle>
         </port-assignment>
-        <!--quickstart><shortTitle>Quick Start</shortTitle></quickstart-->
-        <release-notes><toc>false</toc></release-notes>
+        <quickstart>
+ 	      <shortTitle>Quick Start</shortTitle>
+	    </quickstart>
+        <release-notes>
+          <toc>false</toc>
+        </release-notes>
         <release-notes-1-3-0>
            <shortTitle>Release 1.3.0</shortTitle>
            <!-- Use H1 headings only for the TOC -->
@@ -152,8 +174,9 @@
            <!-- Use H1 headings only for the TOC -->
            <tocTopFlatten>false</tocTopFlatten>
         </release-notes-0-8-0>
-        <roadmap><shortTitle>Roadmap</shortTitle></roadmap>
-        <traf_authentication_config><shortTitle>.traf_authentication_config Configuration
File</shortTitle></traf_authentication_config>
+        <roadmap>
+          <shortTitle>Roadmap</shortTitle>
+        </roadmap>
       </pages>
     </reflowSkin>
   </custom>
@@ -164,10 +187,15 @@
     </breadcrumbs>
     <links>
       <item name="Download" href="download.html"/>
-      <item name="Contributing" href="contributing-redirect.html"/>
+      <item name="Quick Start" href="quickstart.html"/>
+      <item name="Docs" href="documentation.html"/>
+      <item name="Contribute" href="contributing-redirect.html"/>
     </links>
-    <menu name="About">
-      <item href="index.html" name="Project Overview"/>
+    <menu name="Project">
+      <item href="index.html" name="Overview"/>
+      <item href="faq.html" name="FAQ"/>
+      <item href="release-notes.html" name="Release Notes"/>
+      <item href="management.html" name="Managing Trafodion"/>
       <!-- item href="new-features.html" name="New Features"/-->
       <!-- item href="roadmap.html" name="Roadmap"/-->
       <!-- item href="performance.html" name="Performance"/-->
@@ -180,19 +208,6 @@
       <item href="issue-tracking.html" name="Issue Tracking"/>
       <item href="license.html" name="License"/>
     </menu>
-    <menu name="Using">
-      <!--item href="quickstart.html" name="Quick Start"/-->
-      <item href="documentation.html" name="Documentation"/>
-      <item href="download.html" name="Download"/>
-      <item href="management.html" name="Managing Trafodion"/>
-      <item href="http:divider" name=""/>
-      <item href="faq.html" name="FAQ"/>
-      <item href="release-notes.html" name="Release Notes"/>
-      <!-- 
-      <item href="http:divider" name=""/>
-      <item href="udf-tutorial.html" name="UDF API Tutorial"/>
-      -->
-    </menu>
     <menu name="Features">
       <item href="architecture-overview.html" name="Architecture Overview"/>
       <item href="http:divider" name=""/>


Mime
View raw message