You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bu...@apache.org on 2014/05/04 19:29:34 UTC
svn commit: r908015 [7/19] - in /websites/staging/accumulo/trunk/content: ./
1.4/examples/ 1.4/user_manual/ 1.5/examples/ css/ downloads/ example/
fonts/ governance/ images/ js/ release_notes/ user_manual_1.3-incubating/
user_manual_1.3-incubating/exam...
Modified: websites/staging/accumulo/trunk/content/1.5/examples/isolation.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.5/examples/isolation.html (original)
+++ websites/staging/accumulo/trunk/content/1.5/examples/isolation.html Sun May 4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link href="/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <script src="/js/bootstrap.min.js"></script>
<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+ <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<title>Apache Accumulo Isolation Example</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript">
-
+/*
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-21103458-6']);
_gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
+*/
</script>
</head>
<body>
- <div id="banner">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/index.html">Accumulo</a>
</div>
+ <div class="collapse navbar-collapse" id="navbar-items">
+ <ul class="nav navbar-nav">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Project <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Community <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Development <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source & Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Documentation <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers & Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
+</ul>
+</li>
- <div id="navigation">
- <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source & Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
-</ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers & Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
-</ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ ASF Links <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
</ul>
+</li>
+</ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+ <div class="form-group">
+ <input type="text" name="q" class="form-control" placeholder="Search"/>
+ <input type="hidden" name="fc_project" value="Accumulo"/>
+ </div>
+ <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
</div>
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+ <div class="col-md-2" id="sidebar">
+ <div style="text-align: center">
+ <a href="/index.html"><img id="logo" alt="Apache Accumulo ™" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+ <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+ <br>
+ <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+ </div>
+ <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+ </div>
+ <div class="col-md-8 col-md-offset-1">
+<!--
<div id="bannertext">
- <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>™
+ <img id="logo" alt="Apache Accumulo ™" src="/images/accumulo-logo.png"/>
</div>
+-->
<div id="content">
+
<h1 class="title">Apache Accumulo Isolation Example</h1>
+
<p>Accumulo has an isolated scanner that ensures partial changes to rows are not
seen. Isolation is documented in ../docs/isolation.html and the user manual. </p>
<p>InterferenceTest is a simple example that shows the effects of scanning with
@@ -123,19 +224,25 @@ it reports no problems.</p>
<div id="footer">
<a alt="Apache Software Foundation" href="http://www.apache.org">
- <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+ <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
</a>
<div class="copyright">
<p>
- Copyright © 2011-2013 The Apache Software Foundation, Licensed under
+ Copyright © 2011-2014 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
- <br />
Apache Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
- <br />
- project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+ project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+ Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
</p>
</div>
</div>
+ </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+</script>
</body>
</html>
Modified: websites/staging/accumulo/trunk/content/1.5/examples/mapred.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.5/examples/mapred.html (original)
+++ websites/staging/accumulo/trunk/content/1.5/examples/mapred.html Sun May 4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link href="/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <script src="/js/bootstrap.min.js"></script>
<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+ <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<title>Apache Accumulo MapReduce Example</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript">
-
+/*
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-21103458-6']);
_gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
+*/
</script>
</head>
<body>
- <div id="banner">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/index.html">Accumulo</a>
</div>
+ <div class="collapse navbar-collapse" id="navbar-items">
+ <ul class="nav navbar-nav">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Project <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Community <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Development <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source & Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Documentation <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers & Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
+</ul>
+</li>
- <div id="navigation">
- <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source & Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
-</ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers & Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
-</ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ ASF Links <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
</ul>
+</li>
+</ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+ <div class="form-group">
+ <input type="text" name="q" class="form-control" placeholder="Search"/>
+ <input type="hidden" name="fc_project" value="Accumulo"/>
+ </div>
+ <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
</div>
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+ <div class="col-md-2" id="sidebar">
+ <div style="text-align: center">
+ <a href="/index.html"><img id="logo" alt="Apache Accumulo ™" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+ <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+ <br>
+ <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+ </div>
+ <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+ </div>
+ <div class="col-md-8 col-md-offset-1">
+<!--
<div id="bannertext">
- <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>™
+ <img id="logo" alt="Apache Accumulo ™" src="/images/accumulo-logo.png"/>
</div>
+-->
<div id="content">
+
<h1 class="title">Apache Accumulo MapReduce Example</h1>
+
<p>This example uses mapreduce and accumulo to compute word counts for a set of
documents. This is accomplished using a map-only mapreduce job and a
accumulo table with combiners.</p>
@@ -176,19 +277,25 @@ can directly read a tables files from HD
<div id="footer">
<a alt="Apache Software Foundation" href="http://www.apache.org">
- <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+ <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
</a>
<div class="copyright">
<p>
- Copyright © 2011-2013 The Apache Software Foundation, Licensed under
+ Copyright © 2011-2014 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
- <br />
Apache Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
- <br />
- project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+ project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+ Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
</p>
</div>
</div>
+ </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+</script>
</body>
</html>
Modified: websites/staging/accumulo/trunk/content/1.5/examples/maxmutation.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.5/examples/maxmutation.html (original)
+++ websites/staging/accumulo/trunk/content/1.5/examples/maxmutation.html Sun May 4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link href="/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <script src="/js/bootstrap.min.js"></script>
<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+ <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<title>Apache Accumulo MaxMutation Constraints Example</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript">
-
+/*
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-21103458-6']);
_gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
+*/
</script>
</head>
<body>
- <div id="banner">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/index.html">Accumulo</a>
</div>
+ <div class="collapse navbar-collapse" id="navbar-items">
+ <ul class="nav navbar-nav">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Project <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Community <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Development <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source & Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Documentation <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers & Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
+</ul>
+</li>
- <div id="navigation">
- <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source & Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
-</ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers & Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
-</ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ ASF Links <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
</ul>
+</li>
+</ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+ <div class="form-group">
+ <input type="text" name="q" class="form-control" placeholder="Search"/>
+ <input type="hidden" name="fc_project" value="Accumulo"/>
+ </div>
+ <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
</div>
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+ <div class="col-md-2" id="sidebar">
+ <div style="text-align: center">
+ <a href="/index.html"><img id="logo" alt="Apache Accumulo ™" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+ <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+ <br>
+ <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+ </div>
+ <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+ </div>
+ <div class="col-md-8 col-md-offset-1">
+<!--
<div id="bannertext">
- <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>™
+ <img id="logo" alt="Apache Accumulo ™" src="/images/accumulo-logo.png"/>
</div>
+-->
<div id="content">
+
<h1 class="title">Apache Accumulo MaxMutation Constraints Example</h1>
+
<p>This an example of how to limit the size of mutations that will be accepted into
a table. Under the default configuration, accumulo does not provide a limitation
on the size of mutations that can be ingested. Poorly behaved writers might
@@ -125,19 +226,25 @@ a single row with 10000 columns, which e
<div id="footer">
<a alt="Apache Software Foundation" href="http://www.apache.org">
- <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+ <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
</a>
<div class="copyright">
<p>
- Copyright © 2011-2013 The Apache Software Foundation, Licensed under
+ Copyright © 2011-2014 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
- <br />
Apache Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
- <br />
- project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+ project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+ Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
</p>
</div>
</div>
+ </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+</script>
</body>
</html>
Modified: websites/staging/accumulo/trunk/content/1.5/examples/regex.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.5/examples/regex.html (original)
+++ websites/staging/accumulo/trunk/content/1.5/examples/regex.html Sun May 4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link href="/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <script src="/js/bootstrap.min.js"></script>
<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+ <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<title>Apache Accumulo Regex Example</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript">
-
+/*
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-21103458-6']);
_gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
+*/
</script>
</head>
<body>
- <div id="banner">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/index.html">Accumulo</a>
</div>
+ <div class="collapse navbar-collapse" id="navbar-items">
+ <ul class="nav navbar-nav">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Project <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Community <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Development <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source & Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Documentation <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers & Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
+</ul>
+</li>
- <div id="navigation">
- <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source & Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
-</ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers & Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
-</ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ ASF Links <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
</ul>
+</li>
+</ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+ <div class="form-group">
+ <input type="text" name="q" class="form-control" placeholder="Search"/>
+ <input type="hidden" name="fc_project" value="Accumulo"/>
+ </div>
+ <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
</div>
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+ <div class="col-md-2" id="sidebar">
+ <div style="text-align: center">
+ <a href="/index.html"><img id="logo" alt="Apache Accumulo ™" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+ <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+ <br>
+ <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+ </div>
+ <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+ </div>
+ <div class="col-md-8 col-md-offset-1">
+<!--
<div id="bannertext">
- <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>™
+ <img id="logo" alt="Apache Accumulo ™" src="/images/accumulo-logo.png"/>
</div>
+-->
<div id="content">
+
<h1 class="title">Apache Accumulo Regex Example</h1>
+
<p>This example uses mapreduce and accumulo to find items using regular expressions.
This is accomplished using a map-only mapreduce job and a scan-time iterator.</p>
<p>To run this example you will need some data in a table. The following will
@@ -133,19 +234,25 @@ $
<div id="footer">
<a alt="Apache Software Foundation" href="http://www.apache.org">
- <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+ <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
</a>
<div class="copyright">
<p>
- Copyright © 2011-2013 The Apache Software Foundation, Licensed under
+ Copyright © 2011-2014 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
- <br />
Apache Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
- <br />
- project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+ project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+ Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
</p>
</div>
</div>
+ </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+</script>
</body>
</html>
Modified: websites/staging/accumulo/trunk/content/1.5/examples/rowhash.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.5/examples/rowhash.html (original)
+++ websites/staging/accumulo/trunk/content/1.5/examples/rowhash.html Sun May 4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link href="/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <script src="/js/bootstrap.min.js"></script>
<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+ <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<title>Apache Accumulo RowHash Example</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript">
-
+/*
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-21103458-6']);
_gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
+*/
</script>
</head>
<body>
- <div id="banner">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/index.html">Accumulo</a>
</div>
+ <div class="collapse navbar-collapse" id="navbar-items">
+ <ul class="nav navbar-nav">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Project <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Community <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Development <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source & Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Documentation <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers & Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
+</ul>
+</li>
- <div id="navigation">
- <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source & Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
-</ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers & Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
-</ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ ASF Links <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
</ul>
+</li>
+</ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+ <div class="form-group">
+ <input type="text" name="q" class="form-control" placeholder="Search"/>
+ <input type="hidden" name="fc_project" value="Accumulo"/>
+ </div>
+ <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
</div>
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+ <div class="col-md-2" id="sidebar">
+ <div style="text-align: center">
+ <a href="/index.html"><img id="logo" alt="Apache Accumulo ™" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+ <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+ <br>
+ <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+ </div>
+ <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+ </div>
+ <div class="col-md-8 col-md-offset-1">
+<!--
<div id="bannertext">
- <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>™
+ <img id="logo" alt="Apache Accumulo ™" src="/images/accumulo-logo.png"/>
</div>
+-->
<div id="content">
+
<h1 class="title">Apache Accumulo RowHash Example</h1>
+
<p>This example shows a simple map/reduce job that reads from an accumulo table and
writes back into that table.</p>
<p>To run this example you will need some data in a table. The following will
@@ -136,19 +237,25 @@ specified colum. Here's how you run the
<div id="footer">
<a alt="Apache Software Foundation" href="http://www.apache.org">
- <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+ <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
</a>
<div class="copyright">
<p>
- Copyright © 2011-2013 The Apache Software Foundation, Licensed under
+ Copyright © 2011-2014 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
- <br />
Apache Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
- <br />
- project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+ project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+ Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
</p>
</div>
</div>
+ </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+</script>
</body>
</html>
Modified: websites/staging/accumulo/trunk/content/1.5/examples/shard.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.5/examples/shard.html (original)
+++ websites/staging/accumulo/trunk/content/1.5/examples/shard.html Sun May 4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link href="/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <script src="/js/bootstrap.min.js"></script>
<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+ <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<title>Apache Accumulo Shard Example</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript">
-
+/*
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-21103458-6']);
_gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
+*/
</script>
</head>
<body>
- <div id="banner">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/index.html">Accumulo</a>
</div>
+ <div class="collapse navbar-collapse" id="navbar-items">
+ <ul class="nav navbar-nav">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Project <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
- <div id="navigation">
- <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Community <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
</ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Development <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source & Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source & Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Documentation <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers & Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
</ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers & Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ ASF Links <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
</ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+</li>
</ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+ <div class="form-group">
+ <input type="text" name="q" class="form-control" placeholder="Search"/>
+ <input type="hidden" name="fc_project" value="Accumulo"/>
</div>
+ <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
+ </div>
+
+</div>
+</nav>
+
+<div class="container-fluid">
+<div class="row">
+ <div class="col-md-2" id="sidebar">
+ <div style="text-align: center">
+ <a href="/index.html"><img id="logo" alt="Apache Accumulo ™" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+ <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+ <br>
+ <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+ </div>
+ <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+ </div>
+ <div class="col-md-8 col-md-offset-1">
+<!--
<div id="bannertext">
- <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>™
+ <img id="logo" alt="Apache Accumulo ™" src="/images/accumulo-logo.png"/>
</div>
+-->
<div id="content">
+
<h1 class="title">Apache Accumulo Shard Example</h1>
+
<p>Accumulo has an iterator called the intersecting iterator which supports querying a term index that is partitioned by
document, or "sharded". This example shows how to use the intersecting iterator through these four programs:</p>
<ul>
@@ -148,19 +249,25 @@ randomly selects one set of 5 terms and
<div id="footer">
<a alt="Apache Software Foundation" href="http://www.apache.org">
- <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+ <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
</a>
<div class="copyright">
<p>
- Copyright © 2011-2013 The Apache Software Foundation, Licensed under
+ Copyright © 2011-2014 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
- <br />
Apache Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
- <br />
- project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+ project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+ Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
</p>
</div>
</div>
+ </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+</script>
</body>
</html>
Modified: websites/staging/accumulo/trunk/content/1.5/examples/tabletofile.html
==============================================================================
--- websites/staging/accumulo/trunk/content/1.5/examples/tabletofile.html (original)
+++ websites/staging/accumulo/trunk/content/1.5/examples/tabletofile.html Sun May 4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
<head>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link href="/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <script src="/js/bootstrap.min.js"></script>
<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+ <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<title>Apache Accumulo Table-to-File Example</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript">
-
+/*
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-21103458-6']);
_gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
+*/
</script>
</head>
<body>
- <div id="banner">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/index.html">Accumulo</a>
</div>
+ <div class="collapse navbar-collapse" id="navbar-items">
+ <ul class="nav navbar-nav">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Project <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Community <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Development <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source & Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ Documentation <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers & Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
+</ul>
+</li>
- <div id="navigation">
- <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source & Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
-</ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers & Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
-</ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+ ASF Links <span class="caret"></span>
+ </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
</ul>
+</li>
+</ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+ <div class="form-group">
+ <input type="text" name="q" class="form-control" placeholder="Search"/>
+ <input type="hidden" name="fc_project" value="Accumulo"/>
+ </div>
+ <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
</div>
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+ <div class="col-md-2" id="sidebar">
+ <div style="text-align: center">
+ <a href="/index.html"><img id="logo" alt="Apache Accumulo ™" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+ <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+ <br>
+ <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+ </div>
+ <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+ </div>
+ <div class="col-md-8 col-md-offset-1">
+<!--
<div id="bannertext">
- <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>™
+ <img id="logo" alt="Apache Accumulo ™" src="/images/accumulo-logo.png"/>
</div>
+-->
<div id="content">
+
<h1 class="title">Apache Accumulo Table-to-File Example</h1>
+
<p>This example uses mapreduce to extract specified columns from an existing table.</p>
<p>To run this example you will need some data in a table. The following will
put a trivial amount of data into accumulo using the accumulo shell:</p>
@@ -135,19 +236,25 @@ $
<div id="footer">
<a alt="Apache Software Foundation" href="http://www.apache.org">
- <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+ <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
</a>
<div class="copyright">
<p>
- Copyright © 2011-2013 The Apache Software Foundation, Licensed under
+ Copyright © 2011-2014 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
- <br />
Apache Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
- <br />
- project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+ project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+ Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
</p>
</div>
</div>
+ </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+</script>
</body>
</html>