trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lium...@apache.org
Subject [1/4] trafodion git commit: [TRAFODION-2857] Web-site changes to remove incubating status
Date Tue, 16 Jan 2018 16:02:48 GMT
Repository: trafodion
Updated Branches:
  refs/heads/release2.2 3254cc16b -> 5be0d2e5e


[TRAFODION-2857] Web-site changes to remove incubating status

Project status and URL changes.
Email lists and git repo name changes still to come based on infra changes.


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

Branch: refs/heads/release2.2
Commit: f077620ae434bfdc115a599a591bec1f5eb7bff6
Parents: 3254cc1
Author: Steve Varnau <steve.varnau@esgyn.com>
Authored: Fri Dec 22 19:23:57 2017 +0000
Committer: Steve Varnau <steve.varnau@esgyn.com>
Committed: Thu Jan 11 18:15:36 2018 +0000

----------------------------------------------------------------------
 README                                          |  8 ++---
 README.md                                       |  6 ++--
 docs/client_install/pom.xml                     | 16 +++++-----
 .../src/asciidoc/_chapters/introduction.adoc    |  2 +-
 .../src/asciidoc/_chapters/jdbct4.adoc          |  2 +-
 .../src/asciidoc/_chapters/preparation.adoc     |  7 ++---
 .../src/asciidoc/_chapters/sample_prog.adoc     |  6 ++--
 docs/command_interface/pom.xml                  | 12 ++++----
 docs/cqd_reference/pom.xml                      | 12 ++++----
 docs/jdbct4ref_guide/pom.xml                    | 12 ++++----
 docs/load_transform/pom.xml                     | 12 ++++----
 docs/messages_guide/pom.xml                     | 12 ++++----
 docs/odb_user/pom.xml                           | 12 ++++----
 docs/provisioning_guide/pom.xml                 | 16 +++++-----
 .../src/asciidoc/_chapters/about.adoc           |  2 +-
 .../src/asciidoc/_chapters/enable_security.adoc |  4 +--
 .../src/asciidoc/_chapters/introduction.adoc    |  4 +--
 .../src/asciidoc/_chapters/quickstart.adoc      | 22 +++++++-------
 .../src/asciidoc/_chapters/script_install.adoc  | 10 +++---
 .../src/asciidoc/_chapters/script_remove.adoc   |  2 +-
 .../src/asciidoc/_chapters/script_upgrade.adoc  |  6 ++--
 docs/shared/license.txt                         |  5 ---
 docs/spj_guide/pom.xml                          | 12 ++++----
 .../src/asciidoc/_chapters/deploy_spjs.adoc     |  2 +-
 .../src/resources/source/Inventory.java         |  6 ++--
 .../spj_guide/src/resources/source/Payroll.java |  8 ++---
 docs/spj_guide/src/resources/source/Sales.java  | 12 ++++----
 .../src/resources/source/adjustSalary.java      |  2 +-
 .../src/resources/source/employeeJob.java       |  2 +-
 .../src/resources/source/lowerPrice.java        |  2 +-
 .../src/resources/source/numDailyOrders.java    |  2 +-
 .../src/resources/source/numMonthlyOrders.java  |  2 +-
 .../src/resources/source/orderSummary.java      |  2 +-
 .../src/resources/source/partData.java          |  2 +-
 .../src/resources/source/partLocations.java     |  2 +-
 .../src/resources/source/projectTeam.java       |  2 +-
 .../src/resources/source/supplierInfo.java      |  2 +-
 .../src/resources/source/supplyQuantities.java  |  2 +-
 .../src/resources/source/topSalesReps.java      |  2 +-
 .../src/resources/source/totalPrice.java        |  2 +-
 docs/sql_reference/pom.xml                      | 12 ++++----
 docs/src/site/markdown/index.md                 | 10 +++---
 docs/src/site/markdown/ldapcheck.md             |  2 +-
 docs/src/site/markdown/ldapconfigcheck.md       |  2 +-
 docs/src/site/markdown/quickstart.md            |  4 +--
 docs/src/site/site.xml                          | 10 ++----
 install/ambari-installer/traf_ambari.spec       |  2 +-
 licenses/lic-server-src                         | 32 ++++++++++----------
 licenses/lic-test-src                           |  6 ++--
 pom.xml                                         |  8 ++---
 tools/docker/Dockerfile                         |  2 +-
 51 files changed, 167 insertions(+), 179 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/README
