update website
git-svn-id: https://svn.apache.org/repos/asf/hama/trunk@1688381 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
index de1a972..8079c0a 100644
--- a/src/site/resources/css/site.css
+++ b/src/site/resources/css/site.css
@@ -15,108 +15,38 @@
* limitations under the License.
*/
-p {
- padding: 0px 0px 0px 0px;
-}
+#bannerRight { margin-right: 65%; }
+body {
+ font: large/1.35 "Linux Libertine", Palatino, "Palatino Linotype", "Book Antiqua", Georgia, "Times New Roman", serif; word-spacing: 0.13em;
+}
body a:link {
- color: #74240f;
+ color: #74240f; text-decoration: underline;
}
body a:visited {
- color: #74240f;
+ color: #74240f; text-decoration: underline;
}
body a:hover {
text-decoration: underline;
color: #888800;
}
-
-h2, h3, h4, h5 {
- color: #74240f;
-}
-
-h5 {
- font-size: 15px;
- margin-top: -0.1em;
-}
-
-table {
- width: 100%;
- margin-left: 0em;
-}
-
ul {
- margin-left:10px;
+ margin-left: 3em; list-style-type: decimal;
}
-
-.maintable {
- width: 100%;
- margin-left: 0em;
- padding: 0px 0px 0px 0px;
- border: 0px;
+.main {
+ text-align: left; width: 850px;
}
-
-#bodyColumn {
- margin-left: 10px;
- margin-right: 10px;
+h1 {
+ font-family: Palatino, "Palatino Linotype", "Book Antiqua", Georgia, "Times New Roman", serif; font-size: 35; text-shadow: 0 0 1px #665; margin-bottom: 0em;
}
-
-.green {
- color: #0f7355;
- width: 95%;
- margin: 20px 20px 20px 20px;
- border: 1px solid #0f7355;
- background: #edf7f4;
- background-color: #edf7f4;
+h2 {
+ font-family: Palatino, "Palatino Linotype", "Book Antiqua", Georgia, "Times New Roman", serif; font-size: 22; text-shadow: 0 0 1px #665; margin-bottom: 0em;
+}
+h3 {
+ font-family: Palatino, "Palatino Linotype", "Book Antiqua", Georgia, "Times New Roman", serif; font-size: 17; text-shadow: 0 0 1px #665; margin-bottom: 0em;
}
pre {
width: 95%;
margin: 20px 20px 20px 20px;
}
-
-.green a:link, .green a:active, .green a:visited { color: #0a4d39; }
-.green a:hover { color: #888800; }
-.green h3 {
- margin-bottom:-5px;
- margin-top:5px;
- padding: 0px 0px 0px 0px;
- border: 0px;
- color: #74240f;
- background-color: #edf7f4;
- font-weight: bold;
- font-size: 17px;
-}
-
-#banner {
- padding: 12px 5px 12px 5px;
-}
-
-#leftColumn {
- max-width: 180px;
- float:left;
- overflow: auto;
-}
-
-#navcolumn h5 {
- margin: 0;
- padding: 0;
- font-size: small;
-}
-
-ul {
- margin-left: 20px;
- padding-left: 1em;
- list-style-position: inside;
-}
-
-#leftColumn li.none{
- text-indent:-1em;
- margin-left:-1em;
-}
-
-#leftColumn h3 {
- font-size: 16px;
- margin-left:-0.7em;
-}
-
-body.topBarDisabled{padding-top:0px;}
diff --git a/src/site/site.xml b/src/site/site.xml
index 956faa1..a86483a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -15,27 +15,31 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Hama">
+<project name="Apache Hama">
<bannerLeft>
<name>Apache Hama</name>
- <src>/images/headerlogo.png</src>
+ <src>http://www.apache.org/images/feather-small.gif</src>
<href>/index.html</href>
- <width>340</width>
</bannerLeft>
-
- <publishDate position="right"/>
- <version position="right"/>
+ <bannerRight>
+ <name>Apache Hama</name>
+ </bannerRight>
+
+ <publishDate position="none"/>
+ <version position="none"/>
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.0</version>
+ <version>1.4</version>
</skin>
<custom>
<fluidoSkin>
<topBarEnabled>true</topBarEnabled>
<sideBarEnabled>false</sideBarEnabled>
+ <googlePlusOne />
+ <facebookLike />
</fluidoSkin>
</custom>
@@ -51,16 +55,8 @@
ga('send', 'pageview');
</script>
</head>
- <links position="left">
- <item name="Wiki" href="http://wiki.apache.org/hama" />
- <item name="JIRA" href="http://issues.apache.org/jira/browse/HAMA" />
- <item name="Hama Twitter" href="http://twitter.com/apachehama" />
- </links>
-
- <breadcrumbs position="left">
- <item name="Apache" href="http://www.apache.org/" />
- <item name="Hama" href="http://hama.apache.org/"/>
- </breadcrumbs>
+
+ <breadcrumbs position="none"/>
<menu name="Information">
<item name="Overview" href="index.html"/>
@@ -87,28 +83,17 @@
<item name="Books" href="http://wiki.apache.org/hama/Books" />
</menu>
- <menu name="Related Projects">
- <item name="Hadoop" href="http://hadoop.apache.org/" />
- <item name="Whirr" href="http://whirr.apache.org/" />
- <item name="Bigtop" href="http://incubator.apache.org/bigtop/" />
- <item name="Mahout" href="http://mahout.apache.org/" />
- </menu>
-
<menu name="Art works">
<item name="Artwork and Clothing" href="artwork.html" />
</menu>
-
- <menu name="ASF">
- <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html"/>
- <item name="Foundation" href="http://www.apache.org/foundation/"/>
- <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
- <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
- </menu>
+
+
<footer>
- <div class="row span16">Apache Hama, Apache, the Apache feather logo, and
+ <div style="font-size:80%;">Apache Hama, Apache, the Apache feather logo, and
the Apache Hama project logos are trademarks of The Apache Software
Foundation. All other marks mentioned may be trademarks or registered
trademarks of their respective owners.</div>
</footer>
</body>
+
</project>
diff --git a/src/site/xdoc/getting_started_with_hama.xml b/src/site/xdoc/getting_started_with_hama.xml
index e797309..57c2bbb 100644
--- a/src/site/xdoc/getting_started_with_hama.xml
+++ b/src/site/xdoc/getting_started_with_hama.xml
@@ -28,7 +28,7 @@
<p>1. Make sure all required software is installed on all nodes in your cluster:</p>
<ul>
<li>hadoop-1.0.x or higher version (non-secure version)</li>
- <li>Sun Java JDK 1.6.x or higher version</li>
+ <li>Sun Java JDK 1.7.x or higher version</li>
<li>SSH access to manage BSP deamons</li>
</ul>
<p>2. <a href="downloads.html">Download</a> Hama from the release page.
@@ -43,6 +43,12 @@
<li>Pseudo Distributed Mode - <font style="font-size: 11px;">This mode is when you just have a single server and want to launch all the deamon processes (BSPMaster, Groom and Zookeeper). It can be configured when you set the bsp.master.address to a host address e.g., <b>localhost</b> and put the same address into the groomservers file in the configuration directory. As stated it will run a BSPMaster, a Groom and a Zookeeper on your machine.</font></li>
<li>Distributed Mode - <font style="font-size: 11px;">This mode is just like the "Pseudo Distributed Mode", but you have multiple machines, which are mapped in the groomservers file.</font></li>
</ul>
+ <br/>
+ <p>
+ NOTE: We also support the <a href="http://wiki.apache.org/hama/GettingStartedMesos">Mesos</a> and <a href="http://wiki.apache.org/hama/GettingStartedYARN">Yet Another Resource Negotiator (YARN)</a>,
+ so you're able to submit your BSP applications to the existing open source and enterprise clusters e.g., CDH, HDP, and Mesosphere without any installation.
+ </p>
+ <br/>
<subsection name="Configuration Files"></subsection>
<p>The $HAMA_HOME/conf directory contains some configuration files for Hama. These are:</p>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index b351910..52301ef 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -19,24 +19,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties></properties>
- <title>a general BSP framework on top of Hadoop</title>
+ <title>Big Data and High-Performance Computing</title>
<body>
- <section name="Apache Hama"></section>
-
- <table class="maintable"><tr><td valign="top">
- <strong>Apache Hama</strong> is an Apache Top-Level open source project, allowing you to do advanced analytics beyond MapReduce.
- <br/><br/>
- Many data analysis techniques such as machine learning and graph algorithms require iterative computations,
- this is where Bulk Synchronous Parallel model can be more effective than "plain" MapReduce.
- Therefore To run such iterative data analysis applications more efficiently, Hama offers pure Bulk Synchronous Parallel computing engine.
- <br/><br/>
- Hama can make jobs that take hours in Hadoop run in minutes. For details, see the <a href="http://wiki.apache.org/hama/Benchmarks">Performance Benchmarks</a>.
- </td><td width="505" valign="top">
- <div align="center"><img src="images/mahout_vs_hama.png" width="500"/>
+ <section name=""></section>
+ <p>
+ Apache Hama<sup>TM</sup> is a general BSP computing engine on top of Hadoop, which was established in 2012 as a Top-Level Project of The Apache Software Foundation.
+ It provides High-Performance computing engine for performing massive scientific and iterative algorithms on existing open source or enterprise Hadoop cluster,
+ such as Matrix, Graph, and Machine Learning.
+ </p>
+ <div align="center"><img src="./images/hama_art_arthur_300x220.png"/>
</div>
- </td></tr></table>
-
+
<subsection name="Getting Started"></subsection>
<p>
Start by installing Hama on a Hadoop cluster.
diff --git a/src/site/xdoc/run_examples.xml b/src/site/xdoc/run_examples.xml
index acdac53..51b06c3 100644
--- a/src/site/xdoc/run_examples.xml
+++ b/src/site/xdoc/run_examples.xml
@@ -29,12 +29,12 @@
<p>1. First, you need to generate a symmetric adjacency matrix using the 'gen' command:</p>
<pre>
- % $HAMA_HOME/bin/hama jar hama-examples-x.x.x.jar gen fastgen 100 10 randomgraph 2</pre>
+ % $HAMA_HOME/bin/hama jar hama-examples-x.x.x.jar gen fastgen -v 100 -e 10 -o randomgraph -t 2</pre>
<p>This will create a graph with 100 nodes and 1K edges and store 2 partitions on HDFS as the sequence file.
You can adjust partition and tasks numbers to fit your cluster. Then, run PageRank using:</p>
<pre>
- % $HAMA_HOME/bin/hama jar hama-examples-x.x.x.jar pagerank randomgraph pagerankresult 4</pre>
+ % $HAMA_HOME/bin/hama jar hama-examples-x.x.x.jar pagerank -i randomgraph -o pagerankresult -t 4</pre>
<subsection name="Run K-Means example"></subsection>
Download a <a href="http://people.apache.org/~edwardyoon/kmeans.txt">Iris dataset</a> [<a href="http://archive.ics.uci.edu/ml/datasets/Iris">Dataset Information</a>].
