You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by cm...@apache.org on 2022/04/21 01:20:58 UTC

[calcite-site] 03/22: Publish javadoc for Apache Calcite Avatica 1.20.0 release

This is an automated email from the ASF dual-hosted git repository.

cml pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite-site.git

commit f37cd1f6685b45720b64b3082511d9d8e539415a
Author: Julian Hyde <jh...@apache.org>
AuthorDate: Mon Dec 13 12:46:32 2021 -0800

    Publish javadoc for Apache Calcite Avatica 1.20.0 release
---
 avatica/javadocAggregate/allclasses-frame.html     |   2 +
 avatica/javadocAggregate/allclasses-noframe.html   |   2 +
 avatica/javadocAggregate/constant-values.html      |  21 ++-
 avatica/javadocAggregate/deprecated-list.html      |  10 ++
 avatica/javadocAggregate/index-all.html            |  42 +++++-
 .../org/apache/calcite/avatica/package-tree.html   |  16 +--
 .../calcite/avatica/remote/package-tree.html       |   2 +-
 .../avatica/server/AvaticaServerConfiguration.html |  64 ++++++++-
 .../avatica/server/AvaticaSpnegoAuthenticator.html |   4 +-
 ...egoAuthenticator.html => AvaticaUserStore.html} | 146 +++++++++++++--------
 .../avatica/server/DelegatingAvaticaHandler.html   |   4 +-
 .../calcite/avatica/server/HttpServer.Builder.html |  32 +++--
 .../apache/calcite/avatica/server/HttpServer.html  |  29 +---
 .../calcite/avatica/server/package-frame.html      |   1 +
 .../calcite/avatica/server/package-summary.html    |  22 ++--
 .../calcite/avatica/server/package-tree.html       |   5 +
 .../StandaloneServer.SerializationConverter.html   |   4 +-
 ....html => StandaloneServer.ToFileConverter.html} |  44 +++----
 .../avatica/standalone/StandaloneServer.html       |   6 +
 .../calcite/avatica/standalone/package-frame.html  |   1 +
 .../avatica/standalone/package-summary.html        |   6 +
 .../calcite/avatica/standalone/package-tree.html   |   1 +
 .../apache/calcite/avatica/util/package-tree.html  |   4 +-
 avatica/javadocAggregate/overview-tree.html        |   6 +
 24 files changed, 327 insertions(+), 147 deletions(-)

diff --git a/avatica/javadocAggregate/allclasses-frame.html b/avatica/javadocAggregate/allclasses-frame.html
index 12c67d4f..2852f9cb 100644
--- a/avatica/javadocAggregate/allclasses-frame.html
+++ b/avatica/javadocAggregate/allclasses-frame.html
@@ -59,6 +59,7 @@
 <li><a href="org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html" title="class in org.apache.calcite.avatica.server" target="classFrame">AvaticaSpnegoAuthenticator</a></li>
 <li><a href="org/apache/calcite/avatica/AvaticaSqlException.html" title="class in org.apache.calcite.avatica" target="classFrame">AvaticaSqlException</a></li>
 <li><a href="org/apache/calcite/avatica/AvaticaStatement.html" title="class in org.apache.calcite.avatica" target="classFrame">AvaticaStatement</a></li>
+<li><a href="org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server" target="classFrame">AvaticaUserStore</a></li>
 <li><a href="org/apache/calcite/avatica/AvaticaUtils.html" title="class in org.apache.calcite.avatica" target="classFrame">AvaticaUtils</a></li>
 <li><a href="org/apache/calcite/avatica/util/Base64.html" title="class in org.apache.calcite.avatica.util" target="classFrame">Base64</a></li>
 <li><a href="org/apache/calcite/avatica/util/Base64.InputStream.html" title="class in org.apache.calcite.avatica.util" target="classFrame">Base64.InputStream</a></li>
@@ -282,6 +283,7 @@
 <li><a href="org/apache/calcite/avatica/SqlType.Method.html" title="enum in org.apache.calcite.avatica" target="classFrame">SqlType.Method</a></li>
 <li><a href="org/apache/calcite/avatica/standalone/StandaloneServer.html" title="class in org.apache.calcite.avatica.standalone" target="classFrame">StandaloneServer</a></li>
 <li><a href="org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" title="class in org.apache.calcite.avatica.standalone" target="classFrame">StandaloneServer.SerializationConverter</a></li>
+<li><a href="org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone" target="classFrame">StandaloneServer.ToFileConverter</a></li>
 <li><a href="org/apache/calcite/avatica/jdbc/StatementInfo.html" title="class in org.apache.calcite.avatica.jdbc" target="classFrame">StatementInfo</a></li>
 <li><a href="org/apache/calcite/avatica/util/StructImpl.html" title="class in org.apache.calcite.avatica.util" target="classFrame">StructImpl</a></li>
 <li><a href="org/apache/calcite/avatica/util/StructImpl.Factory.html" title="interface in org.apache.calcite.avatica.util" target="classFrame"><span class="interfaceName">StructImpl.Factory</span></a></li>
diff --git a/avatica/javadocAggregate/allclasses-noframe.html b/avatica/javadocAggregate/allclasses-noframe.html
index 6c41cdb4..2b03c20b 100644
--- a/avatica/javadocAggregate/allclasses-noframe.html
+++ b/avatica/javadocAggregate/allclasses-noframe.html
@@ -59,6 +59,7 @@
 <li><a href="org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html" title="class in org.apache.calcite.avatica.server">AvaticaSpnegoAuthenticator</a></li>
 <li><a href="org/apache/calcite/avatica/AvaticaSqlException.html" title="class in org.apache.calcite.avatica">AvaticaSqlException</a></li>
 <li><a href="org/apache/calcite/avatica/AvaticaStatement.html" title="class in org.apache.calcite.avatica">AvaticaStatement</a></li>
+<li><a href="org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server">AvaticaUserStore</a></li>
 <li><a href="org/apache/calcite/avatica/AvaticaUtils.html" title="class in org.apache.calcite.avatica">AvaticaUtils</a></li>
 <li><a href="org/apache/calcite/avatica/util/Base64.html" title="class in org.apache.calcite.avatica.util">Base64</a></li>
 <li><a href="org/apache/calcite/avatica/util/Base64.InputStream.html" title="class in org.apache.calcite.avatica.util">Base64.InputStream</a></li>
@@ -282,6 +283,7 @@
 <li><a href="org/apache/calcite/avatica/SqlType.Method.html" title="enum in org.apache.calcite.avatica">SqlType.Method</a></li>
 <li><a href="org/apache/calcite/avatica/standalone/StandaloneServer.html" title="class in org.apache.calcite.avatica.standalone">StandaloneServer</a></li>
 <li><a href="org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" title="class in org.apache.calcite.avatica.standalone">StandaloneServer.SerializationConverter</a></li>
+<li><a href="org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone">StandaloneServer.ToFileConverter</a></li>
 <li><a href="org/apache/calcite/avatica/jdbc/StatementInfo.html" title="class in org.apache.calcite.avatica.jdbc">StatementInfo</a></li>
 <li><a href="org/apache/calcite/avatica/util/StructImpl.html" title="class in org.apache.calcite.avatica.util">StructImpl</a></li>
 <li><a href="org/apache/calcite/avatica/util/StructImpl.Factory.html" title="interface in org.apache.calcite.avatica.util"><span class="interfaceName">StructImpl.Factory</span></a></li>
