diff --git a/build.xml b/build.xml
index 53d399dd..48b3c560 100644
--- a/build.xml
+++ b/build.xml
@@ -554,11 +554,22 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/docs/Makefile b/src/docs/Makefile
index 103bebf5..a84bce8b 100644
--- a/src/docs/Makefile
+++ b/src/docs/Makefile
@@ -15,6 +15,9 @@
BUILDROOT=../../build
BUILD_DIR=$(BUILDROOT)/docs
+WEBSITE_DIR=$(BUILDROOT)/webdocs
+
+VERSION=Unknown
all: man userguide devguide
@@ -25,10 +28,33 @@ devguide: $(BUILD_DIR)/SqoopDevGuide.html
MANSOURCES=$(shell echo man/sqoop*.txt)
MANPAGES=$(MANSOURCES:.txt=.1.gz)
+REVDATE=$(shell date)
+
+
+website:
+ mkdir -p $(WEBSITE_DIR)
+ asciidoc --unsafe -a revnumber=$(VERSION) \
+ -b docbook \
+ user/SqoopUserGuide.txt
+ xmlto -o $(WEBSITE_DIR) -m web/html.xsl html-nochunks user/SqoopUserGuide.xml
+ asciidoc --unsafe -a revnumber=$(VERSION) \
+ -b docbook \
+ dev/SqoopDevGuide.txt
+ xmlto -o $(WEBSITE_DIR) -m web/html.xsl html-nochunks dev/SqoopDevGuide.xml
+ asciidoc --unsafe -a revnumber=$(VERSION) \
+ -b docbook \
+ web/index.txt
+ xmlto -o $(WEBSITE_DIR) -m web/html.xsl html-nochunks web/index.xml
+ cp web/docbook.css $(WEBSITE_DIR)
+ rsync -a web/images $(WEBSITE_DIR)/
+ rm user/SqoopUserGuide.xml
+ rm dev/SqoopDevGuide.xml
+ rm web/index.xml
+
man: $(MANPAGES)
%.1.gz : %.txt
- asciidoc --unsafe -b docbook -d manpage $<
+ asciidoc --unsafe -b docbook -d manpage -a "author=Sqoop Team" $<
xmlto man $*.xml -o man
gzip $*.1
rm $*.xml
@@ -37,12 +63,14 @@ man: $(MANPAGES)
$(BUILD_DIR)/SqoopUserGuide.html: user/*.txt
asciidoc -a toc -a toclevels=1 -a "toc-title=Table of Contents" \
+ -a revnumber=$(VERSION) -a "revdate=$(REVDATE)" \
user/SqoopUserGuide.txt
mkdir -p $(BUILD_DIR)
mv user/SqoopUserGuide.html $(BUILD_DIR)
$(BUILD_DIR)/SqoopDevGuide.html: dev/*.txt
asciidoc -a toc -a toclevels=1 -a "toc-title=Table of Contents" \
+ -a revnumber=$(VERSION) -a "revdate=$(REVDATE)" \
dev/SqoopDevGuide.txt
mkdir -p $(BUILD_DIR)
mv dev/SqoopDevGuide.html $(BUILD_DIR)
diff --git a/src/docs/dev/SqoopDevGuide.txt b/src/docs/dev/SqoopDevGuide.txt
index 4a6f3ed6..d1f451a1 100644
--- a/src/docs/dev/SqoopDevGuide.txt
+++ b/src/docs/dev/SqoopDevGuide.txt
@@ -16,6 +16,11 @@
limitations under the License.
////
+Sqoop Developer's Guide v{revnumber}
+====================================
+
+
+
include::intro.txt[]
include::preface.txt[]
diff --git a/src/docs/dev/preface.txt b/src/docs/dev/preface.txt
index ce9fa705..4163ae05 100644
--- a/src/docs/dev/preface.txt
+++ b/src/docs/dev/preface.txt
@@ -21,7 +21,7 @@
Supported Releases
------------------
-This documentation applies to Sqoop v1.0.0 (June 2010).
+This documentation applies to Sqoop v{revnumber}.
Sqoop Releases
--------------
diff --git a/src/docs/user/SqoopUserGuide.txt b/src/docs/user/SqoopUserGuide.txt
index 35ac4ec3..921ec5fc 100644
--- a/src/docs/user/SqoopUserGuide.txt
+++ b/src/docs/user/SqoopUserGuide.txt
@@ -16,6 +16,10 @@
limitations under the License.
////
+Sqoop User Guide (v{revnumber})
+===============================
+
+
include::intro.txt[]
diff --git a/src/docs/user/preface.txt b/src/docs/user/preface.txt
index 6d956327..3fe142ce 100644
--- a/src/docs/user/preface.txt
+++ b/src/docs/user/preface.txt
@@ -21,7 +21,7 @@
Supported Releases
------------------
-This documentation applies to Sqoop v1.0.0 (June 2010).
+This documentation applies to Sqoop v{revnumber}.
Sqoop Releases
--------------
@@ -30,6 +30,7 @@ Sqoop is an open source software product of Cloudera, Inc.
Software development for Sqoop occurs at http://github.com/cloudera/sqoop.
At that site you can obtain:
+
- New releases of Sqoop as well as its most recent source code
- An issue tracker
- A wiki that contains Sqoop documentation
diff --git a/src/docs/user/support.txt b/src/docs/user/support.txt
index 36927b4c..c0da874a 100644
--- a/src/docs/user/support.txt
+++ b/src/docs/user/support.txt
@@ -19,11 +19,14 @@
Getting Support
---------------
+Some general information is available at the
+http://wiki.github.com/cloudera/sqoop/[Sqoop wiki].
+
Report bugs in Sqoop to the issue tracker at
http://github.com/cloudera/sqoop/issues[].
-For general questions and answers, a support forum is available at
-http://getsatisfaction.com/cloudera/products/cloudera_sqoop[].
+Questions and discussion regarding the usage of Sqoop should be directed to the
+http://groups.google.com/a/cloudera.org/group/sqoop-user[sqoop-user mailing list].
Before contacting either forum, run your Sqoop job with the
+\--verbose+ flag to acquire as much debugging information as
diff --git a/src/docs/user/version.txt b/src/docs/user/version.txt
index 077eb2f1..5ede8611 100644
--- a/src/docs/user/version.txt
+++ b/src/docs/user/version.txt
@@ -41,7 +41,7 @@ Display the version:
----
$ sqoop version
-Sqoop 1.0.0
+Sqoop {revnumber}
git commit id 46b3e06b79a8411320d77c984c3030db47dd1c22
Compiled by aaron@jargon on Mon May 17 13:43:22 PDT 2010
----
diff --git a/src/docs/web/breadcrumbs.xsl b/src/docs/web/breadcrumbs.xsl
new file mode 100644
index 00000000..3863192a
--- /dev/null
+++ b/src/docs/web/breadcrumbs.xsl
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
diff --git a/src/docs/web/docbook.css b/src/docs/web/docbook.css
new file mode 100644
index 00000000..85e44491
--- /dev/null
+++ b/src/docs/web/docbook.css
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2001, 2003 The FreeBSD Documentation Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: doc/share/misc/docbook.css,v 1.14 2008/11/21 07:28:34 keramida Exp $
+ */
+
+BODY ADDRESS {
+ line-height: 1.3;
+ margin: .6em 0;
+}
+
+BODY BLOCKQUOTE {
+ margin-top: .75em;
+ line-height: 1.5;
+ margin-bottom: .75em;
+}
+
+HTML BODY {
+ margin: 1em 4% 1em 4%;
+ line-height: 1.2;
+ font-family: verdana;
+}
+
+a {
+ text-decoration: none;
+ color: #1c84bf;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+a:visited {
+ color: #597e93;
+}
+
+div.titlepage .title {
+ font-size: 26px;
+}
+
+.LEGALNOTICE {
+ font-size: small;
+ font-variant: small-caps;
+}
+
+BODY DIV {
+ margin: 0;
+}
+
+DL {
+ margin: .8em 0;
+ line-height: 1.2;
+}
+
+BODY FORM {
+ margin: .6em 0;
+}
+
+H1, H2, H3, H4, H5, H6,
+DIV.EXAMPLE P B,
+.QUESTION,
+DIV.TABLE P B,
+DIV.PROCEDURE P B {
+ color: #148BCF;
+}
+
+BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 {
+ line-height: 1.3;
+ margin-left: 0;
+}
+
+BODY H1, H2, H3, H4, H5, H6 {
+ margin: 6px 0 0 0;
+}
+
+BODY HR {
+ border-width: 0 0 1px 0;
+ border-style: solid;
+ border-color: #0068BB;
+}
+
+BODY IMG.NAVHEADER {
+ margin: 0 0 0 -4%;
+}
+
+OL {
+ margin: 0 0 0 5%;
+ line-height: 1.2;
+}
+
+BODY PRE {
+ margin: .75em 0;
+ line-height: 1.0;
+ font-family: monospace;
+}
+
+BODY TD, BODY TH {
+ line-height: 1.2;
+}
+
+UL, BODY DIR, BODY MENU {
+ margin: 0 0 0 5%;
+ line-height: 1.2;
+}
+
+HTML {
+ margin: 0;
+ padding: 0;
+}
+
+BODY P B.APPLICATION {
+ color: #000000;
+}
+
+.navfooter td, .literal, .FILENAME {
+ color: #007a00;
+ font-family: monospace;
+}
+
+
+.GUIMENU, .GUIMENUITEM, .GUISUBMENU,
+.GUILABEL, .INTERFACE,
+.SHORTCUT, .SHORTCUT .KEYCAP {
+ font-weight: bold;
+}
+
+.GUIBUTTON {
+ background-color: #CFCFCF;
+ padding: 2px;
+}
+
+.ACCEL {
+ background-color: #F0F0F0;
+ text-decoration: underline;
+}
+
+.PROGRAMLISTING {
+ padding: 1ex;
+ background-color: #eee;
+ border: 1px solid #ccc;
+}
+
+@media screen { /* hide from IE3 */:/
+ a[href]:hover { background: #ffa }
+}
+
+.NOTE, .SCREEN {
+ color: #222;
+ background: #fff;
+ border: 1px solid #ccc;
+ padding: 0.4em 0.4em;
+}
+
+.SCREEN {
+ background: #eee;
+}
+
+.TIP {
+ color: #004F00;
+ background: #fff;
+ border: 1px solid green;
+ padding: 0.4em 0.4em;
+}
+
+table.CDH {
+ padding:0px 0px 8px
+}
+
+table.CDH th {
+ background: #EDF2F9;
+ border-right: 0.5pt solid #adb6cd;
+ border-bottom: 0.5pt solid #adb6cd;
+ padding:2px 8px 1px;
+}
+
+table.CDH td {
+ font-size: 12px;
+}
+
+div.breadcrumbs {
+ border-top: 2px solid #0068BB;
+ background: #EDF2F9;
+ font-style: bold;
+ font-size: small;
+ padding: 0.6em 0.6em;
+}
+
+span.breadcrumb-node {
+ font-style: italic;
+}
+
+/* Match the the breadcrumbs at the top */
+div.footer-text {
+ border-bottom: 2px solid #0068BB;
+ background: #EDF2F9;
+ font-size: small;
+ padding: 0.2em 0.2em;
+ text-align: center;
+}
+
+.IMPORTANT, .caution {
+ font-style:italic;
+ border: 1px solid #a00;
+ border-left: 12px solid #c00;
+ padding: 0.1em 1em;
+}
+
+.WARNING {
+ color: #9F1313;
+ background: #fff;
+ border: 1px solid #e59595;
+ padding: 0.4em 0.4em;
+ width: 85%;
+}
+
+.EXAMPLE {
+ width: 100%;
+}
+
+.tip, .note, .caution {
+ margin:4px 0 4px;
+}
+
+img {
+ border: 0;
+}
diff --git a/src/docs/web/footer.xsl b/src/docs/web/footer.xsl
new file mode 100644
index 00000000..b42c945e
--- /dev/null
+++ b/src/docs/web/footer.xsl
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/docs/web/header.xsl b/src/docs/web/header.xsl
new file mode 100644
index 00000000..67462985
--- /dev/null
+++ b/src/docs/web/header.xsl
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+