You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2015/11/13 21:43:46 UTC
[1/2] calcite git commit: [CALCITE-960] Download links for pgp, md5,
KEYS files, and direct from mirrors
Repository: calcite
Updated Branches:
refs/heads/master d1c72b80c -> 05e099f39
[CALCITE-960] Download links for pgp, md5, KEYS files, and direct from mirrors
* Download src.tar.gz and src.zip directly from a mirror,
per [CAMEL-9308].
* Add links for md5 and pgp (asc) files, using https.
* Describe how to verify downloads, and how to retry a download in case
you get a bad mirror.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/7dd21420
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/7dd21420
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/7dd21420
Branch: refs/heads/master
Commit: 7dd2142065f0348fe9ce89974b4a5751330452e3
Parents: d1c72b8
Author: Julian Hyde <jh...@apache.org>
Authored: Tue Nov 10 22:09:46 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Nov 13 12:06:41 2015 -0800
----------------------------------------------------------------------
site/_docs/downloads.md | 50 +++++++++++++++++++++++++++---
site/_includes/primary-nav-items.html | 4 ++-
2 files changed, 49 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/7dd21420/site/_docs/downloads.md
----------------------------------------------------------------------
diff --git a/site/_docs/downloads.md b/site/_docs/downloads.md
index 160da8d..1c19ab2 100644
--- a/site/_docs/downloads.md
+++ b/site/_docs/downloads.md
@@ -27,10 +27,52 @@ Calcite is released as a source artifact, and also through Maven.
# Source releases
-Release | Date | Commit | Notes | Download
-:--------------- | :--------- | :------- | :---- | :-------
-{% for post in site.categories.release %}{{ post.version }} | {{ post.date | date_to_string }} | <a href="https://github.com/apache/calcite/commit/{{ post.sha }}">{{ post.sha }}</a> | <a href="history.html#{{ post.tag }}">notes</a> | <a href="http://{% if forloop.index0 < 2 %}www.apache.org/dyn/closer.cgi{% else %}archive.apache.org/dist{% endif %}/calcite/{% if post.fullVersion %}{{ post.fullVersion }}{% else %}apache-calcite-{{ post.version }}{% endif %}">src</a>
- {% endfor %}
+Release | Date | Commit | Download
+:--------------- | :--------- | :------- | :-------
+{% for post in site.categories.release %}{% comment %}
+{% endcomment %}{% if post.fullVersion %}{% comment %}
+{% endcomment %}{% assign v = post.fullVersion %}{% comment %}
+{% endcomment %}{% else %}{% comment %}
+{% endcomment %}{% capture v %}apache-calcite-{{ post.version }}{% endcapture %}{% comment %}
+{% endcomment %}{% endif %}{% comment %}
+{% endcomment %}{% if forloop.index0 < 2 %}{% comment %}
+{% endcomment %}{% capture p %}http://www.apache.org/dyn/closer.lua?filename=calcite/{{ v }}{% endcapture %}{% comment %}
+{% endcomment %}{% assign q = "&action=download" %}{% comment %}
+{% endcomment %}{% assign d = "https://www.apache.org/dist" %}{% comment %}
+{% endcomment %}{% else %}{% comment %}
+{% endcomment %}{% capture p %}http://archive.apache.org/dist/incubator/calcite/{{ v }}{% endcapture %}{% comment %}
+{% endcomment %}{% assign q = "" %}{% comment %}
+{% endcomment %}{% assign d = "https://archive.apache.org/dist/incubator" %}{% comment %}
+{% endcomment %}{% endif %}{% comment %}
+{% endcomment %}<a href="history.html#{{ post.tag }}">{{ post.version }}</a>{% comment %}
+{% endcomment %} | {{ post.date | date_to_string }}{% comment %}
+{% endcomment %} | <a href="https://github.com/apache/calcite/commit/{{ post.sha }}">{{ post.sha }}</a>{% comment %}
+{% endcomment %} | <a href="{{ p }}/{{ v }}-src.tar.gz{{ q }}">tar</a>{% comment %}
+{% endcomment %} (<a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.tar.gz.md5">md5</a>{% comment %}
+{% endcomment %} <a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.tar.gz.asc">pgp</a>){% comment %}
+{% endcomment %} {% raw %}<br>{% endraw %}{% comment %}
+{% endcomment %} <a href="{{ p }}/{{ v }}-src.zip{{ q }}">zip</a>{% comment %}
+{% endcomment %} (<a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.zip.md5">md5</a>{% comment %}
+{% endcomment %} <a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.zip.asc">pgp</a>){% comment %}
+{% endcomment %}
+{% endfor %}
+
+Choose a source distribution in either *tar* or *zip* format,
+and [verify](http://www.apache.org/dyn/closer.cgi#verify)
+using the corresponding *pgp* signature (using the committer file in
+[KEYS](http://www.apache.org/dist/calcite/KEYS)).
+If you cannot do that, the *md5* hash file may be used to check that the
+download has completed OK.
+
+For fast downloads, recent source distributions may be hosted on mirror servers;
+older source distributions are in the
+[archive](http://archive.apache.org/dist/calcite/)
+or [incubator archive](http://archive.apache.org/dist/incubator/calcite/).
+If a download from a mirror fails, retry, and the second download will likely
+succeed.
+
+For security, hash and signature files are always hosted at
+[Apache](https://www.apache.org/dist).
# Maven artifacts
http://git-wip-us.apache.org/repos/asf/calcite/blob/7dd21420/site/_includes/primary-nav-items.html
----------------------------------------------------------------------
diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html
index c2b24a1..995df86 100644
--- a/site/_includes/primary-nav-items.html
+++ b/site/_includes/primary-nav-items.html
@@ -3,7 +3,9 @@
<a href="{{ site.baseurl }}/">Home</a>
</li>
<li class="{% if page.url contains '/docs/' %}current{% endif %}">
- <a href="{{ site.baseurl }}/docs/">Documentation</a>
+ <a href="{{ site.baseurl }}/docs/">
+ <span class="show-on-mobiles">Docs</span>
+ <span class="hide-on-mobiles">Documentation</span></a>
</li>
<li class="{% if page.url contains '/talks/' %}current{% endif %}">
<a href="{{ site.baseurl }}/talks/">Talks</a>
[2/2] calcite git commit: [CALCITE-961] Web site: Add downloads and
Apache navigation links
Posted by jh...@apache.org.
[CALCITE-961] Web site: Add downloads and Apache navigation links
* Replace the previous top-level menu [home, documentation, talks,
news, help, develop] with [home, download, community, develop, news,
docs].
* "Download" is now a top-level menu item, as it should be.
* To make way for "Downloads", delete the "help" and "talks" pages.
* Add a "community" page containing the "project members" and
"mailing lists" sections of the "develop" page, and the entire old
"help" and "talks" pages.
* The "contributing" page has also gone; its content is now on the
"develop" page.
* Add contents to the HOWTO, "community" and "develop" pages.
* Add feather logo to footer, and a bit of padding.
* Add downloads link on history page.
* Add Josh and Maryann to committers.
* Add test API.
* Add link to CSV adapter documentation.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/05e099f3
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/05e099f3
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/05e099f3
Branch: refs/heads/master
Commit: 05e099f3986e7e52c6213e26e9e9d8044987e9f6
Parents: 7dd2142
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Nov 11 21:06:41 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Nov 13 12:07:00 2015 -0800
----------------------------------------------------------------------
README | 8 +--
site/_data/contributors.yml | 10 +++
site/_data/docs.yml | 2 -
site/_docs/adapter.md | 2 +-
site/_docs/contributing.md | 74 --------------------
site/_docs/downloads.md | 97 --------------------------
site/_docs/history.md | 2 +
site/_docs/howto.md | 49 ++-----------
site/_docs/index.md | 2 +-
site/_docs/testapi.md | 28 ++++++++
site/_includes/footer.html | 7 ++
site/_includes/primary-nav-items.html | 20 +++---
site/_sass/_style.scss | 13 ++++
site/community/index.md | 108 +++++++++++++++++++++++++++++
site/develop/index.md | 95 ++++++++++++++++++-------
site/doap_calcite.rdf | 2 +-
site/downloads/index.md | 96 +++++++++++++++++++++++++
site/help/index.md | 50 -------------
site/img/feather.png | Bin 0 -> 7886 bytes
site/index.html | 25 +++++++
site/talks/index.md | 58 ----------------
21 files changed, 381 insertions(+), 367 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/README
----------------------------------------------------------------------
diff --git a/README b/README
index 7b1640e..a68be99 100644
--- a/README
+++ b/README
@@ -2,14 +2,14 @@ Apache Calcite release 1.5.0
This is a source or binary distribution of Apache Calcite.
-Changes since the previous release are described in the doc/history.md
-file.
+Changes since the previous release are described in the
+site/_docs/history.md file.
The LICENSE and NOTICE files contain license information.
If this is a source distribution, you can find instructions how to
-build the release in the "Building from a source release" section in
-doc/howto.md.
+build the release in the "Building from a source distribution" section
+in site/_docs/howto.md.
README.md contains examples of running Calcite.
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_data/contributors.yml
----------------------------------------------------------------------
diff --git a/site/_data/contributors.yml b/site/_data/contributors.yml
index 1304143..7d61dbc 100644
--- a/site/_data/contributors.yml
+++ b/site/_data/contributors.yml
@@ -56,12 +56,22 @@
githubId: jpullokkaran
org: Hortonworks
role: PMC
+- name: Josh Elser
+ apacheId: elserj
+ githubId: joshelser
+ org: Hortonworks
+ role: Committer
- name: Julian Hyde
apacheId: jhyde
githubId: julianhyde
org: Hortonworks
role: PMC Chair
homepage: http://people.apache.org/~jhyde
+- name: Maryann Xue
+ apacheId: maryannxue
+ githubId: maryannxue
+ org: Intel
+ role: Committer
- name: Nick Dimiduk
apacheId: ndimiduk
githubId: ndimiduk
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_data/docs.yml
----------------------------------------------------------------------
diff --git a/site/_data/docs.yml b/site/_data/docs.yml
index 1c0a842..88c2c88 100644
--- a/site/_data/docs.yml
+++ b/site/_data/docs.yml
@@ -41,9 +41,7 @@
- title: Meta
docs:
- - downloads
- history
- - contributing
- api
- testapi
# End docs.yml
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_docs/adapter.md
----------------------------------------------------------------------
diff --git a/site/_docs/adapter.md b/site/_docs/adapter.md
index 57ae8cd..ece553e 100644
--- a/site/_docs/adapter.md
+++ b/site/_docs/adapter.md
@@ -24,7 +24,7 @@ limitations under the License.
* <a href="https://github.com/apache/drill">Apache Drill adapter</a>
* Cascading adapter (<a href="https://github.com/Cascading/lingual">Lingual</a>)
-* CSV adapter (example/csv)
+* CSV adapter (<a href="{{ site.apiRoot }}/org/apache/calcite/adapter/csv/package-summary.html">example/csv</a>)
* JDBC adapter (part of <a href="{{ site.apiRoot }}/org/apache/calcite/adapter/jdbc/package-summary.html">calcite-core</a>)
* MongoDB adapter (<a href="{{ site.apiRoot }}/org/apache/calcite/adapter/mongodb/package-summary.html">calcite-mongodb</a>)
* Spark adapter (<a href="{{ site.apiRoot }}/org/apache/calcite/adapter/spark/package-summary.html">calcite-spark</a>)
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_docs/contributing.md
----------------------------------------------------------------------
diff --git a/site/_docs/contributing.md b/site/_docs/contributing.md
deleted file mode 100644
index a79066b..0000000
--- a/site/_docs/contributing.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-layout: docs
-title: Contributing
-permalink: /docs/contributing.html
----
-
-<!--
-{% comment %}
-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.
-{% endcomment %}
--->
-
-We welcome contributions.
-
-If you are planning to make a large contribution, talk to us first! It
-helps to agree on the general approach. Log a
-[JIRA case](https://issues.apache.org/jira/browse/CALCITE) for your
-proposed feature or start a discussion on the dev list.
-
-Fork the github repository, and create a branch for your feature.
-
-Develop your feature and test cases, and make sure that
-`mvn install` succeeds. (Run extra tests if your change warrants it.)
-
-Commit your change to your branch, and use a comment that starts with
-the JIRA case number, like this:
-
-{% highlight text %}
-[CALCITE-345] AssertionError in RexToLixTranslator comparing to date literal
-{% endhighlight %}
-
-If your change had multiple commits, use `git rebase -i master` to
-combine them into a single commit, and to bring your code up to date
-with the latest on the main line.
-
-Then push your commit(s) to github, and create a pull request from
-your branch to the calcite master branch. Update the JIRA case
-to reference your pull request, and a committer will review your
-changes.
-
-## Getting started
-
-Calcite is a community, so the first step to joining the project is to introduce yourself.
-Join the [developers list](http://mail-archives.apache.org/mod_mbox/calcite-dev/)
-and send an email.
-
-If you have the chance to attend a [meetup](http://www.meetup.com/Apache-Calcite/),
-or meet [members of the community](http://calcite.apache.org/develop)
-at a conference, that's also great.
-
-Choose an initial task to work on. It should be something really simple,
-such as a bug fix or a [Jira task that we have labeled
-"newbie"](https://issues.apache.org/jira/issues/?jql=labels%20%3D%20newbie%20%26%20project%20%3D%20Calcite%20%26%20status%20%3D%20Open).
-Follow the [contributing guidelines](#contributing) to get your change committed.
-
-After you have made several useful contributions we may
-[invite you to become a committer](https://community.apache.org/contributors/).
-We value all contributions that help to build a vibrant community, not just code.
-You can contribute by testing the code, helping verify a release,
-writing documentation or the web site,
-or just by answering questions on the list.
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_docs/downloads.md
----------------------------------------------------------------------
diff --git a/site/_docs/downloads.md b/site/_docs/downloads.md
deleted file mode 100644
index 1c19ab2..0000000
--- a/site/_docs/downloads.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-layout: docs
-title: Downloads
-permalink: /docs/downloads.html
----
-
-<!--
-{% comment %}
-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.
-{% endcomment %}
--->
-
-Calcite is released as a source artifact, and also through Maven.
-
-# Source releases
-
-Release | Date | Commit | Download
-:--------------- | :--------- | :------- | :-------
-{% for post in site.categories.release %}{% comment %}
-{% endcomment %}{% if post.fullVersion %}{% comment %}
-{% endcomment %}{% assign v = post.fullVersion %}{% comment %}
-{% endcomment %}{% else %}{% comment %}
-{% endcomment %}{% capture v %}apache-calcite-{{ post.version }}{% endcapture %}{% comment %}
-{% endcomment %}{% endif %}{% comment %}
-{% endcomment %}{% if forloop.index0 < 2 %}{% comment %}
-{% endcomment %}{% capture p %}http://www.apache.org/dyn/closer.lua?filename=calcite/{{ v }}{% endcapture %}{% comment %}
-{% endcomment %}{% assign q = "&action=download" %}{% comment %}
-{% endcomment %}{% assign d = "https://www.apache.org/dist" %}{% comment %}
-{% endcomment %}{% else %}{% comment %}
-{% endcomment %}{% capture p %}http://archive.apache.org/dist/incubator/calcite/{{ v }}{% endcapture %}{% comment %}
-{% endcomment %}{% assign q = "" %}{% comment %}
-{% endcomment %}{% assign d = "https://archive.apache.org/dist/incubator" %}{% comment %}
-{% endcomment %}{% endif %}{% comment %}
-{% endcomment %}<a href="history.html#{{ post.tag }}">{{ post.version }}</a>{% comment %}
-{% endcomment %} | {{ post.date | date_to_string }}{% comment %}
-{% endcomment %} | <a href="https://github.com/apache/calcite/commit/{{ post.sha }}">{{ post.sha }}</a>{% comment %}
-{% endcomment %} | <a href="{{ p }}/{{ v }}-src.tar.gz{{ q }}">tar</a>{% comment %}
-{% endcomment %} (<a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.tar.gz.md5">md5</a>{% comment %}
-{% endcomment %} <a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.tar.gz.asc">pgp</a>){% comment %}
-{% endcomment %} {% raw %}<br>{% endraw %}{% comment %}
-{% endcomment %} <a href="{{ p }}/{{ v }}-src.zip{{ q }}">zip</a>{% comment %}
-{% endcomment %} (<a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.zip.md5">md5</a>{% comment %}
-{% endcomment %} <a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.zip.asc">pgp</a>){% comment %}
-{% endcomment %}
-{% endfor %}
-
-Choose a source distribution in either *tar* or *zip* format,
-and [verify](http://www.apache.org/dyn/closer.cgi#verify)
-using the corresponding *pgp* signature (using the committer file in
-[KEYS](http://www.apache.org/dist/calcite/KEYS)).
-If you cannot do that, the *md5* hash file may be used to check that the
-download has completed OK.
-
-For fast downloads, recent source distributions may be hosted on mirror servers;
-older source distributions are in the
-[archive](http://archive.apache.org/dist/calcite/)
-or [incubator archive](http://archive.apache.org/dist/incubator/calcite/).
-If a download from a mirror fails, retry, and the second download will likely
-succeed.
-
-For security, hash and signature files are always hosted at
-[Apache](https://www.apache.org/dist).
-
-# Maven artifacts
-
-Add the following to the dependencies section of your `pom.xml` file:
-
-{% for post in site.categories.release limit:1 %}
-{% assign current_release = post %}
-{% endfor %}
-
-{% highlight xml %}
-<dependencies>
- <dependency>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-core</artifactId>
- <version>{{ current_release.version }}</version>
- </dependency>
-</dependencies>
-{% endhighlight %}
-
-Also include `<dependency>` elements for any extension modules you
-need: `calcite-mongodb`, `calcite-spark`, `calcite-splunk`, and so
-forth.
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_docs/history.md
----------------------------------------------------------------------
diff --git a/site/_docs/history.md b/site/_docs/history.md
index b939c91..b746cc7 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -25,6 +25,8 @@ limitations under the License.
For a full list of releases, see
<a href="https://github.com/apache/calcite/releases">github</a>.
+Downloads are available on the
+[downloads page]({{ site.baseurl }}/downloads/).
## <a href="https://github.com/apache/calcite/releases/tag/calcite-1.5.0">1.5.0</a> / 2015-11-06
{: #v1-5-0}
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index aff04b2..8b55b55 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -26,6 +26,9 @@ limitations under the License.
Here's some miscellaneous documentation about using Calcite and its various
adapters.
+* TOC
+{:toc}
+
## Building from a source distribution
Prerequisites are maven (3.2.1 or later)
@@ -156,53 +159,11 @@ Integration tests should be named `...IT.java`, so they are not picked up on uni
## Contributing
-We welcome contributions.
-
-If you are planning to make a large contribution, talk to us first! It
-helps to agree on the general approach. Log a
-[JIRA case](https://issues.apache.org/jira/browse/CALCITE) for your
-proposed feature or start a discussion on the dev list.
-
-Fork the github repository, and create a branch for your feature.
-
-Develop your feature and test cases, and make sure that `mvn
-install` succeeds. (Run extra tests if your change warrants it.)
-
-Commit your change to your branch, and use a comment that starts with
-the JIRA case number, like this:
-
-`[CALCITE-345] AssertionError in RexToLixTranslator comparing to date literal`
-
-If your change had multiple commits, use `git rebase -i master` to
-combine them into a single commit, and to bring your code up to date
-with the latest on the main line.
-
-Then push your commit(s) to github, and create a pull request from
-your branch to the calcite master branch. Update the JIRA case
-to reference your pull request, and a committer will review your
-changes.
+See the [developers guide]({{ site.baseurl }}/develop/#contributing).
## Getting started
-Calcite is a community, so the first step to joining the project is to introduce yourself.
-Join the [developers list](http://mail-archives.apache.org/mod_mbox/calcite-dev/)
-and send an email.
-
-If you have the chance to attend a [meetup](http://www.meetup.com/Apache-Calcite/),
-or meet [members of the community](http://calcite.apache.org/develop)
-at a conference, that's also great.
-
-Choose an initial task to work on. It should be something really simple,
-such as a bug fix or a [Jira task that we have labeled
-"newbie"](https://issues.apache.org/jira/issues/?jql=labels%20%3D%20newbie%20%26%20project%20%3D%20Calcite%20%26%20status%20%3D%20Open).
-Follow the [contributing guidelines](#contributing) to get your change committed.
-
-After you have made several useful contributions we may
-[invite you to become a committer](https://community.apache.org/contributors/).
-We value all contributions that help to build a vibrant community, not just code.
-You can contribute by testing the code, helping verify a release,
-writing documentation or the web site,
-or just by answering questions on the list.
+See the [developers guide]({{ site.baseurl }}/develop/#getting-started).
## Tracing
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_docs/index.md
----------------------------------------------------------------------
diff --git a/site/_docs/index.md b/site/_docs/index.md
index 6f89946..58d2ef4 100644
--- a/site/_docs/index.md
+++ b/site/_docs/index.md
@@ -139,7 +139,7 @@ The following features are complete.
(syntax as <a
href="http://www.postgresql.org/docs/8.4/static/sql-select.html#SQL-LIMIT">Postgres</a>);
more details in the [SQL reference](reference.html)
-* Local and remote JDBC drivers; see [Avatica](avatica.html)
+* Local and remote JDBC drivers; see [Avatica](avatica_overview.html)
* Several [adapters](adapter.html)
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_docs/testapi.md
----------------------------------------------------------------------
diff --git a/site/_docs/testapi.md b/site/_docs/testapi.md
new file mode 100644
index 0000000..661f374
--- /dev/null
+++ b/site/_docs/testapi.md
@@ -0,0 +1,28 @@
+---
+title: Test API
+layout: external
+external_url: /testapidocs
+---
+{% comment %}
+Ideally, we want to use {{ site.apiRoot }} instead of hardcoding
+the above external_url value, but I don't believe there's a way to do that
+{% endcomment %}
+
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_includes/footer.html
----------------------------------------------------------------------
diff --git a/site/_includes/footer.html b/site/_includes/footer.html
index d077112..51749d6 100644
--- a/site/_includes/footer.html
+++ b/site/_includes/footer.html
@@ -1,8 +1,15 @@
<footer role="contentinfo">
+ <div id="poweredby">
+ <a href="http://www.apache.org/">
+ <span class="sr-only">Apache</span>
+ <img src="{{ site.baseurl }}/img/feather.png" alt="Apache Logo"></a>
+ </div>
+ <div id="copyright">
<p>The contents of this website are © {{ site.time | date: '%Y' }}
<a href="https://www.apache.org/">Apache Software Foundation</a>
under the terms of
the <a href="https://www.apache.org/licenses/LICENSE-2.0.html">
Apache License v2</a>. Apache Calcite and its logo are
trademarks of the Apache Software Foundation.</p>
+ </div>
</footer>
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_includes/primary-nav-items.html
----------------------------------------------------------------------
diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html
index 995df86..687cdd2 100644
--- a/site/_includes/primary-nav-items.html
+++ b/site/_includes/primary-nav-items.html
@@ -2,21 +2,19 @@
<li class="{% if page.overview %}current{% endif %}">
<a href="{{ site.baseurl }}/">Home</a>
</li>
- <li class="{% if page.url contains '/docs/' %}current{% endif %}">
- <a href="{{ site.baseurl }}/docs/">
- <span class="show-on-mobiles">Docs</span>
- <span class="hide-on-mobiles">Documentation</span></a>
+ <li class="{% if page.url contains '/downloads/' %}current{% endif %}">
+ <a href="{{ site.baseurl }}/downloads/">Download</a>
+ </li>
+ <li class="{% if page.url contains '/community/' %}current{% endif %}">
+ <a href="{{ site.baseurl }}/community/">Community</a>
</li>
- <li class="{% if page.url contains '/talks/' %}current{% endif %}">
- <a href="{{ site.baseurl }}/talks/">Talks</a>
+ <li class="{% if page.url contains '/develop/' %}current{% endif %}">
+ <a href="{{ site.baseurl }}/develop/">Develop</a>
</li>
<li class="{% if page.url contains '/news/' %}current{% endif %}">
<a href="{{ site.baseurl }}/news/">News</a>
</li>
- <li class="{% if page.url contains '/help/' %}current{% endif %}">
- <a href="{{ site.baseurl }}/help/">Help</a>
- </li>
- <li class="{% if page.url contains '/develop/' %}current{% endif %}">
- <a href="{{ site.baseurl }}/develop/">Develop</a>
+ <li class="{% if page.url contains '/docs/' %}current{% endif %}">
+ <a href="{{ site.baseurl }}/docs/">Docs</a>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/_sass/_style.scss
----------------------------------------------------------------------
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index d6e832a..626acb5 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -170,6 +170,8 @@ footer {
background-color: #212121;
font-size: 16px;
padding-bottom: 5px;
+ padding-left: 5px;
+ padding-right: 5px;
color: #c0c0c0;
margin-top: 40px;
@@ -974,3 +976,14 @@ code.output {
clip: rect(0, 0, 0, 0);
border: 0;
}
+
+#poweredby {
+ float: right;
+ text-align: right;
+ width: 120px;
+ height: 36px;
+}
+
+#resources {
+ background-color: #000;
+}
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/community/index.md
----------------------------------------------------------------------
diff --git a/site/community/index.md b/site/community/index.md
new file mode 100644
index 0000000..ac2452c
--- /dev/null
+++ b/site/community/index.md
@@ -0,0 +1,108 @@
+---
+layout: page
+title: Community
+---
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
+
+* TOC
+{:toc}
+
+# Project Members
+
+Name (Apache ID) | Github | Org | Role
+:--------------- | :----- | :-- | :---
+{% for c in site.data.contributors %} {{ c.name }} (<a href="http://people.apache.org/committer-index#{{ c.apacheId }}">{{ c.apacheId }}</a>) | <a href="http://github.com/{{ c.githubId }}"><img width="64" src="{% unless c.avatar %}http://github.com/{{ c.githubId }}.png{% else %}{{ c.avatar }}{% endunless %}"></a> | {{ c.org }} | {{ c.role }}
+{% endfor %}
+
+# Mailing Lists
+
+There are several development mailing lists for Calcite:
+
+* [dev@calcite.apache.org](mailto:dev@calcite.apache.org) - Development discussions
+ [[archive](https://mail-archives.apache.org/mod_mbox/calcite-dev/)]
+* [issues@calcite.apache.org](mailto:issues@calcite.apache.org) - Bug tracking
+ [[archive](https://mail-archives.apache.org/mod_mbox/calcite-issues/)]
+* [commits@calcite.apache.org](mailto:commits@calcite.apache.org) - Git tracking
+ [[archive](https://mail-archives.apache.org/mod_mbox/calcite-commits/)]
+
+You can subscribe to the lists by sending email to
+*list*-subscribe@calcite.apache.org and unsubscribe by sending email to
+*list*-unsubscribe@calcite.apache.org.
+
+# Help
+
+Need help with Calcite? Try these resources:
+
+* **Mailing Lists**.
+ The best option is to send email to the developers list
+ [dev@calcite.apache.org](mailto:dev@calcite.apache.org). All
+ of the historic traffic is available in the
+ [archive](http://mail-archives.apache.org/mod_mbox/calcite-dev/). To
+ subscribe to the user list, please send email to
+ [dev-subscribe@calcite.apache.org](mailto:dev-subscribe@calcite.apache.org).
+* **Bug Reports**.
+ Please file any issues you encounter or fixes you'd like on the
+ [Calcite Jira](https://issues.apache.org/jira/browse/CALCITE). We welcome
+ patches!
+* **StackOverflow**.
+ [StackOverflow](http://stackoverflow.com) is a wonderful resource for
+ any developer. Take a look over there to see if someone has answered
+ your question.
+* **Browse the code**.
+ One of the advantages of open source software is that you can browse the code.
+ The code is available on [github](https://github.com/apache/calcite/tree/master).
+
+# Talks
+
+Want to learn more about Calcite?
+
+Watch some presentations and read through some slide decks about Calcite.
+
+## Apache Calcite: One planner fits all
+
+Voted [Best Lightning Talk at XLDB-2015](http://www.xldb.org/archives/2015/05/best-lightning-talks-selected/);
+[[video](https://www.youtube.com/watch?v=5_MyORYjq3w)],
+[[slides](http://www.slideshare.net/julianhyde/apache-calcite-one-planner-fits-all)].
+
+{% oembed https://www.youtube.com/watch?v=5_MyORYjq3w %}
+
+## Why you care about relational algebra (even though you didn't know it)
+
+Washington DC, April 2015;
+[[slides](http://www.slideshare.net/julianhyde/calcite-algebraedw2015)].
+
+<iframe src="//www.slideshare.net/slideshow/embed_code/key/vfVDu6y1mAM5Dl" width="629" height="355" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe>
+
+## Apache Calcite overview
+
+Apache Kylin meetup, 2014;
+[[slides](http://www.slideshare.net/julianhyde/apache-calcite-overview)].
+
+<iframe src="//www.slideshare.net/slideshow/embed_code/key/fCGsAedsQiq53V" width="629" height="354" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe>
+
+## More talks
+
+* <a href="https://github.com/julianhyde/share/blob/master/slides/hive-cbo-seattle-2014.pdf?raw=true">Cost-based optimization in Hive 0.14</a> (Seattle, 2014)
+* <a href="https://github.com/julianhyde/share/blob/master/slides/dmmq-summit-2014.pdf?raw=true">Discardable, in-memory materialized query for Hadoop</a> (<a href="https://www.youtube.com/watch?v=CziGOa8GXqI">video</a>) (Hadoop Summit, 2014)
+* <a href="https://github.com/julianhyde/share/blob/master/slides/hive-cbo-summit-2014.pdf?raw=true">Cost-based optimization in Hive</a> (<a href="https://www.youtube.com/watch?v=vpG5noIbEFs">video</a>) (Hadoop Summit, 2014)
+* <a href="https://github.com/julianhyde/share/blob/master/slides/optiq-nosql-now-2013.pdf?raw=true">SQL Now!</a> (NoSQL Now! conference, 2013)
+* <a href="https://github.com/julianhyde/share/blob/master/slides/optiq-richrelevance-2013.pdf?raw=true">SQL on Big Data using Optiq</a> (2013)
+* <a href="https://github.com/julianhyde/share/blob/master/slides/optiq-drill-user-group-2013.pdf?raw=true">Drill / SQL / Optiq</a> (2013)
+* <a href="http://www.slideshare.net/julianhyde/how-to-integrate-splunk-with-any-data-solution">How to integrate Splunk with any data solution</a> (Splunk User Conference, 2012)
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/develop/index.md
----------------------------------------------------------------------
diff --git a/site/develop/index.md b/site/develop/index.md
index 2e9e120..4d046e1 100644
--- a/site/develop/index.md
+++ b/site/develop/index.md
@@ -1,6 +1,6 @@
---
layout: page
-title: Developing
+title: Developing Calcite
---
<!--
{% comment %}
@@ -23,30 +23,15 @@ limitations under the License.
Want to help add a feature or fix a bug?
-## Project Members
-
-Name | Apache Id | Github | Organization | Role
-:--- | :-------- | :----- | :--- | :---
-{% for c in site.data.contributors %} {{ c.name }} | <a href="http://people.apache.org/committer-index#{{ c.apacheId }}">{{ c.apacheId }}</a> | <a href="http://github.com/{{ c.githubId }}"><img width="64" src="{% unless c.avatar %}http://github.com/{{ c.githubId }}.png{% else %}{{ c.avatar }}{% endunless %}"></a> | {{ c.org }} | {{ c.role }}
-{% endfor %}
-
-## Mailing Lists
-
-There are several development mailing lists for Calcite:
-
-* [dev@calcite.apache.org](mailto:dev@calcite.apache.org) - Development discussions
- [[archive](https://mail-archives.apache.org/mod_mbox/calcite-dev/)]
-* [issues@calcite.apache.org](mailto:issues@calcite.apache.org) - Bug tracking
- [[archive](https://mail-archives.apache.org/mod_mbox/calcite-issues/)]
-* [commits@calcite.apache.org](mailto:commits@calcite.apache.org) - Git tracking
- [[archive](https://mail-archives.apache.org/mod_mbox/calcite-commits/)]
-
-You can subscribe to the lists by sending email to
-*list*-subscribe@calcite.apache.org and unsubscribe by sending email to
-*list*-unsubscribe@calcite.apache.org.
+* TOC
+{:toc}
## Source code
+You can get the source code by
+[downloading a release]({{ site.baseurl }}/downloads)
+or from source control.
+
Calcite uses git for version control. The canonical source is in
[Apache](https://git-wip-us.apache.org/repos/asf/calcite.git),
but most people find the
@@ -58,7 +43,7 @@ user-friendly.
Prerequisites are git, maven (3.2.1 or later) and Java (JDK 1.7 or
later, 1.8 preferred) on your path.
-Create a local copy of the git repository, cd to its root directory,
+Create a local copy of the git repository, `cd` to its root directory,
then build using maven:
{% highlight bash %}
@@ -67,5 +52,67 @@ $ cd calcite
$ mvn install
{% endhighlight %}
-Please check our [contributing guidelines]({{ site.baseurl }}/docs/howto.html#contributing).
+If you need to re-build from scratch, clean and install as two separate steps:
+
+{% highlight bash %}
+$ mvn clean
+$ mvn install
+{% endhighlight %}
+
+The HOWTO describes how to
+[build from a source distribution]({{ site.baseurl }}/docs/howto.html#building-from-a-source-distribution),
+[run more or fewer tests]({{ site.baseurl }}/docs/howto.html#running-tests) and
+[run integration tests]({{ site.baseurl }}/docs/howto.html#running-integration-tests).
+
+## Contributing
+
+We welcome contributions.
+
+If you are planning to make a large contribution, talk to us first! It
+helps to agree on the general approach. Log a
+[JIRA case](https://issues.apache.org/jira/browse/CALCITE) for your
+proposed feature or start a discussion on the dev list.
+
+Fork the github repository, and create a branch for your feature.
+
+Develop your feature and test cases, and make sure that
+`mvn install` succeeds. (Run extra tests if your change warrants it.)
+
+Commit your change to your branch, and use a comment that starts with
+the JIRA case number, like this:
+
+{% highlight text %}
+[CALCITE-345] AssertionError in RexToLixTranslator comparing to date literal
+{% endhighlight %}
+
+If your change had multiple commits, use `git rebase -i master` to
+squash them into a single commit, and to bring your code up to date
+with the latest on the main line.
+
+Then push your commit(s) to github, and create a pull request from
+your branch to the calcite master branch. Update the JIRA case
+to reference your pull request, and a committer will review your
+changes.
+
+## Getting started
+
+Calcite is a community, so the first step to joining the project is to introduce yourself.
+Join the [developers list](http://mail-archives.apache.org/mod_mbox/calcite-dev/)
+and send an email.
+
+If you have the chance to attend a [meetup](http://www.meetup.com/Apache-Calcite/),
+or meet [members of the community](http://calcite.apache.org/develop/#project-members)
+at a conference, that's also great.
+
+Choose an initial task to work on. It should be something really simple,
+such as a bug fix or a [Jira task that we have labeled
+"newbie"](https://issues.apache.org/jira/issues/?jql=labels%20%3D%20newbie%20%26%20project%20%3D%20Calcite%20%26%20status%20%3D%20Open).
+Follow the [contributing guidelines](#contributing) to get your change committed.
+
+After you have made several useful contributions we may
+[invite you to become a committer](https://community.apache.org/contributors/).
+We value all contributions that help to build a vibrant community, not just code.
+You can contribute by testing the code, helping verify a release,
+writing documentation or the web site,
+or just by answering questions on the list.
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/doap_calcite.rdf
----------------------------------------------------------------------
diff --git a/site/doap_calcite.rdf b/site/doap_calcite.rdf
index 65db4a5..46204e9 100644
--- a/site/doap_calcite.rdf
+++ b/site/doap_calcite.rdf
@@ -38,7 +38,7 @@ limitations under the License.
plugins.</description>
<bug-database rdf:resource="https://issues.apache.org/jira/browse/CALCITE" />
<mailing-list rdf:resource="https://calcite.apache.org/develop" />
- <download-page rdf:resource="https://calcite.apache.org/docs/downloads.html" />
+ <download-page rdf:resource="https://calcite.apache.org/downloads" />
<programming-language>Java</programming-language>
<category rdf:resource="http://projects.apache.org/category/big-data" />
<category rdf:resource="http://projects.apache.org/category/hadoop" />
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/downloads/index.md
----------------------------------------------------------------------
diff --git a/site/downloads/index.md b/site/downloads/index.md
new file mode 100644
index 0000000..6fedde0
--- /dev/null
+++ b/site/downloads/index.md
@@ -0,0 +1,96 @@
+---
+layout: page
+title: Downloads
+---
+
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
+
+Calcite is released as a source artifact, and also through Maven.
+
+# Source releases
+
+Release | Date | Commit | Download
+:--------------- | :--------- | :------- | :-------
+{% for post in site.categories.release %}{% comment %}
+{% endcomment %}{% if post.fullVersion %}{% comment %}
+{% endcomment %}{% assign v = post.fullVersion %}{% comment %}
+{% endcomment %}{% else %}{% comment %}
+{% endcomment %}{% capture v %}apache-calcite-{{ post.version }}{% endcapture %}{% comment %}
+{% endcomment %}{% endif %}{% comment %}
+{% endcomment %}{% if forloop.index0 < 2 %}{% comment %}
+{% endcomment %}{% capture p %}http://www.apache.org/dyn/closer.lua?filename=calcite/{{ v }}{% endcapture %}{% comment %}
+{% endcomment %}{% assign q = "&action=download" %}{% comment %}
+{% endcomment %}{% assign d = "https://www.apache.org/dist" %}{% comment %}
+{% endcomment %}{% else %}{% comment %}
+{% endcomment %}{% capture p %}http://archive.apache.org/dist/incubator/calcite/{{ v }}{% endcapture %}{% comment %}
+{% endcomment %}{% assign q = "" %}{% comment %}
+{% endcomment %}{% assign d = "https://archive.apache.org/dist/incubator" %}{% comment %}
+{% endcomment %}{% endif %}{% comment %}
+{% endcomment %}<a href="{{ site.baseurl }}/docs/history.html#{{ post.tag }}">{{ post.version }}</a>{% comment %}
+{% endcomment %} | {{ post.date | date_to_string }}{% comment %}
+{% endcomment %} | <a href="https://github.com/apache/calcite/commit/{{ post.sha }}">{{ post.sha }}</a>{% comment %}
+{% endcomment %} | <a href="{{ p }}/{{ v }}-src.tar.gz{{ q }}">tar</a>{% comment %}
+{% endcomment %} (<a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.tar.gz.md5">md5</a>{% comment %}
+{% endcomment %} <a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.tar.gz.asc">pgp</a>){% comment %}
+{% endcomment %} {% raw %}<br>{% endraw %}{% comment %}
+{% endcomment %} <a href="{{ p }}/{{ v }}-src.zip{{ q }}">zip</a>{% comment %}
+{% endcomment %} (<a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.zip.md5">md5</a>{% comment %}
+{% endcomment %} <a href="{{ d }}/calcite/{{ v }}/{{ v }}-src.zip.asc">pgp</a>){% comment %}
+{% endcomment %}
+{% endfor %}
+
+Choose a source distribution in either *tar* or *zip* format,
+and [verify](http://www.apache.org/dyn/closer.cgi#verify)
+using the corresponding *pgp* signature (using the committer file in
+[KEYS](http://www.apache.org/dist/calcite/KEYS)).
+If you cannot do that, the *md5* hash file may be used to check that the
+download has completed OK.
+
+For fast downloads, recent source distributions may be hosted on mirror servers;
+older source distributions are in the
+[archive](http://archive.apache.org/dist/calcite/)
+or [incubator archive](http://archive.apache.org/dist/incubator/calcite/).
+If a download from a mirror fails, retry, and the second download will likely
+succeed.
+
+For security, hash and signature files are always hosted at
+[Apache](https://www.apache.org/dist).
+
+# Maven artifacts
+
+Add the following to the dependencies section of your `pom.xml` file:
+
+{% for post in site.categories.release limit:1 %}
+{% assign current_release = post %}
+{% endfor %}
+
+{% highlight xml %}
+<dependencies>
+ <dependency>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
+ <version>{{ current_release.version }}</version>
+ </dependency>
+</dependencies>
+{% endhighlight %}
+
+Also include `<dependency>` elements for any extension modules you
+need: `calcite-mongodb`, `calcite-spark`, `calcite-splunk`, and so
+forth.
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/help/index.md
----------------------------------------------------------------------
diff --git a/site/help/index.md b/site/help/index.md
deleted file mode 100644
index 9ef2a62..0000000
--- a/site/help/index.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-layout: page
-title: Getting Help
----
-<!--
-{% comment %}
-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.
-{% endcomment %}
--->
-
-Need help with Calcite? Try these resources.
-
-## Mailing Lists
-
-The best option is to send email to the developers list
-[dev@calcite.apache.org](mailto:dev@calcite.apache.org). All
-of the historic traffic is available in the
-[archive](http://mail-archives.apache.org/mod_mbox/calcite-dev/). To
-subscribe to the user list, please send email to
-[dev-subscribe@calcite.apache.org](mailto:dev-subscribe@calcite.apache.org).
-
-## Bug Reports
-
-Please file any issues you encounter or fixes you'd like on the
-[Calcite Jira](https://issues.apache.org/jira/browse/CALCITE). We welcome
-patches!
-
-## StackOverflow
-
-[StackOverflow](http://stackoverflow.com) is a wonderful resource for
-any developer. Take a look over there to see if someone has answered
-your question.
-
-## Browse the code
-
-One of the advantages of open source software is that you can browse the code.
-The code is available on [github](https://github.com/apache/calcite/tree/master).
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/img/feather.png
----------------------------------------------------------------------
diff --git a/site/img/feather.png b/site/img/feather.png
new file mode 100644
index 0000000..7302231
Binary files /dev/null and b/site/img/feather.png differ
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/index.html
----------------------------------------------------------------------
diff --git a/site/index.html b/site/index.html
index a81cd9b..8857d27 100644
--- a/site/index.html
+++ b/site/index.html
@@ -48,3 +48,28 @@ limitations under the License.
<div class="clear"></div>
</div>
</section>
+<section class="resources">
+ <div class="grid">
+ <div class="unit one-third">
+ <summary>
+ <h3>Resources</h3>
+ <ul>
+ <li><a href="{{ site.baseurl }}/downloads">Downloads</a></li>
+ <li><a href="{{ site.baseurl }}/docs/history.html">History</a></li>
+ <li><a href="http://www.apache.org/security">Security</a></li>
+ </ul>
+ </summary>
+ </div>
+ <div class="unit one-third">
+ <summary>
+ <h3>Apache</h3>
+ <ul>
+ <li><a href="http://www.apache.org/licenses">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html">Donate</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a href="http://www.apache.org">Website</a></li>
+ </ul>
+ </summary>
+ </div>
+ </div>
+</section>
http://git-wip-us.apache.org/repos/asf/calcite/blob/05e099f3/site/talks/index.md
----------------------------------------------------------------------
diff --git a/site/talks/index.md b/site/talks/index.md
deleted file mode 100644
index f546a2c..0000000
--- a/site/talks/index.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-layout: page
-title: Calcite Talks
----
-<!--
-{% comment %}
-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.
-{% endcomment %}
--->
-
-Want to learn more about Calcite?
-
-Watch some presentations and read through some slide decks about Calcite.
-
-## Apache Calcite: One planner fits all
-
-Voted [Best Lightning Talk at XLDB-2015](http://www.xldb.org/archives/2015/05/best-lightning-talks-selected/);
-[[video](https://www.youtube.com/watch?v=5_MyORYjq3w)],
-[[slides](http://www.slideshare.net/julianhyde/apache-calcite-one-planner-fits-all)].
-
-{% oembed https://www.youtube.com/watch?v=5_MyORYjq3w %}
-
-## Why you care about relational algebra (even though you didn't know it)
-
-Washington DC, April 2015;
-[[slides](http://www.slideshare.net/julianhyde/calcite-algebraedw2015)].
-
-<iframe src="//www.slideshare.net/slideshow/embed_code/key/vfVDu6y1mAM5Dl" width="629" height="355" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe>
-
-## Apache Calcite overview
-
-Apache Kylin meetup, 2014;
-[[slides](http://www.slideshare.net/julianhyde/apache-calcite-overview)].
-
-<iframe src="//www.slideshare.net/slideshow/embed_code/key/fCGsAedsQiq53V" width="629" height="354" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe>
-
-## More talks
-
-* <a href="https://github.com/julianhyde/share/blob/master/slides/hive-cbo-seattle-2014.pdf?raw=true">Cost-based optimization in Hive 0.14</a> (Seattle, 2014)
-* <a href="https://github.com/julianhyde/share/blob/master/slides/dmmq-summit-2014.pdf?raw=true">Discardable, in-memory materialized query for Hadoop</a> (<a href="https://www.youtube.com/watch?v=CziGOa8GXqI">video</a>) (Hadoop Summit, 2014)
-* <a href="https://github.com/julianhyde/share/blob/master/slides/hive-cbo-summit-2014.pdf?raw=true">Cost-based optimization in Hive</a> (<a href="https://www.youtube.com/watch?v=vpG5noIbEFs">video</a>) (Hadoop Summit, 2014)
-* <a href="https://github.com/julianhyde/share/blob/master/slides/optiq-nosql-now-2013.pdf?raw=true">SQL Now!</a> (NoSQL Now! conference, 2013)
-* <a href="https://github.com/julianhyde/share/blob/master/slides/optiq-richrelevance-2013.pdf?raw=true">SQL on Big Data using Optiq</a> (2013)
-* <a href="https://github.com/julianhyde/share/blob/master/slides/optiq-drill-user-group-2013.pdf?raw=true">Drill / SQL / Optiq</a> (2013)
-* <a href="http://www.slideshare.net/julianhyde/how-to-integrate-splunk-with-any-data-solution">How to integrate Splunk with any data solution</a> (Splunk User Conference, 2012)