Site: Fix links to javadoc
diff --git a/site/_config.yml b/site/_config.yml
index 1fc3bfa..1421468 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -20,7 +20,7 @@
repository: https://github.com/apache/calcite-avatica
destination: target/avatica
exclude: [README.md,Gemfile*,add-avatica-go-docs.sh,docker-compose.yml,target]
-keep_files: [".git", ".svn", "apidocs", "testapidocs"]
+keep_files: [".git", ".svn", "javadocAggregate"]
# This ensures 2016-03-03-separate-project.md is rendered 2016-03-03
# no matter what the client time zone is
timezone: Etc/GMT+5
@@ -33,12 +33,8 @@
sourceRoot: https://github.com/apache/calcite-avatica/tree/master
# The URL where Avatica Javadocs are located
-apiRoot: /avatica/apidocs
-# apiRoot: http://calcite.apache.org/avatica/apidocs
-
-# The URL where Test Javadocs are located
-testApiRoot: /avatica/testapidocs
-# testApiRoot: http://calcite.apache.org/avatica/testapidocs
+apiRoot: /avatica/javadocAggregate
+# apiRoot: http://calcite.apache.org/avatica/javadocAggregate
# The URL where the JDK's Javadocs are located
jdkApiRoot: https://docs.oracle.com/javase/8/docs/api/
diff --git a/site/_data/docs.yml b/site/_data/docs.yml
index 5081d6b..d037d87 100644
--- a/site/_data/docs.yml
+++ b/site/_data/docs.yml
@@ -41,7 +41,6 @@
docs:
- history
- api
- - testapi
- title: Avatica Go Client Meta
docs:
diff --git a/site/_docs/api.md b/site/_docs/api.md
index 54b23c3..937b940 100644
--- a/site/_docs/api.md
+++ b/site/_docs/api.md
@@ -1,7 +1,7 @@
---
title: API
layout: external
-external_url: http://calcite.apache.org/avatica/apidocs
+external_url: http://calcite.apache.org/avatica/javadocAggregate
---
{% comment %}
Ideally, we want to use {{ site.apiRoot }} instead of hardcoding
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 4867c57..1ff5cd7 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -475,8 +475,7 @@
## Add release notes and announce the release
Add a release note by copying
[site/_posts/2016-11-01-release-1.9.0.md]({{ site.sourceRoot }}/site/_posts/2016-11-01-release-1.9.0.md),
-generate the javadoc and copy to `site/target/avatica/apidocs`
-and `site/target/avatica/testapidocs`,
+generate the javadoc and copy to `site/target/avatica/javadocAggregate`
[publish the site](#publish-the-web-site),
and check that it appears in the contents in [news](http://localhost:4000/news/).
diff --git a/site/_docs/testapi.md b/site/_docs/testapi.md
deleted file mode 100644
index 6e86025..0000000
--- a/site/_docs/testapi.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: Test API
-layout: external
-external_url: /avatica/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 %}
--->
diff --git a/site/_includes/section_nav.html b/site/_includes/section_nav.html
index e154275..48b112f 100644
--- a/site/_includes/section_nav.html
+++ b/site/_includes/section_nav.html
@@ -33,7 +33,7 @@
{% comment %}
See CALCITE-2036 for an explanation of the replacement below
{% endcomment %}
- <a href="{{ next_page | replace: '/docs/api.html', '/apidocs/' }}" class="next">Next</a>
+ <a href="{{ next_page | replace: '/docs/api.html', '/javadocAggregate/' }}" class="next">Next</a>
{% endif %}
</div>
</div>
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 6c163d8..8bfc72a 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -30,7 +30,7 @@
generate-javadoc:
image: gradle:6.0
working_dir: /usr/src/calcite-avatica
- command: sh -c "gradle javadocAggregate; rm -rf site/target/avatica/apidocs site/target/avatica/testapidocs; mkdir -p site/target/avatica; mv build/docs/javadocAggregate site/target/avatica"
+ command: sh -c "gradle javadocAggregate; rm -rf site/target/avatica/javadocAggregate; mkdir -p site/target/avatica; mv build/docs/javadocAggregate site/target/avatica"
volumes:
- ../:/usr/src/calcite-avatica
- gradle-cache:/home/gradle/.gradle