diff --git a/avatica/javadocAggregate/constant-values.html b/avatica/javadocAggregate/constant-values.html
index 0c2ad82f..475a0bac 100644
--- a/avatica/javadocAggregate/constant-values.html
+++ b/avatica/javadocAggregate/constant-values.html
@@ -332,6 +332,25 @@
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server">AvaticaUserStore</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.calcite.avatica.server.AvaticaUserStore.AVATICA_USER_ROLE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/calcite/avatica/server/AvaticaUserStore.html#AVATICA_USER_ROLE">AVATICA_USER_ROLE</a></code></td>
+<td class="colLast"><code>"avatica-user"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/MetricsAwareAvaticaHandler.html" title="interface in org.apache.calcite.avatica.server">MetricsAwareAvaticaHandler</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -515,7 +534,7 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="org/apache/calcite/avatica/util/FilteredConstants.html#VERSION">VERSION</a></code></td>
-<td class="colLast"><code>"1.20.0-SNAPSHOT"</code></td>
+<td class="colLast"><code>"1.21.0-SNAPSHOT"</code></td>
 </tr>
 </tbody>
 </table>
diff --git a/avatica/javadocAggregate/deprecated-list.html b/avatica/javadocAggregate/deprecated-list.html
index cba589f3..6b82a94d 100644
--- a/avatica/javadocAggregate/deprecated-list.html
+++ b/avatica/javadocAggregate/deprecated-list.html
@@ -158,6 +158,16 @@
 <div class="block"><span class="deprecationComment">Use <a href="org/apache/calcite/avatica/Meta.CursorFactory.html#record-java.lang.Class-java.util.List-java.util.List-"><code>Meta.CursorFactory.record(Class, List, List)</code></a></span></div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="org/apache/calcite/avatica/server/HttpServer.Builder.html#withSpnego-java.lang.String-java.lang.String:A-">org.apache.calcite.avatica.server.HttpServer.Builder.withSpnego(String, String[])</a>
+<div class="block"><span class="deprecationComment">Since 1.20.0, because <code>additionalAllowedRealms</code> is no longer considered.</span></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/apache/calcite/avatica/server/HttpServer.Builder.html#withSpnego-java.lang.String-java.lang.String-java.lang.String:A-">org.apache.calcite.avatica.server.HttpServer.Builder.withSpnego(String, String, String[])</a>
+<div class="block"><span class="deprecationComment">since 1.20.0 because <code>additionalAllowedRealms</code> is no longer considered.</span></div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/avatica/javadocAggregate/index-all.html b/avatica/javadocAggregate/index-all.html
index adc4b770..a1f17058 100644
--- a/avatica/javadocAggregate/index-all.html
+++ b/avatica/javadocAggregate/index-all.html
@@ -475,6 +475,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/MetaImpl.MetaTypeInfo.html#autoIncrement">autoIncrement</a></span> - Variable in class org.apache.calcite.avatica.<a href="org/apache/calcite/avatica/MetaImpl.MetaTypeInfo.html" title="class in org.apache.calcite.avatica">MetaImpl.MetaTypeInfo</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/AvaticaUserStore.html#AVATICA_USER_ROLE">AVATICA_USER_ROLE</a></span> - Static variable in class org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server">AvaticaUserStore</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/calcite/avatica/AvaticaClientRuntimeException.html" title="class in org.apache.calcite.avatica"><span class="typeNameLink">AvaticaClientRuntimeException</span></a> - Exception in <a href="org/apache/calcite/avatica/package-summary.html">org.apache.calcite.avatica</a></dt>
 <dd>
 <div class="block">The client-side representation of <a href="org/apache/calcite/avatica/remote/AvaticaRuntimeException.html" title="class in org.apache.calcite.avatica.remote"><code>AvaticaRuntimeException</code></a>.</div>
@@ -708,6 +710,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/ConnectionConfigImpl.html#avaticaUser--">avaticaUser()</a></span> - Method in class org.apache.calcite.avatica.<a href="org/apache/calcite/avatica/ConnectionConfigImpl.html" title="class in org.apache.calcite.avatica">ConnectionConfigImpl</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">AvaticaUserStore</span></a> - Class in <a href="org/apache/calcite/avatica/server/package-summary.html">org.apache.calcite.avatica.server</a></dt>
+<dd>
+<div class="block">Implementation of UserStore which creates users when they do not already exist.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/AvaticaUserStore.html#AvaticaUserStore--">AvaticaUserStore()</a></span> - Constructor for class org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server">AvaticaUserStore</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/calcite/avatica/AvaticaUtils.html" title="class in org.apache.calcite.avatica"><span class="typeNameLink">AvaticaUtils</span></a> - Class in <a href="org/apache/calcite/avatica/package-summary.html">org.apache.calcite.avatica</a></dt>
 <dd>
 <div class="block">Avatica utilities.</div>
@@ -1316,6 +1324,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html#convert-java.lang.String-">convert(String)</a></span> - Method in class org.apache.calcite.avatica.standalone.<a href="org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" title="class in org.apache.calcite.avatica.standalone">StandaloneServer.SerializationConverter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html#convert-java.lang.String-">convert(String)</a></span> - Method in class org.apache.calcite.avatica.standalone.<a href="org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone">StandaloneServer.ToFileConverter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/remote/AbstractHandler.html#convertToErrorResponse-java.lang.Exception-">convertToErrorResponse(Exception)</a></span> - Method in class org.apache.calcite.avatica.remote.<a href="org/apache/calcite/avatica/remote/AbstractHandler.html" title="class in org.apache.calcite.avatica.remote">AbstractHandler</a></dt>
 <dd>
 <div class="block">Attempts to convert an Exception to an ErrorResponse.</div>
@@ -2454,8 +2464,6 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/SqlType.html#GET_LIST">GET_LIST</a></span> - Static variable in enum org.apache.calcite.avatica.<a href="org/apache/calcite/avatica/SqlType.html" title="enum in org.apache.calcite.avatica">SqlType</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/HttpServer.html#getAllowedRealms-java.lang.String-org.apache.calcite.avatica.server.AvaticaServerConfiguration-">getAllowedRealms(String, AvaticaServerConfiguration)</a></span> - Method in class org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/HttpServer.html" title="class in org.apache.calcite.avatica.server">HttpServer</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getAllowedRoles--">getAllowedRoles()</a></span> - Method in interface org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server">AvaticaServerConfiguration</a></dt>
 <dd>
 <div class="block">Returns the array of allowed roles for login.</div>
@@ -3171,6 +3179,15 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/AvaticaConnection.html#getKerberosConnection--">getKerberosConnection()</a></span> - Method in class org.apache.calcite.avatica.<a href="org/apache/calcite/avatica/AvaticaConnection.html" title="class in org.apache.calcite.avatica">AvaticaConnection</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getKerberosHostName--">getKerberosHostName()</a></span> - Method in interface org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server">AvaticaServerConfiguration</a></dt>
+<dd>
+<div class="block">Returns the "instance" component of the Kerberos principal for the Avatica server,
+ e.g.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getKerberosKeytab--">getKerberosKeytab()</a></span> - Method in interface org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server">AvaticaServerConfiguration</a></dt>
+<dd>
+<div class="block">Returns the file to the server's Kerberos keytab.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getKerberosPrincipal--">getKerberosPrincipal()</a></span> - Method in interface org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server">AvaticaServerConfiguration</a></dt>
 <dd>
 <div class="block">Returns the Kerberos principal that the Avatica server should log in as.</div>
@@ -3179,6 +3196,11 @@
 <dd>
 <div class="block">Returns the Kerberos realm to use for the server's login.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getKerberosServiceName--">getKerberosServiceName()</a></span> - Method in interface org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server">AvaticaServerConfiguration</a></dt>
+<dd>
+<div class="block">Returns the "primary" component of the Kerberos principal for the Avatica server,
+ e.g.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/remote/KerberosConnection.html#getKrb5LoginModuleName--">getKrb5LoginModuleName()</a></span> - Static method in class org.apache.calcite.avatica.remote.<a href="org/apache/calcite/avatica/remote/KerberosConnection.html" title="class in org.apache.calcite.avatica.remote">KerberosConnection</a></dt>
 <dd>
 <div class="block">Returns the KRB5 LoginModule implementation.</div>
