Cosmetic changes
Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/05c59afe Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/05c59afe Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/05c59afe Branch: refs/heads/branch-avatica-1.12 Commit: 05c59afed5d2cf0840e12dbe8c4727aa4b8aba17 Parents: b863988 Author: Julian Hyde <jh...@apache.org> Authored: Fri Jun 1 10:59:25 2018 -0700 Committer: Julian Hyde <jh...@apache.org> Committed: Fri Jun 1 10:59:47 2018 -0700 ---------------------------------------------------------------------- .../avatica/remote/RemoteProtobufService.java | 1 - .../org/apache/calcite/avatica/util/ArrayImpl.java | 1 - .../apache/calcite/avatica/MetaResultSetTest.java | 1 - docker/src/main/dockerhub-hypersql/Dockerfile | 4 +++- site/.gitignore | 2 +- site/README.md | 2 +- site/_docs/security.md | 15 +++++++++------ site/develop/index.md | 2 +- site/doap_calcite-avatica.rdf | 10 +++++----- site/docker-compose.yml | 4 +++- site/downloads/avatica-go.md | 2 +- site/downloads/index.md | 2 +- 12 files changed, 25 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/core/src/main/java/org/apache/calcite/avatica/remote/RemoteProtobufService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/RemoteProtobufService.java b/core/src/main/java/org/apache/calcite/avatica/remote/RemoteProtobufService.java index 0f4cbfb..f62e994 100644 --- a/core/src/main/java/org/apache/calcite/avatica/remote/RemoteProtobufService.java +++ b/core/src/main/java/org/apache/calcite/avatica/remote/RemoteProtobufService.java @@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.nio.charset.StandardCharsets; - /** * ProtobufService implementation that queries against a remote implementation, using * protocol buffers as the serialized form. http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/core/src/main/java/org/apache/calcite/avatica/util/ArrayImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/avatica/util/ArrayImpl.java b/core/src/main/java/org/apache/calcite/avatica/util/ArrayImpl.java index e57fde8..6864859 100644 --- a/core/src/main/java/org/apache/calcite/avatica/util/ArrayImpl.java +++ b/core/src/main/java/org/apache/calcite/avatica/util/ArrayImpl.java @@ -27,7 +27,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - /** Implementation of JDBC {@link Array}. */ public class ArrayImpl implements Array { private final List<Object> list; http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/core/src/test/java/org/apache/calcite/avatica/MetaResultSetTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/calcite/avatica/MetaResultSetTest.java b/core/src/test/java/org/apache/calcite/avatica/MetaResultSetTest.java index 3d5eb80..50ddab5 100644 --- a/core/src/test/java/org/apache/calcite/avatica/MetaResultSetTest.java +++ b/core/src/test/java/org/apache/calcite/avatica/MetaResultSetTest.java @@ -16,7 +16,6 @@ */ package org.apache.calcite.avatica; - import org.apache.calcite.avatica.remote.TypedValue; import org.junit.After; http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/docker/src/main/dockerhub-hypersql/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/src/main/dockerhub-hypersql/Dockerfile b/docker/src/main/dockerhub-hypersql/Dockerfile index f0b4d85..9ced71b 100644 --- a/docker/src/main/dockerhub-hypersql/Dockerfile +++ b/docker/src/main/dockerhub-hypersql/Dockerfile @@ -24,4 +24,6 @@ ADD https://repo1.maven.org/maven2/net/hydromatic/scott-data-hsqldb/0.1/scott-da ADD https://repo1.maven.org/maven2/org/hsqldb/hsqldb/${HSQLDB_VERSION}/hsqldb-${HSQLDB_VERSION}.jar /home/avatica/classpath/ # Add on to avatica-server's entrypoint -CMD ["-u", "jdbc:hsqldb:res:scott"] \ No newline at end of file +CMD ["-u", "jdbc:hsqldb:res:scott"] + +# End Dockerfile http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/site/.gitignore ---------------------------------------------------------------------- diff --git a/site/.gitignore b/site/.gitignore index aa7624f..74fb5fa 100644 --- a/site/.gitignore +++ b/site/.gitignore @@ -1,3 +1,3 @@ .sass-cache Gemfile.lock -.jekyll-metadata \ No newline at end of file +.jekyll-metadata http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/site/README.md ---------------------------------------------------------------------- diff --git a/site/README.md b/site/README.md index b2558c9..38e5cc7 100644 --- a/site/README.md +++ b/site/README.md @@ -39,7 +39,7 @@ Site generation currently works best with ruby-2.5.1. 2. `svn co https://svn.apache.org/repos/asf/calcite/site/avatica target/avatica` 3. `sudo apt-get install rubygems ruby2.5-dev zlib1g-dev` (linux) 4. `sudo gem install bundler` -5. Add avatica-go content: `./add-avatica-go-docs.sh` +5. Add avatica-go content: `./add-avatica-go-docs.sh` 6. `bundle install` ### Add javadoc http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/site/_docs/security.md ---------------------------------------------------------------------- diff --git a/site/_docs/security.md b/site/_docs/security.md index a6909dc..70f644b 100644 --- a/site/_docs/security.md +++ b/site/_docs/security.md @@ -259,12 +259,16 @@ config = new AvaticaServerConfiguration() { ## Custom Authentication -Avatica server now offers users to plugin their Custom Authentication mechanism through the HTTPServer Builder. -This is useful if users want to combine features of various authentication types. Examples include combining -basic authentication with impersonation or adding mutual authentication with impersonation. More Examples -are available in `CustomAuthHttpServerTest` class. +Avatica server allows users to plugin their Custom Authentication +mechanism through the HTTPServer Builder. This is useful if users +want to combine features of various authentication types. Examples +include combining basic authentication with impersonation or adding +mutual authentication with impersonation. More Examples are available +in `CustomAuthHttpServerTest` class. + +Note: Users need to configure their own `ServerConnectors` and +`Handlers` with the help of `ServerCustomizers`. -Note: Users need to configure their own `ServerConnectors` and `Handlers` with the help of `ServerCustomizers`. {% highlight java %} AvaticaServerConfiguration configuration = new ExampleAvaticaServerConfiguration(); HttpServer server = new HttpServer.Builder() @@ -273,7 +277,6 @@ HttpServer server = new HttpServer.Builder() .build(); {% endhighlight %} - ## Client implementation Many HTTP client libraries, such as [Apache Commons HttpComponents](https://hc.apache.org/), already have http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/site/develop/index.md ---------------------------------------------------------------------- diff --git a/site/develop/index.md b/site/develop/index.md index 165c1ed..0c8604e 100644 --- a/site/develop/index.md +++ b/site/develop/index.md @@ -28,4 +28,4 @@ Please find the development guides for Avatica's components here: Component | Guide :---------------- | :----------------------------------- Avatica | [Development Guide]({{ site.baseurl }}/develop/avatica.html) -Avatica Go Client | [Development Guide]({{ site.baseurl }}/develop/avatica-go.html) \ No newline at end of file +Avatica Go Client | [Development Guide]({{ site.baseurl }}/develop/avatica-go.html) http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/site/doap_calcite-avatica.rdf ---------------------------------------------------------------------- diff --git a/site/doap_calcite-avatica.rdf b/site/doap_calcite-avatica.rdf index 271a56d..f2a17b6 100644 --- a/site/doap_calcite-avatica.rdf +++ b/site/doap_calcite-avatica.rdf @@ -28,11 +28,11 @@ limitations under the License. <homepage rdf:resource="https://calcite.apache.org/avatica"; /> <asfext:pmc rdf:resource="https://calcite.apache.org/avatica"; /> <shortdesc>Avatica is a JDBC driver framework which is a part of Apache Calcite.</shortdesc> - <description>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 + <description>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.</description> <bug-database rdf:resource="https://issues.apache.org/jira/browse/CALCITE"; /> <mailing-list rdf:resource="https://calcite.apache.org/avatica/develop"; /> http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/site/docker-compose.yml ---------------------------------------------------------------------- diff --git a/site/docker-compose.yml b/site/docker-compose.yml index 5aa355c..47b3a2d 100644 --- a/site/docker-compose.yml +++ b/site/docker-compose.yml @@ -35,4 +35,6 @@ services: - ../:/usr/src/calcite-avatica - maven-repo:/root/.m2 volumes: - maven-repo: \ No newline at end of file + maven-repo: + +# End docker-compose.yml http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/site/downloads/avatica-go.md ---------------------------------------------------------------------- diff --git a/site/downloads/avatica-go.md b/site/downloads/avatica-go.md index ba3ecc4..a9846f8 100644 --- a/site/downloads/avatica-go.md +++ b/site/downloads/avatica-go.md @@ -85,4 +85,4 @@ 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). \ No newline at end of file +[Apache](https://www.apache.org/dist). http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/05c59afe/site/downloads/index.md ---------------------------------------------------------------------- diff --git a/site/downloads/index.md b/site/downloads/index.md index 02d3816..1b9464d 100644 --- a/site/downloads/index.md +++ b/site/downloads/index.md @@ -27,4 +27,4 @@ The following downloads are available from the Avatica project: Component | Download :---------------- | :----------------------------------- Avatica | [Source and binaries]({{ site.baseurl }}/downloads/avatica.html) -Avatica Go Client | [Source]({{ site.baseurl }}/downloads/avatica-go.html) \ No newline at end of file +Avatica Go Client | [Source]({{ site.baseurl }}/downloads/avatica-go.html)
