Repository: incubator-blur Updated Branches: refs/heads/apache-blur-0.2 225d54c9b -> a0cb5bf19
Documentation updates. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/a0cb5bf1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/a0cb5bf1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/a0cb5bf1 Branch: refs/heads/apache-blur-0.2 Commit: a0cb5bf19cd76de677cbf6787e337bf2774f07ca Parents: 225d54c Author: Aaron McCurry <[email protected]> Authored: Tue May 6 09:17:41 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Tue May 6 09:17:41 2014 -0400 ---------------------------------------------------------------------- .../src/main/scripts/interface/genAndReplace.sh | 4 ++-- docs/getting-started.html | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a0cb5bf1/distribution/src/main/scripts/interface/genAndReplace.sh ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/genAndReplace.sh b/distribution/src/main/scripts/interface/genAndReplace.sh index dad5512..99504b3 100755 --- a/distribution/src/main/scripts/interface/genAndReplace.sh +++ b/distribution/src/main/scripts/interface/genAndReplace.sh @@ -37,5 +37,5 @@ mvn exec:java -Dexec.mainClass="org.apache.blur.doc.CreateBlurApiHtmlPage" -Dexe cd $cdir cp -r gen-java/* ../../../../../blur-thrift/src/main/java/ cd ../../../../../blur-thrift -mvn exec:java -Dexec.mainClass="org.apache.blur.thrift.util.GenerateSafeClient" -cd $cdir \ No newline at end of file +mvn exec:java -Dexec.mainClass="org.apache.blur.thrift.util.GenerateSafeClient" -Dhadoop1 +cd $cdir http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a0cb5bf1/docs/getting-started.html ---------------------------------------------------------------------- diff --git a/docs/getting-started.html b/docs/getting-started.html index 3ee4708..5fbee2a 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -104,17 +104,24 @@ cat ~/.ssh/id_dsa.pub >> ~/.ssh/authorized_keys</code></pre> </section> <section> <div class="page-header"> - <h1 id="compile">Compile</h1> + <h1 id="compile">Compile Hadoop</h1> </div> <p class="lead"> If building from source, the distribution needs to be compiled before use </p> <p>Clone master</p> <pre><code class="bash">git clone https://git-wip-us.apache.org/repos/asf/incubator-blur.git</code></pre> - <p>Build the artifacts (if you want to run the tests remove the "-DskipTests")</p> + <h4>Hadoop 1</h4> + <p>Build the artifacts for Hadoop 1 (if you want to run the tests remove the "-DskipTests")</p> <pre><code class="bash">cd incubator-blur/ -mvn install -DskipTests</code></pre> - <p>The binary artifact is located <code>distribution/target/apache-blur-0.2.2-incubating-bin.tar.gz</code>.</p> +mvn install -DskipTests -Dhadoop1</code></pre> + <p>The binary artifact is located <code>distribution/target/apache-blur-0.2.2-incubating-hadoop1-bin.tar.gz</code>.</p> + <h4>Hadoop 2</h4> + <div class="bs-callout bs-callout-info"><h4>Heads Up!</h4><p>While all the tests pass on Hadoop 2, Blur has not be tested at scale on Hadoop 2 and bin/blur-config.sh script will likely require modification to include the correct Hadoop 2 libraries.</p></div> + <p>Build the artifacts for Hadoop 2 (if you want to run the tests remove the "-DskipTests")</p> + <pre><code class="bash">cd incubator-blur/ +mvn install -DskipTests -Dhadoop2</code></pre> + <p>The binary artifact is located <code>distribution/target/apache-blur-0.2.2-incubating-hadoop2-bin.tar.gz</code>.</p> </section> <section> <div class="page-header">