@@ -4065,6 +4087,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/util/Cursor.Accessor.html#getURL--">getURL()</a></span> - Method in interface org.apache.calcite.avatica.util.<a href="org/apache/calcite/avatica/util/Cursor.Accessor.html" title="interface in org.apache.calcite.avatica.util">Cursor.Accessor</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/AvaticaUserStore.html#getUserIdentity-java.lang.String-">getUserIdentity(String)</a></span> - Method in class org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server">AvaticaUserStore</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/AvaticaDatabaseMetaData.html#getUserName--">getUserName()</a></span> - Method in class org.apache.calcite.avatica.<a href="org/apache/calcite/avatica/AvaticaDatabaseMetaData.html" title="class in org.apache.calcite.avatica">AvaticaDatabaseMetaData</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/noop/AvaticaNoopDatabaseMetaData.html#getUserName--">getUserName()</a></span> - Method in class org.apache.calcite.avatica.noop.<a href="org/apache/calcite/avatica/noop/AvaticaNoopDatabaseMetaData.html" title="class in org.apache.calcite.avatica.noop">AvaticaNoopDatabaseMetaData</a></dt>
@@ -7474,6 +7498,10 @@
 <dd>
 <div class="block">Converter from String to Serialization.</div>
 </dd>
+<dt><a href="org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">StandaloneServer.ToFileConverter</span></a> - Class in <a href="org/apache/calcite/avatica/standalone/package-summary.html">org.apache.calcite.avatica.standalone</a></dt>
+<dd>
+<div class="block">Converter from String to a File.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/metrics/dropwizard/DropwizardTimer.html#start--">start()</a></span> - Method in class org.apache.calcite.avatica.metrics.dropwizard.<a href="org/apache/calcite/avatica/metrics/dropwizard/DropwizardTimer.html" title="class in org.apache.calcite.avatica.metrics.dropwizard">DropwizardTimer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/metrics/noop/NoopTimer.html#start--">start()</a></span> - Method in class org.apache.calcite.avatica.metrics.noop.<a href="org/apache/calcite/avatica/metrics/noop/NoopTimer.html" title="class in org.apache.calcite.avatica.metrics.noop">NoopTimer</a></dt>
@@ -8063,6 +8091,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/remote/Service.ErrorResponse.html#toException--">toException()</a></span> - Method in class org.apache.calcite.avatica.remote.<a href="org/apache/calcite/avatica/remote/Service.ErrorResponse.html" title="class in org.apache.calcite.avatica.remote">Service.ErrorResponse</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html#ToFileConverter--">ToFileConverter()</a></span> - Constructor for class org.apache.calcite.avatica.standalone.<a href="org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone">StandaloneServer.ToFileConverter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/remote/TypedValue.html#toJdbc-java.util.Calendar-">toJdbc(Calendar)</a></span> - Method in class org.apache.calcite.avatica.remote.<a href="org/apache/calcite/avatica/remote/TypedValue.html" title="class in org.apache.calcite.avatica.remote">TypedValue</a></dt>
 <dd>
 <div class="block">Converts the value into the JDBC representation.</div>
@@ -9156,7 +9186,9 @@ the order they are declared.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/HttpServer.Builder.html#withSpnego-java.lang.String-java.lang.String:A-">withSpnego(String, String[])</a></span> - Method in class org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a></dt>
 <dd>
-<div class="block">Configures the server to use SPNEGO authentication.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Since 1.20.0, because <code>additionalAllowedRealms</code> is no longer considered.</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/HttpServer.Builder.html#withSpnego-java.lang.String-java.lang.String-">withSpnego(String, String)</a></span> - Method in class org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a></dt>
 <dd>
@@ -9164,7 +9196,9 @@ the order they are declared.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/HttpServer.Builder.html#withSpnego-java.lang.String-java.lang.String-java.lang.String:A-">withSpnego(String, String, String[])</a></span> - Method in class org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a></dt>
 <dd>
-<div class="block">Configures the server to use SPNEGO authentication.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">since 1.20.0 because <code>additionalAllowedRealms</code> is no longer considered.</span></div>
+</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/calcite/avatica/server/HttpServer.Builder.html#withTLS-java.io.File-java.lang.String-java.io.File-java.lang.String-">withTLS(File, String, File, String)</a></span> - Method in class org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a></dt>
 <dd>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/package-tree.html b/avatica/javadocAggregate/org/apache/calcite/avatica/package-tree.html
index 4a634574..9ad64d3a 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/package-tree.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/package-tree.html
@@ -201,8 +201,8 @@
 <h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
 <ul>
 <li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/MetaImpl.ColumnNullableUnknown.html" title="annotation in org.apache.calcite.avatica"><span class="typeNameLink">MetaImpl.ColumnNullableUnknown</span></a> (implements java.lang.annotation.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/MetaImpl.ColumnNoNulls.html" title="annotation in org.apache.calcite.avatica"><span class="typeNameLink">MetaImpl.ColumnNoNulls</span></a> (implements java.lang.annotation.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/MetaImpl.ColumnNullable.html" title="annotation in org.apache.calcite.avatica"><span class="typeNameLink">MetaImpl.ColumnNullable</span></a> (implements java.lang.annotation.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/MetaImpl.ColumnNoNulls.html" title="annotation in org.apache.calcite.avatica"><span class="typeNameLink">MetaImpl.ColumnNoNulls</span></a> (implements java.lang.annotation.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>)</li>
 </ul>
 <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
@@ -210,19 +210,19 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
-<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/InternalProperty.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">InternalProperty</span></a></li>
+<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/BuiltInConnectionProperty.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">BuiltInConnectionProperty</span></a> (implements org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/ConnectionProperty.html" title="interface in org.apache.calcite.avatica">ConnectionProperty</a>)</li>
 <li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/ConnectionProperty.Type.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">ConnectionProperty.Type</span></a></li>
-<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/AvaticaSeverity.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">AvaticaSeverity</span></a></li>
+<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/QueryState.StateType.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">QueryState.StateType</span></a></li>
+<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/ColumnMetaData.Rep.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">ColumnMetaData.Rep</span></a></li>
 <li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/Meta.Style.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">Meta.Style</span></a></li>
+<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/Meta.StatementType.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">Meta.StatementType</span></a></li>
 <li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/UnregisteredDriver.JdbcVersion.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">UnregisteredDriver.JdbcVersion</span></a></li>
 <li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/SqlState.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">SqlState</span></a></li>
+<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/SqlType.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">SqlType</span></a></li>
 <li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/Meta.DatabaseProperty.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">Meta.DatabaseProperty</span></a></li>
+<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/InternalProperty.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">InternalProperty</span></a></li>
+<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/AvaticaSeverity.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">AvaticaSeverity</span></a></li>
 <li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/SqlType.Method.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">SqlType.Method</span></a></li>
-<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/Meta.StatementType.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">Meta.StatementType</span></a></li>
-<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/ColumnMetaData.Rep.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">ColumnMetaData.Rep</span></a></li>
-<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/SqlType.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">SqlType</span></a></li>
-<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/QueryState.StateType.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">QueryState.StateType</span></a></li>
-<li type="circle">org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/BuiltInConnectionProperty.html" title="enum in org.apache.calcite.avatica"><span class="typeNameLink">BuiltInConnectionProperty</span></a> (implements org.apache.calcite.avatica.<a href="../../../../org/apache/calcite/avatica/ConnectionProperty.html" title="interface in org.apache.calcite.avatica">ConnectionProperty</a>)</li>
 </ul>
 </li>
 </ul>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/remote/package-tree.html b/avatica/javadocAggregate/org/apache/calcite/avatica/remote/package-tree.html
