http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/_posts/2015-09-02-release-1.4.0-incubating.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2015-09-02-release-1.4.0-incubating.md 
b/avatica/site/_posts/2015-09-02-release-1.4.0-incubating.md
deleted file mode 100644
index 6a2bde4..0000000
--- a/avatica/site/_posts/2015-09-02-release-1.4.0-incubating.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-layout: news_item
-date: "2015-09-02 12:00:00 +0000"
-author: jhyde
-version: 1.4.0-incubating
-categories: [release]
-tag: v1-4-0
-sha: 0c0c203d
----
-<!--
-{% 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 %}
--->
-
-In addition to a large number of bug fixes and minor enhancements,
-this release includes improvements to
-<a href="https://issues.apache.org/jira/browse/CALCITE-758";>lattices</a> and
-<a href="https://issues.apache.org/jira/browse/CALCITE-761";>materialized 
views</a>,
-and adds a
-<a href="https://issues.apache.org/jira/browse/CALCITE-748";>builder API</a>
-so that you can easily create relational algebra expressions.
-
-Read more about the [builder]({{ site.baseurl 
}}/news/2015/06/05/algebra-builder/),
-[relational algebra]({{ site.baseurl }}/docs/algebra.html), and
-[lattices]({{ site.baseurl }}/docs/lattice.html).

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/_posts/2015-10-22-calcite-graduates.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2015-10-22-calcite-graduates.md 
b/avatica/site/_posts/2015-10-22-calcite-graduates.md
deleted file mode 100644
index fb954cb..0000000
--- a/avatica/site/_posts/2015-10-22-calcite-graduates.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-layout: news_item
-date: "2015-10-22 12:00:00 +0000"
-author: jhyde
-categories: [milestones]
-tag: v1-4-0
-sha: 0c0c203d
----
-<!--
-{% 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 %}
--->
-
-On October 21st, 2015 the board of the
-[Apache Software Foundation](http://www.apache.org)
-voted to establish Calcite as a top-level Apache project.
-
-![Calcite's graduation cake]({{ site.baseurl }}/img/cake.jpg)
-
-Describing itself as "the foundation for your next high-performance
-database", Calcite is a
-[framework for building data management systems]({{ site.baseurl }}/docs/).
-Calcite includes a comprehensive implementation of relational algebra
-and an extensible cost-based query optimizer. It also includes an
-optional SQL parser and JDBC driver.
-
-Calcite joined Apache as an incubator project in May, 2014. To
-graduate from the incubator, projects have to prove that they can
-create high quality releases, form a diverse community, and operate as
-a meritocracy.
-
-Calcite's committers have delivered eight releases during incubation
-(roughly one every two months) including the
-[milestone 1.0 release in January, 2015]({{ site.baseurl 
}}/news/2015/01/31/release-1.0.0-incubating/).
-
-The project has become a key component in many high-performance
-databases, including the
-[Apache Drill](http://drill.apache.org),
-[Apache Hive](http://hive.apache.org),
-[Apache Kylin](http://kylin.apache.org) and
-[Apache Phoenix](http://phoenix.apache.org) open source projects,
-and several commercial products.
-
-Also, in collaboration with [Apache Samza](http://samza.apache.org) and
-[Apache Storm](http://storm.apache.org), Calcite is developing
-[streaming extensions to standard SQL]({{ site.baseurl }}/docs/stream.html).
-
-The Calcite community met at a hangout on October 27th, 2015, and
-celebrated with a graduation cake.

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/_posts/2015-11-08-new-committers.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2015-11-08-new-committers.md 
b/avatica/site/_posts/2015-11-08-new-committers.md
deleted file mode 100644
index 8946fc5..0000000
--- a/avatica/site/_posts/2015-11-08-new-committers.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-layout: news_item
-title: "Calcite adds 2 committers"
-date: "2015-11-08 19:03:07 -0800"
-author: jhyde
-categories: [team]
----
-<!--
-{% 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 %}
--->
-
-The Calcite project management committee today added two new
-committers for their work on Calcite. Welcome!
-
-* [Josh 
Elser](http://mail-archives.apache.org/mod_mbox/incubator-calcite-dev/201511.mbox/%3CCAPSgeEQ4%2Bj8MNjYFaa%3D15QjJV%2BiVDwG6bAhW1muk8Gdo0UAYWg%40mail.gmail.com%3E)
-* [Maryann 
Xue](http://mail-archives.apache.org/mod_mbox/incubator-calcite-dev/201511.mbox/%3CCAPSgeEQg7ACNWfPXiPY69PNPqA9ov%2BKGzzrNe7t7mMyOEV7hYQ%40mail.gmail.com%3E)

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/_posts/2015-11-10-release-1.5.0.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2015-11-10-release-1.5.0.md 
b/avatica/site/_posts/2015-11-10-release-1.5.0.md
deleted file mode 100644
index e4bb8d1..0000000
--- a/avatica/site/_posts/2015-11-10-release-1.5.0.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-layout: news_item
-date: "2015-11-10 12:00:00 +0000"
-author: jcamacho
-version: 1.5.0
-categories: [release]
-tag: v1-5-0
-sha: ba6e43c
----
-<!--
-{% 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 %}
--->
-
-This is our first release as a top-level Apache project! Thanks to everyone 
who has contributed to it.
-
-In addition to a large number of bug fixes and minor enhancements, this 
release includes major improvements to Avatica, planner rules, and RelBuilder.
-
-Further, we built Piglet, a subset of the classic Hadoop language Pig. Pig is 
particularly interesting because it makes heavy use of nested multi-sets. You 
can follow this example to implement your own query language, and immediately 
taking advantage of Calcite's back-ends and optimizer rules.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/_posts/2016-01-22-release-1.6.0.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2016-01-22-release-1.6.0.md 
b/avatica/site/_posts/2016-01-22-release-1.6.0.md
deleted file mode 100644
index beb5267..0000000
--- a/avatica/site/_posts/2016-01-22-release-1.6.0.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-layout: news_item
-date: "2016-01-22 12:00:00 +0000"
-author: jhyde
-version: 1.6.0
-categories: [release]
-tag: v1-6-0
-sha: c4d346b
----
-<!--
-{% 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 %}
--->
-
-As usual in this release, there are new SQL features, improvements to
-planning rules and Avatica, and lots of bug fixes. We'll spotlight a
-couple of features make it easier to handle complex queries.
-
-[<a href="https://issues.apache.org/jira/browse/CALCITE-816";>CALCITE-816</a>]
-allows you to represent sub-queries (`EXISTS`, `IN` and scalar) as
-<a href="{{ site.apiRoot 
}}/org/apache/calcite/rex/RexSubQuery.html">RexSubQuery</a>,
-a kind of expression in the relational algebra. Until
-now, the sql-to-rel converter was burdened with expanding sub-queries,
-and people creating relational algebra directly (or via
-<a href="{{ site.apiRoot 
}}/org/apache/calcite/tools/RelBuilder.html">RelBuilder</a>)
-could only create 'flat' relational expressions. Now we have planner
-rules to expand and de-correlate sub-queries.
-
-Metadata is the fuel that powers query planning. It includes
-traditional query-planning statistics such as cost and row-count
-estimates, but also information such as which columns form unique
-keys, unique and what predicates are known to apply to a relational
-expression's output rows. From the predicates we can deduce which
-columns are constant, and following
-[<a href="https://issues.apache.org/jira/browse/CALCITE-1023";>CALCITE-1023</a>]
-we can now remove constant columns from `GROUP BY` keys.
-
-Metadata is often computed recursively, and it is hard to safely and
-efficiently calculate metadata on a graph of `RelNode`s that is large,
-frequently cyclic, and constantly changing.
-[<a href="https://issues.apache.org/jira/browse/CALCITE-794";>CALCITE-794</a>]
-introduces a context to each metadata call. That context can detect
-cyclic metadata calls and produce a safe answer to the metadata
-request. It will also allow us to add finer-grained caching and
-further tune the metadata layer.

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/_posts/2016-02-17-elser-pmc.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2016-02-17-elser-pmc.md 
b/avatica/site/_posts/2016-02-17-elser-pmc.md
deleted file mode 100644
index 960fe79..0000000
--- a/avatica/site/_posts/2016-02-17-elser-pmc.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-layout: news_item
-title: "Calcite appoints Josh Elser to PMC"
-date: "2016-02-17 10:30:00 -0800"
-author: jhyde
-categories: [team]
----
-<!--
-{% 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 %}
--->
-
-The Apache Calcite project management committee (PMC) today announced the
-appointment of [Josh 
Elser](https://mail-archives.apache.org/mod_mbox/calcite-dev/201602.mbox/%3C12AA8D09-BBF8-470B-8933-5B672162546C%40apache.org%3E)
-to the committee.
-
-Josh has only been a committer for a few months, but has become a prominent
-member of the Calcite project, and has taken leadership in several areas,
-not least in discussing [the future of 
Avatica](https://mail-archives.apache.org/mod_mbox/calcite-dev/201601.mbox/%3C56ABCCFF.3010205%40gmail.com%3E).

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/_posts/2016-02-17-streaming-sql-talk.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2016-02-17-streaming-sql-talk.md 
b/avatica/site/_posts/2016-02-17-streaming-sql-talk.md
deleted file mode 100644
index 9c5d55a..0000000
--- a/avatica/site/_posts/2016-02-17-streaming-sql-talk.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-layout: news_item
-title: "Streaming SQL in Samza"
-date: "2016-02-17 11:53:00 -0800"
-author: jhyde
-categories: ["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 %}
--->
-
-Julian Hyde gave a talk at the [Apache Samza](http://samza.apache.org/)
-meetup in Mountain View, CA.
-
-His talk asked the questions:
-
-* What is [SamzaSQL](https://github.com/milinda/samza-sql),
-  and what might I use it for?
-* Does this mean that Samza is turning into a database?
-* What is a query optimizer, and what can it do for my streaming queries?
-
-The talk is available in
-[[slides](http://www.slideshare.net/julianhyde/streaming-sql)]
-and
-[[video](http://www.ustream.tv/recorded/83322450#to00:55:48)].

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/_posts/2016-03-03-separate-project.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2016-03-03-separate-project.md 
b/avatica/site/_posts/2016-03-03-separate-project.md
new file mode 100644
index 0000000..6fee099
--- /dev/null
+++ b/avatica/site/_posts/2016-03-03-separate-project.md
@@ -0,0 +1,32 @@
+---
+layout: news_item
+title: "Splitting Avatica from Calcite"
+date: "2016-03-03 23:57:33 -0500"
+author: elserj
+categories: [milestones]
+---
+<!--
+{% 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 %}
+-->
+
+This marks the separation of Avatica from it's previous location as a 
sub-module
+of Apache Calcite's Maven build. This separation is not to remove Avatica from
+the governance of the Apache Calcite project, but to allow for even more rapid
+releases from both the Avatica and Calcite projects. We can confidently make 
new
+releases of each without having to worry about the current state of development
+features in the other.

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/_posts/2016-03-03-tbd-release.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2016-03-03-tbd-release.md 
b/avatica/site/_posts/2016-03-03-tbd-release.md
new file mode 100644
index 0000000..f6ec926
--- /dev/null
+++ b/avatica/site/_posts/2016-03-03-tbd-release.md
@@ -0,0 +1,30 @@
+---
+layout: news_item
+title: "Avatica x.y.z"
+date: "2016-03-03 23:57:33 -0500"
+author: elserj
+version: 9.9.9
+tag: v9-9-9
+sha: abcdef
+categories: [release]
+---
+<!--
+{% 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 %}
+-->
+
+Apache Calcite is happy to release Avatica x.y.z.

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/community/index.md
----------------------------------------------------------------------
diff --git a/avatica/site/community/index.md b/avatica/site/community/index.md
index b0c9fdb..14b81dc 100644
--- a/avatica/site/community/index.md
+++ b/avatica/site/community/index.md
@@ -67,50 +67,4 @@ Need help with Calcite? Try these resources:
   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>
-
-## Streaming SQL
-
-At Samza meetup, Mountain View, CA, 2016
-[[video](http://www.ustream.tv/recorded/83322450#to00:55:48)],
-[[slides](http://www.slideshare.net/julianhyde/streaming-sql)].
-
-<iframe src="//www.slideshare.net/slideshow/embed_code/key/rzaptOy3H8K6Gz" 
width="595" height="485" 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)
+  The code is available on 
[github](https://github.com/apache/calcite/tree/master/avatica).

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/develop/index.md
----------------------------------------------------------------------
diff --git a/avatica/site/develop/index.md b/avatica/site/develop/index.md
index c2b11f3..f32836f 100644
--- a/avatica/site/develop/index.md
+++ b/avatica/site/develop/index.md
@@ -48,7 +48,7 @@ then build using maven:
 
 {% highlight bash %}
 $ git clone git://github.com/apache/calcite.git
-$ cd calcite
+$ cd calcite/avatica
 $ mvn install
 {% endhighlight %}
 
@@ -91,7 +91,7 @@ changes.
 
 Calcite has a collection of Jenkins jobs on ASF-hosted infrastructure.
 They are all organized in a single view and available at
-[https://builds.apache.org/view/A-D/view/Calcite/](https://builds.apache.org/view/A-D/view/Calcite/).
+[https://builds.apache.org/view/A-D/view/Calcite-Avatica/](https://builds.apache.org/view/A-D/view/Calcite-Avatica/).
 
 ## Getting started
 
@@ -114,4 +114,3 @@ 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/65f2afa7/avatica/site/doap_calcite.rdf
----------------------------------------------------------------------
diff --git a/avatica/site/doap_calcite.rdf b/avatica/site/doap_calcite.rdf
deleted file mode 100644
index 46204e9..0000000
--- a/avatica/site/doap_calcite.rdf
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl"?>
-<rdf:RDF xml:lang="en"
-         xmlns="http://usefulinc.com/ns/doap#";
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-         xmlns:asfext="http://projects.apache.org/ns/asfext#";
-         xmlns:foaf="http://xmlns.com/foaf/0.1/";>
-<!--
-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.
--->
-  <Project rdf:about="https://calcite.apache.org";>
-    <created>2015-05-27</created>
-    <license rdf:resource="http://spdx.org/licenses/Apache-2.0"; />
-    <name>Apache Calcite</name>
-    <homepage rdf:resource="https://calcite.apache.org"; />
-    <asfext:pmc rdf:resource="https://calcite.apache.org"; />
-    <shortdesc>A dynamic data management framework.</shortdesc>
-    <description>Calcite is a framework for writing data management
-      systems.  It converts queries, represented in relational algebra,
-      into an efficient executable form using pluggable query
-      transformation rules. There is an optional SQL parser and JDBC
-      driver. Calcite does not store data or have a preferred execution
-      engine. Data formats, execution algorithms, planning rules,
-      operator types, metadata, and cost model are added at runtime as
-      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/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"; />
-    <category rdf:resource="http://projects.apache.org/category/sql"; />
-    <repository>
-      <GitRepository>
-        <location 
rdf:resource="https://git-wip-us.apache.org/repos/asf/calcite.git"/>
-        <browse rdf:resource="https://github.com/apache/calcite"/>
-      </GitRepository>
-    </repository>
-    <maintainer>
-      <foaf:Person>
-        <foaf:name>Julian Hyde</foaf:name>
-          <foaf:mbox rdf:resource="mailto:[email protected]"/>
-      </foaf:Person>
-    </maintainer>
-  </Project>
-</rdf:RDF>

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/avatica/site/downloads/index.md
----------------------------------------------------------------------
diff --git a/avatica/site/downloads/index.md b/avatica/site/downloads/index.md
index 7faead0..74e9225 100644
--- a/avatica/site/downloads/index.md
+++ b/avatica/site/downloads/index.md
@@ -88,13 +88,9 @@ Add the following to the dependencies section of your 
`pom.xml` file:
 {% highlight xml %}
 <dependencies>
   <dependency>
-    <groupId>org.apache.calcite</groupId>
-    <artifactId>calcite-core</artifactId>
+    <groupId>org.apache.calcite.avatica</groupId>
+    <artifactId>calcite-avatica</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/65f2afa7/avatica/site/index.html
----------------------------------------------------------------------
diff --git a/avatica/site/index.html b/avatica/site/index.html
index 8857d27..5bb3ff8 100644
--- a/avatica/site/index.html
+++ b/avatica/site/index.html
@@ -23,29 +23,18 @@ limitations under the License.
 <section class="intro">
   <div class="grid">
     <div class="unit whole center-on-mobiles">
-      <p class="first">The foundation for your next high-performance 
database.</p>
+      <p class="first">Avatica is a framework for building database 
drivers.</p>
     </div>
   </div>
 </section>
 <section class="features">
   <div class="grid">
-    <div class="unit one-third">
-      <h2>Standard SQL</h2>
-      <p>Industry-standard SQL parser, validator and JDBC driver.</p>
-      <a href="{{ site.baseurl }}/docs/reference.html">SQL &rarr;</a>
-    </div>
-    <div class="unit one-third">
-      <h2>Query optimization</h2>
-      <p>Represent your query in relational algebra, transform using
-        planning rules, and optimize according to a cost model.</p>
-      <a href="{{ site.baseurl }}/docs/algebra.html">Relational algebra 
&rarr;</a>
-    </div>
-    <div class="unit one-third">
-      <h2>Any data, anywhere</h2>
-      <p>Connect to third-party data sources, browse metadata, and optimize by 
pushing the computation to the data.</p>
-      <a href="{{ site.baseurl }}/docs/adapter.html">Adapters &rarr;</a>
+    <div class="unit whole center-on-mobiles">
+      <p>Avatica is defined by a wire API between a client and a server. The 
Avatica server is
+      an HTTP server, the Avatica client is a JDBC driver, and the wire API is 
defined by
+      JSON or Protobuf Buffers. The flexibility of the wire API and HTTP 
transport allows
+      other Avatica clients to be built in any language, implementing any 
client specification.</p>
     </div>
-    <div class="clear"></div>
   </div>
 </section>
 <section class="resources">

http://git-wip-us.apache.org/repos/asf/calcite/blob/65f2afa7/site/index.html
----------------------------------------------------------------------
diff --git a/site/index.html b/site/index.html
index 8857d27..33ed466 100644
--- a/site/index.html
+++ b/site/index.html
@@ -71,5 +71,13 @@ limitations under the License.
         </ul>
       </summary>
     </div>
+    <div class="unit one-third">
+      <summary>
+        <h3>Sub-Projects</h3>
+        <ul>
+          <li><a href="{{ site.baseurl }}/avatica">Avatica</a></li>
+        </ul>
+      </summary>
+    </div>
   </div>
 </section>

Reply via email to