You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/02/12 23:08:58 UTC
[1/4] incubator-trafodion git commit: Updated the website to use the
new Apache incubator logo. Also,
updated versions on the pom.xml file to a new version of the PDF generator.
This version exposes the Messages Guide, which now uses the env.TRAFODION_VE
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 3a1b73c87 -> fab414d41
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/src/site/markdown/documentation.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/documentation.md b/docs/src/site/markdown/documentation.md
index 3a50dc9..bc21ff2 100644
--- a/docs/src/site/markdown/documentation.md
+++ b/docs/src/site/markdown/documentation.md
@@ -21,6 +21,7 @@ Document | Formats
Trafodion Client Installation Guide | [Web Book](docs/client_install/index.html),[PDF](docs/client_install/Trafodion_Client_Installation_Guide.pdf)
Trafodion Command Interface Guide | [Web Book](docs/command_interface/index.html),[PDF](docs/command_interface/Trafodion_Command_Interface_Guide.pdf)
Trafodion Database Connectivity Services Guide | [Web Book](docs/dcs_reference/index.html),[API](docs/dcs_reference/apidocs/index.html)
+Trafodion Messages Guide | [Web Book](docs/messages_guide/index.html),[PDF](docs/messages_guide/Trafodion_Messages_Guide.pdf)
Trafodion odb User Guide | [Web Book](docs/odb/index.html),[PDF](docs/odb/Trafodion_odb_User_Guide.pdf)
Trafodion REST Server Reference Guide | [Web Book](docs/rest_reference/index.html),[API](docs/rest_reference/apidocs/index.html)
Trafodion SQL Reference Manual | [Web Book](docs/sql_reference/index.html),[PDF](docs/sql_reference/Trafodion_SQL_Reference_Manual.pdf)
@@ -32,6 +33,7 @@ Document | Formats
Trafodion Client Installation Guide | [Web Book](docs/2.0.0/client_install/index.html),[PDF](docs/2.0.0/client_install/Trafodion_Client_Installation_Guide.pdf)
Trafodion Command Interface Guide | [Web Book](docs/2.0.0/command_interface/index.html),[PDF](docs/2.0.0/command_interface/Trafodion_Command_Interface_Guide.pdf)
Trafodion Database Connectivity Services Guide | [Web Book](docs/2.0.0/dcs_reference/index.html),[API](docs/2.0.0/dcs_reference/apidocs/index.html)
+Trafodion Messages Guide | [Web Book](docs/2.0.0/messages_guide/index.html),[PDF](docs/2.0.0/messages_guide/Trafodion_Messages_Guide.pdf)
Trafodion odb User Guide | [Web Book](docs/2.0.0/odb/index.html),[PDF](docs/2.0.0/odb/Trafodion_odb_User_Guide.pdf)
Trafodion REST Server Reference Guide | [Web Book](docs/2.0.0/rest_reference/index.html),[API](docs/2.0.0/rest_reference/apidocs/index.html)
Trafodion SQL Reference Manual | [Web Book](docs/2.0.0/sql_reference/index.html),[PDF](docs/2.0.0/sql_reference/Trafodion_SQL_Reference_Manual.pdf)
@@ -43,6 +45,7 @@ Document | Formats
Trafodion Client Installation Guide | [Web Book](docs/1.3.0/client_install/index.html),[PDF](docs/1.3.0/client_install/Trafodion_Client_Installation_Guide.pdf)
Trafodion Command Interface Guide | [Web Book](docs/1.3.0/command_interface/index.html),[PDF](docs/1.3.0/command_interface/Trafodion_Command_Interface_Guide.pdf)
Trafodion Database Connectivity Services Guide | [Web Book](docs/1.3.0/dcs_reference/index.html),[API](docs/1.3.0/dcs_reference/apidocs/index.html)
+Trafodion Messages Guide | [Web Book](docs/1.3.0/messages_guide/index.html),[PDF](docs/1.3.0/messages_guide/Trafodion_Messages_Guide.pdf)
Trafodion odb User Guide | [Web Book](docs/1.3.0/odb/index.html),[PDF](docs/1.3.0/odb/Trafodion_odb_User_Guide.pdf)
Trafodion REST Server Reference Guide | [Web Book](docs/1.3.0/rest_reference/index.html),[API](docs/1.3.0/rest_reference/apidocs/index.html)
Trafodion SQL Reference Manual | [Web Book](docs/1.3.0/sql_reference/index.html),[PDF](docs/1.3.0/sql_reference/Trafodion_SQL_Reference_Manual.pdf)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/src/site/resources/images/logos/egg-logo.gif
----------------------------------------------------------------------
diff --git a/docs/src/site/resources/images/logos/egg-logo.gif b/docs/src/site/resources/images/logos/egg-logo.gif
deleted file mode 100644
index f26d275..0000000
Binary files a/docs/src/site/resources/images/logos/egg-logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 641c321..0f4b7bc 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -257,8 +257,7 @@
<span>Apache, Apache Maven, Apache Maven Fluido Skin, the Apache feather logo, the Apache Maven project logo and the Apache Incubator project logo
are trademarks of The Apache Software Foundation.</span><br /><br />
<span>
- <a href="http://www.apache.org" target="_blank"><img id="asf-logo" alt="Apache Software Foundation" src="images/logos/feather-small.gif" /></a>
- <a href="http://incubator.apache.org/" target="_blank"><img id="incubator-logo" alt="Apache Incubator" src="images/logos/egg-logo.gif" /></a>
+ <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>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e795d0d..f723602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
<module>dcs</module>
<module>core/rest</module>
<module>docs/command_interface</module>
- <module>docs/install_guide</module>
+ <module>docs/provisioning_guide</module>
<module>docs/messages_guide</module>
<module>docs/odb_user</module>
<module>docs/sql_reference</module>
@@ -189,12 +189,6 @@
<artifactId>velocity</artifactId>
<version>1.7</version>
</dependency>
- <!-- For building docs from asciidoctor -->
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <version>1.5.2</version>
- </dependency>
</dependencies>
<configuration>
<siteDirectory>${basedir}/docs/src/site</siteDirectory>
@@ -248,44 +242,6 @@
<backend>html5</backend>
</configuration>
</execution>
- <execution>
- <id>output-pdf</id>
- <phase>site</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <backend>pdf</backend>
- <attributes>
- <pagenums/>
- <toc/>
- <idprefix/>
- <idseparator>-</idseparator>
- </attributes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${maven.antrun.version}</version>
- <inherited>false</inherited>
- <!-- Rename the book.pdf generated by asciidoctor -->
- <executions>
- <execution>
- <id>rename-pdf</id>
- <phase>post-site</phase>
- <configuration>
- <target name="rename file">
- <move file="${project.basedir}/docs/target/docs/book.pdf" tofile="${project.basedir}/docs/target/docs/apache_trafodion_reference_guide.pdf" />
- <move file="${project.basedir}/docs/target/docs/book.pdfmarks" tofile="${project.basedir}/docs/target/docs/apache_trafodion_reference_guide.pdfmarks" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
</executions>
</plugin>
</plugins>
[3/4] incubator-trafodion git commit: Hardcoded version number in
parent tag. Also hid empty pages.
Posted by db...@apache.org.
Hardcoded version number in parent tag. Also hid empty 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/1c974caf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1c974caf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1c974caf
Branch: refs/heads/master
Commit: 1c974caff48bb8391f19f9c90ee3a6d9411b9de4
Parents: 08d2915
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Wed Feb 10 10:40:57 2016 -0700
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Wed Feb 10 10:40:57 2016 -0700
----------------------------------------------------------------------
docs/client_install/pom.xml | 4 +++-
docs/client_install/src/asciidoc/index.adoc | 2 +-
docs/command_interface/pom.xml | 3 ++-
docs/messages_guide/pom.xml | 2 +-
docs/odb_user/pom.xml | 2 +-
docs/provisioning_guide/pom.xml | 2 +-
docs/sql_reference/pom.xml | 2 +-
docs/src/site/site.xml | 8 ++++----
8 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c974caf/docs/client_install/pom.xml
----------------------------------------------------------------------
diff --git a/docs/client_install/pom.xml b/docs/client_install/pom.xml
index d31a60c..0deba63 100644
--- a/docs/client_install/pom.xml
+++ b/docs/client_install/pom.xml
@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
- <version>${env.TRAFODION_VER}</version>
+ <version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -208,6 +208,8 @@
<toc/>
<idprefix/>
<idseparator>-</idseparator>
+ <project-version>${env.TRAFODION_VER}</project-version>
+ <build-date>${maven.build.timestamp}</build-date>
</attributes>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c974caf/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 f63d803..f4001b2 100644
--- a/docs/client_install/src/asciidoc/index.adoc
+++ b/docs/client_install/src/asciidoc/index.adoc
@@ -22,7 +22,6 @@
////
= Trafodion Client Installation Guide
-Version 1.3.0, January 2016
:doctype: book
:numbered:
:toc: left
@@ -32,6 +31,7 @@ Version 1.3.0, January 2016
:iconsdir: icons
:experimental:
:source-language: text
+:revnumber: {project-version}
:images: ../images
:sourcedir: ../../resources/source
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c974caf/docs/command_interface/pom.xml
----------------------------------------------------------------------
diff --git a/docs/command_interface/pom.xml b/docs/command_interface/pom.xml
index 2aad1e3..37732c1 100644
--- a/docs/command_interface/pom.xml
+++ b/docs/command_interface/pom.xml
@@ -32,11 +32,12 @@
<description>This guide describes how to use the Trafodion Command Interface (TrafCI).</description>
<url>http://trafodion.incubator.apache.org</url>
<inceptionYear>2015</inceptionYear>
+
<parent>
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>${env.TRAFODION_VER}</version>
+ <version>1.3.0</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c974caf/docs/messages_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/messages_guide/pom.xml b/docs/messages_guide/pom.xml
index 2355827..f0fd81f 100644
--- a/docs/messages_guide/pom.xml
+++ b/docs/messages_guide/pom.xml
@@ -36,8 +36,8 @@
<parent>
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
- <version>${env.TRAFODION_VER}</version>
<relativePath>../../pom.xml</relativePath>
+ <version>1.3.0</version>
</parent>
<licenses>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c974caf/docs/odb_user/pom.xml
----------------------------------------------------------------------
diff --git a/docs/odb_user/pom.xml b/docs/odb_user/pom.xml
index 4d13c01..7dded2d 100644
--- a/docs/odb_user/pom.xml
+++ b/docs/odb_user/pom.xml
@@ -36,7 +36,7 @@
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>${env.TRAFODION_VER}</version>
+ <version>1.3.0</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c974caf/docs/provisioning_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/pom.xml b/docs/provisioning_guide/pom.xml
index 07e4517..04e865d 100644
--- a/docs/provisioning_guide/pom.xml
+++ b/docs/provisioning_guide/pom.xml
@@ -37,7 +37,7 @@
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>${env.TRAFODION_VER}</version>
+ <version>1.3.0</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c974caf/docs/sql_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/sql_reference/pom.xml b/docs/sql_reference/pom.xml
index fd692ca..628004a 100644
--- a/docs/sql_reference/pom.xml
+++ b/docs/sql_reference/pom.xml
@@ -39,7 +39,7 @@
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>${env.TRAFODION_VER}</version>
+ <version>1.3.0</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c974caf/docs/src/site/site.xml
----------------------------------------------------------------------
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 0f4b7bc..41b0a34 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -183,9 +183,9 @@
</links>
<menu name="About">
<item href="index.html" name="Project Overview"/>
- <item href="new-features.html" name="New Features"/>
- <item href="roadmap.html" name="Roadmap"/>
- <item href="performance.html" name="Performance"/>
+ <!-- item href="new-features.html" name="New Features"/-->
+ <!-- item href="roadmap.html" name="Roadmap"/-->
+ <!-- item href="performance.html" name="Performance"/-->
<item href="http:divider" name=""/>
<item href="team-redirect.html" name="Team"/>
<item href="presentations.html" name="Presentations"/>
@@ -196,7 +196,7 @@
<item href="license.html" name="License"/>
</menu>
<menu name="Using">
- <item href="quickstart.html" name="Quick Start"/>
+ <!--item href="quickstart.html" name="Quick Start"/-->
<item href="download.html" name="Download"/>
<item href="install.html" name="Install"/>
<item href="uninstall.html" name="Uninstall"/>
[4/4] incubator-trafodion git commit: PR 316 Merge updates to web
site including new Apache incubator logo
Posted by db...@apache.org.
PR 316 Merge updates to web site including new Apache incubator logo
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fab414d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fab414d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fab414d4
Branch: refs/heads/master
Commit: fab414d412808b7304a6a922ec0528a480fd85fc
Parents: 3a1b73c 1c974ca
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Feb 12 22:07:12 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Feb 12 22:07:12 2016 +0000
----------------------------------------------------------------------
docs/client_install/pom.xml | 10 +-
.../src/asciidoc/_chapters/about.adoc | 2 -
docs/client_install/src/asciidoc/index.adoc | 2 +-
docs/command_interface/pom.xml | 11 +-
docs/install_guide/pom.xml | 226 ----------
.../src/asciidoc/_chapters/about.adoc | 131 ------
.../src/asciidoc/_chapters/requirements.adoc | 96 ----
docs/install_guide/src/asciidoc/index.adoc | 64 ---
docs/messages_guide/pom.xml | 21 +-
docs/odb_user/pom.xml | 10 +-
docs/provisioning_guide/pom.xml | 287 ++++++++++++
.../src/asciidoc/_chapters/about.adoc | 195 ++++++++
.../src/asciidoc/_chapters/install_prepare.adoc | 39 ++
.../src/asciidoc/_chapters/requirements.adoc | 446 +++++++++++++++++++
docs/provisioning_guide/src/asciidoc/index.adoc | 65 +++
docs/sql_reference/pom.xml | 12 +-
docs/src/site/markdown/documentation.md | 3 +
.../site/resources/images/logos/egg-logo.gif | Bin 3296 -> 0 bytes
docs/src/site/site.xml | 11 +-
pom.xml | 46 +-
20 files changed, 1079 insertions(+), 598 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-trafodion git commit: Updated the website to use the
new Apache incubator logo. Also,
updated versions on the pom.xml file to a new version of the PDF generator.
This version exposes the Messages Guide, which now uses the env.TRAFODION_VE
Posted by db...@apache.org.
Updated the website to use the new Apache incubator logo. Also, updated
versions on the pom.xml file to a new version of the PDF generator. This
version exposes the Messages Guide, which now uses the env.TRAFODION_VER
variable. The docs/messages_guide needs to be built for 1.3.0 and 2.0.0
and checked in accordingly to the website git branch.
This pull request also includes the first checkin of the upcoming
Provisioning Guide, which replaces the never-published Installation Guide.
Finally, removed the asciidoc handling in the main pom.xml file since it
is not used and was wrong anyway.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/08d2915f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/08d2915f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/08d2915f
Branch: refs/heads/master
Commit: 08d2915f6cee076725ce165a09a10d4fb2778cb3
Parents: 8c955e6
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Tue Feb 9 22:02:23 2016 -0700
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Tue Feb 9 22:02:23 2016 -0700
----------------------------------------------------------------------
docs/client_install/pom.xml | 10 +-
.../src/asciidoc/_chapters/about.adoc | 2 -
docs/command_interface/pom.xml | 10 +-
docs/install_guide/pom.xml | 226 ----------
.../src/asciidoc/_chapters/about.adoc | 131 ------
.../src/asciidoc/_chapters/requirements.adoc | 96 ----
docs/install_guide/src/asciidoc/index.adoc | 64 ---
docs/messages_guide/pom.xml | 21 +-
docs/odb_user/pom.xml | 10 +-
docs/provisioning_guide/pom.xml | 287 ++++++++++++
.../src/asciidoc/_chapters/about.adoc | 195 ++++++++
.../src/asciidoc/_chapters/install_prepare.adoc | 39 ++
.../src/asciidoc/_chapters/requirements.adoc | 446 +++++++++++++++++++
docs/provisioning_guide/src/asciidoc/index.adoc | 65 +++
docs/sql_reference/pom.xml | 12 +-
docs/src/site/markdown/documentation.md | 3 +
.../site/resources/images/logos/egg-logo.gif | Bin 3296 -> 0 bytes
docs/src/site/site.xml | 3 +-
pom.xml | 46 +-
19 files changed, 1072 insertions(+), 594 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/client_install/pom.xml
----------------------------------------------------------------------
diff --git a/docs/client_install/pom.xml b/docs/client_install/pom.xml
index 4d4ef59..d31a60c 100644
--- a/docs/client_install/pom.xml
+++ b/docs/client_install/pom.xml
@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
- <version>1.3.0</version>
+ <version>${env.TRAFODION_VER}</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -75,8 +75,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
- <asciidoctorj.pdf.version>1.5.0-alpha.10.1</asciidoctorj.pdf.version>
- <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+ <asciidoctorj.pdf.version>1.5.0-alpha.11</asciidoctorj.pdf.version>
+ <asciidoctorj.version>1.5.4</asciidoctorj.version>
<rubygems.prawn.version>2.0.2</rubygems.prawn.version>
<jruby.version>9.0.4.0</jruby.version>
</properties>
@@ -183,8 +183,8 @@
<attributes>
<!-- Location of centralized stylesheet -->
<stylesheet>${basedir}/../shared/trafodion-manuals.css</stylesheet>
- <projectVersion>1.3.0</projectVersion>
- <buildDate>${maven.build.timestamp}</buildDate>
+ <project-version>${env.TRAFODION_VER}</project-version>
+ <build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/client_install/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/about.adoc b/docs/client_install/src/asciidoc/_chapters/about.adoc
index c3211c8..3b14fd7 100644
--- a/docs/client_install/src/asciidoc/_chapters/about.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/about.adoc
@@ -26,8 +26,6 @@
= About This Document
This manual describes how to install and configure client applications that enable you to connect to and use a Trafodion database.
---
-
== Intended Audience
This manual is intended for users who want to connect to and use a Trafodion database.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/command_interface/pom.xml
----------------------------------------------------------------------
diff --git a/docs/command_interface/pom.xml b/docs/command_interface/pom.xml
index fab074f..2aad1e3 100644
--- a/docs/command_interface/pom.xml
+++ b/docs/command_interface/pom.xml
@@ -35,8 +35,8 @@
<parent>
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
- <version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
+ <version>${env.TRAFODION_VER}</version>
</parent>
@@ -74,8 +74,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
- <asciidoctorj.pdf.version>1.5.0-alpha.10.1</asciidoctorj.pdf.version>
- <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+ <asciidoctorj.pdf.version>1.5.0-alpha.11</asciidoctorj.pdf.version>
+ <asciidoctorj.version>1.5.4</asciidoctorj.version>
<rubygems.prawn.version>2.0.2</rubygems.prawn.version>
<jruby.version>9.0.4.0</jruby.version>
</properties>
@@ -182,8 +182,8 @@
<attributes>
<!-- Location of centralized stylesheet -->
<stylesheet>${basedir}/../shared/trafodion-manuals.css</stylesheet>
- <projectVersion>1.3.0</projectVersion>
- <buildDate>${maven.build.timestamp}</buildDate>
+ <project-version>${env.TRAFODION_VER}</project-version>
+ <build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/install_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/install_guide/pom.xml b/docs/install_guide/pom.xml
deleted file mode 100644
index 5860c1d..0000000
--- a/docs/install_guide/pom.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--
-* @@@ START COPYRIGHT @@@
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "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.
-*
-* @@@ END COPYRIGHT @@@
--->
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.trafodion</groupId>
- <artifactId>install-guide</artifactId>
- <version>1.3.0</version>
- <packaging>pom</packaging>
- <name>Trafodion Installation Guide</name>
- <description>This guide describes how to install Trafodion.</description>
- <url>http://trafodion.incubator.apache.org</url>
- <inceptionYear>2015</inceptionYear>
- <parent>
- <groupId>org.apache.trafodion</groupId>
- <artifactId>trafodion</artifactId>
- <version>1.3.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
-
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/TRAFODION</url>
- </issueManagement>
-
- <scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
- <tag>HEAD</tag>
- </scm>
-
- <ciManagement>
- <system>Jenkins</system>
- <url>https://jenkins.esgyn.com</url>
- </ciManagement>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
- <asciidoctorj.pdf.version>1.5.0-alpha.10.1</asciidoctorj.pdf.version>
- <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <attributes>
- <generateReports>false</generateReports>
- </attributes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <version>${asciidoctor.maven.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-pdf</artifactId>
- <version>${asciidoctorj.pdf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj</artifactId>
- <version>${asciidoctorj.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDirectory>${basedir}/src</sourceDirectory>
- </configuration>
- <executions>
- <execution>
- <id>generate-html-doc</id>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <phase>site</phase>
- <configuration>
- <doctype>book</doctype>
- <backend>html5</backend>
- <sourceHighlighter>coderay</sourceHighlighter>
- <outputDirectory>${basedir}/target/site</outputDirectory>
- <attributes>
- <!-- Location of centralized stylesheet -->
- <stylesheet>${basedir}/../shared/trafodion-manuals.css</stylesheet>
- <projectVersion>1.3.0</projectVersion>
- <buildDate>${maven.build.timestamp}</buildDate>
- </attributes>
- </configuration>
- </execution>
- <execution>
- <id>generate-pdf-doc</id>
- <phase>site</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <doctype>book</doctype>
- <backend>pdf</backend>
- <sourceHighlighter>coderay</sourceHighlighter>
- <outputDirectory>${basedir}/target</outputDirectory>
- <attributes>
- <icons>font</icons>
- <pagenums/>
- <toc/>
- <idprefix/>
- <idseparator>-</idseparator>
- </attributes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Copy files to the web-site end destinations. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>populate-release-directories</id>
- <phase>post-site</phase>
- <configuration>
- <target name="Populate Release Directories">
- <!-- The website uses the following organization for the docs/target/docs directory:
- - To ensure a known location, the base directory contains the LATEST version of the web book and the PDF files.
- - The know location is docs/target/docs/<document>
- - target/docs/<version>/<document> contains version-specific renderings of the documents.
- - target/docs/<version>/<document> contains the PDF version and the web book. The web book is named index.html
- -->
- <!-- Copy the PDF file to its target directories -->
- <copy file="${basedir}/target/index.pdf" tofile="${basedir}/../target/docs/install_guide/Trafodion_Install_Guide.pdf" />
- <copy file="${basedir}/target/index.pdf" tofile="${basedir}/../target/docs/${project.version}/install_guide/Trafodion_Install_Guide.pdf" />
- <!-- Copy the Web Book files to their target directories -->
- <copy todir="${basedir}/../target/docs/install_guide">
- <fileset dir="${basedir}/target/site">
- <include name="**/*.*"/> <!--All sub-directories, too-->
- </fileset>
- </copy>
- <copy todir="${basedir}/../target/docs/${project.version}/install_guide">
- <fileset dir="${basedir}/target/site">
- <include name="**/*.*"/> <!--All sub-directories, too-->
- </fileset>
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <!-- Included because this is required. No reports are generated. -->
- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.8</version>
- <reportSets>
- <reportSet>
- <reports>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
- <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
- 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>
- </site>
- </distributionManagement>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/install_guide/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/install_guide/src/asciidoc/_chapters/about.adoc b/docs/install_guide/src/asciidoc/_chapters/about.adoc
deleted file mode 100644
index 5db7104..0000000
--- a/docs/install_guide/src/asciidoc/_chapters/about.adoc
+++ /dev/null
@@ -1,131 +0,0 @@
-////
-/**
-* @@@ START COPYRIGHT @@@
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "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.
-*
-* @@@ END COPYRIGHT @@@
- */
-////
-
-= About This Document
-This guide describes how to install Trafodion for end-user environments. This install allows you to store and query data using Trafodion, either via Trafodion clients
-(see http://trafodion.incubator.apache.org/client_install/index.html[Trafodion 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/contributor_guide/index.html[Trafodion Contributors' Guide].
-
-== Intended Audience
-This guide is intended for:
-
-* *Single-Node Install*: Typically used when you want to evalulate Trafodion.
-* *Cluster (Multi-Node) Install*: Typically used when you deploy Trafodion for application usage.
-
-NOTE: Trafodion can be installed on a single-node or multi-node enviroment. Unless specifically noted, the term *cluster* is used
-to mean both single- and multi-node environments.
-
-The installation instructions applies to a diverse set of platforms:
-
-* *Virtual Machines*: Often used for evaluations and Trafodion development.
-* *Cloud*: Used for Product Environments as well as for Developer Environments.
-* *Bare Metal*: Used for Product Environments as well as for Developer Environments.
-
-NOTE: The term *node* is used to represent a computing platform on which operating system, Hadoop, and Trafodion software is running.
-Unless specifically qualified (bare-metal node, virtual-machin node, or cloud-node), *node* represents a computing platform in your cluster
-regardless of platform type.
-
-== New and Changed Information
-This is a new guide.
-
-== Notation Conventions
-This list summarizes the notation conventions for syntax presentation in this manual.
-
-[cols="15%,30%,25%,30%",options="header"]
-|===
-| Notation | Usage | Example | Notes
-| UPPERCASE LETTERS | Uppercase letters indicate keywords and reserved words. Type these items exactly as shown. Items not enclosed in brackets are required. | SELECT |
-| _Italic Letters_ | Italic letters, regardless of font, indicate variable items that you supply. Items not enclosed in brackets are required. | _file-name_ |
-| `Computer Type` | Computer type letters within text indicate case-sensitive keywords and reserved words. Type these items exactly as shown. Items not enclosed in
-brackets are required. | `myfile.sh` |
-| *Bold Text* | Bold text in an example indicates user input typed at the terminal. | `ENTER RUN CODE:` +
- ?**123** +
- `CODE RECEIVED: 123.00` | The user must press the Return key after typing the input.
-| [ ] Brackets | Brackets enclose optional syntax items. |
-DATETIME [__start-field__ TO] +
-_end-field_
-| A group of items enclosed in brackets is a list from which you can choose one item or none.
-
-The items in the list can be arranged either vertically, with aligned brackets on each side of the list, or horizontally, enclosed in a pair of brackets and separated by vertical lines.
-
-For example:
-
-`DROP SCHEMA _schema_ [CASCADE]` +
-`DROP SCHEMA _schema_ [ CASCADE \| RESTRICT ]`
-| { } Braces | Braces enclose required syntax items. | `FROM { __grantee__[, __grantee__]...}` | A group of items enclosed in braces is a list from which you are required to choose one item.
-
-The items in the list can be arranged either vertically, with aligned braces on each side of the list, or horizontally, enclosed in a pair of braces and separated by vertical lines.
-
-For example:
-
-`INTERVAL { _start-field_ TO _end-field_ }` +
-`{ _single-field_ }` +
-`INTERVAL { _start-field_ TO _end-field_ \| _single-field_ }`
---
-| \| Vertical Line | A vertical line separates alternatives in a horizontal list that is enclosed in brackets or braces. | `{__expression__ \| NULL}` |
-| … Ellipsis | An ellipsis immediately following a pair of brackets or braces indicates that you can repeat the enclosed sequence of syntax items any number of times. |
-`ATTRIBUTE[S] _attribute_ [, __attribute__]...` +
-`{, __sql-expression__}...`
-| An ellipsis immediately following a single syntax item indicates that you can repeat that syntax item any number of times.
-
-For example:
-
-`__expression-n__…`
-| Punctuation | Parentheses, commas, semicolons, and other symbols not previously described must be typed as shown. |
-DAY (__datetime-expression__)` +
-`@__script-file__` | Quotation marks around a symbol such as a bracket or brace indicate the symbol is a required character that you must type as shown.
-
-For example:
-
-`"{" _module-name_ [, __module-name__]... "}"`
-| Item Spacing | Spaces shown between items are required unless one of the items is a punctuation symbol such as a parenthesis or a comma. |
-`DAY (__datetime-expression__) DAY(__datetime-expression__)` | If there is no space between two items, spaces are not permitted. In this example, no spaces are permitted between the period and any other items:
-
-`__myfile__.sh`
-
-| Line Spacing | If the syntax of a command is too long to fit on a single line, each continuation line is indented three spaces and is separated from the preceding line by a blank line.
-
-This spacing distinguishes items in a continuation line from items in a vertical list of selections. |
-`_match-value_ [NOT] LIKE _pattern_`
- [ESCAPE __esc-char-expression__] |
-|===
-
-== Publishing History
-[cols="2*",options="header"]
-|===
-| Product Version | Publication Date
-| Trafodion Release 1.3.0 | To be announced.
-|===
-
-== Comments Encouraged
-The Trafodion community encourages your comments concerning this document. We are committed to providing documentation that meets your
-needs. Send any errors found, suggestions for improvement, or compliments to:
-
-issues@trafodion.incubator.apache.org
-
-Include the document title and any comment, error found, or suggestion for improvement you have concerning this document.
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/install_guide/src/asciidoc/_chapters/requirements.adoc
----------------------------------------------------------------------
diff --git a/docs/install_guide/src/asciidoc/_chapters/requirements.adoc b/docs/install_guide/src/asciidoc/_chapters/requirements.adoc
deleted file mode 100644
index b88f46d..0000000
--- a/docs/install_guide/src/asciidoc/_chapters/requirements.adoc
+++ /dev/null
@@ -1,96 +0,0 @@
-////
-/**
-* @@@ START COPYRIGHT @@@
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "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.
-*
-* @@@ END COPYRIGHT @@@
- */
-////
-
-= Requirements
-
-The current release of Trafodion has been tested with:
-
-* 64-bit Red Hat Enterprise Linux (RHEL) 6.5, 6.6, and 6.7
-* SUSE SLES 11.3
-* Cloudera CDH 5.2
-* Cloudera CDH 5.3
-* Hortonworks HDP 2.2
-
-Other OS releases may work, too. The Trafodion project is currently working on better support for non-distribution version of Hadoop.
-
-== General Hardware and OS Requirements and Recommendations
-
-Trafodion assumes an environment based on the requirements of the supported Hadoop distributions. Please verify these assumptions on
-each server you will install Trafodion on:
-
-* `bash` is available for shell-script execution.
-* `sshd` (the `ssh` daemon) is running on each node in the cluster.
-* `ntpd` (the `ntp` daemon) is running and synchronizign time on each node in the cluster.
-* `/etc/hosts` is set up for fully-qualified node names (FQDN).
-* `/etc/resolv.conf` is configured to use a name server tat can resolve commands such as `host -T <FQDN>`.
-Please attempt to use such a command to validate host-name resolution.
-* The Linux Kernel Firewall (`iptables`) has either been disabled (to check: `service iptables status` (requires sudo access)
-or <<ip_ports,ports required by Trafodion>> have been opened
-
-[[ip_ports]]
-=== IP Ports
-The following table lists the default ports used by the different Trafodion components plus the configuration file and configuration attribute associated with each port setting.
-
-[cols="10%h,20%l,20%l,10%,10%,10%,20%",options="header"]
-|===
-| Default Port | Configuration File | Configuration Entry | Required | Range | Protocol | Comment
-| 4200 | rest-site.xml | trafodion.rest.port | Yes | 1 | REST | Trafodion REST Server.
-| 4201 | rest-site.xml | trafodion.rest.https.port | Yes | 1 | HTTPS | Trafodion REST Server (HTTPS).
-| 23400 | dcs-site.xml | dcs.master.port | Yes | _n_ | binary | Start of Trafodion DCS port range. (37800 for Trafodion 1.1)
-| 24400 | dcs-site.xml | dcs.master.info.port | Yes | 1 | HTTP | DCS master web GUI. (40010 for Trafodion 1.1)
-| 24410 | dcs-site.xml | dcs.server.info.port | Yes | _n_ | HTTP | Start of range for DCS server web GUIs. (40020 for Trafodion 1.1)
-| 50030 | mapred-site.xml | mapred.job.tracker.http.address | No | 1 | HTTP | MapReduce Job Tracker web GUI.
-| 50070 | hdfs-site.xml | dfs.http.address | No | 1 | HTTP | HDFS Name Node web GUI.
-| 50075 | hdfs-site.xml | dfs.datanode.http.address | No | 1 | HTTP | HDFS Data Node web GUI.
-| 50090 | hdfs-site.xml | dfs.secondary.http.address | No | 1 | HTTP | HDFS Secondary Name Node web GUI.
-| 60010 | hbase-site.xml | hbase.master.info.port | No | 1 | HTTP | HBase Master web GUI.
-| 60030 | hbase-site.xml | hbase.regionserver.info.port | No | 1 | HTTP | HBase Region Server web GUI.
-|===
-
-There are two port ranges used by Trafodion.
-
-* 23400 is a range, to allow multiple mxosrvr processes on each node. Allow a range of a few ports,
-enough to cover all the servers per node that are listed in the "servers" file in the DCS configuration directory.
-* 24410 is a range as well, enough to cover the DCS servers per node, usually 1 or 2.
-
-On top of the ports identified above, you also need the ports required by your Hadoop distribution. For example:
-
-* http://www.cloudera.com/content/www/en-us/documentation/enterprise/latest/topics/cdh_ig_ports_cdh5.html[_Cloudera Ports_]
-* http://docs.hortonworks.com/HDPDocuments/HDP2/HDP-2.3.0-Win/bk_HDP_Install_Win/content/ref-79239257-778e-42a9-9059-d982d0c08885.1.html[_Hortonworks Ports_]
-
-Although not all the ports will be used on every node of the cluster, you need to open most of them for all the nodes in the cluster that
-have Trafodion, HBase, or HDFS servers on them.
-
-== Prerequisite Software
-
-=== Hadoop Services
-
-The following Hadoop services must be running on the cluster where you install Trafodion:
-
-
-
-=== Software Packages
-
-You need to install the following software and dependencies before installing Trafodion.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/install_guide/src/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/docs/install_guide/src/asciidoc/index.adoc b/docs/install_guide/src/asciidoc/index.adoc
deleted file mode 100644
index 3e51ea8..0000000
--- a/docs/install_guide/src/asciidoc/index.adoc
+++ /dev/null
@@ -1,64 +0,0 @@
-////
-* @@@ START COPYRIGHT @@@
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "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.
-*
-* @@@ END COPYRIGHT @@@
-////
-
-= Trafodion Install Guide
-Version 1.3.0, January 2016
-:doctype: book
-:numbered:
-:toc: left
-:toclevels: 3
-:toc-title: Table of Contents
-:icons: font
-:iconsdir: icons
-:experimental:
-:source-language: text
-
-:images: ../images
-:leveloffset: 1
-
-// The directory is called _chapters because asciidoctor skips direct
-// processing of files found in directories starting with an _. This
-// prevents each chapter being built as its own book.
-
-**License Statement**
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
-"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.
-
-[cols="2",options="header"]
-|===
-| Version | Date
-| 1.3.0 | January, 2016
-|===
-
-include::asciidoc/_chapters/about.adoc[]
-include::asciidoc/_chapters/requirements.adoc[]
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/messages_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/messages_guide/pom.xml b/docs/messages_guide/pom.xml
index 3de991d..2355827 100644
--- a/docs/messages_guide/pom.xml
+++ b/docs/messages_guide/pom.xml
@@ -26,13 +26,20 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.trafodion</groupId>
<artifactId>messages-guide</artifactId>
- <version>1.3.0</version>
+ <version>${env.TRAFODION_VER}</version>
<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>
<inceptionYear>2015</inceptionYear>
+ <parent>
+ <groupId>org.apache.trafodion</groupId>
+ <artifactId>trafodion</artifactId>
+ <version>${env.TRAFODION_VER}</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -67,8 +74,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
- <asciidoctorj.pdf.version>1.5.0-alpha.10.1</asciidoctorj.pdf.version>
- <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+ <asciidoctorj.pdf.version>1.5.0-alpha.11</asciidoctorj.pdf.version>
+ <asciidoctorj.version>1.5.4</asciidoctorj.version>
<rubygems.prawn.version>2.0.2</rubygems.prawn.version>
<jruby.version>9.0.4.0</jruby.version>
</properties>
@@ -175,8 +182,8 @@
<attributes>
<!-- Location of centralized stylesheet -->
<stylesheet>${basedir}/../shared/trafodion-manuals.css</stylesheet>
- <projectVersion>1.3.0</projectVersion>
- <buildDate>${maven.build.timestamp}</buildDate>
+ <project-version>${env.TRAFODION_VER}</project-version>
+ <build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
</configuration>
@@ -224,8 +231,8 @@
- target/docs/<version>/<document> contains the PDF version and the web book. The web book is named index.html
-->
<!-- Copy the PDF file to its target directories -->
- <copy file="${basedir}/target/index.pdf" tofile="${basedir}/../target/docs/client_install/Trafodion_Messages_Guide.pdf" />
- <copy file="${basedir}/target/index.pdf" tofile="${basedir}/../target/docs/${project.version}/client_install/Trafodion_Messages_Guide.pdf" />
+ <copy file="${basedir}/target/index.pdf" tofile="${basedir}/../target/docs/messages_guide/Trafodion_Messages_Guide.pdf" />
+ <copy file="${basedir}/target/index.pdf" tofile="${basedir}/../target/docs/${project.version}/messages_guide/Trafodion_Messages_Guide.pdf" />
<!-- Copy the Web Book files to their target directories -->
<copy todir="${basedir}/../target/docs/messages_guide">
<fileset dir="${basedir}/target/site">
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/odb_user/pom.xml
----------------------------------------------------------------------
diff --git a/docs/odb_user/pom.xml b/docs/odb_user/pom.xml
index db21320..4d13c01 100644
--- a/docs/odb_user/pom.xml
+++ b/docs/odb_user/pom.xml
@@ -35,8 +35,8 @@
<parent>
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
- <version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
+ <version>${env.TRAFODION_VER}</version>
</parent>
@@ -74,8 +74,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
- <asciidoctorj.pdf.version>1.5.0-alpha.10.1</asciidoctorj.pdf.version>
- <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+ <asciidoctorj.pdf.version>1.5.0-alpha.11</asciidoctorj.pdf.version>
+ <asciidoctorj.version>1.5.4</asciidoctorj.version>
<rubygems.prawn.version>2.0.2</rubygems.prawn.version>
<jruby.version>9.0.4.0</jruby.version>
</properties>
@@ -182,8 +182,8 @@
<attributes>
<!-- Location of centralized stylesheet -->
<stylesheet>${basedir}/../shared/trafodion-manuals.css</stylesheet>
- <projectVersion>1.3.0</projectVersion>
- <buildDate>${maven.build.timestamp}</buildDate>
+ <project-version>${env.TRAFODION_VER}</project-version>
+ <build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/provisioning_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/pom.xml b/docs/provisioning_guide/pom.xml
new file mode 100644
index 0000000..07e4517
--- /dev/null
+++ b/docs/provisioning_guide/pom.xml
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+* @@@ START COPYRIGHT @@@
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "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.
+*
+* @@@ END COPYRIGHT @@@
+-->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.trafodion</groupId>
+ <artifactId>provisioning-guide</artifactId>
+ <version>${env.TRAFODION_VER}</version>
+ <packaging>pom</packaging>
+ <name>Trafodion Provisioning Guide</name>
+ <description>This guide describes how to provision Trafodion.</description>
+ <url>http://trafodion.incubator.apache.org</url>
+ <inceptionYear>2015</inceptionYear>
+
+ <parent>
+ <groupId>org.apache.trafodion</groupId>
+ <artifactId>trafodion</artifactId>
+ <relativePath>../../pom.xml</relativePath>
+ <version>${env.TRAFODION_VER}</version>
+ </parent>
+
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/TRAFODION</url>
+ </issueManagement>
+
+ <scm>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>https://jenkins.esgyn.com</url>
+ </ciManagement>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
+ <asciidoctorj.pdf.version>1.5.0-alpha.11</asciidoctorj.pdf.version>
+ <asciidoctorj.version>1.5.4</asciidoctorj.version>
+ <rubygems.prawn.version>2.0.2</rubygems.prawn.version>
+ <jruby.version>9.0.4.0</jruby.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>rubygems-proxy-releases</id>
+ <name>RubyGems.org Proxy (Releases)</name>
+ <url>http://rubygems-proxy.torquebox.org/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>prawn</artifactId>
+ <version>${rubygems.prawn.version}</version>
+ <type>gem</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ <version>${jruby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj</artifactId>
+ <version>${asciidoctorj.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>gem-maven-plugin</artifactId>
+ <version>1.0.10</version>
+ <configuration>
+ <!-- align JRuby version with AsciidoctorJ to avoid redundant downloading -->
+ <jrubyVersion>${jruby.version}</jrubyVersion>
+ <gemHome>${project.build.directory}/gems</gemHome>
+ <gemPath>${project.build.directory}/gems</gemPath>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>initialize</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <attributes>
+ <generateReports>false</generateReports>
+ </attributes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <version>${asciidoctor.maven.plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj-pdf</artifactId>
+ <version>${asciidoctorj.pdf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj</artifactId>
+ <version>${asciidoctorj.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDirectory>${basedir}/src</sourceDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-html-doc</id>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <phase>site</phase>
+ <configuration>
+ <doctype>book</doctype>
+ <backend>html5</backend>
+ <sourceHighlighter>coderay</sourceHighlighter>
+ <outputDirectory>${basedir}/target/site</outputDirectory>
+ <requires>
+ <require>${basedir}/../shared/google-analytics-postprocessor.rb</require>
+ </requires>
+ <attributes>
+ <!-- Location of centralized stylesheet -->
+ <stylesheet>${basedir}/../shared/trafodion-manuals.css</stylesheet>
+ <project-version>${env.TRAFODION_VER}</project-version>
+ <build-date>${maven.build.timestamp}</build-date>
+ <google-analytics-account>UA-72491210-1</google-analytics-account>
+ </attributes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-pdf-doc</id>
+ <phase>site</phase>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <configuration>
+ <doctype>book</doctype>
+ <backend>pdf</backend>
+ <sourceHighlighter>coderay</sourceHighlighter>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ <attributes>
+ <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>
+ <pdf-style>trafodion</pdf-style>
+ <icons>font</icons>
+ <pagenums/>
+ <toc/>
+ <idprefix/>
+ <idseparator>-</idseparator>
+ </attributes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Rename target/site/index.pdf to client-install-guide.pdf -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>populate-release-directories</id>
+ <phase>post-site</phase>
+ <configuration>
+ <target name="Populate Release Directories">
+ <!-- The website uses the following organization for the docs/target/docs directory:
+ - To ensure a known location, the base directory contains the LATEST version of the web book and the PDF files.
+ - The know location is docs/target/docs/<document>
+ - target/docs/<version>/<document> contains version-specific renderings of the documents.
+ - target/docs/<version>/<document> contains the PDF version and the web book. The web book is named index.html
+ -->
+ <!-- Copy the PDF file to its target directories -->
+ <copy file="${basedir}/target/index.pdf" tofile="${basedir}/../target/docs/provisioning_guide/Trafodion_Provisioning_Guide.pdf" />
+ <copy file="${basedir}/target/index.pdf" tofile="${basedir}/../target/docs/${project.version}/provisioning_guide/Trafodion_Provisioning_Guide.pdf" />
+ <!-- Copy the Web Book files to their target directories -->
+ <copy todir="${basedir}/../target/docs/provisioning_guide">
+ <fileset dir="${basedir}/target/site">
+ <include name="**/*.*"/> <!--All sub-directories, too-->
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/../target/docs/${project.version}/provisioning_guide">
+ <fileset dir="${basedir}/target/site">
+ <include name="**/*.*"/> <!--All sub-directories, too-->
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Included because this is required. No reports are generated. -->
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.8</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <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
+ 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>
+ </site>
+ </distributionManagement>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/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
new file mode 100644
index 0000000..87b0134
--- /dev/null
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/about.adoc
@@ -0,0 +1,195 @@
+////
+/**
+* @@@ START COPYRIGHT @@@
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "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.
+*
+* @@@ END COPYRIGHT @@@
+ */
+////
+
+= About This Document
+This guide describes how to provision Trafodion for end-user environments. This install allows you to store and query data using Trafodion, either via Trafodion clients
+(see http://trafodion.incubator.apache.org/client_install/index.html[Trafodion 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.
+
+== Intended Audience
+This guide is intended for:
+
+* *Single-Node Environments*: Typically used when you want to evalulate Trafodion.
+* *Cluster (Multi-Node) Environments*: Typically used when you deploy Trafodion for application usage.
+
+NOTE: Trafodion can be provisioned on a single-node or multi-node enviroment. Unless specifically noted, the term *cluster* is used
+to mean both single- and multi-node environments.
+
+The provisioning instructions applies to a diverse set of platforms:
+
+* *Virtual Machines*: Often used for evaluations and Trafodion development.
+* *Cloud*: Used for Product Environments as well as for Developer Environments.
+* *Bare Metal*: Used for Product Environments as well as for Developer Environments.
+
+NOTE: The term *node* is used to represent a computing platform on which operating system, Hadoop, and Trafodion software is running.
+Unless specifically qualified (bare-metal node, virtual-machin node, or cloud-node), *node* represents a computing platform in your cluster
+regardless of platform type.
+
+== New and Changed Information
+This is a new guide.
+
+== Notation Conventions
+This list summarizes the notation conventions for syntax presentation in this manual.
+
+* UPPERCASE LETTERS
++
+Uppercase letters indicate keywords and reserved words. Type these items exactly as shown. Items not enclosed in brackets are required.
++
+```
+SELECT
+```
+
+* lowercase letters
++
+Lowercase letters, regardless of font, indicate variable items that you supply. Items not enclosed in brackets are required.
++
+```
+file-name
+```
+
+<<<
+* [ ] Brackets
++
+Brackets enclose optional syntax items.
++
+```
+DATETIME [start-field TO] end-field
+```
++
+A group of items enclosed in brackets is a list from which you can choose one item or none.
++
+The items in the list can be arranged either vertically, with aligned brackets on each side of the list, or horizontally, enclosed in a pair of brackets and separated by vertical lines.
++
+For example:
++
+```
+DROP SCHEMA schema [CASCADE]
+DROP SCHEMA schema [ CASCADE | RESTRICT ]
+```
+
+* { } Braces
++
+Braces enclose required syntax items.
++
+```
+FROM { grantee [, grantee ] ... }
+```
++
+A group of items enclosed in braces is a list from which you are required to choose one item.
++
+The items in the list can be arranged either vertically, with aligned braces on each side of the list, or horizontally, enclosed in a pair of braces and separated by vertical lines.
++
+For example:
++
+```
+INTERVAL { start-field TO end-field }
+{ single-field }
+INTERVAL { start-field TO end-field | single-field }
+```
+* | Vertical Line
++
+A vertical line separates alternatives in a horizontal list that is enclosed in brackets or braces.
+```
+{expression | NULL}
+```
+
+<<<
+* … Ellipsis
++
+An ellipsis immediately following a pair of brackets or braces indicates that you can repeat the enclosed sequence of syntax items any number of times.
++
+```
+ATTRIBUTE[S] attribute [, attribute] ...
+{, sql-expression } ...
+```
++
+An ellipsis immediately following a single syntax item indicates that you can repeat that syntax item any number of times.
++
+For example:
+```
+expression-n ...
+```
+
+* Punctuation
++
+Parentheses, commas, semicolons, and other symbols not previously described must be typed as shown.
++
+```
+DAY (datetime-expression)
+@script-file
+```
++
+Quotation marks around a symbol such as a bracket or brace indicate the symbol is a required character that you must type as shown.
++
+For example:
++
+```
+"{" module-name [, module-name] ... "}"
+```
+
+* Item Spacing
++
+Spaces shown between items are required unless one of the items is a punctuation symbol such as a parenthesis or a comma.
++
+```
+DAY (datetime-expression) DAY(datetime-expression)
+```
++
+If there is no space between two items, spaces are not permitted. In this example, no spaces are permitted between the period and any other items:
++
+```
+myfile.sh
+```
+
+<<<
+* Line Spacing
++
+If the syntax of a command is too long to fit on a single line, each continuation line is indented three spaces and is separated from the preceding line by a blank line.
++
+This spacing distinguishes items in a continuation line from items in a vertical list of selections.
++
+```
+match-value [NOT] LIKE _pattern
+ [ESCAPE esc-char-expression]
+```
+
+== Publishing History
+[cols="2*",options="header"]
+|===
+| Product Version | Publication Date
+| Trafodion Release 1.3.0 | To be announced.
+|===
+
+== Comments Encouraged
+The Trafodion community encourages your comments concerning this document. We are committed to providing documentation that meets your
+needs. Send any errors found, suggestions for improvement, or compliments to:
+
+issues@trafodion.incubator.apache.org
+
+Include the document title and any comment, error found, or suggestion for improvement you have concerning this document. Or, even
+better, join our community and help us improve our documentation. Please refer to
+http://trafodion.incubator.apache.org/contributing_redirect.html[Trafodion Contributor Guide] for details.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/provisioning_guide/src/asciidoc/_chapters/install_prepare.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/install_prepare.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/install_prepare.adoc
new file mode 100644
index 0000000..ea6bcad
--- /dev/null
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/install_prepare.adoc
@@ -0,0 +1,39 @@
+////
+/**
+* @@@ START COPYRIGHT @@@
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "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.
+*
+* @@@ END COPYRIGHT @@@
+ */
+////
+
+=== Special instructions:
+
+sudo yum install rpm-build
+sudo yum install apr-devel
+sudo yum install apr-util-devel
+sudo yum install doxygen
+sudo yum install gcc
+sudo yum install gcc-c++
+sudo rpm -ivv log4cxx-0.10.0-13.fc18.src.rpm
+sudo rpmbuild -ba /root/rpmbuild/SPECS/log4cxx.spec
+sudo rpm -U /root/rpmbuild/RPMS/x86_64/log4cxx<tab>
+NOTE: The rpm that was created now must be copied and installed (either rpm -U or yum install) on every node of the cluster.
+sudo rpm -qa | grep log4cxx
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc b/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
new file mode 100644
index 0000000..f049d60
--- /dev/null
+++ b/docs/provisioning_guide/src/asciidoc/_chapters/requirements.adoc
@@ -0,0 +1,446 @@
+////
+/**
+* @@@ START COPYRIGHT @@@
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "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.
+*
+* @@@ END COPYRIGHT @@@
+ */
+////
+
+= Requirements
+
+Trafodion requires an x86 version of Linux.
+
+The current release of Trafodion has been tested with:
+
+* 64-bit Red Hat Enterprise Linux (RHEL) or CentOS 6.5, 6.6, and 6.7
+* SUSE SLES 11.3
+* Cloudera CDH 5.2
+* Cloudera CDH 5.3
+* Hortonworks HDP 2.2
+
+Other OS releases may work, too. The Trafodion project is currently working on better support for non-distribution version of Hadoop.
+
+[[general-cluster-and-os-requirements-and-recommendations]]
+== General Cluster and OS Requirements and Recommendations
+
+64-bit x86 instruction set running a Linux distribution is required. Further, Trafodion assumes an environment
+based on the requirements of the supported Hadoop distributions.
+
+[[cluster-requirements-and-recommendations]]
+=== Hardware Requirements and Recommendations
+
+==== Single-Node Cluster
+It is possible to run Trafodion on a single-node sandbox environment. Typically, any sandbox running a Hadoop distribution
+can be used. A typical single-node configuration uses 4-8 cores with 16 GB of memory, and 20 GB free disk space beyond
+what's used for the Hadoop environment.
+
+==== Multi-Node Cluster
+For multi-node end-user clusters, your typical HBase environment should suffice for Trafodion.
+Typically, memory configuration range between 64-128 GB per node with minimum requirement of 16 GB.
+The cluster size can span from 1 to _n_ nodes; a minimum of two nodes is recommended.
+A minumum of two cores is required regardless of whether you're deploying Trafodion on a bare-metal or virtual environment.
+
+Recommended configurations:
+
+[cols="40%h,60%a"]
+|===
+| Processors per Node |
+* Small: 2 cores
+* Medium: 4 cores
+* Large: 8+ cores
+| Memory per Node |
+* Small: 16 GB
+* Medium: 64 GB
+* Large: 128 GB
+| Concurrency:Nodes |
+* Two Small Nodes: Four concurrent queries
+* Two Medium Nodes: 64 concurrent queries
+* Two Large Nodes: 256 concurrent queries
+|===
+
+[[os-requirements-and-recommendations]]
+=== OS Requirements and Recommendations
+
+Please verify these requirements on each node you will install Trafodion on:
+
+[cols="20%a,40%a,40%a",options="header"]
+|===
+| Function | Requirement | Verification Guidance
+| Linux | 64-bit version of Red Hat 6.5 or later, or SUSE SLES 11.3 or later. |
+| sshd | The `ssh` daemon is running on each node in the cluster. |
+* `ps aux \| grep sshd`
+* `sudo netstat -plant \| grep :22`
+| ntpd | The `ntp` daemon is running and synchronizign time on each node in the cluster. |
+* `ps aux \| grep ntp`
+* `ntpq -p`
+| FQDN |
+* `/etc/hosts` is set up for fully-qualified node names (FQDN).
+* `/etc/resolv.conf` is configured to use a name server. |
+* `host -T <FQDN>` (responds if using a DNS server, times out otherwise)
+* Simply ssh among nodes using `ssh <FQDN>`.
+| Port Availability | The Linux Kernel Firewall (`iptables`) has either been disabled or <<ip_ports,ports required by Trafodion>> have been opened. |
+* `lsmod \| grep ip_tables` checks whether `iptables` is loaded. If not, no further checking is needed.
+* `sudo iptables -nL \| grep <port>` checks the configuration of a port. An empty response indicates no rule for the port, which often means
+the port is *not* open.
+| passwordless ssh | The user name used to provision Trafodion must have passwordless ssh access to all nodes. | ssh to the nodes, ensure that no password prompt appears.
+| sudo priviliges | The user name used to provision Trafodion must sudo access to a number of root functions . | `sudo echo "test"` on each node.
+| bash | Available for shell-script execution. | `bash --version`
+| java | Available to run the Trafodion software. Sama version as HBase is using. | `java --version`
+| perl | Available for script execution. | `perl --version`
+| python | Available for script execution. | `python --version`
+| yum | Available for installs, updates, and removal of software packages. | `yum --version`
+| rpm | Available for installs, updates, and removal of software packages. | `rpm --version`
+| scp | Available to copy files among nodes in the cluster. | `scp --help`
+| curl | Available to transfer data with URL syntax. | `curl --version`
+| wget | Available to download files from the Web. | `wget --version`
+| pdsh | Available to run shell commands in parallel. | `pdsh -V`
+| pdcp | Available to copy files among nodes in parallel. part of the `pdsh` package. | `pdcp -V`
+|===
+
+
+[[ip_ports]]
+=== IP Ports
+The following table lists the default ports used by the different Trafodion components plus the configuration file and configuration attribute associated with each port setting.
+
+[cols="10%h,20%l,20%l,10%,10%,10%,20%",options="header"]
+|===
+| Default Port | Configuration File | Configuration Entry | Required | Range | Protocol | Comment
+| 4200 | rest-site.xml | trafodion.rest.port | Yes | 1 | REST | Trafodion REST Server.
+| 4201 | rest-site.xml | trafodion.rest.https.port | Yes | 1 | HTTPS | Trafodion REST Server (HTTPS).
+| 23400 | dcs-site.xml | dcs.master.port | Yes | _n_ | binary | Start of Trafodion DCS port range. (37800 for Trafodion 1.1)
+| 24400 | dcs-site.xml | dcs.master.info.port | Yes | 1 | HTTP | DCS master web GUI. (40010 for Trafodion 1.1)
+| 24410 | dcs-site.xml | dcs.server.info.port | Yes | _n_ | HTTP | Start of range for DCS server web GUIs. (40020 for Trafodion 1.1)
+| 50030 | mapred-site.xml | mapred.job.tracker.http.address | No | 1 | HTTP | MapReduce Job Tracker web GUI.
+| 50070 | hdfs-site.xml | dfs.http.address | No | 1 | HTTP | HDFS Name Node web GUI.
+| 50075 | hdfs-site.xml | dfs.datanode.http.address | No | 1 | HTTP | HDFS Data Node web GUI.
+| 50090 | hdfs-site.xml | dfs.secondary.http.address | No | 1 | HTTP | HDFS Secondary Name Node web GUI.
+| 60010 | hbase-site.xml | hbase.master.info.port | No | 1 | HTTP | HBase Master web GUI.
+| 60030 | hbase-site.xml | hbase.regionserver.info.port | No | 1 | HTTP | HBase Region Server web GUI.
+|===
+
+There are two port ranges used by Trafodion.
+
+* 23400 is a range, to allow multiple mxosrvr processes on each node. Allow a range of a few ports,
+enough to cover all the servers per node that are listed in the "servers" file in the DCS configuration directory.
+* 24410 is a range as well, enough to cover the DCS servers per node, usually 1 or 2.
+
+On top of the ports identified above, you also need the ports required by your Hadoop distribution. For example:
+
+* http://www.cloudera.com/content/www/en-us/documentation/enterprise/latest/topics/cdh_ig_ports_cdh5.html[_Cloudera Ports_]
+* http://docs.hortonworks.com/HDPDocuments/HDP2/HDP-2.3.0-Win/bk_HDP_Install_Win/content/ref-79239257-778e-42a9-9059-d982d0c08885.1.html[_Hortonworks Ports_]
+
+Although not all the ports will be used on every node of the cluster, you need to open most of them for all the nodes in the cluster that
+have Trafodion, HBase, or HDFS servers on them.
+
+== Prerequisite Software
+
+Trafodion runs as an add-on service on Hadoop distributions. The following Hadoop services and their dependiencies must be installed and running
+on the cluster where you intend to install Trafodion:
+
+* Hadoop Distributed File System (HDFS)
+* YARN with MapReduce version 2
+* ZooKeeper
+* HBase
+* Hive
+* Apache Ambari (Hortonworks) or Cloudera Manager (Cloudera) with associated embedded databases.
+
+The following distributions are supported for Trafodion:
+
+[cols="25%,15%,10%,50%",options="header"]
+|===
+| Distribution | Version | HBase Version | Installation Documentation
+| Cloudera Distribution Including Apache Hadoop (CDH) | 5.2 or 5.3 | 0.98 | http://www.cloudera.com/downloads/manager/5-2-0.html[CHD 5.2 Installation] +
+http://www.cloudera.com/downloads/manager/5-3-0.html[CDH 5.3 Installation]^1^
+| Hortonworks Data Platform (HDP) | 2.2 | 0.98 | http://hortonworks.com/products/releases/hdp-2-2/#install[HDP 2.2 Installation]
+|===
+
+^1^ When possible, install using *parcels* to simply the installation process.
+
+NOTE: Trafodion does not yet support installation on a non-distribution version of Hadoop; that is,
+Hadoop downloaded from the Apache web site. This restriction will be lifted in a later release of
+Trafodion.
+
+=== Software Packages
+
+In addition to the software packages required to run different Hadoop services listed above (for example, `Java`),
+the following software packages and their dependencies must be installed on all nodes where Trafodion will be installed.
+
+NOTE: For RedHat/CentOS, the Trafodion Installer can install a subset of the packages below.
+
+[cols="20%,45%,35%l",options="header"]
+|===
+| Package | Usage | Installation
+| EPEL | Add-on packages to completed the Linux distribution. | http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch[Fedora RPM]
+| pdsh | Parellelize shell commands during install and Trafodion runtime utilities. | yum install pdsh
+| log4cxx | Message logging. | Manual process^1^
+| sqlite | Internal configuration information managed by the Trafodion Foundation component. | yum install sqlite
+| expect | Not used? | yum install expect
+| perl-DBD-SQLite | Allows Perl scripts to connect to SQLite. | yum install perl-DBD-SQLite
+| perl-Params-Validate | Validates method/function parameters in Perl sripts. | yum install perl-Params-Validate
+| perl-Time-HiRes | High resolution alarm, sleep, gettimeofday, interval timers in Perl scripts. | yum install perl-Time-HiRes
+| protobuf | Data serialization. | yum install protobuf
+| xerces-c | C++ XML parsing. | yum install xerces-c
+| gzip | Data compress/decompress. | yum install gzip
+| rpm-build^2^ | Build binary and source software packages. | yum install rpm-build
+| apr-devel^2^ | Support files used to build applications using the APR library. | yum install apr-devel
+| apr-util-devel^2^ | Support files used to build applications using the APR utility library. | yum install apr-util-devel
+| doxygen^2^ | Generate documentation from annotated C++ sources. | yum install doxygen
+| gcc^2^ | GNU Compiler Collection | yum install gcc
+| gcc_c++^2^ | GNU C++ compiler. | yum install gcc_c++
+|===
+
+1. `log4c++` was recently withdrawn from public repositories. Therefore, you will need to build the `log4c++` RPM
+on your system and then install the RPM using the procedure described in <<log4cplusplus_installation,log4c++ Installation>>.
+2. Software package required to build `log4c++`. Not required otherwise. These packages are *not* installed by the Trafodon Installer in this release.
+
+The Trafodion Installer requires Internet access to install the required software packages.
+
+== Trafodion User IDs and Their Priviliges
+
+=== Runtime
+
+The `trafodion:trafodion` user ID is created as part of the installation process. The default password is: `traf123`.
+
+Trafodion runs under this ID, which must be registered as a user in the Hadoop Distributed File System (HDFS) to store and
+access objects in HDFS, HBase, and Hive. In addition, the `trafodion` user ID required passwordless access among the nodes
+where Trafodion is installed.
+
+Trafodion requires that either HDFS ACLs or Kerberos is enabled.
+
+Trafodion users are managed by the Trafodion security features (grant, revoke, etc.), which can be integrated with LDAP if so desired.
+These users are referred to as *database users* and do not have direct access to the operating system.
+
+NOTE: Do *not* create the `trafodion:trafodion` user ID in advance. The Trafodion Installer uses the presence of this user ID to determine
+whether you're doing an installation or upgrade.
+
+=== Installation/Upgrades
+
+Typically, the Trafodion Installer is used for Trafodion installations. It requires access to the following user IDs:
+
+[cols="20%a,30%a,50%a",options="header"]
+|===
+| User ID | Usage | Requirements
+| Linux | Run the Trafodion Installer, which sets up the enviroment and installs the Trafodion software. |
+* User name or group cannot be `trafodion`.
+* Passwordless ssh access to all nodes in the cluster.
+* Internet access to download software packages.
+* `requiretty` must be disabled in `/etc/sudoers`.
+* `sudo`^1^ access to:
+** Download and install software packages.
+** Mofify `/etc/sudoers.d` (allow the `trafodion` user to modify floating IP: `ip` and `arping`).
+** Create the `trafodion` user ID and group.
+** Install Trafodion software into the HBase environment.
+** Run Java version command on each node in the cluster.
+** Run Hadoop version command on each node in the cluster.
+** Run HBase version command on each node in the cluster.
+** Create directories and files in:
+*** `/etc`
+*** `/usr/lib`
+*** `/var/log`
+** Invoke `su` to execute commands as other users; for example, `trafodion`.
+** Edit `sysctl.conf` and activate changes using `sysctl -p`:
+*** Modify kernel limits.
+*** Reserve IP ports.
+
+^1^ `sudo` is *required* in the current release of Trafodion. This restriction may be relaxed in later releases.
+Alternative mechanisms for priviliged access (such as running as `root` or `sudo` alternative commands) are not supported.
+| Distribution Manager | Modify configuration and stop/start services. |
+* Administrator user name and password.
+* URL to Distribution Manager's REST API.
+| HDFS Administator | Create directories and change security setting, if needed. |
+* HDFS Administrator user name and password.
+* Write access to home directory on the node where the Distribution Manager is running.
+| HBase Administator | |
+* HBase Administrator user name and password.
+* Read access to `hbase-site.xml`.
+|===
+
+[[required-configuration-changes]]
+== Required Configuration Changes
+
+Trafodion requires changes to a number of different areas of your system configuration: operating system, HDFS, and HBase.
+
+NOTE: These changes are performed by the Trafodion Installer, if used.
+
+[[operating-system-changes]]
+=== Operating System Changes
+
+`/etc/security/limits.d/trafodion.conf` on each node in the cluster must contain the following settings:
+
+```
+# Trafodion settings
+trafodion soft core unlimited
+trafodion hard core unlimited
+trafodion soft memlock unlimited
+trafodion hard memlock unlimited
+trafodion soft nofile 32768
+trafodion hard nofile 65536
+trafodion soft nproc 100000
+trafodion hard nproc 100000
+hbase soft nofile 8192
+trafodion soft nofile 8192
+trafodion hard nofile 65535
+```
+
+=== ZooKeeper Changes
+
+NOTE: These changes require a restart of ZooKeeper on all nodes in the cluster.
+
+Trafodion requires the following changes to `zoo.cfg`:
+
+[cols="30%l,40%l,30%a",options="header"]
+|===
+| Setting | New Value | Purpose
+| maxClientCnxns | 0 | Tell ZooKeeper to impose no limit to the number of connections.
+|===
+
+=== HDFS Changes
+
+NOTE: These changes require a restart of HDFS on all nodes in the cluster.
+
+Trafodion requires the following changes to the HDFS environment:
+
+[cols="60%a,40%a",options="header"]
+|===
+| Action | Purpose
+| * Create `/hase-staging` directory.
+ * Change owner to HBase Administrator. |
+| * Create `/bulkload` directory.
+ * Change owner to `trafodion`. |
+| * Create `/lobs` directory.
+ * Change owner to `trafodion`. |
+| * Create `/apps/hbase/data/archive`^1^.
+ * Change owner to:
+ ** `hbase:hbase` (Cloudera)
+ ** `hbase:hdfs` (Hortonworks)
+ * Give the `trafodion` user RWX access to `/apps/hbase/data/archive`
+ * Set default user of `/apps/hbase/data/archive` to `trafodion`
+ * Recursively change `setafcl` of `/apps/hbase/data/archive` to RWX |
+|===
+
+1. These steps are performed *after* HDFS ACLs have been enabled.
+
+The following changes are required in `hdfs-site.xml`:
+
+[cols="30%l,40%l,30%a",options="header"]
+|===
+| Setting | New Value | Purpose
+| dfs.namenode.acls.enabled | true | Enable HDFS POSIX Access Control Lists (ACLs).
+|===
+
+=== HBase Changes
+
+NOTE: These changes require a restart of ZooKeeper on all nodes in the cluster.
+
+Trafodion requires that the following changes to the HBase environment:
+
+[cols="30%a,30%a,40%a",options="header"]
+|===
+| Action | Affected Directories | Purpose
+| Install/replace Trafodion's version of `hbase-trx` |
+* `/usr/lib/hbase/lib/`
+* `/usr/share/cmf/lib/plugins/` (Cloudera)
+* `/usr/hdp/current/hbase-regionserver/lib/` (Hortonworks) |
+Trafodion transaction management relies on an enhanced version of `hbase-trx`.
+| Install/Replace Trafodion utility jar file. |
+* `/usr/lib/hbase/lib/`
+* `/usr/share/cmf/lib/plugins/` (Cloudera)
+* `/usr/hdp/current/hbase-regionserver/lib` (Hortonworks) |
+TODO: Add purpose here.
+|===
+
+The following changes are required in `hbase-site.xml`. Please refer to the
+https://hbase.apache.org/book.html[Apache HBase Reference Guide] for additional descriptions of these settings.
+
+[cols="30%l,40%l,30%a",options="header"]
+|===
+| Setting | New Value | Purpose
+| hbase.master.
+distributed.log.splitting | false | Do not use the HBase Split Log Manager. Instead, the HMaster controls all log-splitting activities.
+| hbase.coprocessor.
+region.classes |
+org.apache.hadoop.
+hbase.coprocessor.
+transactional.TrxRegionObserver,
+org.apache.hadoop.
+hbase.coprocessor.
+transactional.TrxRegionEndpoint,
+org.apache.hadoop.
+hbase.coprocessor.
+AggregateImplementation | Install Trafodion coprocessor classes.
+| hbase.hregion.impl | org.apache.hadoop.
+hbase.regionserver.
+transactional.TransactionalRegion | Install the Trafodion class for Write Ahead Log reading.
+| hbase.regionserver.
+region.split.policy | org.apache.hadoop.
+hbase.regionserver.
+ConstantSizeRegionSplitPolicy | Tell HBase to use the ConstantSizeRegionSplitPolicy for region splitting.
+This setting causes region splitting to occur only when the maximum file size is reached.
+| hbase.snapshot.
+enabled | true | Enable the HBase Snapshot feature. Used for Trafodion backup and restore.
+| hbase.bulkload.
+staging.dir | hbase-staging | Use `/hbase-staging` as the bulk load staging directory.
+| hbase.regionserver.region.
+transactional.tlog | true | The HBase Regions requests that the Transaction Manager redrives in-doubt transactions.
+| hbase.snapshot.
+master.timeoutMillis | 600000 | HMaster timeout when waiting for RegionServers involved in the snapshot operation.
+| hbase.snapshot.
+region.timeout | 600000 | RegionServer timeout when waiting for snapshot to be created.
+| hbase.client.
+scanner.timeout.period | 600000 | Time limit to perform a scan request.
+| hbase.regionserver.
+lease.period | 600000 | Clients must report within this time limit or they are considered dead by HBase.
+| hbase.namenode.
+java.heapsize^1^ | 1073741824 (1GB) | Java Heap Size for the HDFS NameNode.
+| hbase.secondary.namenode.
+java.heapsize^1^ | 1073741824 (1GB) | Java Heap Size for the HDFS Secondary NameNode.
+|===
+
+1. Applies to Cloudera distributions only.
+
+== Recommended Configuration Changes
+The following configuration changes are recommended but not required.
+
+NOTE: The Trafodion Installer does *not* make these changes.
+
+=== Recommended HBase Configuration Changes
+
+[cols="30%l,20%,50%a",options="header"]
+|===
+| Configuration Property | Recommended Setting | Guidance
+| hbase.rpc.timeout | 10 minutes | This setting depends on the tables' size. Sixty (60) seconds is the default.
+Increase this value for big tables. Make it the same value as `hbase.client.scanner.timeout.period`. We have found
+that increasing the setting to six-hundred (600) seconds will prevent many of the timeout-related errors we encountered,
+such as `OutOfOrderNextException` errors.
+| hbase.client.scanner.timeout.period | 10 minutes | Similar to the `hbase.rpc.timeout` setting. Sixty (60) seconds is the
+default. Depending on the size of a user table, we have experienced timeout failures on count(\*) and update statistics commands
+from this setting. The underlying issue is the length of the execution of the coprocessor within HBase.
+ +
+NOTE: HBase uses the smaller of `hbase.rpc.timeout` and `hbase.client.scanner.timeout.period` to calculate the scanner timeout.
+| hbase.snapshot.master.timeoutMillis and hbase.snapshot.region.timeout | 10 minutes | HBase's default setting is 60000 milliseconds.
+If you experience timeout issues with HBase snapshots when you use the Trafodion Bulk Loader or other statements,
+you can set the value for these two HBase properties to 10 minutes (600,000 milliseconds).
+| hbase.hregion.max.filesize | 107374182400 bytes | HBase's default setting is 10737418240 (10 GB). We have increased the setting to
+107374182400 (100 GB), which reduces the number of HStoreFiles per table and appears to reduce disruptions to active transactions from
+region splitting.
+| hbase.hstore.blockingStoreFiles | 10 | http://gbif.blogspot.com/2012/07/optimizing-writes-in-hbase.html
+| hbase.regionserver.handler.count | <num> | This setting should match the number of concurrent sessions (mxosrvr). The default is 10.
+|===
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/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
new file mode 100644
index 0000000..f41820d
--- /dev/null
+++ b/docs/provisioning_guide/src/asciidoc/index.adoc
@@ -0,0 +1,65 @@
+////
+* @@@ START COPYRIGHT @@@
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "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.
+*
+* @@@ END COPYRIGHT @@@
+////
+
+= Trafodion Install Guide
+Version 1.3.0, January 2016
+:doctype: book
+:numbered:
+:toc: left
+:toclevels: 3
+:toc-title: Table of Contents
+:icons: font
+:iconsdir: icons
+:experimental:
+:source-language: text
+
+:images: ../images
+:leveloffset: 1
+
+// The directory is called _chapters because asciidoctor skips direct
+// processing of files found in directories starting with an _. This
+// prevents each chapter being built as its own book.
+
+**License Statement**
+
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+"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.
+
+[cols="2",options="header"]
+|===
+| Version | Date
+| 1.3.0 | January, 2016
+|===
+
+include::asciidoc/_chapters/about.adoc[]
+include::asciidoc/_chapters/requirements.adoc[]
+// include::asciidoc/_chapters/installation_process.adoc[]
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d2915f/docs/sql_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/sql_reference/pom.xml b/docs/sql_reference/pom.xml
index d2d2d97..fd692ca 100644
--- a/docs/sql_reference/pom.xml
+++ b/docs/sql_reference/pom.xml
@@ -25,7 +25,7 @@
-->
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.trafodion</groupId>
- <artifactId>sq-reference-manual</artifactId>
+ <artifactId>sql-reference-manual</artifactId>
<version>${env.TRAFODION_VER}</version>
<packaging>pom</packaging>
<name>Trafodion SQL Reference Manual</name>
@@ -38,8 +38,8 @@
<parent>
<groupId>org.apache.trafodion</groupId>
<artifactId>trafodion</artifactId>
- <version>1.3.0</version>
<relativePath>../../pom.xml</relativePath>
+ <version>${env.TRAFODION_VER}</version>
</parent>
@@ -77,8 +77,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<asciidoctor.maven.plugin.version>1.5.2.1</asciidoctor.maven.plugin.version>
- <asciidoctorj.pdf.version>1.5.0-alpha.10.1</asciidoctorj.pdf.version>
- <asciidoctorj.version>1.5.3.2</asciidoctorj.version>
+ <asciidoctorj.pdf.version>1.5.0-alpha.11</asciidoctorj.pdf.version>
+ <asciidoctorj.version>1.5.4</asciidoctorj.version>
<rubygems.prawn.version>2.0.2</rubygems.prawn.version>
<jruby.version>9.0.4.0</jruby.version>
</properties>
@@ -186,8 +186,8 @@
<attributes>
<!-- Location of centralized stylesheet -->
<stylesheet>${basedir}/../shared/trafodion-manuals.css</stylesheet>
- <projectVersion>1.3.0</projectVersion>
- <buildDate>${maven.build.timestamp}</buildDate>
+ <project-version>${env.TRAFODION_VER}</project-version>
+ <build-date>${maven.build.timestamp}</build-date>
<google-analytics-account>UA-72491210-1</google-analytics-account>
</attributes>
</configuration>