index 9181b82a..6c3003ec 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/remote/package-tree.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/remote/package-tree.html
@@ -225,8 +225,8 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
 <li type="circle">org.apache.calcite.avatica.remote.<a href="../../../../../org/apache/calcite/avatica/remote/HostnameVerificationConfigurable.HostnameVerification.html" title="enum in org.apache.calcite.avatica.remote"><span class="typeNameLink">HostnameVerificationConfigurable.HostnameVerification</span></a></li>
-<li type="circle">org.apache.calcite.avatica.remote.<a href="../../../../../org/apache/calcite/avatica/remote/MetaDataOperation.html" title="enum in org.apache.calcite.avatica.remote"><span class="typeNameLink">MetaDataOperation</span></a></li>
 <li type="circle">org.apache.calcite.avatica.remote.<a href="../../../../../org/apache/calcite/avatica/remote/Driver.Serialization.html" title="enum in org.apache.calcite.avatica.remote"><span class="typeNameLink">Driver.Serialization</span></a></li>
+<li type="circle">org.apache.calcite.avatica.remote.<a href="../../../../../org/apache/calcite/avatica/remote/MetaDataOperation.html" title="enum in org.apache.calcite.avatica.remote"><span class="typeNameLink">MetaDataOperation</span></a></li>
 <li type="circle">org.apache.calcite.avatica.remote.<a href="../../../../../org/apache/calcite/avatica/remote/AvaticaRemoteConnectionProperty.html" title="enum in org.apache.calcite.avatica.remote"><span class="typeNameLink">AvaticaRemoteConnectionProperty</span></a> (implements org.apache.calcite.avatica.<a href="../../../../../org/apache/calcite/avatica/ConnectionProperty.html" title="interface in org.apache.calcite.avatica">ConnectionProperty</a>)</li>
 <li type="circle">org.apache.calcite.avatica.remote.<a href="../../../../../org/apache/calcite/avatica/remote/AuthenticationType.html" title="enum in org.apache.calcite.avatica.remote"><span class="typeNameLink">AuthenticationType</span></a></li>
 </ul>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaServerConfiguration.html b/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaServerConfiguration.html
index 2a1d3b51..e4285507 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaServerConfiguration.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaServerConfiguration.html
@@ -18,8 +18,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":18,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -116,7 +116,7 @@ var activeTableTab = "activeTableTab";
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t5" class="tableTab"><span><a href="javascript:show(16);">Default Methods</a></span><span class="tabE [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -156,23 +156,43 @@ var activeTableTab = "activeTableTab";
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getKerberosHostName--">getKerberosHostName</a></span>()</code>
+<div class="block">Returns the "instance" component of the Kerberos principal for the Avatica server,
+ e.g.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>default <a href="https://docs.oracle.com/javase/8/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getKerberosKeytab--">getKerberosKeytab</a></span>()</code>
+<div class="block">Returns the file to the server's Kerberos keytab.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getKerberosPrincipal--">getKerberosPrincipal</a></span>()</code>
 <div class="block">Returns the Kerberos principal that the Avatica server should log in as.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getKerberosRealm--">getKerberosRealm</a></span>()</code>
 <div class="block">Returns the Kerberos realm to use for the server's login.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getKerberosServiceName--">getKerberosServiceName</a></span>()</code>
+<div class="block">Returns the "primary" component of the Kerberos principal for the Avatica server,
+ e.g.</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/calcite/avatica/server/RemoteUserExtractor.html" title="interface in org.apache.calcite.avatica.server">RemoteUserExtractor</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#getRemoteUserExtractor--">getRemoteUserExtractor</a></span>()</code>
 <div class="block">Extract the user this request should execute as.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html#supportsImpersonation--">supportsImpersonation</a></span>()</code>
 <div class="block">Returns true if the Avatica server should run user requests at that remote user.</div>
@@ -222,6 +242,28 @@ var activeTableTab = "activeTableTab";
 </dl>
 </li>
 </ul>
+<a name="getKerberosServiceName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getKerberosServiceName</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getKerberosServiceName()</pre>
+<div class="block">Returns the "primary" component of the Kerberos principal for the Avatica server,
+ e.g. primary/instance@REALM</div>
+</li>
+</ul>
+<a name="getKerberosHostName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getKerberosHostName</h4>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getKerberosHostName()</pre>
+<div class="block">Returns the "instance" component of the Kerberos principal for the Avatica server,
+ e.g. primary/instance@REALM</div>
+</li>
+</ul>
 <a name="getKerberosPrincipal--">
 <!--   -->
 </a>
@@ -236,6 +278,16 @@ var activeTableTab = "activeTableTab";
 </dl>
 </li>
 </ul>
+<a name="getKerberosKeytab--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getKerberosKeytab</h4>
+<pre>default&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&nbsp;getKerberosKeytab()</pre>
+<div class="block">Returns the file to the server's Kerberos keytab.</div>
+</li>
+</ul>
 <a name="getAllowedRoles--">
 <!--   -->
 </a>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html b/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html
index 8221a9e0..8ea3118e 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/calcite/avatica/server/DelegatingAvaticaHandler.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html" target="_top">Frames</a></li>
@@ -300,7 +300,7 @@ extends org.eclipse.jetty.security.authentication.SpnegoAuthenticator</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/calcite/avatica/server/DelegatingAvaticaHandler.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html" target="_top">Frames</a></li>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html b/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaUserStore.html
similarity index 62%
copy from avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html
copy to avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaUserStore.html
index 8221a9e0..e007244a 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/server/AvaticaUserStore.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AvaticaSpnegoAuthenticator (Apache Calcite Avatica calcite-avatica API)</title>
+<title>AvaticaUserStore (Apache Calcite Avatica calcite-avatica API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AvaticaSpnegoAuthenticator (Apache Calcite Avatica calcite-avatica API)";
+            parent.document.title="AvaticaUserStore (Apache Calcite Avatica calcite-avatica API)";
         }
     }
     catch(err) {
@@ -49,12 +49,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/calcite/avatica/server/DelegatingAvaticaHandler.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html" target="_top">Frames</a></li>
-<li><a href="AvaticaSpnegoAuthenticator.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/calcite/avatica/server/AvaticaUserStore.html" target="_top">Frames</a></li>
+<li><a href="AvaticaUserStore.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -74,14 +74,14 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.org.eclipse.jetty.security.authentication.LoginAuthenticator">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested.classes.inherited.from.class.org.eclipse.jetty.util.component.AbstractLifeCycle">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
@@ -93,20 +93,20 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.calcite.avatica.server</div>
-<h2 title="Class AvaticaSpnegoAuthenticator" class="title">Class AvaticaSpnegoAuthenticator</h2>
+<h2 title="Class AvaticaUserStore" class="title">Class AvaticaUserStore</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
 <li>
 <ul class="inheritance">
-<li>org.eclipse.jetty.security.authentication.LoginAuthenticator</li>
+<li>org.eclipse.jetty.util.component.AbstractLifeCycle</li>
 <li>
 <ul class="inheritance">
-<li>org.eclipse.jetty.security.authentication.SpnegoAuthenticator</li>
+<li>org.eclipse.jetty.security.UserStore</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.calcite.avatica.server.AvaticaSpnegoAuthenticator</li>
+<li>org.apache.calcite.avatica.server.AvaticaUserStore</li>
 </ul>
 </li>
 </ul>
@@ -119,14 +119,13 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.eclipse.jetty.security.Authenticator</dd>
+<dd>org.eclipse.jetty.util.component.LifeCycle</dd>
 </dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">AvaticaSpnegoAuthenticator</span>
-extends org.eclipse.jetty.security.authentication.SpnegoAuthenticator</pre>
-<div class="block">Custom SpnegoAuthenticator which will still reponse with a WWW-Authentication: Negotiate
- header if the client provides some other kind of authentication header.</div>
+<pre>public class <span class="typeNameLabel">AvaticaUserStore</span>
+extends org.eclipse.jetty.security.UserStore</pre>
+<div class="block">Implementation of UserStore which creates users when they do not already exist.</div>
 </li>
 </ul>
 </div>
@@ -140,11 +139,18 @@ extends org.eclipse.jetty.security.authentication.SpnegoAuthenticator</pre>
 </a>
 <h3>Nested Class Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="nested.classes.inherited.from.class.org.eclipse.jetty.security.Authenticator">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.eclipse.jetty.util.component.AbstractLifeCycle">
 <!--   -->
 </a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;org.eclipse.jetty.security.Authenticator</h3>
-<code>org.eclipse.jetty.security.Authenticator.AuthConfiguration, org.eclipse.jetty.security.Authenticator.Factory</code></li>
+<h3>Nested classes/interfaces inherited from class&nbsp;org.eclipse.jetty.util.component.AbstractLifeCycle</h3>
+<code>org.eclipse.jetty.util.component.AbstractLifeCycle.AbstractLifeCycleListener</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.eclipse.jetty.util.component.LifeCycle">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from interface&nbsp;org.eclipse.jetty.util.component.LifeCycle</h3>
+<code>org.eclipse.jetty.util.component.LifeCycle.Listener</code></li>
 </ul>
 </li>
 </ul>
@@ -154,12 +160,23 @@ extends org.eclipse.jetty.security.authentication.SpnegoAuthenticator</pre>
 <!--   -->
 </a>
 <h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaUserStore.html#AVATICA_USER_ROLE">AVATICA_USER_ROLE</a></span></code>&nbsp;</td>
+</tr>
+</table>
 <ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.org.eclipse.jetty.security.authentication.LoginAuthenticator">
+<li class="blockList"><a name="fields.inherited.from.class.org.eclipse.jetty.util.component.AbstractLifeCycle">
 <!--   -->
 </a>
-<h3>Fields inherited from class&nbsp;org.eclipse.jetty.security.authentication.LoginAuthenticator</h3>
-<code>_identityService, _loginService</code></li>
+<h3>Fields inherited from class&nbsp;org.eclipse.jetty.util.component.AbstractLifeCycle</h3>
+<code>FAILED, RUNNING, STARTED, STARTING, STOPPED, STOPPING</code></li>
 </ul>
 </li>
 </ul>
@@ -175,7 +192,7 @@ extends org.eclipse.jetty.security.authentication.SpnegoAuthenticator</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html#AvaticaSpnegoAuthenticator--">AvaticaSpnegoAuthenticator</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaUserStore.html#AvaticaUserStore--">AvaticaUserStore</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -193,32 +210,37 @@ extends org.eclipse.jetty.security.authentication.SpnegoAuthenticator</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.eclipse.jetty.server.Authentication</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html#validateRequest-javax.servlet.ServletRequest-javax.servlet.ServletResponse-boolean-">validateRequest</a></span>(javax.servlet.ServletRequest&nbsp;request,
-               javax.servlet.ServletResponse&nbsp;response,
-               boolean&nbsp;mandatory)</code>&nbsp;</td>
+<td class="colFirst"><code>org.eclipse.jetty.server.UserIdentity</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaUserStore.html#getUserIdentity-java.lang.String-">getUserIdentity</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;userName)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.jetty.security.authentication.SpnegoAuthenticator">
+<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.jetty.security.UserStore">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.eclipse.jetty.security.authentication.SpnegoAuthenticator</h3>
-<code>getAuthMethod, secureResponse</code></li>
+<h3>Methods inherited from class&nbsp;org.eclipse.jetty.security.UserStore</h3>
+<code>addUser, getIdentityService, getKnownUserIdentities, removeUser</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.jetty.security.authentication.LoginAuthenticator">
+<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.jetty.util.component.AbstractLifeCycle">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.eclipse.jetty.security.authentication.LoginAuthenticator</h3>
-<code>getLoginService, login, logout, prepareRequest, renewSession, setConfiguration</code></li>
+<h3>Methods inherited from class&nbsp;org.eclipse.jetty.util.component.AbstractLifeCycle</h3>
+<code>addLifeCycleListener, doStart, doStop, getState, getState, getStopTimeout, isFailed, isRunning, isStarted, isStarting, isStopped, isStopping, removeLifeCycleListener, setStopTimeout, start, stop, toString</code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="htt [...]
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="htt [...]
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.jetty.util.component.LifeCycle">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;org.eclipse.jetty.util.component.LifeCycle</h3>
+<code>start, stop</code></li>
 </ul>
 </li>
 </ul>
