You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2015/11/05 18:37:03 UTC
[10/23] hbase git commit: HBASE-14481 Deprecate HBase Wiki
HBASE-14481 Deprecate HBase Wiki
We have an awesome community resource in our online book. It's maintained and looked after with
diligence. We also have an HBase section on the hadoop wiki that hasn't been updated since 2012.
Let's sift through the pages of the wiki, bring over any content that's still relevant and
not already present in the book, and kill the wiki.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c575e18a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c575e18a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c575e18a
Branch: refs/heads/hbase-12439
Commit: c575e18ab82627b5f352caa10d964828fc5c0b6a
Parents: 090fbd3
Author: Misty Stanley-Jones <ms...@cloudera.com>
Authored: Mon Nov 2 15:48:36 2015 +1000
Committer: Misty Stanley-Jones <ms...@cloudera.com>
Committed: Wed Nov 4 09:09:02 2015 +1000
----------------------------------------------------------------------
conf/hbase-env.cmd | 2 +-
conf/hbase-env.sh | 2 +-
hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp | 2 +-
.../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 2 +-
hbase-server/src/main/javadoc/overview.html | 1 -
hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp | 2 +-
.../test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 2 +-
.../src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java | 2 +-
hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp | 2 +-
src/main/asciidoc/_chapters/preface.adoc | 5 ++++-
src/main/asciidoc/_chapters/thrift_filter_language.adoc | 1 -
11 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/conf/hbase-env.cmd
----------------------------------------------------------------------
diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd
index 9fb87d7..a40be8e 100644
--- a/conf/hbase-env.cmd
+++ b/conf/hbase-env.cmd
@@ -37,7 +37,7 @@
@rem Extra Java runtime options.
@rem Below are what we set by default. May only work with SUN JVM.
@rem For more on why as well as other possible settings,
-@rem see http://wiki.apache.org/hadoop/PerformanceTuning
+@rem see http://hbase.apache.org/book.html#performance
@rem JDK6 on Windows has a known bug for IPv6, use preferIPv4Stack unless JDK7.
@rem @rem See TestIPv6NIOServerSocketChannel.
set HBASE_OPTS="-XX:+UseConcMarkSweepGC" "-Djava.net.preferIPv4Stack=true"
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/conf/hbase-env.sh
----------------------------------------------------------------------
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index b7d00d1..5ce959b 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -39,7 +39,7 @@
# Extra Java runtime options.
# Below are what we set by default. May only work with SUN JVM.
# For more on why as well as other possible settings,
-# see http://wiki.apache.org/hadoop/PerformanceTuning
+# see http://hbase.apache.org/book.html#performance
export HBASE_OPTS="-XX:+UseConcMarkSweepGC"
# Configure PermSize. Only needed in JDK7. You can safely remove it for JDK8+
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp
----------------------------------------------------------------------
diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp
index afc0b2f..e002749 100644
--- a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp
+++ b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp
@@ -105,7 +105,7 @@ String listenPort = conf.get("hbase.rest.port", "8080");
<div class="row">
<section>
-<a href="http://wiki.apache.org/hadoop/Hbase/Stargate">Apache HBase Wiki on REST</a>
+<a href="http://hbase.apache.org/book.html#_rest">Apache HBase documentation about REST</a>
</section>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
index 6704eae..d3685d8 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -150,7 +150,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<div class="alert alert-error">
Your current JVM version <% System.getProperty("java.version") %> is known to be
unstable with HBase. Please see the
- <a href="http://wiki.apache.org/hadoop/Hbase/Troubleshooting#A18">HBase wiki</a>
+ <a href="http://hbase.apache.org/book.html#trouble.log.gc">HBase Reference Guide</a>
for details.
</div>
</%if>
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/hbase-server/src/main/javadoc/overview.html
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/javadoc/overview.html b/hbase-server/src/main/javadoc/overview.html
index c5e743c..8b7f918 100644
--- a/hbase-server/src/main/javadoc/overview.html
+++ b/hbase-server/src/main/javadoc/overview.html
@@ -48,7 +48,6 @@ section of the <a href="../book.html">HBase Book</a>.
<ul>
<li><a href="http://hbase.org">HBase Home Page</a> </li>
<li><a href="http://hbase.apache.org/book/book.html">HBase Book</a> </li>
- <li><a href="http://wiki.apache.org/hadoop/Hbase">HBase Wiki</a> </li>
<li><a href="http://hadoop.apache.org/">Hadoop Home Page</a> </li>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp b/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp
index 4651ad0..fa98f05 100644
--- a/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp
@@ -126,7 +126,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false");
</div>
<div class="row">
<section>
- <a href="http://wiki.apache.org/hadoop/Hbase/ThriftApi">Apache HBase Wiki on Thrift</a>
+ <a href="http://hbase.apache.org/book.html#thrift">Apache HBase Reference Guide chapter on Thrift</a>
</section>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index 473419e..021f626 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -2590,7 +2590,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
/**
* Expire a ZooKeeper session as recommended in ZooKeeper documentation
- * http://wiki.apache.org/hadoop/ZooKeeper/FAQ#A4
+ * http://hbase.apache.org/book.html#trouble.zookeeper
* There are issues when doing this:
* [1] http://www.mail-archive.com/dev@zookeeper.apache.org/msg01942.html
* [2] https://issues.apache.org/jira/browse/ZOOKEEPER-1105
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
index 6d4cab3..4e1599a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
@@ -135,7 +135,7 @@ public class TestZooKeeper {
/**
- * See HBASE-1232 and http://wiki.apache.org/hadoop/ZooKeeper/FAQ#4.
+ * See HBASE-1232 and http://hbase.apache.org/book.html#trouble.zookeeper.
* @throws IOException
* @throws InterruptedException
*/
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
index d5425ab..97b948f 100644
--- a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
+++ b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
@@ -126,7 +126,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false");
</div>
<div class="row">
<section>
- <a href="http://wiki.apache.org/hadoop/Hbase/ThriftApi">Apache HBase Wiki on Thrift</a>
+ <a href="http://hbase.apache.org/book.html#_thrift">Apache HBase Reference Guide chapter on Thrift</a>
</section>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/src/main/asciidoc/_chapters/preface.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/preface.adoc b/src/main/asciidoc/_chapters/preface.adoc
index 960fcc4..b2a7ef0 100644
--- a/src/main/asciidoc/_chapters/preface.adoc
+++ b/src/main/asciidoc/_chapters/preface.adoc
@@ -29,7 +29,10 @@
This is the official reference guide for the link:http://hbase.apache.org/[HBase] version it ships with.
-Herein you will find either the definitive documentation on an HBase topic as of its standing when the referenced HBase version shipped, or it will point to the location in link:http://hbase.apache.org/apidocs/index.html[Javadoc], link:https://issues.apache.org/jira/browse/HBASE[JIRA] or link:http://wiki.apache.org/hadoop/Hbase[wiki] where the pertinent information can be found.
+Herein you will find either the definitive documentation on an HBase topic as of its
+standing when the referenced HBase version shipped, or it will point to the location
+in link:http://hbase.apache.org/apidocs/index.html[Javadoc] or
+link:https://issues.apache.org/jira/browse/HBASE[JIRA] where the pertinent information can be found.
.About This Guide
This reference guide is a work in progress. The source for this guide can be found in the _src/main/asciidoc directory of the HBase source. This reference guide is marked up using link:http://asciidoc.org/[AsciiDoc] from which the finished guide is generated as part of the 'site' build target. Run
http://git-wip-us.apache.org/repos/asf/hbase/blob/c575e18a/src/main/asciidoc/_chapters/thrift_filter_language.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/thrift_filter_language.adoc b/src/main/asciidoc/_chapters/thrift_filter_language.adoc
index ed099cd..da36cea 100644
--- a/src/main/asciidoc/_chapters/thrift_filter_language.adoc
+++ b/src/main/asciidoc/_chapters/thrift_filter_language.adoc
@@ -31,7 +31,6 @@
Apache link:http://thrift.apache.org/[Thrift] is a cross-platform, cross-language development framework.
HBase includes a Thrift API and filter language.
The Thrift API relies on client and server processes.
-Documentation about the HBase Thrift API is located at http://wiki.apache.org/hadoop/Hbase/ThriftApi.
You can configure Thrift for secure authentication at the server and client side, by following the procedures in <<security.client.thrift>> and <<security.gateway.thrift>>.