----------------------------------------------------------------------
diff --git a/README b/README
index 8351595..a8264c0 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-******************************* Apache Trafodion (incubating) **************************
+******************************* Apache Trafodion **************************
 
 Apache Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or 
 operational workloads on Hadoop.  The name "Trafodion" (the Welsh word for 
@@ -13,16 +13,16 @@ To get started using Apache Trafodion:
 
   - documentation for this release can be viewed on the Apache Trafodion 
     wiki page: 
-      http://trafodion.incubator.apache.org/documentation.html
+      http://trafodion.apache.org/documentation.html
 
   - release notes describing changes for particular releases can be viewed:
       http://trafodion.apache.org/release-notes.html
 
-  - the latest Apache Trafodion can be downloaded from Apache incubator
+  - the latest Apache Trafodion can be downloaded from Apache
     distribution site or accessed from git
 
     - download site:
-      https://dist.apache.org/repos/dist/release/incubator/trafodion
+      https://dist.apache.org/repos/dist/release/trafodion
 
     - git site:
       git@github.com:apache/incubator-trafodion  

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 3b93d2c..fb84714 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Apache Trafodion (incubating)
+# Apache Trafodion
 ![trafodion logo](http://trafodion.apache.org/images/logos/trafodion-logo.jpg)
 
 Apache Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or 
@@ -20,11 +20,11 @@ Hadoop.
   
   http://trafodion.apache.org/release-notes.html
 
-  - the latest Apache Trafodion can be downloaded from Apache incubator
+  - the latest Apache Trafodion can be downloaded from Apache
     distribution site or accessed from git:
 
     - download site:
-      https://dist.apache.org/repos/dist/release/incubator/trafodion
+      https://dist.apache.org/repos/dist/release/trafodion
 
     - git site:
       `git@github.com:apache/incubator-trafodion`

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/client_install/pom.xml
----------------------------------------------------------------------
diff --git a/docs/client_install/pom.xml b/docs/client_install/pom.xml
index 7d6d122..bb75de5 100644
--- a/docs/client_install/pom.xml
+++ b/docs/client_install/pom.xml
@@ -30,7 +30,7 @@
   <packaging>pom</packaging>
   <name>Trafodion Client Installation Guide</name>
   <description>This guide describes how to install different Trafodion client applications.</description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
 
   <parent>
@@ -188,8 +188,8 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
-                <download-url>http://trafodion.incubator.apache.org/download.html</download-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
+                <download-url>http://trafodion.apache.org/download.html</download-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
               </attributes>
@@ -218,8 +218,8 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
-                <download-url>http://http://trafodion.incubator.apache.org/download.html</download-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
+                <download-url>http://http://trafodion.apache.org/download.html</download-url>
                 <build-date>${maven.build.timestamp}</build-date>
               </attributes>
             </configuration>
@@ -289,9 +289,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/client_install/src/asciidoc/_chapters/introduction.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/introduction.adoc b/docs/client_install/src/asciidoc/_chapters/introduction.adoc
index 4b9172e..4a3c654 100644
--- a/docs/client_install/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/introduction.adoc
@@ -38,7 +38,7 @@ The following table lists JDBC-based clients supported by {project-name}.
 *NOTE:* The {project-name} Command Interface (trafci), DBVisualizer, and SQuirreL SQL Client require this driver to be installed on the client
 workstation.
 | *{project-name} Command Interface (trafci)* | A command-line interface that allows you to connect to a {project-name} database and run SQL statements and other commands interactively or from
-script files. For more information, see the http://trafodion.incubator.apache.org/docs/command_interface/index.html[{project-name} Command Interface Guide].
+script files. For more information, see the http://trafodion.apache.org/docs/command_interface/index.html[{project-name} Command Interface Guide].
 | *DBVisualizer* | A third-party database tool that allows you to connect to a {project-name} database. For more information, see the http://www.dbvis.com/[DbVisualizer website].
 | *SQuirreL SQL Client* | A third-party database tool that allows you to connect to a {project-name} database. For more information, see the 
 http://squirrel-sql.sourceforge.net/[SQuirreL SQL Client website].

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/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 43dbf73..3b73d14 100644
--- a/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
@@ -92,7 +92,7 @@ Set these values for your environment:
 `<port-number>` is the location where the 
 {project-name} Database Connectivity Service (DCS) is running. (Default: *23400*).
 
-See the http://trafodion.incubator.apache.org/docs/dcs_reference/index.html[{project-name} Database Connectivity Services Reference Guide]
+See the http://trafodion.apache.org/docs/dcs_reference/index.html[{project-name} Database Connectivity Services Reference Guide]
 for information about how to configure the DCS port.
 
 *Example*

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/client_install/src/asciidoc/_chapters/preparation.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/preparation.adoc b/docs/client_install/src/asciidoc/_chapters/preparation.adoc
index 90b9ebb..d042017 100644
--- a/docs/client_install/src/asciidoc/_chapters/preparation.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/preparation.adoc
@@ -103,7 +103,6 @@ The {project-name} Client binaries are in the `clients` folder, which contains t
 [cols="30%,70%", options="header"]
 |===
 | File                               | Usage
-| `DISCLAIMER`                       | {project-name} Apache incubation disclaimer.
 | `JDBCT4.zip`                       | {project-name} JDBC Type 4 Driver.
 | `LICENCE`                          | Apache license.
 | `NOTICE`                           | Apache notice.
@@ -166,7 +165,7 @@ using the URL you copied in step 3 above.
 $ mkdir $HOME/trafodion
 $ cd $HOME/trafodion
 $ wget <link to package>
-$ tar -xzvf apache-trafodion_clients-*-incubating.tar.gz
+$ tar -xzvf apache-trafodion_clients-*.tar.gz
 $ cd clients
 $ ls
 DISCLAIMER  LICENSE  odb64_linux.tar.gz  TRAF_ODBC_Linux_Driver_64.tar.gz
@@ -220,7 +219,7 @@ $ unzip trafci.zip -d $HOME/trafodion/trafci
 .
 $ cd ..
 $ ls
-apache-trafodion_clients-2.0.1-incubating.tar.gz  clients  jdbct4  trafci
+apache-trafodion_clients-2.2.0.tar.gz  clients  jdbct4  trafci
 $
 ```
 
@@ -258,7 +257,7 @@ $ tar -xzvf odb64_linux.tar.gz -C $HOME/trafodion/odb
 .
 $ cd ..
 $ ls
-apache-trafodion_clients-2.0.1-incubating.tar.gz  clients  odb  odbc
+apache-trafodion_clients-2.2.0.tar.gz  clients  odb  odbc
 ```
 
 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/client_install/src/asciidoc/_chapters/sample_prog.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/sample_prog.adoc b/docs/client_install/src/asciidoc/_chapters/sample_prog.adoc
index 2562319..ab22ca8 100644
--- a/docs/client_install/src/asciidoc/_chapters/sample_prog.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/sample_prog.adoc
@@ -34,7 +34,7 @@ Copy and paste the code from this appendix into the recommended files. To build
 
 === `basicsql.cpp` Source Code
 You can download the `basicsql.cpp` example from
-http://trafodion.incubator.apache.org/docs/client_install/resources/source/basicsql.cpp.
+http://trafodion.apache.org/docs/client_install/resources/source/basicsql.cpp.
 
 Alternatively, copy and paste the following code into a file named `basicsql.cpp`:
 
@@ -52,7 +52,7 @@ see the instructions in <<win_odbc_run_basicsql, Run Sample Program (`basicsql`)
 
 ==== `build.bat` (Build Script)
 You can download the `build.bat` example from
-http://trafodion.incubator.apache.org/docs/client_install/resources/source/build.bat.
+http://trafodion.apache.org/docs/client_install/resources/source/build.bat.
 
 Alternatively, copy and paste the following code into a file named `build.bat`, which is used to build the sample program on Windows:
 
@@ -64,7 +64,7 @@ To build the sample program on Windows, see the instructions in <<win_odbc_run_b
 
 ==== Run `run.bat`
 You can download the `run.bat` example from
-http://trafodion.incubator.apache.org/docs/client_install/resources/source/run.bat.
+http://trafodion.apache.org/docs/client_install/resources/source/run.bat.
 
 Alternatively, copy and paste the following code into a file named `run.bat`, which is used to run the sample program on Windows:
 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/command_interface/pom.xml
----------------------------------------------------------------------
diff --git a/docs/command_interface/pom.xml b/docs/command_interface/pom.xml
index 064ac1d..9eba1d6 100644
--- a/docs/command_interface/pom.xml
+++ b/docs/command_interface/pom.xml
@@ -30,7 +30,7 @@
   <packaging>pom</packaging>
   <name>Trafodion Command Interface Guide</name>
   <description>This guide describes how to use the Trafodion Command Interface (TrafCI).</description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
 
   <parent>
@@ -188,7 +188,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
               </attributes>
@@ -210,7 +210,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
@@ -287,9 +287,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/cqd_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/cqd_reference/pom.xml b/docs/cqd_reference/pom.xml
index e84a495..2247918 100644
--- a/docs/cqd_reference/pom.xml
+++ b/docs/cqd_reference/pom.xml
@@ -32,7 +32,7 @@
   <description>
      This guide describes Trafodion Control Query Defaults (CQDs) that are used to override system-level default settings. 
   </description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
 
   <parent>
@@ -190,7 +190,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
               </attributes>
@@ -212,7 +212,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
@@ -289,9 +289,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/jdbct4ref_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/jdbct4ref_guide/pom.xml b/docs/jdbct4ref_guide/pom.xml
index b5fdcd7..6f9a6fa 100644
--- a/docs/jdbct4ref_guide/pom.xml
+++ b/docs/jdbct4ref_guide/pom.xml
@@ -30,7 +30,7 @@
   <packaging>pom</packaging>
   <name>Trafodion JDBC Type 4 Programmer's Reference Guide</name>
   <description>This document describes how to use the JDBC Type 4 Driver.</description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
 
   <parent>
@@ -188,7 +188,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
               </attributes>
@@ -217,7 +217,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
               </attributes>
             </configuration>
@@ -287,9 +287,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/load_transform/pom.xml
----------------------------------------------------------------------
diff --git a/docs/load_transform/pom.xml b/docs/load_transform/pom.xml
index 26eaa5c..2b7b379 100644
--- a/docs/load_transform/pom.xml
+++ b/docs/load_transform/pom.xml
@@ -30,7 +30,7 @@
   <packaging>pom</packaging>
   <name>Trafodion Load and Transform Guide</name>
   <description>This guide describes how to load and transform data into Trafodion.</description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
 
   <parent>
@@ -188,7 +188,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
               </attributes>
@@ -210,7 +210,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
@@ -287,9 +287,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/messages_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/messages_guide/pom.xml b/docs/messages_guide/pom.xml
index 4a4b0dd..20f1a47 100644
--- a/docs/messages_guide/pom.xml
+++ b/docs/messages_guide/pom.xml
@@ -30,7 +30,7 @@
   <packaging>pom</packaging>
   <name>Trafodion Messages Guide</name>
   <description>This guide describes user-visible messages produced by Trafodion.</description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
 
   <parent>
@@ -187,7 +187,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
               </attributes>
@@ -209,7 +209,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
@@ -286,9 +286,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/odb_user/pom.xml
----------------------------------------------------------------------
diff --git a/docs/odb_user/pom.xml b/docs/odb_user/pom.xml
index f8de8fa..0227708 100644
--- a/docs/odb_user/pom.xml
+++ b/docs/odb_user/pom.xml
@@ -30,7 +30,7 @@
   <packaging>pom</packaging>
   <name>Trafodion odb User Guide</name>
   <description>This guide describes how to odb, a multi-threaded, ODBC-based command-line tool, to perform various operations on a Trafodion database.</description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
   <parent>
     <groupId>org.apache.trafodion</groupId>
@@ -187,7 +187,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
               </attributes>
@@ -209,7 +209,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
@@ -286,9 +286,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/pom.xml b/docs/provisioning_guide/pom.xml
index b48f592..b6ee0d8 100644
--- a/docs/provisioning_guide/pom.xml
+++ b/docs/provisioning_guide/pom.xml
@@ -30,7 +30,7 @@
   <packaging>pom</packaging>
   <name>Trafodion Provisioning Guide</name>
   <description>This guide describes how to provision Trafodion.</description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
 
   <parent>
@@ -188,8 +188,8 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
-                <download-url>http://trafodion.incubator.apache.org/download.html</download-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
+                <download-url>http://trafodion.apache.org/download.html</download-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
               </attributes>
@@ -211,8 +211,8 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
-                <download-url>http://trafodion.incubator.apache.org/download.html</download-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
+                <download-url>http://trafodion.apache.org/download.html</download-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
@@ -289,9 +289,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
index ddce5bf..a98cad3 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
@@ -28,7 +28,7 @@ This guide describes how to provision the end-user {project-name} binaries on to
 (see {docs-url}/client_install/index.html[{project-name} Client Installation Guide]) or via application code you write.
 
 If you want to install a Trafodion developer-build environment, then please refer to the 
-http://trafodion.incubator.apache.org/contributing-redirect.html[Trafodion Contributor Guide] for instructions.
+http://trafodion.apache.org/contributing-redirect.html[Trafodion Contributor Guide] for instructions.
 
 == Intended Audience
 This guide assumes that you are well-versed in Linux and Hadoop administration. If you don't have such experience, then

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/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 df6ced7..e315f72 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/enable_security.adoc
@@ -495,10 +495,10 @@ Current Environment
 ----------------------------------
 AUTHENTICATION     enabled
 AUTHORIZATION      enabled
-CURRENT DIRECTORY  /.../incubator-trafodion/install/installer
+CURRENT DIRECTORY  /.../trafodion/install/installer
 LIST_COUNT         4294967295
 LOG FILE
-MESSAGEFILE        /.../incubator-trafodion/core/sqf/export/ ...
+MESSAGEFILE        /.../trafodion/core/sqf/export/ ...
 MESSAGEFILE LANG   US English
 MESSAGEFILE VRSN   {2016-06-14 22:27 LINUX:host/user} 
 SQL CATALOG        TRAFODION

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/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 67cc082..b16eea3 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/introduction.adoc
@@ -158,7 +158,7 @@ Next, you unpack the tar file.
 ```
 $ mkdir $HOME/trafodion-installer
 $ cd $HOME/trafodion-downloads
-$ tar -zxf apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz -C $HOME/trafodion-installer
+$ tar -zxf apache-trafodion-pyinstaller-2.2.0.tar.gz -C $HOME/trafodion-installer
 $
 ```
 
@@ -268,7 +268,7 @@ that matches the security policies of your organization.
 The {project-name} Installer supports a minimum configuration to quick start your installation in two steps.
 1. Copy {project-name} server binary file to your installer directory.
 ```
-cp /path/to/apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz python-installer/
+cp /path/to/apache-trafodion_server-2.2.0-RH-x86_64.tar.gz python-installer/
 ```
 2. Modify configuration file `my_config`, add the Hadoop Distribution Manager URL in `mgr_url`.
 ```

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
index fbdac4f..c346ee3 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/quickstart.adoc
@@ -53,31 +53,31 @@ Download the Trafodion Installer and Server binaries:
 $ mkdir $HOME/trafodion-download
 $ cd $HOME/trafodion-download
 $ # Download the Trafodion Installer binaries
-$ wget http://apache.cs.utah.edu/incubator/trafodion/trafodion-2.1.0.incubating/apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz
+$ wget http://apache.cs.utah.edu/trafodion/trafodion-2.2.0/apache-trafodion-pyinstaller-2.2.0.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 request sent, awaiting response... 200 OK
 Length: 68813 (67K) [application/x-gzip]
-Saving to: "apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz"
+Saving to: "apache-trafodion-pyinstaller-2.2.0.tar.gz"
 
 100%[=====================================================================================================================>] 68,813       124K/s   in 0.5s
 
-2016-02-14 04:19:42 (124 KB/s) - "apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz" saved [68813/68813]
+2016-02-14 04:19:42 (124 KB/s) - "apache-trafodion-pyinstaller-2.2.0.tar.gz" saved [68813/68813]
 
-$ wget http://apache.cs.utah.edu/incubator/trafodion/trafodion-2.1.0.incubating/apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz
+$ wget http://apache.cs.utah.edu/trafodion/trafodion-2.2.0/apache-trafodion_server-2.2.0-RH-x86_64.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 request sent, awaiting response... 200 OK
 Length: 214508243 (205M) [application/x-gzip]
-Saving to: "apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz"
+Saving to: "apache-trafodion_server-2.2.0-RH-x86_64.tar.gz"
 
 100%[=====================================================================================================================>] 214,508,243 3.90M/s   in 55s
 
-2016-02-14 04:22:14 (3.72 MB/s) - "apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz" saved [214508243/214508243]
+2016-02-14 04:22:14 (3.72 MB/s) - "apache-trafodion_server-2.2.0-RH-x86_64.tar.gz" saved [214508243/214508243]
 
 $ ls -l
--rw-rw-r--. 1 centos centos     74237 Feb 13 14:53 apache-trafodion_pyinstaller-2.1.0-incubating.tar.gz
--rw-rw-r--. 1 centos centos 183114066 Feb 10 22:34 apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz
+-rw-rw-r--. 1 centos centos     74237 Feb 13 14:53 apache-trafodion_pyinstaller-2.2.0.tar.gz
+-rw-rw-r--. 1 centos centos 183114066 Feb 10 22:34 apache-trafodion_server-2.2.0-RH-x86_64.tar.gz
 $
 ```
 
@@ -92,10 +92,10 @@ The first step in the installation process is to unpack the {project-name} Insta
 ```
 $ mkdir $HOME/trafodion-installer
 $ cd $HOME/trafodion-downloads
-$ tar -zxf apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz -C $HOME/trafodion-installer
-$ cp -f apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz $HOME/trafodion-installer
+$ tar -zxf apache-trafodion-pyinstaller-2.2.0.tar.gz -C $HOME/trafodion-installer
+$ cp -f apache-trafodion_server-2.2.0-RH-x86_64.tar.gz $HOME/trafodion-installer
 $ ls $HOME/trafodion-installer/python-installer
-apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz  db_install.py    DISCLAIMER    LICENSE  prettytable.py  scripts
+apache-trafodion_server-2.2.0-RH-x86_64.tar.gz  db_install.py    DISCLAIMER    LICENSE  prettytable.py  scripts
 configs                                                    db_uninstall.py  discovery.py  NOTICE   README.md
 $
 ```

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/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 65aba51..d5b42e5 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_install.adoc
@@ -43,7 +43,7 @@ The first step in the installation process is to unpack the {project-name} Insta
 ```
 $ mkdir $HOME/trafodion-installer
 $ cd $HOME/trafodion-downloads
-$ tar -zxf apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz -C $HOME/trafodion-installer
+$ tar -zxf apache-trafodion_pyinstaller-x.x.x.tar.gz -C $HOME/trafodion-installer
 $
 ```
 
@@ -74,8 +74,8 @@ Confirm Enter HDP/CDH web manager user password:
 TASK: Environment Discover ***************************************************************
 
 Time Cost: 0 hour(s) 0 minute(s) 4 second(s)
-Enter full path to Trafodion tar file [/data/python-installer/apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz]:
-Enter directory name to install trafodion to [apache-trafodion-2.1.0]:
+Enter full path to Trafodion tar file [/data/python-installer/apache-trafodion_server-x.x.x-RH-x86_64.tar.gz]:
+Enter directory name to install trafodion to [apache-trafodion-x.x.x]:
 Enter trafodion user password:
 Confirm Enter trafodion user password:
 Enter number of DCS client connections per node [4]:
@@ -102,8 +102,8 @@ Enable DCS High Avalability (Y/N)  [N]:
 | mgr_user         | admin                                                                             |
 | node_list        | node-1,node-2                                                                     |
 | scratch_locs     | $TRAF_VAR                                                                         |
-| traf_dirname     | apache-trafodion-2.1.0                                                            |
-| traf_package     | /data/python-installer/apache-trafodion_server-2.1.0-RH-x86_64-incubating.tar.gz  |
+| traf_dirname     | apache-trafodion-x.x.x                                                            |
+| traf_package     | /data/python-installer/apache-trafodion_server-x.x.x-RH-x86_64.tar.gz             |
 | traf_start       | Y                                                                                 |
 | traf_user        | trafodion                                                                         |
 +------------------+-----------------------------------------------------------------------------------+

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/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 5ad55a7..b402327 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_remove.adoc
@@ -74,7 +74,7 @@ Issued a 'shutdown normal' request
 Shutdown in progress
 
 # of SQ processes: 0
-SQ Shutdown (normal) from /home/trafodion/apache-trafodion-1.3.0-incubating-bin/sql/scripts Successful
+SQ Shutdown (normal) from /home/trafodion/apache-trafodion-2.2.0-bin/sql/scripts Successful
 Mon Feb 15 07:49:26 UTC 2016
 [trafodion@trafodion-1 scripts]$ exit
 [admin@trafodion-1 ~]$

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/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 c6a05f6..4eb72a6 100644
--- a/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/script_upgrade.adoc
@@ -55,7 +55,7 @@ You unpack the updated {project-name} Installer into a new directory.
 ```
 $ mkdir $HOME/trafodion-installer
 $ cd $HOME/trafodion-downloads
-$ tar -zxf apache-trafodion-pyinstaller-2.1.0-incubating.tar.gz -C $HOME/trafodion-installer
+$ tar -zxf apache-trafodion-pyinstaller-2.2.0.tar.gz -C $HOME/trafodion-installer
 $
 ```
 
@@ -149,13 +149,13 @@ $ cd $HOME/trafodion-configuration
 $ cp my_config my_config_2.0
 $ # Pre edit content
 
-traf_package = "/home/centos/trafodion-download/apache-trafodion-2.0.0-incubating.tar.gz"
+traf_package = "/home/centos/trafodion-download/apache-trafodion-2.2.0.tar.gz"
 
 $ # Use your favorite editor to modify my_config_2.0
 $ emacs my_config_2.0
 $ # Post edit changes
 
-traf_package = "/home/centos/trafodion-download/apache-trafodion-2.1.0-incubating.tar.gz"
+traf_package = "/home/centos/trafodion-download/apache-trafodion-2.2.0.tar.gz"
 ```
 
 NOTE: The {project-name} Installer performs the same configuration changes as it does for an installation,

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/shared/license.txt
----------------------------------------------------------------------
diff --git a/docs/shared/license.txt b/docs/shared/license.txt
index 5808b25..3dd96d1 100644
--- a/docs/shared/license.txt
+++ b/docs/shared/license.txt
@@ -9,8 +9,3 @@ Unless required by applicable law or agreed to in writing, software distributed
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations under the License.
 
-*Disclaimer:* _Apache Trafodion is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by 
-the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that 
-the infrastructure, communications, and decision making process have stabilized in a manner consistent with other 
-successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, 
-it does indicate that the project has yet to be fully endorsed by the ASF._

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/spj_guide/pom.xml b/docs/spj_guide/pom.xml
index 51f7177..bba8f1e 100644
--- a/docs/spj_guide/pom.xml
+++ b/docs/spj_guide/pom.xml
@@ -30,7 +30,7 @@
   <packaging>pom</packaging>
   <name>Trafodion SPJ Guide</name>
   <description>This guide describes how to develop, deploy, and manage Stored Procedures in Java (SPJs) on the Trafodion database.</description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
 
   <parent>
@@ -188,7 +188,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
               </attributes>
@@ -217,7 +217,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
               </attributes>
             </configuration>
@@ -287,9 +287,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/asciidoc/_chapters/deploy_spjs.adoc
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/asciidoc/_chapters/deploy_spjs.adoc b/docs/spj_guide/src/asciidoc/_chapters/deploy_spjs.adoc
index 7f55713..23b84aa 100644
--- a/docs/spj_guide/src/asciidoc/_chapters/deploy_spjs.adoc
+++ b/docs/spj_guide/src/asciidoc/_chapters/deploy_spjs.adoc
@@ -66,7 +66,7 @@ Do the following:
 +
 ```
 $ # Set up the environmental variables.
-$ cd $HOME/trafodion-incubator
+$ cd $HOME/trafodion
 $ source env.sh
 $ # Prepare the class jar file
 $ cd $HOME/trafodion-spjs

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/Inventory.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/Inventory.java b/docs/spj_guide/src/resources/source/Inventory.java
index 76c5359..1cfd397 100644
--- a/docs/spj_guide/src/resources/source/Inventory.java
+++ b/docs/spj_guide/src/resources/source/Inventory.java
@@ -7,7 +7,7 @@ public class Inventory
    // supplier's name, street, city, state, and post code to separate output
    // parameters.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#supplierinfo-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#supplierinfo-procedure
    // for more documentation.
    public static void supplierInfo( BigDecimal suppNum
                                   , String[] suppName
@@ -46,7 +46,7 @@ public class Inventory
    // quantities of available parts in inventory to separate output
    // parameters.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#supplyquantities-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#supplyquantities-procedure
    // for more documentation.
    public static void supplyQuantities( int[] avgQty
                                       , int[] minQty
@@ -79,7 +79,7 @@ public class Inventory
    // set of location codes that have the exact quantity and a set of location
    // codes that have more than that quantity.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#partlocations-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#partlocations-procedure
    // for more documentation.
    public static void partLocations( int partNum
                                    , int quantity

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/Payroll.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/Payroll.java b/docs/spj_guide/src/resources/source/Payroll.java
index 89c28a5..13b8d1c 100644
--- a/docs/spj_guide/src/resources/source/Payroll.java
+++ b/docs/spj_guide/src/resources/source/Payroll.java
@@ -8,7 +8,7 @@ public class Payroll
    // percentage. This method also returns the updated salary to an output  
    // parameter.    
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#adjustsalary-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#adjustsalary-procedure
    // for more documentation.
    public static void adjustSalary( BigDecimal empNum
                                   , double percent
@@ -48,7 +48,7 @@ public class Payroll
    // The EMPLOYEEJOB procedure accepts an employee number and returns a job
    // code or null value to an output parameter.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#employeejob-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#employeejob-procedure
    // for more documentation.
    public static void employeeJob( int empNum
                                  , java.lang.Integer[] jobCode
@@ -82,7 +82,7 @@ public class Payroll
    // employee number, first name, last name, and location of the employees
    // assigned to that project.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#projectteam-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#projectteam-procedure
    // for more documentation.
    public static void projectTeam( int projectCode
                                  , ResultSet[] members
@@ -110,7 +110,7 @@ public class Payroll
    // figures of the top five sales representatives who had the highest sales
    // (unit_price * qty_ordered) that quarter.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#topsalesreps-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#topsalesreps-procedure
    // for more documentation.
    public static void topSalesReps( int whichQuarter
                                   , ResultSet[] topReps

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/Sales.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/Sales.java b/docs/spj_guide/src/resources/source/Sales.java
index fd47df8..c611ad1 100644
--- a/docs/spj_guide/src/resources/source/Sales.java
+++ b/docs/spj_guide/src/resources/source/Sales.java
@@ -7,7 +7,7 @@ public class Sales
    // is, have less than 50 orders) and lowers the price of these items in the
    // database by 10 percent.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#lowerprice-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#lowerprice-procedure
    // for more documentation.
    public static void lowerPrice() throws SQLException
    {
@@ -50,7 +50,7 @@ public class Sales
    // The DAILYORDERS procedure accepts a date and returns the number of
    //orders on that date to an output parameter.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#dailyorders-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#dailyorders-procedure
    // for additional documenation.
    public static void numDailyOrders( Date date
                                     , int[] numOrders 
@@ -80,7 +80,7 @@ public class Sales
    // The MONTHLYORDERS procedure accepts an integer representing the month
    // and returns the number of orders during that month to an output parameter.
    // 
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#monthlyorders-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#monthlyorders-procedure
    // for more documentation.
    public static void numMonthlyOrders( int month
                                       , int[] numOrders
@@ -122,7 +122,7 @@ public class Sales
    // of an item, calculates the total price, including tax and shipping
    // charges, and returns the total price to an input/output parameter.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#totalprice-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#totalprice-procedure
    // for more documentation.
    public static void totalPrice( BigDecimal qtyOrdered
                                 , String shippingSpeed
@@ -175,7 +175,7 @@ public class Sales
    // * A result set that contains rows from the PARTSUPP table for suppliers who carry this part.
    // * A result set that contains rows from the EMPLOYEE table for sales reps who have sold this part.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#partdata-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#partdata-procedure
    // for more documentation.
    public static void partData( int partNum
                               , String[] partDescription
@@ -281,7 +281,7 @@ public class Sales
    //   contains fields for the order number, part number, unit price, quantity
    //   ordered, and part description.
    //
-   // See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#ordersummary-procedure
+   // See http://trafodion.apache.org/docs/spj_guide/index.html#ordersummary-procedure
    // for more documentation.
    public static void orderSummary( java.lang.String onOrAfter
                                   , long[] numOrders

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/adjustSalary.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/adjustSalary.java b/docs/spj_guide/src/resources/source/adjustSalary.java
index cc2b095..46df21c 100644
--- a/docs/spj_guide/src/resources/source/adjustSalary.java
+++ b/docs/spj_guide/src/resources/source/adjustSalary.java
@@ -3,7 +3,7 @@
 // percentage. This method also returns the updated salary to an output  
 // parameter.    
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#adjustsalary-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#adjustsalary-procedure
 // for more documentation.
 public static void adjustSalary( BigDecimal empNum
 			       , double percent

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/employeeJob.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/employeeJob.java b/docs/spj_guide/src/resources/source/employeeJob.java
index ce5cdab..e9f083a 100644
--- a/docs/spj_guide/src/resources/source/employeeJob.java
+++ b/docs/spj_guide/src/resources/source/employeeJob.java
@@ -1,7 +1,7 @@
 // The EMPLOYEEJOB procedure accepts an employee number and returns a job
 // code or null value to an output parameter.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#employeejob-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#employeejob-procedure
 // for more documentation.
 public static void employeeJob( int empNum
 			      , java.lang.Integer[] jobCode

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/lowerPrice.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/lowerPrice.java b/docs/spj_guide/src/resources/source/lowerPrice.java
index b49ff2f..db00775 100644
--- a/docs/spj_guide/src/resources/source/lowerPrice.java
+++ b/docs/spj_guide/src/resources/source/lowerPrice.java
@@ -2,7 +2,7 @@
 // is, have less than 50 orders) and lowers the price of these items in the
 // database by 10 percent.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#lowerprice-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#lowerprice-procedure
 // for more documentation.
 public static void lowerPrice() throws SQLException
 {

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/numDailyOrders.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/numDailyOrders.java b/docs/spj_guide/src/resources/source/numDailyOrders.java
index 568d71f..642ab85 100644
--- a/docs/spj_guide/src/resources/source/numDailyOrders.java
+++ b/docs/spj_guide/src/resources/source/numDailyOrders.java
@@ -1,7 +1,7 @@
 // The DAILYORDERS procedure accepts a date and returns the number of
 //orders on that date to an output parameter.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#dailyorders-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#dailyorders-procedure
 // for additional documenation.
 public static void numDailyOrders( Date date
 				 , int[] numOrders 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/numMonthlyOrders.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/numMonthlyOrders.java b/docs/spj_guide/src/resources/source/numMonthlyOrders.java
index 942ea01..7654d12 100644
--- a/docs/spj_guide/src/resources/source/numMonthlyOrders.java
+++ b/docs/spj_guide/src/resources/source/numMonthlyOrders.java
@@ -1,7 +1,7 @@
 // The MONTHLYORDERS procedure accepts an integer representing the month
 // and returns the number of orders during that month to an output parameter.
 // 
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#monthlyorders-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#monthlyorders-procedure
 // for more documentation.
 public static void numMonthlyOrders( int month
 				   , int[] numOrders

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/orderSummary.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/orderSummary.java b/docs/spj_guide/src/resources/source/orderSummary.java
index 8b8e5bb..50cdf74 100644
--- a/docs/spj_guide/src/resources/source/orderSummary.java
+++ b/docs/spj_guide/src/resources/source/orderSummary.java
@@ -11,7 +11,7 @@
 //   contains fields for the order number, part number, unit price, quantity
 //   ordered, and part description.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#ordersummary-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#ordersummary-procedure
 // for more documentation.
 public static void orderSummary( java.lang.String onOrAfter
 			       , long[] numOrders

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/partData.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/partData.java b/docs/spj_guide/src/resources/source/partData.java
index 6d7b54b..db0f8dc 100644
--- a/docs/spj_guide/src/resources/source/partData.java
+++ b/docs/spj_guide/src/resources/source/partData.java
@@ -8,7 +8,7 @@
 // * A result set that contains rows from the PARTSUPP table for suppliers who carry this part.
 // * A result set that contains rows from the EMPLOYEE table for sales reps who have sold this part.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#partdata-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#partdata-procedure
 // for more documentation.
 public static void partData( int partNum
 			   , String[] partDescription

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/partLocations.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/partLocations.java b/docs/spj_guide/src/resources/source/partLocations.java
index 88cdaae..873b40d 100644
--- a/docs/spj_guide/src/resources/source/partLocations.java
+++ b/docs/spj_guide/src/resources/source/partLocations.java
@@ -2,7 +2,7 @@
 // set of location codes that have the exact quantity and a set of location
 // codes that have more than that quantity.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#partlocations-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#partlocations-procedure
 // for more documentation.
 public static void partLocations( int partNum
 				, int quantity

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/projectTeam.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/projectTeam.java b/docs/spj_guide/src/resources/source/projectTeam.java
index 0d150c4..024c348 100644
--- a/docs/spj_guide/src/resources/source/projectTeam.java
+++ b/docs/spj_guide/src/resources/source/projectTeam.java
@@ -2,7 +2,7 @@
 // employee number, first name, last name, and location of the employees
 // assigned to that project.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#projectteam-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#projectteam-procedure
 // for more documentation.
 public static void projectTeam( int projectCode
 			      , ResultSet[] members

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/supplierInfo.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/supplierInfo.java b/docs/spj_guide/src/resources/source/supplierInfo.java
index c98a392..01a1dd8 100644
--- a/docs/spj_guide/src/resources/source/supplierInfo.java
+++ b/docs/spj_guide/src/resources/source/supplierInfo.java
@@ -2,7 +2,7 @@
 // supplier's name, street, city, state, and post code to separate output
 // parameters.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#supplierinfo-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#supplierinfo-procedure
 // for more documentation.
 public static void supplierInfo( BigDecimal suppNum
 			       , String[] suppName

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/supplyQuantities.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/supplyQuantities.java b/docs/spj_guide/src/resources/source/supplyQuantities.java
index 59a6911..c29d593 100644
--- a/docs/spj_guide/src/resources/source/supplyQuantities.java
+++ b/docs/spj_guide/src/resources/source/supplyQuantities.java
@@ -2,7 +2,7 @@
 // quantities of available parts in inventory to separate output
 // parameters.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#supplyquantities-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#supplyquantities-procedure
 // for more documentation.
 public static void supplyQuantities( int[] avgQty
 				   , int[] minQty

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/topSalesReps.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/topSalesReps.java b/docs/spj_guide/src/resources/source/topSalesReps.java
index beee8ca..18eb455 100644
--- a/docs/spj_guide/src/resources/source/topSalesReps.java
+++ b/docs/spj_guide/src/resources/source/topSalesReps.java
@@ -4,7 +4,7 @@
 // figures of the top five sales representatives who had the highest sales
 // (unit_price * qty_ordered) that quarter.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#topsalesreps-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#topsalesreps-procedure
 // for more documentation.
 public static void topSalesReps( int whichQuarter
 			       , ResultSet[] topReps

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/spj_guide/src/resources/source/totalPrice.java
----------------------------------------------------------------------
diff --git a/docs/spj_guide/src/resources/source/totalPrice.java b/docs/spj_guide/src/resources/source/totalPrice.java
index 5e1ff15..4eafbb4 100644
--- a/docs/spj_guide/src/resources/source/totalPrice.java
+++ b/docs/spj_guide/src/resources/source/totalPrice.java
@@ -2,7 +2,7 @@
 // of an item, calculates the total price, including tax and shipping
 // charges, and returns the total price to an input/output parameter.
 //
-// See http://trafodion.incubator.apache.org/docs/spj_guide/index.html#totalprice-procedure
+// See http://trafodion.apache.org/docs/spj_guide/index.html#totalprice-procedure
 // for more documentation.
 public static void totalPrice( BigDecimal qtyOrdered
 			     , String shippingSpeed

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/sql_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/sql_reference/pom.xml b/docs/sql_reference/pom.xml
index c5ebf3c..83edd20 100644
--- a/docs/sql_reference/pom.xml
+++ b/docs/sql_reference/pom.xml
@@ -33,7 +33,7 @@
                functions, and other SQL language elements supported by the Trafodion project’s 
                database software.
   </description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
   <parent>
     <groupId>org.apache.trafodion</groupId>
@@ -191,7 +191,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
               </attributes>
@@ -213,7 +213,7 @@
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
                 <project-support>user@trafodion.incubator.apache.org</project-support>
-                <docs-url>http://trafodion.incubator.apache.org/docs</docs-url>
+                <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
                 <pdf-style>trafodion</pdf-style>
@@ -290,9 +290,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/index.md b/docs/src/site/markdown/index.md
index b8798b3..a023bfa 100644
--- a/docs/src/site/markdown/index.md
+++ b/docs/src/site/markdown/index.md
@@ -31,8 +31,8 @@ Running out of room with your current SQL solution? Starting a new operational a
 
 Trafodion provides SQL access to structured, semi-structured, and unstructured data allowing you to run operational, historical, and analytical workloads on a single platform.
 
-[revolution]: http://trafodion.incubator.apache.org
-[scale]: http://trafodion.incubator.apache.org
+[revolution]: http://trafodion.apache.org
+[scale]: http://trafodion.apache.org
 [stack]: index.html
 
 
@@ -45,7 +45,7 @@ Trafodion provides SQL access to structured, semi-structured, and unstructured d
   <p><h5>We're working on release 2.2!</h5></p> 
   <p>Check out the <a href="https://cwiki.apache.org/confluence/display/TRAFODION/Roadmap">Roadmap</a> page for planned content.</p>
   <p><h5>Apache Trafodion 2.1.0-incubating was released on May 1, 2017</h5></p> 
-  <p>Check it out on the <a href="http://trafodion.incubator.apache.org/download.html">Download</a> page.</p>
+  <p>Check it out on the <a href="http://trafodion.apache.org/download.html">Download</a> page.</p>
   <p><h5>Want to disucss Trafodion in Chinese? Join the Trafodion discussion on Tencent QQ!</h5></p> 
   <p><a href="http://im.qq.com/">QQ</a> Group ID: 176011868.</p>
 </td></tr></table>
@@ -70,14 +70,12 @@ Are you using Trafodion? We need permission to add your company's logo here.
 
 ## About
 
-Apache Trafodion (incubating) is a webscale SQL-on-Hadoop solution enabling transactional or operational workloads on Apache Hadoop. 
+Apache Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or operational workloads on Apache Hadoop. 
 
 The name &quot;Trafodion&quot; (the Welsh word for transactions, pronounced &quot;Tra-vod-eee-on&quot;) was chosen specifically to emphasize the differentiation that Trafodion provides in closing a critical gap in the Hadoop ecosystem. 
 
 Trafodion builds on the scalability, elasticity, and flexibility of Hadoop. Trafodion extends Hadoop to provide guaranteed transactional integrity, enabling new kinds of big data applications to run on Hadoop. 
 
-<em>Disclaimer: Apache Trafodion is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</em>
-
 ---
 
 ## Key Features

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/src/site/markdown/ldapcheck.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/ldapcheck.md b/docs/src/site/markdown/ldapcheck.md
index 02575ad..b5f12cc 100644
--- a/docs/src/site/markdown/ldapcheck.md
+++ b/docs/src/site/markdown/ldapcheck.md
@@ -13,5 +13,5 @@
   License.
 -->
 Redirecting to the Trafodion Provisioning Guide...
-<p><meta http-equiv="refresh" content="0; url=http://trafodion.incubator.apache.org/docs/provisioning_guide/target/site/index.html#enable-security-ldapcheck"></meta></p>
+<p><meta http-equiv="refresh" content="0; url=http://trafodion.apache.org/docs/provisioning_guide/target/site/index.html#enable-security-ldapcheck"></meta></p>
 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/src/site/markdown/ldapconfigcheck.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/ldapconfigcheck.md b/docs/src/site/markdown/ldapconfigcheck.md
index b24b16a..bada8f5 100644
--- a/docs/src/site/markdown/ldapconfigcheck.md
+++ b/docs/src/site/markdown/ldapconfigcheck.md
@@ -13,4 +13,4 @@
   License.
 -->
 Redirecting to the Trafodion Provisioning Guide...
-<p><meta http-equiv="refresh" content="0; url=http://trafodion.incubator.apache.org/docs/provisioning_guide/target/site/index.html#enable-security-ldapconfigcheck"></meta></p>
+<p><meta http-equiv="refresh" content="0; url=http://trafodion.apache.org/docs/provisioning_guide/target/site/index.html#enable-security-ldapconfigcheck"></meta></p>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/src/site/markdown/quickstart.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/quickstart.md b/docs/src/site/markdown/quickstart.md
index 22fbc66..bed136d 100644
--- a/docs/src/site/markdown/quickstart.md
+++ b/docs/src/site/markdown/quickstart.md
@@ -101,8 +101,8 @@ Trafodion provides connectivity services so that applications, tools, and other
 
 # 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.
+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.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
+Have fun with Trafodion!

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 64328df..fc1b70e 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -35,7 +35,7 @@
     <!-- Apache Trafodion, but with "Trafodion" highlighted -->
     <name>
        <![CDATA[
-       <img src="images/logos/trafodion-logo.jpg" alt="Trafodion Logo" width="383"> <a href="http://incubator.apache.org" target="_blank"><span class="logo-right"><img id="incubator-logo" alt="Apache Incubator" src="images/logos/egg-logo.png" /></span></a>
+       <img src="images/logos/trafodion-logo.jpg" alt="Trafodion Logo" width="383">
        ]]>
     </name>
     <href>index.html</href>
@@ -57,7 +57,7 @@
       <brand>
         <!-- Brand text in top-left part of the site -->
         <name>
-          <![CDATA[<span class="brand-apache">Apache </span><span class="brand-trafodion">Trafodion</span> <span class="brand-apache">(incubating)</span> ]]>
+          <![CDATA[<span class="brand-apache">Apache </span><span class="brand-trafodion">Trafodion</span> <span class="brand-apache"></span> ]]>
         </name>
         <href>index.html</href>
       </brand>
@@ -249,7 +249,6 @@
       <item href="https://cwiki.apache.org/confluence/display/TRAFODION/Metadata+Cleanup" name="Metadata Cleanup Utility"/>
     </menu>
     <menu name="Apache">
-      <item href="http://incubator.apache.org/projects/trafodion.html" name="Project Status" target="_blank"/>
       <item href="http://www.apache.org/foundation/how-it-works.html" name="Apache Foundation" target="_blank"/>
       <item href="http://www.apache.org/licenses/" name="Apache License" target="_blank"/>
       <item href="http://www.apache.org/security/" name="Apache Security" target="_blank"/>
@@ -260,11 +259,8 @@
     <footer>
       <hr />
       <div class="row span16">
-        <span>Apache, Apache Maven, Apache Maven Fluido Skin, the Apache feather logo, the Apache Maven project logo and the Apache Incubator project logo 
+        <span>Apache, Apache Maven, Apache Maven Fluido Skin, the Apache feather logo, and the Apache Maven project logo
         are trademarks of the Apache Software Foundation.</span><br /><br />
-        <span>
-          <a href="http://incubator.apache.org" target="_blank"><img id="incubator-logo" alt="Apache Incubator" src="images/logos/egg-logo.png" /></a>
-        </span>
       </div>
     </footer>
   </body>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/install/ambari-installer/traf_ambari.spec
----------------------------------------------------------------------
diff --git a/install/ambari-installer/traf_ambari.spec b/install/ambari-installer/traf_ambari.spec
index 1c1dcb9..e49b2e9 100644
--- a/install/ambari-installer/traf_ambari.spec
+++ b/install/ambari-installer/traf_ambari.spec
@@ -29,7 +29,7 @@ Group:		Applications/Databases
 Source0:        ambari_rpm.tar.gz
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
-URL:            http://trafodion.incubator.apache.org
+URL:            http://trafodion.apache.org
 
 Requires: ambari-server
 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/licenses/lic-server-src
----------------------------------------------------------------------
diff --git a/licenses/lic-server-src b/licenses/lic-server-src
index dbe56af..fe1cf85 100644
--- a/licenses/lic-server-src
+++ b/licenses/lic-server-src
@@ -4,8 +4,8 @@ The core component of Apache Trafodion uses several BSD-like, MIT-like and Postg
 +++++++++++++++++++++++++++++
 
 BSD-3 clause for files:
-   incubator-trafodion/core/sql/common/swsprintf.cpp
-   incubator-trafodion/core/sql/common/swscanf.cpp
+   trafodion/core/sql/common/swsprintf.cpp
+   trafodion/core/sql/common/swscanf.cpp
 
 Copyright (c) 1990, 1993
    The Regents of the University of California.  All rights reserved.
@@ -39,7 +39,7 @@ Copyright (c) 1990, 1993
 
 +++++++++++++++++++++++++++++
 
-BSD-3 clause for file incubator-trafodion/core/sql/parser/ulexer.h
+BSD-3 clause for file trafodion/core/sql/parser/ulexer.h
 
  Copyright (c) 1993 The Regents of the University of California.
 
@@ -59,7 +59,7 @@ BSD-3 clause for file incubator-trafodion/core/sql/parser/ulexer.h
 
 +++++++++++++++++++++++++++++
 
-MIT-Expat for files in: incubator-trafodion/core/sql/qmscommon/expat
+MIT-Expat for files in: trafodion/core/sql/qmscommon/expat
 
  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
                                 and Clark Cooper
@@ -68,7 +68,7 @@ MIT-Expat for files in: incubator-trafodion/core/sql/qmscommon/expat
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
  Copyright 2000, Clark Cooper
 
- For details see incubator-trafodion/core/sql/qmscommon/expat/COPYING
+ For details see trafodion/core/sql/qmscommon/expat/COPYING
 
 +++++++++++++++++++++++++++++
 
@@ -79,18 +79,18 @@ MIT-like licenses:
 +++++++++++++++++++++++++++++
 
 BSD-3 clause for files in:  
-   incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables
+   trafodion/dcs/src/main/resources/dcs-webapps/master/datatables
 
  Copyright 2009 Allan Jardine. All Rights Reserved
  Copyright 2008-2012 Allan Jardine, all rights reserved.
 
 For details see:
-  incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables/license-bsd.txt
+  trafodion/dcs/src/main/resources/dcs-webapps/master/datatables/license-bsd.txt
 
 +++++++++++++++++++++++++++++
 
 MIT-Expat for files in: 
-   incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jit.js
+   trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jit.js
 
  Copyright (c) 2011 Sencha Inc. - Author: Nicolas Garcia Belmonte (http://philogb.github.com/)
  Copyright (c) 2006-2010 Valerio Proietti
@@ -116,8 +116,8 @@ MIT-Expat for files in:
 +++++++++++++++++++++++++++++
 
 MIT-Expat for files in:
-   incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui
-   incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jquery-1.11.0.js
+   trafodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui
+   trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jquery-1.11.0.js
 
  Copyright 2014 jQuery Foundation and other contributors
  (c) 2005, 2014 jQuery Foundation, Inc.
@@ -142,11 +142,11 @@ MIT-Expat for files in:
 ++++++++++++++++++++++++++++++
 
 The PostgreSQL Licence (PostgreSQL) for files in:
-	incubator-trafodion/core/sql/common/ComJSON.cpp
-	incubator-trafodion/core/sql/common/ComJSON.h
-	incubator-trafodion/core/sql/common/ComJSONFuncs.cpp
-	incubator-trafodion/core/sql/common/ComJSONStringInfo.cpp
-	incubator-trafodion/core/sql/common/ComJSONStringInfo.h
+	trafodion/core/sql/common/ComJSON.cpp
+	trafodion/core/sql/common/ComJSON.h
+	trafodion/core/sql/common/ComJSONFuncs.cpp
+	trafodion/core/sql/common/ComJSONStringInfo.cpp
+	trafodion/core/sql/common/ComJSONStringInfo.h
 	
 PostgreSQL License is a liberal Open Source license, similar to the BSD or MIT licenses.
 
@@ -167,4 +167,4 @@ $ORGANISATION SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED 
 HEREUNDER IS ON AN "AS IS" BASIS, AND $ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, 
 SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-++++++++++++++++++++++++++++++
\ No newline at end of file
+++++++++++++++++++++++++++++++

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/licenses/lic-test-src
----------------------------------------------------------------------
diff --git a/licenses/lic-test-src b/licenses/lic-test-src
index e60863d..a487c84 100644
--- a/licenses/lic-test-src
+++ b/licenses/lic-test-src
@@ -2,7 +2,7 @@
 Software used to test Apache Trafodion bundles source with BSD-like licenses:
 
 BSD-3 clause for files in:
-  incubator-trafodion/tests/phx/src/test/java/org/trafodion/phoenix/end2end
+  trafodion/tests/phx/src/test/java/org/trafodion/phoenix/end2end
 
 Apache Trafodion changed these files to work within its test environment
 
@@ -37,7 +37,7 @@ As part of testing large objects (LOBs), the testware needs some object files.
 Two pictures were donated for this purpose by Christophe LeRouzo.  He has
 formally given Apache Trafodion to permission to use these picturs.
 
- incubator-trafodion/core/sql/regress/executor/anoush.jpg
- incubator-trafodion/core/sql/regress/executor/deep.jpg
+ trafodion/core/sql/regress/executor/anoush.jpg
+ trafodion/core/sql/regress/executor/deep.jpg
 
 +++++++++++++++++++++++++++++

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9298358..e23e8f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
   <packaging>pom</packaging>
   <name>Apache Trafodion</name>
   <description>Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or operational workloads on Hadoop.</description>
-  <url>http://trafodion.incubator.apache.org</url>
+  <url>http://trafodion.apache.org</url>
   <inceptionYear>2015</inceptionYear>
 
   <licenses>
@@ -280,9 +280,9 @@
 
   <distributionManagement>
     <site>
-      <id>trafodion.incubator.apache.org</id>
-      <name>Trafodion Website at incubator.apache.org</name>
-      <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see
+      <id>trafodion.apache.org</id>
+      <name>Trafodion Website at apache.org</name>
+      <!-- On why this is the tmp dir and not trafodion.apache.org, see
       https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866
       -->
       <url>file:///tmp</url>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/f077620a/tools/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index be75b9b..21cb98e 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -17,7 +17,7 @@
 FROM centos:centos6.6
 MAINTAINER Trafodion Community <dev@trafodion.incubator.apache.org>
 
-LABEL Vendor="Apache Trafodion (incubating)"
+LABEL Vendor="Apache Trafodion"
 LABEL version=unstable
 
 # download and install environment dependencies


Mime
View raw message