@@ -228,19 +250,40 @@ extends org.eclipse.jetty.security.authentication.SpnegoAuthenticator</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="AVATICA_USER_ROLE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AVATICA_USER_ROLE</h4>
+<pre>public static final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> AVATICA_USER_ROLE</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../constant-values.html#org.apache.calcite.avatica.server.AvaticaUserStore.AVATICA_USER_ROLE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="AvaticaSpnegoAuthenticator--">
+<a name="AvaticaUserStore--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>AvaticaSpnegoAuthenticator</h4>
-<pre>public&nbsp;AvaticaSpnegoAuthenticator()</pre>
+<h4>AvaticaUserStore</h4>
+<pre>public&nbsp;AvaticaUserStore()</pre>
 </li>
 </ul>
 </li>
@@ -251,23 +294,16 @@ extends org.eclipse.jetty.security.authentication.SpnegoAuthenticator</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="validateRequest-javax.servlet.ServletRequest-javax.servlet.ServletResponse-boolean-">
+<a name="getUserIdentity-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>validateRequest</h4>
-<pre>public&nbsp;org.eclipse.jetty.server.Authentication&nbsp;validateRequest(javax.servlet.ServletRequest&nbsp;request,
-                                                               javax.servlet.ServletResponse&nbsp;response,
-                                                               boolean&nbsp;mandatory)
-                                                        throws org.eclipse.jetty.security.ServerAuthException</pre>
+<h4>getUserIdentity</h4>
+<pre>public&nbsp;org.eclipse.jetty.server.UserIdentity&nbsp;getUserIdentity(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;userName)</pre>
 <dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>validateRequest</code>&nbsp;in interface&nbsp;<code>org.eclipse.jetty.security.Authenticator</code></dd>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>validateRequest</code>&nbsp;in class&nbsp;<code>org.eclipse.jetty.security.authentication.SpnegoAuthenticator</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>org.eclipse.jetty.security.ServerAuthException</code></dd>
+<dd><code>getUserIdentity</code>&nbsp;in class&nbsp;<code>org.eclipse.jetty.security.UserStore</code></dd>
 </dl>
 </li>
 </ul>
@@ -299,12 +335,12 @@ extends org.eclipse.jetty.security.authentication.SpnegoAuthenticator</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/calcite/avatica/server/DelegatingAvaticaHandler.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html" target="_top">Frames</a></li>
-<li><a href="AvaticaSpnegoAuthenticator.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/calcite/avatica/server/AvaticaUserStore.html" target="_top">Frames</a></li>
+<li><a href="AvaticaUserStore.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -324,14 +360,14 @@ extends org.eclipse.jetty.security.authentication.SpnegoAuthenticator</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#fields.inherited.from.class.org.eclipse.jetty.security.authentication.LoginAuthenticator">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested.classes.inherited.from.class.org.eclipse.jetty.util.component.AbstractLifeCycle">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/server/DelegatingAvaticaHandler.html b/avatica/javadocAggregate/org/apache/calcite/avatica/server/DelegatingAvaticaHandler.html
index 79ba0724..d773146c 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/server/DelegatingAvaticaHandler.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/server/DelegatingAvaticaHandler.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/calcite/avatica/server/DoAsRemoteUserCallback.html" title="interface in org.apache.calcite.avatica.server"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -521,7 +521,7 @@ implements <a href="../../../../../org/apache/calcite/avatica/server/AvaticaHand
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaSpnegoAuthenticator.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/calcite/avatica/server/DoAsRemoteUserCallback.html" title="interface in org.apache.calcite.avatica.server"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/server/HttpServer.Builder.html b/avatica/javadocAggregate/org/apache/calcite/avatica/server/HttpServer.Builder.html
index de33a2bb..d933c6c1 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/server/HttpServer.Builder.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/server/HttpServer.Builder.html
@@ -18,8 +18,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":10,"i1":10,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":42,"i18":42,"i19":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -150,7 +150,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd [...]
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd [...]
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -236,7 +236,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html#withPort-int-">withPort</a></span>(int&nbsp;port)</code>&nbsp;</td>
 </tr>
 <tr id="i13" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a></code></td>
