Updated Branches: refs/heads/master 38d7b76d0 -> ac3e32467
Adding all the changes needed from the 0.2.0 release into the trunk. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/ac3e3246 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/ac3e3246 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/ac3e3246 Branch: refs/heads/master Commit: ac3e32467749556e3da1c95b39e79fc1b9c2c4df Parents: 38d7b76 Author: Aaron McCurry <[email protected]> Authored: Fri Sep 6 08:01:28 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Fri Sep 6 08:01:28 2013 -0400 ---------------------------------------------------------------------- .../resources/org/apache/blur/doc/header.html | 4 +- docs/Blur.html | 4 +- docs/cluster-setup.html | 2 + docs/data-model.html | 2 + docs/getting-started.html | 2 + docs/index.html | 3 + docs/release-notes.template.html | 71 ++++++++++++++++++++ docs/using-blur.base.html | 2 + docs/using-blur.html | 2 + pom.xml | 3 + 10 files changed, 93 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac3e3246/blur-util/src/main/resources/org/apache/blur/doc/header.html ---------------------------------------------------------------------- diff --git a/blur-util/src/main/resources/org/apache/blur/doc/header.html b/blur-util/src/main/resources/org/apache/blur/doc/header.html index 1718d16..ea1f438 100644 --- a/blur-util/src/main/resources/org/apache/blur/doc/header.html +++ b/blur-util/src/main/resources/org/apache/blur/doc/header.html @@ -17,7 +17,7 @@ --> <html> <head> - <title>Extra - Apache Blur (Incubator) Documentation</title> + <title>Blur API - Apache Blur (Incubator) Documentation</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <!-- Bootstrap --> <link href="resources/css/bootstrap.min.css" rel="stylesheet" media="screen"> @@ -41,6 +41,8 @@ <li><a href="cluster-setup.html">Cluster Setup</a></li> <li><a href="using-blur.html">Using Blur</a></li> <li class="active"><a href="Blur.html">Blur API</a></li> + <li><a href="site/index.html" target="_blank">Maven Site</a></li> + <li><a href="site/apidocs/index.html" target="_blank">Javadocs</a></li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac3e3246/docs/Blur.html ---------------------------------------------------------------------- diff --git a/docs/Blur.html b/docs/Blur.html index 0d70fef..9df0a0c 100644 --- a/docs/Blur.html +++ b/docs/Blur.html @@ -17,7 +17,7 @@ limitations under the License. --> <html> <head> -<title>Extra - Apache Blur (Incubator) Documentation</title> +<title>Blur API - Apache Blur (Incubator) Documentation</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <!-- Bootstrap --> <link href="resources/css/bootstrap.min.css" rel="stylesheet" media="screen"> @@ -41,6 +41,8 @@ limitations under the License. <li><a href="cluster-setup.html">Cluster Setup</a></li> <li><a href="using-blur.html">Using Blur</a></li> <li class="active"><a href="Blur.html">Blur API</a></li> +<li><a href="site/index.html" target="_blank">Maven Site</a></li> +<li><a href="site/apidocs/index.html" target="_blank">Javadocs</a></li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac3e3246/docs/cluster-setup.html ---------------------------------------------------------------------- diff --git a/docs/cluster-setup.html b/docs/cluster-setup.html index 6428bfe..b12b471 100644 --- a/docs/cluster-setup.html +++ b/docs/cluster-setup.html @@ -41,6 +41,8 @@ <li class="active"><a href="cluster-setup.html">Cluster Setup</a></li> <li><a href="using-blur.html">Using Blur</a></li> <li><a href="Blur.html">Blur API</a></li> + <li><a href="site/index.html" target="_blank">Maven Site</a></li> + <li><a href="site/apidocs/index.html" target="_blank">Javadocs</a></li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac3e3246/docs/data-model.html ---------------------------------------------------------------------- diff --git a/docs/data-model.html b/docs/data-model.html index c3df371..b0fbb90 100644 --- a/docs/data-model.html +++ b/docs/data-model.html @@ -41,6 +41,8 @@ <li><a href="cluster-setup.html">Cluster Setup</a></li> <li><a href="using-blur.html">Using Blur</a></li> <li><a href="Blur.html">Blur API</a></li> + <li><a href="site/index.html" target="_blank">Maven Site</a></li> + <li><a href="site/apidocs/index.html" target="_blank">Javadocs</a></li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac3e3246/docs/getting-started.html ---------------------------------------------------------------------- diff --git a/docs/getting-started.html b/docs/getting-started.html index 4d426f0..aca1af3 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -41,6 +41,8 @@ <li><a href="cluster-setup.html">Cluster Setup</a></li> <li><a href="using-blur.html">Using Blur</a></li> <li><a href="Blur.html">Blur API</a></li> + <li><a href="site/index.html" target="_blank">Maven Site</a></li> + <li><a href="site/apidocs/index.html" target="_blank">Javadocs</a></li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac3e3246/docs/index.html ---------------------------------------------------------------------- diff --git a/docs/index.html b/docs/index.html index 67a9a23..cb77d34 100644 --- a/docs/index.html +++ b/docs/index.html @@ -41,6 +41,8 @@ <li><a href="cluster-setup.html">Cluster Setup</a></li> <li><a href="using-blur.html">Using Blur</a></li> <li><a href="Blur.html">Blur API</a></li> + <li><a href="site/index.html" target="_blank">Maven Site</a></li> + <li><a href="site/apidocs/index.html" target="_blank">Javadocs</a></li> </ul> </div> </div> @@ -52,6 +54,7 @@ Blur is an open source search platform capable of querying massive amounts of data at incredible speeds. Blur is built on top of Lucene, Hadoop, Thrift, and ZooKeeper. Tables consist of a series of shards (Lucene indexes) that are distributed across a cluster of commodity servers. All index information is stored in HDFS, cluster coordination is handled by Apache ZooKeeper, Apache Thrift is used for the RPC, and Lucene handles all of the indexing and data storage. </p> <a href="getting-started.html" class="btn btn-primary btn-large">Get Started »</a> + <a href="release-notes.html" class="btn btn-primary btn-large">View Release Notes »</a> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac3e3246/docs/release-notes.template.html ---------------------------------------------------------------------- diff --git a/docs/release-notes.template.html b/docs/release-notes.template.html new file mode 100644 index 0000000..92aa37e --- /dev/null +++ b/docs/release-notes.template.html @@ -0,0 +1,71 @@ +<!DOCTYPE html> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- Header for Release Notes --> +<html> + <head> + <title>Apache Blur (Incubator) Documentation</title> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <!-- Bootstrap --> + <link href="resources/css/bootstrap.min.css" rel="stylesheet" media="screen"> + <link href="resources/css/bs-docs.css" rel="stylesheet" media="screen"> + </head> + <body> + <div class="navbar navbar-inverse navbar-fixed-top"> + <div class="container"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="navbar-brand" href="index.html">Apache Blur (Incubator)</a> + </div> + <div class="collapse navbar-collapse"> + <ul class="nav navbar-nav"> + <li><a href="getting-started.html">Getting Started</a></li> + <li><a href="data-model.html">Data Model</a></li> + <li><a href="cluster-setup.html">Cluster Setup</a></li> + <li><a href="using-blur.html">Using Blur</a></li> + <li><a href="Blur.html">Blur API</a></li> + <li><a href="site/index.html" target="_blank">Maven Site</a></li> + <li><a href="site/apidocs/index.html" target="_blank">Javadocs</a></li> + </ul> + </div> + </div> + </div> + <div class="container"> + <div class="jumbotron"> + <h1>Apache Blur (Incubator)</h1> + <p> +<!-- Header for Release Notes --> + +PUT HTML RELEASE NOTES HERE + +<!-- Footer for Release Notes --> +</p> +</div> +</div> +<!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> +<script src="resources/js/jquery-2.0.3.min.js"></script> +<!-- Include all compiled plugins (below), or include individual files as needed --> +<script src="resources/js/bootstrap.min.js"></script> +<!-- Enable responsive features in IE8 with Respond.js (https://github.com/scottjehl/Respond) --> +<script src="resources/js/respond.min.js"></script> +</body> +</html> +<!-- Footer for Release Notes --> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac3e3246/docs/using-blur.base.html ---------------------------------------------------------------------- diff --git a/docs/using-blur.base.html b/docs/using-blur.base.html index 19d00de..c2efc3e 100644 --- a/docs/using-blur.base.html +++ b/docs/using-blur.base.html @@ -41,6 +41,8 @@ <li><a href="cluster-setup.html">Cluster Setup</a></li> <li class="active"><a href="using-blur.html">Using Blur</a></li> <li><a href="Blur.html">Blur API</a></li> + <li><a href="site/index.html" target="_blank">Maven Site</a></li> + <li><a href="site/apidocs/index.html" target="_blank">Javadocs</a></li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac3e3246/docs/using-blur.html ---------------------------------------------------------------------- diff --git a/docs/using-blur.html b/docs/using-blur.html index e62de54..ed2b408 100644 --- a/docs/using-blur.html +++ b/docs/using-blur.html @@ -41,6 +41,8 @@ <li><a href="cluster-setup.html">Cluster Setup</a></li> <li class="active"><a href="using-blur.html">Using Blur</a></li> <li><a href="Blur.html">Blur API</a></li> + <li><a href="site/index.html" target="_blank">Maven Site</a></li> + <li><a href="site/apidocs/index.html" target="_blank">Javadocs</a></li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac3e3246/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index daef058..dc5f4f4 100644 --- a/pom.xml +++ b/pom.xml @@ -238,6 +238,9 @@ under the License. <exclude>**/.classpath</exclude> <exclude>**/.project</exclude> <exclude>**/.settings/**</exclude> + <exclude>**/site/**</exclude> + <exclude>**/*.png</exclude> + <exclude>**/*.gif</exclude> </excludes> </configuration> </plugin>
