hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject hbase git commit: HBASE-12777 Redirect multi-page book to single-page book
Date Tue, 13 Jan 2015 06:20:09 GMT
Repository: hbase
Updated Branches:
  refs/heads/master acc284eec -> 20a096d62


HBASE-12777 Redirect multi-page book to single-page book


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

Branch: refs/heads/master
Commit: 20a096d62efa943d2035e6e020f24620b767909c
Parents: acc284e
Author: Misty Stanley-Jones <mstanleyjones@cloudera.com>
Authored: Mon Jan 12 16:30:29 2015 -0800
Committer: Misty Stanley-Jones <mstanleyjones@cloudera.com>
Committed: Mon Jan 12 22:09:24 2015 -0800

----------------------------------------------------------------------
 hbase-common/src/main/resources/.htaccess |  8 ++++++++
 pom.xml                                   | 18 ++++++++++++++++++
 src/main/docbkx/configuration.xml         |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/20a096d6/hbase-common/src/main/resources/.htaccess
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/resources/.htaccess b/hbase-common/src/main/resources/.htaccess
new file mode 100644
index 0000000..5bfc3aa
--- /dev/null
+++ b/hbase-common/src/main/resources/.htaccess
@@ -0,0 +1,8 @@
+# Redirect HTML-multi version of the book to HTML-single
+# Rule added 2015-1-12 -- can be removed in 6 months
+Redirect /book/ /book.html
+
+# Redirect replication URL to the right section of the book
+# Rule added 2015-1-12 -- can be removed in 6 months
+Redirect /replication.html /book.html#cluster_replication
+

http://git-wip-us.apache.org/repos/asf/hbase/blob/20a096d6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b3b252c..87070ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -955,6 +955,24 @@
               </resources>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-htaccess</id>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>post-site</phase>
+            <configuration>
+              <outputDirectory>${basedir}/target/site</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/hbase-common/src/main/resources/</directory>
+                  <includes>
+                    <include>.htaccess</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
         </executions>
         <configuration>
           <escapeString>\</escapeString>

http://git-wip-us.apache.org/repos/asf/hbase/blob/20a096d6/src/main/docbkx/configuration.xml
----------------------------------------------------------------------
diff --git a/src/main/docbkx/configuration.xml b/src/main/docbkx/configuration.xml
index 1d6e160..cbf8d1f 100644
--- a/src/main/docbkx/configuration.xml
+++ b/src/main/docbkx/configuration.xml
@@ -925,7 +925,7 @@ stopping hbase...............</screen>
       <!--presumes the pre-site target has put the hbase-default.xml at this location-->
       <xi:include
         xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="hbase-default.xml">
+        href="../../../target/docbkx/hbase-default.xml">
 	<xi:fallback>
           <section
             xml:id="hbase_default_configurations">


Mime
View raw message