+<td class="colFirst"><code><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a>&lt;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="type parameter in HttpServer.Builder">T</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html#withRemoteUserExtractor-org.apache.calcite.avatica.server.RemoteUserExtractor-">withRemoteUserExtractor</a></span>(<a href="../../../../../org/apache/calcite/avatica/server/RemoteUserExtractor.html" title="interface in org.apache.calcite.avatica.server">RemoteUserExtractor</a>&nbsp;remoteUserExtractor)</code>
 <div class="block">Sets a callback implementation to defer the logic on how to use the right remoteUserExtractor
  to extract remote user.</div>
@@ -266,7 +266,9 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colFirst"><code><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a>&lt;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="type parameter in HttpServer.Builder">T</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html#withSpnego-java.lang.String-java.lang.String:A-">withSpnego</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
           <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;additionalAllowedRealms)</code>
-<div class="block">Configures the server to use SPNEGO authentication.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Since 1.20.0, because <code>additionalAllowedRealms</code> is no longer considered.</span></div>
+</div>
 </td>
 </tr>
 <tr id="i18" class="altColor">
@@ -274,7 +276,9 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html#withSpnego-java.lang.String-java.lang.String-java.lang.String:A-">withSpnego</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
           <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;realm,
           <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;additionalAllowedRealms)</code>
-<div class="block">Configures the server to use SPNEGO authentication.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">since 1.20.0 because <code>additionalAllowedRealms</code> is no longer considered.</span></div>
+</div>
 </td>
 </tr>
 <tr id="i19" class="rowColor">
@@ -426,8 +430,10 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>withSpnego</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a>&lt;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="type parameter in HttpServer.Builder">T</a>&gt;&nbsp;withSpnego(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
-                                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;additionalAllowedRealms)</pre>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public&nbsp;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a>&lt;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="type parameter in HttpServer.Builder">T</a>&gt;&nbsp;withSpnego(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
+                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;additionalAllowedRealms)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Since 1.20.0, because <code>additionalAllowedRealms</code> is no longer considered.</span></div>
 <div class="block">Configures the server to use SPNEGO authentication. This method requires that the
  <code>principal</code> contains the Kerberos realm. Invoking this method overrides any
  previous call which configures authentication. Invoking this method overrides any previous
@@ -471,9 +477,11 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>withSpnego</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a>&lt;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="type parameter in HttpServer.Builder">T</a>&gt;&nbsp;withSpnego(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
-                                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;realm,
-                                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;additionalAllowedRealms)</pre>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public&nbsp;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a>&lt;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="type parameter in HttpServer.Builder">T</a>&gt;&nbsp;withSpnego(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;principal,
+                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;realm,
+                                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;additionalAllowedRealms)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">since 1.20.0 because <code>additionalAllowedRealms</code> is no longer considered.</span></div>
 <div class="block">Configures the server to use SPNEGO authentication. It is required that callers are logged
  in via Kerberos already or have provided the necessary configuration to automatically log
  in via JAAS (using the <code>java.security.auth.login.config</code> system property) before
