You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/08/28 04:15:12 UTC
[1/2] git commit: HBASE-4920 We need a mascot,
a totem Add in images Add reference on front page and from refguide.
Repository: hbase
Updated Branches:
refs/heads/master e5123cc2c -> 80fbcfcd2
HBASE-4920 We need a mascot, a totem
Add in images Add reference on front page and from refguide.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cd8a9084
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cd8a9084
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cd8a9084
Branch: refs/heads/master
Commit: cd8a9084992a884f2f3e84aa04ea8bd3fdfa2ab9
Parents: e5123cc
Author: stack <st...@apache.org>
Authored: Wed Aug 27 17:18:20 2014 -0700
Committer: stack <st...@apache.org>
Committed: Wed Aug 27 19:13:33 2014 -0700
----------------------------------------------------------------------
NOTICE.txt | 8 +++++++-
.../hbase-webapps/static/hbase_logo_small.png | Bin 1926 -> 3639 bytes
.../static/jumping-orca_rotated_12percent.png | Bin 0 -> 2401 bytes
.../resources/images/jumping-orca_rotated.png | Bin 0 -> 52812 bytes
.../resources/images/jumping-orca_rotated.xcf | Bin 0 -> 77560 bytes
.../images/jumping-orca_rotated_12percent.png | Bin 0 -> 2401 bytes
.../images/jumping-orca_rotated_25percent.png | Bin 0 -> 4780 bytes
src/main/site/site.vm | 4 +---
src/main/site/site.xml | 6 +++++-
9 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/cd8a9084/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 337c93b..5e159f6 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -15,6 +15,12 @@ Common Public License v1.0.
JRuby itself includes libraries variously licensed. See its COPYING document
for details: https://github.com/jruby/jruby/blob/master/COPYING
-
+
The JRuby community went out of their way to make JRuby compatible with Apache
projects: See https://issues.apache.org/jira/browse/HBASE-3374)
+
+Our Orca logo we got here: http://www.vectorfree.com/jumping-orca
+It is licensed Creative Commons Attribution 3.0.
+See https://creativecommons.org/licenses/by/3.0/us/
+We changed the logo by stripping the colored background, inverting
+it and then rotating it some.
http://git-wip-us.apache.org/repos/asf/hbase/blob/cd8a9084/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png b/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png
index 8c6353a..6e50935 100644
Binary files a/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png and b/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/cd8a9084/hbase-server/src/main/resources/hbase-webapps/static/jumping-orca_rotated_12percent.png
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/resources/hbase-webapps/static/jumping-orca_rotated_12percent.png b/hbase-server/src/main/resources/hbase-webapps/static/jumping-orca_rotated_12percent.png
new file mode 100644
index 0000000..1942f9a
Binary files /dev/null and b/hbase-server/src/main/resources/hbase-webapps/static/jumping-orca_rotated_12percent.png differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/cd8a9084/src/main/site/resources/images/jumping-orca_rotated.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/jumping-orca_rotated.png b/src/main/site/resources/images/jumping-orca_rotated.png
new file mode 100644
index 0000000..4c2c72e
Binary files /dev/null and b/src/main/site/resources/images/jumping-orca_rotated.png differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/cd8a9084/src/main/site/resources/images/jumping-orca_rotated.xcf
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/jumping-orca_rotated.xcf b/src/main/site/resources/images/jumping-orca_rotated.xcf
new file mode 100644
index 0000000..01be6ff
Binary files /dev/null and b/src/main/site/resources/images/jumping-orca_rotated.xcf differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/cd8a9084/src/main/site/resources/images/jumping-orca_rotated_12percent.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/jumping-orca_rotated_12percent.png b/src/main/site/resources/images/jumping-orca_rotated_12percent.png
new file mode 100644
index 0000000..1942f9a
Binary files /dev/null and b/src/main/site/resources/images/jumping-orca_rotated_12percent.png differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/cd8a9084/src/main/site/resources/images/jumping-orca_rotated_25percent.png
----------------------------------------------------------------------
diff --git a/src/main/site/resources/images/jumping-orca_rotated_25percent.png b/src/main/site/resources/images/jumping-orca_rotated_25percent.png
new file mode 100644
index 0000000..219c657
Binary files /dev/null and b/src/main/site/resources/images/jumping-orca_rotated_25percent.png differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/cd8a9084/src/main/site/site.vm
----------------------------------------------------------------------
diff --git a/src/main/site/site.vm b/src/main/site/site.vm
index 0e25195..f9cc08d 100644
--- a/src/main/site/site.vm
+++ b/src/main/site/site.vm
@@ -499,9 +499,7 @@
<body class="composite">
<div id="banner">
#banner( $decoration.bannerLeft "bannerLeft" )
- <!-- Commented out since we do not use it. St.Ack 20110906
- -->
- ## #banner( $decoration.bannerRight "bannerRight" )
+ #banner( $decoration.bannerRight "bannerRight" )
<div class="clear">
<hr/>
</div>
http://git-wip-us.apache.org/repos/asf/hbase/blob/cd8a9084/src/main/site/site.xml
----------------------------------------------------------------------
diff --git a/src/main/site/site.xml b/src/main/site/site.xml
index 0d60e00..b0462ee 100644
--- a/src/main/site/site.xml
+++ b/src/main/site/site.xml
@@ -28,7 +28,11 @@
<src>images/hbase_logo.png</src>
<href>http://hbase.apache.org/</href>
</bannerLeft>
- <bannerRight />
+ <bannerRight>
+ <name>Apache HBase Orca</name>
+ <src>images/jumping-orca_rotated_25percent.png</src>
+ <href>http://hbase.apache.org/</href>
+ </bannerRight>
<version position="right" />
<publishDate position="right" />
<body>
[2/2] git commit: HBASE-4920 We need a mascot, a totem
Posted by st...@apache.org.
HBASE-4920 We need a mascot, a totem
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/80fbcfcd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/80fbcfcd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/80fbcfcd
Branch: refs/heads/master
Commit: 80fbcfcd230bc7eaf201f4412f3f2775f1e130c2
Parents: cd8a908
Author: stack <st...@apache.org>
Authored: Wed Aug 27 19:08:39 2014 -0700
Committer: stack <st...@apache.org>
Committed: Wed Aug 27 19:14:35 2014 -0700
----------------------------------------------------------------------
.../hbase-webapps/static/hbase_logo_small.png | Bin 3639 -> 3206 bytes
.../static/jumping-orca_rotated_12percent.png | Bin 2401 -> 2401 bytes
pom.xml | 6 ++----
src/main/docbkx/book.xml | 10 +++++++++-
src/main/site/resources/css/site.css | 3 +++
5 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/80fbcfcd/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png b/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png
index 6e50935..60452b6 100644
Binary files a/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png and b/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/80fbcfcd/hbase-server/src/main/resources/hbase-webapps/static/jumping-orca_rotated_12percent.png
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/resources/hbase-webapps/static/jumping-orca_rotated_12percent.png b/hbase-server/src/main/resources/hbase-webapps/static/jumping-orca_rotated_12percent.png
index 1942f9a..9e35058 100644
Binary files a/hbase-server/src/main/resources/hbase-webapps/static/jumping-orca_rotated_12percent.png and b/hbase-server/src/main/resources/hbase-webapps/static/jumping-orca_rotated_12percent.png differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/80fbcfcd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84f279d..6c84c41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1911,6 +1911,7 @@
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
@@ -1938,7 +1939,6 @@
<reportSets>
<reportSet>
<id>devapi</id>
- <!-- full internal hbase api -->
<reports>
<report>aggregate</report>
</reports>
@@ -1949,7 +1949,6 @@
<reportSet>
<id>userapi</id>
- <!-- public user hbase api; limited but has stronger compat/deprecation guarantees -->
<reports>
<report>aggregate</report>
</reports>
@@ -1959,14 +1958,12 @@
</doclet>
<docletArtifact>
<groupId>org.apache.hadoop</groupId>
- <!-- doclet lives in hadoop 2's hadoop-common module -->
<artifactId>hadoop-common</artifactId>
<version>${hadoop-two.version}</version>
</docletArtifact>
<destDir>apidocs</destDir>
<name>User API</name>
<description>The HBase Application Programmer's API</description>
- <!-- exclude all the packages that are empty after the public annotation only filter -->
<excludePackageNames>
org.apache.hadoop.hbase.backup*:org.apache.hadoop.hbase.catalog:org.apache.hadoop.hbase.client.coprocessor:org.apache.hadoop.hbase.client.metrics:org.apache.hadoop.hbase.codec*:org.apache.hadoop.hbase.constraint:org.apache.hadoop.hbase.coprocessor.*:org.apache.hadoop.hbase.executor:org.apache.hadoop.hbase.fs:org.apache.hadoop.hbase.generated.*:org.apache.hadoop.hbase.io.hfile.*:org.apache.hadoop.hbase.mapreduce.hadoopbackport:org.apache.hadoop.hbase.mapreduce.replication:org.apache.hadoop.hbase.master.*:org.apache.hadoop.hbase.metrics*:org.apache.hadoop.hbase.migration:org.apache.hadoop.hbase.monitoring:org.apache.hadoop.hbase.p*:org.apache.hadoop.hbase.regionserver.compactions:org.apache.hadoop.hbase.regionserver.handler:org.apache.hadoop.hbase.regionserver.snapshot:org.apache.hadoop.hbase.replication.*:org.apache.hadoop.hbase.rest.filter:org.apache.hadoop.hbase.rest.model:org.apache.hadoop.hbase.rest.p*:org.apache.hadoop.hbase.security.*:org.apache.hadoop.hbase.thr
ift*:org.apache.hadoop.hbase.tmpl.*:org.apache.hadoop.hbase.tool:org.apache.hadoop.hbase.trace:org.apache.hadoop.hbase.util.byterange*:org.apache.hadoop.hbase.util.test:org.apache.hadoop.hbase.util.vint:org.apache.hadoop.hbase.zookeeper.lock:org.apache.hadoop.metrics2*
</excludePackageNames>
@@ -1974,6 +1971,7 @@
</reportSet>
</reportSets>
</plugin>
+ -->
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/hbase/blob/80fbcfcd/src/main/docbkx/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docbkx/book.xml b/src/main/docbkx/book.xml
index f919ec7..99b85a3 100644
--- a/src/main/docbkx/book.xml
+++ b/src/main/docbkx/book.xml
@@ -39,10 +39,18 @@
<imageobject>
<imagedata
align="center"
- valign="middle"
+ valign="left"
fileref="hbase_logo.png" />
</imageobject>
</inlinemediaobject>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata
+ align="center"
+ valign="right"
+ fileref="jumping-orca_rotated_25percent.png" />
+ </imageobject>
+ </inlinemediaobject>
</link>
</subtitle>
<copyright>
http://git-wip-us.apache.org/repos/asf/hbase/blob/80fbcfcd/src/main/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/src/main/site/resources/css/site.css b/src/main/site/resources/css/site.css
index f26d03c..17f0ff0 100644
--- a/src/main/site/resources/css/site.css
+++ b/src/main/site/resources/css/site.css
@@ -72,8 +72,10 @@ h4 {
#banner {
background: none;
+ padding: 10px;
}
+/*
#banner img {
padding: 10px;
margin: auto;
@@ -82,6 +84,7 @@ h4 {
float: center;
height:;
}
+ */
#breadcrumbs {
background-image: url();