@@ -530,7 +538,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>withRemoteUserExtractor</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a>&nbsp;withRemoteUserExtractor(<a href="../../../../../org/apache/calcite/avatica/server/RemoteUserExtractor.html" title="interface in org.apache.calcite.avatica.server">RemoteUserExtractor</a>&nbsp;remoteUserExtractor)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a>&lt;<a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="type parameter in HttpServer.Builder">T</a>&gt;&nbsp;withRemoteUserExtractor(<a href="../../../../../org/apache/calcite/avatica/server/RemoteUserExtractor.html" title="interface in org.apache.calcite.avatica.server">RemoteUse [...]
 <div class="block">Sets a callback implementation to defer the logic on how to use the right remoteUserExtractor
  to extract remote user.</div>
 <dl>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/server/HttpServer.html b/avatica/javadocAggregate/org/apache/calcite/avatica/server/HttpServer.html
index e588bcbc..91574dad 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/server/HttpServer.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/server/HttpServer.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -257,35 +257,30 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </td>
 </tr>
 <tr id="i5" class="rowColor">
-<td class="colFirst"><code>protected <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.html#getAllowedRealms-java.lang.String-org.apache.calcite.avatica.server.AvaticaServerConfiguration-">getAllowedRealms</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;serverRealm,
-                <a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server">AvaticaServerConfiguration</a>&nbsp;config)</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
 <td class="colFirst"><code>protected <a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server">AvaticaServerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.html#getConfig--">getConfig</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.html#getPort--">getPort</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>protected org.eclipse.jetty.server.ServerConnector</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.html#getServerConnector--">getServerConnector</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.html#internalStart--">internalStart</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.html#join--">join</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.html#start--">start</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.html#stop--">stop</a></span>()</code>&nbsp;</td>
 </tr>
@@ -498,16 +493,6 @@ public&nbsp;HttpServer(int&nbsp;port,
 </dl>
 </li>
 </ul>
-<a name="getAllowedRealms-java.lang.String-org.apache.calcite.avatica.server.AvaticaServerConfiguration-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getAllowedRealms</h4>
-<pre>protected&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;getAllowedRealms(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;serverRealm,
-                                    <a href="../../../../../org/apache/calcite/avatica/server/AvaticaServerConfiguration.html" title="interface in org.apache.calcite.avatica.server">AvaticaServerConfiguration</a>&nbsp;config)</pre>
-</li>
-</ul>
 <a name="configureBasicAuthentication-org.eclipse.jetty.server.Server-org.apache.calcite.avatica.server.AvaticaServerConfiguration-">
 <!--   -->
 </a>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-frame.html b/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-frame.html
index a98dedb6..bee8f4ef 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-frame.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-frame.html
@@ -27,6 +27,7 @@
 <li><a href="AvaticaJsonHandler.html" title="class in org.apache.calcite.avatica.server" target="classFrame">AvaticaJsonHandler</a></li>
 <li><a href="AvaticaProtobufHandler.html" title="class in org.apache.calcite.avatica.server" target="classFrame">AvaticaProtobufHandler</a></li>
 <li><a href="AvaticaSpnegoAuthenticator.html" title="class in org.apache.calcite.avatica.server" target="classFrame">AvaticaSpnegoAuthenticator</a></li>
+<li><a href="AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server" target="classFrame">AvaticaUserStore</a></li>
 <li><a href="DelegatingAvaticaHandler.html" title="class in org.apache.calcite.avatica.server" target="classFrame">DelegatingAvaticaHandler</a></li>
 <li><a href="HandlerFactory.html" title="class in org.apache.calcite.avatica.server" target="classFrame">HandlerFactory</a></li>
 <li><a href="HttpQueryStringParameterRemoteUserExtractor.html" title="class in org.apache.calcite.avatica.server" target="classFrame">HttpQueryStringParameterRemoteUserExtractor</a></li>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-summary.html b/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-summary.html
index ffd40465..4b39cccd 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-summary.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-summary.html
@@ -166,56 +166,62 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server">AvaticaUserStore</a></td>
+<td class="colLast">
+<div class="block">Implementation of UserStore which creates users when they do not already exist.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/server/DelegatingAvaticaHandler.html" title="class in org.apache.calcite.avatica.server">DelegatingAvaticaHandler</a></td>
 <td class="colLast">
 <div class="block">An AvaticaHandler implementation that delegates to a provided Jetty Handler instance.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/server/HandlerFactory.html" title="class in org.apache.calcite.avatica.server">HandlerFactory</a></td>
 <td class="colLast">
 <div class="block">Factory that instantiates the desired implementation, typically differing on the method
  used to serialize messages, for use in the Avatica server.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/server/HttpQueryStringParameterRemoteUserExtractor.html" title="class in org.apache.calcite.avatica.server">HttpQueryStringParameterRemoteUserExtractor</a></td>
 <td class="colLast">
 <div class="block">A <a href="../../../../../org/apache/calcite/avatica/server/RemoteUserExtractor.html" title="interface in org.apache.calcite.avatica.server"><code>RemoteUserExtractor</code></a> that extracts the remote user from an HTTP query string parameter.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/server/HttpRequestRemoteUserExtractor.html" title="class in org.apache.calcite.avatica.server">HttpRequestRemoteUserExtractor</a></td>
 <td class="colLast">
 <div class="block">A <a href="../../../../../org/apache/calcite/avatica/server/RemoteUserExtractor.html" title="interface in org.apache.calcite.avatica.server"><code>RemoteUserExtractor</code></a> that extracts the remote user from the HTTP request.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.html" title="class in org.apache.calcite.avatica.server">HttpServer</a></td>
 <td class="colLast">
 <div class="block">Avatica HTTP server.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/server/HttpServer.Builder.html" title="class in org.apache.calcite.avatica.server">HttpServer.Builder</a>&lt;T&gt;</td>
 <td class="colLast">
 <div class="block">Builder class for creating instances of <a href="../../../../../org/apache/calcite/avatica/server/HttpServer.html" title="class in org.apache.calcite.avatica.server"><code>HttpServer</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/server/Main.html" title="class in org.apache.calcite.avatica.server">Main</a></td>
 <td class="colLast">
 <div class="block">Jetty handler that executes Avatica JSON request-responses.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/server/PropertyBasedSpnegoLoginService.html" title="class in org.apache.calcite.avatica.server">PropertyBasedSpnegoLoginService</a></td>
 <td class="colLast">
 <div class="block">A customization of <code>SpnegoLoginService</code> which directly
  specifies the server's principal instead of requiring a file to exist.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/server/ServerKeytabJaasConf.html" title="class in org.apache.calcite.avatica.server">ServerKeytabJaasConf</a></td>
 <td class="colLast">
 <div class="block">Javax Configuration class which always returns a configuration for our keytab-based
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-tree.html b/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-tree.html
index 114d7f32..a75c55d0 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-tree.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/server/package-tree.html
@@ -102,6 +102,11 @@
 <li type="circle">org.apache.calcite.avatica.server.<a href="../../../../../org/apache/calcite/avatica/server/PropertyBasedSpnegoLoginService.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">PropertyBasedSpnegoLoginService</span></a></li>
 </ul>
 </li>
+<li type="circle">org.eclipse.jetty.security.UserStore
+<ul>
+<li type="circle">org.apache.calcite.avatica.server.<a href="../../../../../org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">AvaticaUserStore</span></a></li>
+</ul>
+</li>
 </ul>
 </li>
 <li type="circle">javax.security.auth.login.<a href="https://docs.oracle.com/javase/8/docs/api/javax/security/auth/login/Configuration.html?is-external=true" title="class or interface in javax.security.auth.login"><span class="typeNameLink">Configuration</span></a>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html
index b9beb09e..103fa499 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" target="_top">Frames</a></li>
@@ -241,7 +241,7 @@ implements com.beust.jcommander.IStringConverter&lt;<a href="../../../../../org/
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" target="_top">Frames</a></li>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html
similarity index 78%
copy from avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html
copy to avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html
index b9beb09e..22ce8f22 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StandaloneServer.SerializationConverter (Apache Calcite Avatica calcite-avatica API)</title>
+<title>StandaloneServer.ToFileConverter (Apache Calcite Avatica calcite-avatica API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="StandaloneServer.SerializationConverter (Apache Calcite Avatica calcite-avatica API)";
+            parent.document.title="StandaloneServer.ToFileConverter (Apache Calcite Avatica calcite-avatica API)";
         }
     }
     catch(err) {
@@ -49,12 +49,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" target="_top">Frames</a></li>
-<li><a href="StandaloneServer.SerializationConverter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" target="_top">Frames</a></li>
+<li><a href="StandaloneServer.ToFileConverter.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -93,14 +93,14 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.calcite.avatica.standalone</div>
-<h2 title="Class StandaloneServer.SerializationConverter" class="title">Class StandaloneServer.SerializationConverter</h2>
+<h2 title="Class StandaloneServer.ToFileConverter" class="title">Class StandaloneServer.ToFileConverter</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
 <li>
 <ul class="inheritance">
-<li>org.apache.calcite.avatica.standalone.StandaloneServer.SerializationConverter</li>
+<li>org.apache.calcite.avatica.standalone.StandaloneServer.ToFileConverter</li>
 </ul>
 </li>
 </ul>
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>com.beust.jcommander.IStringConverter&lt;<a href="../../../../../org/apache/calcite/avatica/remote/Driver.Serialization.html" title="enum in org.apache.calcite.avatica.remote">Driver.Serialization</a>&gt;</dd>
+<dd>com.beust.jcommander.IStringConverter&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&gt;</dd>
 </dl>
 <dl>
 <dt>Enclosing class:</dt>
@@ -117,10 +117,10 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">StandaloneServer.SerializationConverter</span>
+<pre>public static class <span class="typeNameLabel">StandaloneServer.ToFileConverter</span>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
-implements com.beust.jcommander.IStringConverter&lt;<a href="../../../../../org/apache/calcite/avatica/remote/Driver.Serialization.html" title="enum in org.apache.calcite.avatica.remote">Driver.Serialization</a>&gt;</pre>
-<div class="block">Converter from String to Serialization. Must be public for JCommander.</div>
+implements com.beust.jcommander.IStringConverter&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&gt;</pre>
+<div class="block">Converter from String to a File.</div>
 </li>
 </ul>
 </div>
@@ -139,7 +139,7 @@ implements com.beust.jcommander.IStringConverter&lt;<a href="../../../../../org/
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html#SerializationConverter--">SerializationConverter</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html#ToFileConverter--">ToFileConverter</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -157,8 +157,8 @@ implements com.beust.jcommander.IStringConverter&lt;<a href="../../../../../org/
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/calcite/avatica/remote/Driver.Serialization.html" title="enum in org.apache.calcite.avatica.remote">Driver.Serialization</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html#convert-java.lang.String-">convert</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</code>&nbsp;</td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html#convert-java.lang.String-">convert</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -182,13 +182,13 @@ implements com.beust.jcommander.IStringConverter&lt;<a href="../../../../../org/
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SerializationConverter--">
+<a name="ToFileConverter--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>SerializationConverter</h4>
-<pre>public&nbsp;SerializationConverter()</pre>
+<h4>ToFileConverter</h4>
+<pre>public&nbsp;ToFileConverter()</pre>
 </li>
 </ul>
 </li>
@@ -205,10 +205,10 @@ implements com.beust.jcommander.IStringConverter&lt;<a href="../../../../../org/
 <ul class="blockListLast">
 <li class="blockList">
 <h4>convert</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/calcite/avatica/remote/Driver.Serialization.html" title="enum in org.apache.calcite.avatica.remote">Driver.Serialization</a>&nbsp;convert(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&nbsp;convert(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;value)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>convert</code>&nbsp;in interface&nbsp;<code>com.beust.jcommander.IStringConverter&lt;<a href="../../../../../org/apache/calcite/avatica/remote/Driver.Serialization.html" title="enum in org.apache.calcite.avatica.remote">Driver.Serialization</a>&gt;</code></dd>
+<dd><code>convert</code>&nbsp;in interface&nbsp;<code>com.beust.jcommander.IStringConverter&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/io/File.html?is-external=true" title="class or interface in java.io">File</a>&gt;</code></dd>
 </dl>
 </li>
 </ul>
@@ -240,12 +240,12 @@ implements com.beust.jcommander.IStringConverter&lt;<a href="../../../../../org/
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" target="_top">Frames</a></li>
-<li><a href="StandaloneServer.SerializationConverter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" target="_top">Frames</a></li>
+<li><a href="StandaloneServer.ToFileConverter.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.html b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.html
index 51668bac..b4fbf3a3 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/StandaloneServer.html
@@ -136,6 +136,12 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <div class="block">Converter from String to Serialization.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone">StandaloneServer.ToFileConverter</a></span></code>
+<div class="block">Converter from String to a File.</div>
+</td>
+</tr>
 </table>
 </li>
 </ul>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-frame.html b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-frame.html
index 74771159..b447a7c9 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-frame.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-frame.html
@@ -15,6 +15,7 @@
 <ul title="Classes">
 <li><a href="StandaloneServer.html" title="class in org.apache.calcite.avatica.standalone" target="classFrame">StandaloneServer</a></li>
 <li><a href="StandaloneServer.SerializationConverter.html" title="class in org.apache.calcite.avatica.standalone" target="classFrame">StandaloneServer.SerializationConverter</a></li>
+<li><a href="StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone" target="classFrame">StandaloneServer.ToFileConverter</a></li>
 </ul>
 </div>
 </body>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-summary.html b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-summary.html
index 29470891..4d368a2b 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-summary.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-summary.html
@@ -98,6 +98,12 @@
 <div class="block">Converter from String to Serialization.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone">StandaloneServer.ToFileConverter</a></td>
+<td class="colLast">
+<div class="block">Converter from String to a File.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-tree.html b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-tree.html
index 48d6fe2c..4175ee93 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-tree.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/standalone/package-tree.html
@@ -83,6 +83,7 @@
 <ul>
 <li type="circle">org.apache.calcite.avatica.standalone.<a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">StandaloneServer</span></a></li>
 <li type="circle">org.apache.calcite.avatica.standalone.<a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">StandaloneServer.SerializationConverter</span></a> (implements com.beust.jcommander.IStringConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.calcite.avatica.standalone.<a href="../../../../../org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">StandaloneServer.ToFileConverter</span></a> (implements com.beust.jcommander.IStringConverter&lt;T&gt;)</li>
 </ul>
 </li>
 </ul>
diff --git a/avatica/javadocAggregate/org/apache/calcite/avatica/util/package-tree.html b/avatica/javadocAggregate/org/apache/calcite/avatica/util/package-tree.html
index d28cc403..4c309208 100644
--- a/avatica/javadocAggregate/org/apache/calcite/avatica/util/package-tree.html
+++ b/avatica/javadocAggregate/org/apache/calcite/avatica/util/package-tree.html
@@ -166,10 +166,10 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
+<li type="circle">org.apache.calcite.avatica.util.<a href="../../../../../org/apache/calcite/avatica/util/TimeUnit.html" title="enum in org.apache.calcite.avatica.util"><span class="typeNameLink">TimeUnit</span></a></li>
+<li type="circle">org.apache.calcite.avatica.util.<a href="../../../../../org/apache/calcite/avatica/util/Casing.html" title="enum in org.apache.calcite.avatica.util"><span class="typeNameLink">Casing</span></a></li>
 <li type="circle">org.apache.calcite.avatica.util.<a href="../../../../../org/apache/calcite/avatica/util/TimeUnitRange.html" title="enum in org.apache.calcite.avatica.util"><span class="typeNameLink">TimeUnitRange</span></a></li>
 <li type="circle">org.apache.calcite.avatica.util.<a href="../../../../../org/apache/calcite/avatica/util/Quoting.html" title="enum in org.apache.calcite.avatica.util"><span class="typeNameLink">Quoting</span></a></li>
-<li type="circle">org.apache.calcite.avatica.util.<a href="../../../../../org/apache/calcite/avatica/util/Casing.html" title="enum in org.apache.calcite.avatica.util"><span class="typeNameLink">Casing</span></a></li>
-<li type="circle">org.apache.calcite.avatica.util.<a href="../../../../../org/apache/calcite/avatica/util/TimeUnit.html" title="enum in org.apache.calcite.avatica.util"><span class="typeNameLink">TimeUnit</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/avatica/javadocAggregate/overview-tree.html b/avatica/javadocAggregate/overview-tree.html
index 3c2ca454..b10f8a2a 100644
--- a/avatica/javadocAggregate/overview-tree.html
+++ b/avatica/javadocAggregate/overview-tree.html
@@ -147,6 +147,11 @@
 <li type="circle">org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/PropertyBasedSpnegoLoginService.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">PropertyBasedSpnegoLoginService</span></a></li>
 </ul>
 </li>
+<li type="circle">org.eclipse.jetty.security.UserStore
+<ul>
+<li type="circle">org.apache.calcite.avatica.server.<a href="org/apache/calcite/avatica/server/AvaticaUserStore.html" title="class in org.apache.calcite.avatica.server"><span class="typeNameLink">AvaticaUserStore</span></a></li>
+</ul>
+</li>
 </ul>
 </li>
 <li type="circle">org.apache.calcite.avatica.remote.<a href="org/apache/calcite/avatica/remote/AbstractService.html" title="class in org.apache.calcite.avatica.remote"><span class="typeNameLink">AbstractService</span></a> (implements org.apache.calcite.avatica.remote.<a href="org/apache/calcite/avatica/remote/Service.html" title="interface in org.apache.calcite.avatica.remote">Service</a>)
@@ -386,6 +391,7 @@
 <li type="circle">org.apache.calcite.avatica.util.<a href="org/apache/calcite/avatica/util/Spaces.html" title="class in org.apache.calcite.avatica.util"><span class="typeNameLink">Spaces</span></a></li>
 <li type="circle">org.apache.calcite.avatica.standalone.<a href="org/apache/calcite/avatica/standalone/StandaloneServer.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">StandaloneServer</span></a></li>
 <li type="circle">org.apache.calcite.avatica.standalone.<a href="org/apache/calcite/avatica/standalone/StandaloneServer.SerializationConverter.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">StandaloneServer.SerializationConverter</span></a> (implements com.beust.jcommander.IStringConverter&lt;T&gt;)</li>
+<li type="circle">org.apache.calcite.avatica.standalone.<a href="org/apache/calcite/avatica/standalone/StandaloneServer.ToFileConverter.html" title="class in org.apache.calcite.avatica.standalone"><span class="typeNameLink">StandaloneServer.ToFileConverter</span></a> (implements com.beust.jcommander.IStringConverter&lt;T&gt;)</li>
 <li type="circle">org.apache.calcite.avatica.jdbc.<a href="org/apache/calcite/avatica/jdbc/StatementInfo.html" title="class in org.apache.calcite.avatica.jdbc"><span class="typeNameLink">StatementInfo</span></a></li>
 <li type="circle">org.apache.calcite.avatica.util.<a href="org/apache/calcite/avatica/util/StructImpl.html" title="class in org.apache.calcite.avatica.util"><span class="typeNameLink">StructImpl</span></a> (implements java.sql.<a href="https://docs.oracle.com/javase/8/docs/api/java/sql/Struct.html?is-external=true" title="class or interface in java.sql">Struct</a>)</li>
 <li type="circle">org.apache.calcite.avatica.tck.<a href="org/apache/calcite/avatica/tck/TestRunner.html" title="class in org.apache.calcite.avatica.tck"><span class="typeNameLink">TestRunner</span></a> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a>)</li>