From 94e1c4eb0779def68b181d8ca3d5f9e587b0ac10 Mon Sep 17 00:00:00 2001
From: jjg-123 <gaynor@illinois.edu>
Date: Tue, 19 Nov 2024 15:29:05 -0600
Subject: [PATCH] https://github.com/ncsa/oa4mp/issues/219,
 https://github.com/ncsa/oa4mp/issues/216 (more VO renaming of internal
 variables to vi)

---
 .idea/workspace.xml                           | 194 ++----------------
 .../oauth2/tools/OA2AdminClientCommands.java  |  10 +-
 .../api/admin/adminClient/AdminClient.java    |   2 +-
 .../org/oa4mp/server/loader/oauth2/OA2SE.java |   6 +-
 .../claims/AbstractAccessTokenHandler.java    |  10 +-
 .../servlet/OA2RegistrationServlet.java       |   4 +-
 .../loader/oauth2/servlet/OA2TokenUtils.java  |   2 +-
 .../transactions/OA2ServiceTransaction.java   |   2 +-
 .../loader/oauth2/storage/vi/VIConverter.java |  26 +--
 .../oauth2/storage/vi/VirtualIssuer.java      |  34 +--
 .../server/loader/qdl/QDLXMLConstants.java    |  16 +-
 11 files changed, 74 insertions(+), 232 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0cdbd50a1..1104b294e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,171 +11,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8e2d727f-106f-4316-98ff-77b4db768ea7" name="Changes" comment="RFC 6749 §4.4 documentation, client credentials flow">
-      <change afterPath="$PROJECT_DIR$/server-admin/src/main/resources/qdl/ui-test/at-echo.qdl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/server-test/src/main/resources/flow-tests/auto/tests/rfc8693/configuring-fts-clients.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/server-test/src/main/resources/flow-tests/auto/tests/rfc8693/ersatz-rt-refresh.qdl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/server-test/src/main/resources/flow-tests/auto/tests/rfc8693/fts-fork.qdl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/server-test/src/main/resources/flow-tests/auto/tests/rfc8693/fts-provisioner.qdl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/server-test/src/main/resources/flow-tests/local/fnal-fork.qdl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/server-test/src/main/resources/flow-tests/local/fnal-provisioner.qdl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client-installer/buildNumber.properties" beforeDir="false" afterPath="$PROJECT_DIR$/client-installer/buildNumber.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/SQLVOStore.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/SQLVOStore.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/SQLVOStoreProvider.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/SQLVOStoreProvider.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOConverter.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOConverter.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOFSProvider.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOFSProvider.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOFileStore.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOFileStore.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOMemoryStore.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOMemoryStore.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOMultiStoreProvider.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOMultiStoreProvider.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOProvider.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOProvider.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOSerializationKeys.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOSerializationKeys.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOTable.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VOTable.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VirtualOrganization.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/VirtualOrganization.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/SQLVOStore.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/SQLVOStore.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/SQLVOStoreProvider.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/SQLVOStoreProvider.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOConverter.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOConverter.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOFSProvider.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOFSProvider.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOFileStore.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOFileStore.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOMemoryStore.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOMemoryStore.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOMultiStoreProvider.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOMultiStoreProvider.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOProvider.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOProvider.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOSerializationKeys.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOSerializationKeys.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOStore.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOStore.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOTable.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VOTable.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VirtualOrganization.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oa4mp/oauth2/storage/vo/class-use/VirtualOrganization.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oauth2/tools/VOCommands.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/edu/uiuc/ncsa/myproxy/oauth2/tools/VOCommands.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/apidocs/org/oa4mp/server/admin/myproxy/oauth2/tools/VOCommands.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/apidocs/org/oa4mp/server/admin/myproxy/oauth2/tools/VOCommands.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/configuration/client-tag.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/configuration/client-tag.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/configuration/configuration-file.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/configuration/configuration-file.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/configuration/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/configuration/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/dtd/asset-store.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/dtd/asset-store.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/dtd/dtd-file.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/dtd/dtd-file.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/manuals/api-reference.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/manuals/api-reference.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/manuals/changelog.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/manuals/changelog.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/manuals/getting-started.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/manuals/getting-started.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/manuals/oa2-refresh-tokens.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/manuals/oa2-refresh-tokens.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/manuals/parameters.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/manuals/parameters.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/manuals/registering-with-an-oauth2-server.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/manuals/registering-with-an-oauth2-server.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/manuals/storage.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/manuals/storage.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/client/manuals/troubleshooting.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/client/manuals/troubleshooting.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/configuration-files.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/configuration-files.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/derby-store.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/derby-store.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/file-store.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/file-store.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/keystore.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/keystore.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/logging.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/logging.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/mariadb-store.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/mariadb-store.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/memory-store.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/memory-store.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/mysql-store.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/mysql-store.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/postgres-store.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/postgres-store.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/scopes.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/scopes.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/ssl.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/ssl.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/configuration/supported-specifications.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/configuration/supported-specifications.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/manuals/expiration-of-tokens.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/manuals/expiration-of-tokens.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/common/manuals/using-self-signed-cert.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/common/manuals/using-self-signed-cert.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/dependencies.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/dependencies.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/dependency-analysis.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/dependency-analysis.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/oa4mp-faq.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/oa4mp-faq.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/claim_source_examples.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/claim_source_examples.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/creating_claim_sources2.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/creating_claim_sources2.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/filestore-migration.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/filestore-migration.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/forking_a_flow_quickstart.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/forking_a_flow_quickstart.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/jwt-util.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/jwt-util.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/oa2-client.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/oa2-client.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/oa4mp-modules.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/oa4mp-modules.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/oa4mp_running_qdl_scripts.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/oa4mp_running_qdl_scripts.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/qdl_clc_ini.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/qdl_clc_ini.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/qdl_oa4mp_store_access.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/qdl_oa4mp_store_access.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/rfc7523_intro.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/rfc7523_intro.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/scopes.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/scopes.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/pdf/token_handler_configuration.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/docs/pdf/token_handler_configuration.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/project-info.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/project-info.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/project-reports.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/project-reports.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server-faq.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server-faq.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/authorization-servlet-configuration.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/authorization-servlet-configuration.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/client_management-configuration.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/client_management-configuration.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/config-index.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/config-index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/device-flow-servlet-configuration.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/device-flow-servlet-configuration.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/ldap.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/ldap.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/qdl-config.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/qdl-config.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/server-configuration-file.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/server-configuration-file.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/server-email.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/server-email.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/server-messages.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/server-messages.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/server-myproxy.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/server-myproxy.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/configuration/signing.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/configuration/signing.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/dtd/server-dtd-content-tags.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/dtd/server-dtd-content-tags.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/dtd/server-dtd-service-tag.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/dtd/server-dtd-service-tag.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/dtd/server-dtd.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/dtd/server-dtd.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/Username-transformations.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/Username-transformations.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/administrative-clients.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/administrative-clients.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/authorized.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/authorized.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/changelog.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/changelog.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/cli.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/cli.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/client-prototypes.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/client-prototypes.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/custom-scope-handler.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/custom-scope-handler.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/demo-mode.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/demo-mode.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/discovery.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/discovery.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/driver-config.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/driver-config.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/dynamic-client-registration.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/dynamic-client-registration.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/ersatz_clients.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/ersatz_clients.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/exception-notifications.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/exception-notifications.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/extended-attributes.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/extended-attributes.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/extending-the-server.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/extending-the-server.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/gc.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/gc.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/getting-started.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/getting-started.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/install-walkthrough.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/install-walkthrough.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/issuers.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/issuers.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/manually-approving-clients.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/manually-approving-clients.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/monitor.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/monitor.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/monitoring-access-times.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/monitoring-access-times.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/remote-user.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/remote-user.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/scripting-hooks.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/scripting-hooks.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/template.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/template.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/test-client.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/test-client.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/testing-from-the-command-line.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/testing-from-the-command-line.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/token-info.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/token-info.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/units.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/units.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/unused-client-cleanup.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/unused-client-cleanup.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/server/manuals/using-proxies.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/server/manuals/using-proxies.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docs/summary.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/summary.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oa4mp-server-oauth2/buildNumber.properties" beforeDir="false" afterPath="$PROJECT_DIR$/oa4mp-server-oauth2/buildNumber.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oauth2/src/main/java/org/oa4mp/delegation/server/client/TokenAwareServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/oauth2/src/main/java/org/oa4mp/delegation/server/client/TokenAwareServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/oauth2/src/main/java/org/oa4mp/delegation/server/jwt/MyOtherJWTUtil2.java" beforeDir="false" afterPath="$PROJECT_DIR$/oauth2/src/main/java/org/oa4mp/delegation/server/jwt/MyOtherJWTUtil2.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/proxy/src/main/java/org/oa4mp/server/proxy/OA2ATServlet.java" beforeDir="false" afterPath="$PROJECT_DIR$/proxy/src/main/java/org/oa4mp/server/proxy/OA2ATServlet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/proxy/src/main/java/org/oa4mp/server/proxy/sas/CLISASServlet.java" beforeDir="false" afterPath="$PROJECT_DIR$/proxy/src/main/java/org/oa4mp/server/proxy/sas/CLISASServlet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/qdl/buildNumber.properties" beforeDir="false" afterPath="$PROJECT_DIR$/qdl/buildNumber.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/qdl/src/main/docs/oa4mp_running_qdl_scripts.odt" beforeDir="false" afterPath="$PROJECT_DIR$/qdl/src/main/docs/oa4mp_running_qdl_scripts.odt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/qdl/src/main/docs/token_handler_configuration.odt" beforeDir="false" afterPath="$PROJECT_DIR$/qdl/src/main/docs/token_handler_configuration.odt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/qdl/src/main/java/org/oa4mp/server/qdl/CLC.java" beforeDir="false" afterPath="$PROJECT_DIR$/qdl/src/main/java/org/oa4mp/server/qdl/CLC.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/base/BaseCommands.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/base/BaseCommands.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/base/CopyCommands.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/base/CopyCommands.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/JWKCLI.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/JWKCLI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/JWKUtilCommands.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/JWKUtilCommands.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2CLCCommands.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2CLCCommands.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2CommandLineClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2CommandLineClient.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2Commands.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2Commands.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/QDLCLICommands.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/resources/help/vi_help.xml" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/resources/help/vi_help.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/resources/qdl/fnal/acl.qdl" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/resources/qdl/fnal/acl.qdl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/resources/qdl/fnal/new/at.qdl" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/resources/qdl/fnal/new/at.qdl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-admin/src/main/resources/qdl/fnal/new/rtx.qdl" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/resources/qdl/fnal/new/rtx.qdl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-api/src/main/java/org/oa4mp/server/api/admin/adminClient/AdminClientKeys.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-api/src/main/java/org/oa4mp/server/api/admin/adminClient/AdminClientKeys.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-installer/buildNumber.properties" beforeDir="false" afterPath="$PROJECT_DIR$/server-installer/buildNumber.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/claims/AbstractPayloadConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/claims/AbstractPayloadConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/claims/IDTokenHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/claims/IDTokenHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/claims/QDLHeadersClaimsSource.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/claims/QDLHeadersClaimsSource.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/cm/oidc_cm/OIDCCMServlet.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/cm/oidc_cm/OIDCCMServlet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2ClientUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2ClientUtils.java" afterDir="false" />
+    <list default="true" id="8e2d727f-106f-4316-98ff-77b4db768ea7" name="Changes" comment="https://github.com/ncsa/oa4mp/issues/221, https://github.com/ncsa/oa4mp/issues/222">
+      <change beforePath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2AdminClientCommands.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2AdminClientCommands.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/server-api/src/main/java/org/oa4mp/server/api/admin/adminClient/AdminClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-api/src/main/java/org/oa4mp/server/api/admin/adminClient/AdminClient.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2RegistrationServlet.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2RegistrationServlet.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/transactions/OA2ServiceTransaction.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/transactions/OA2ServiceTransaction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/tokens/AbstractCommonATandRTConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/tokens/AbstractCommonATandRTConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/qdl/util/SigningCommands.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/qdl/util/SigningCommands.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-test/buildNumber.properties" beforeDir="false" afterPath="$PROJECT_DIR$/server-test/buildNumber.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server-test/src/main/resources/flow-tests/auto/tests/rfc8693/all.qdl" beforeDir="false" afterPath="$PROJECT_DIR$/server-test/src/main/resources/flow-tests/auto/tests/rfc8693/all.qdl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/website/convert-docs.sh" beforeDir="false" afterPath="$PROJECT_DIR$/website/convert-docs.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/website/src/site/xhtml/server/manuals/ersatz_clients.xhtml" beforeDir="false" afterPath="$PROJECT_DIR$/website/src/site/xhtml/server/manuals/ersatz_clients.xhtml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/vi/VirtualIssuer.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/vi/VirtualIssuer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/qdl/QDLXMLConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/server-loader/src/main/java/org/oa4mp/server/loader/qdl/QDLXMLConstants.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1307,15 +1149,7 @@
       <workItem from="1726051918658" duration="61220000" />
       <workItem from="1726656910058" duration="312045000" />
       <workItem from="1730827183985" duration="70712000" />
-      <workItem from="1731622085783" duration="73782000" />
-    </task>
-    <task id="LOCAL-00010" summary="https://github.com/ncsa/oa4mp/issues/165 and https://github.com/ncsa/oa4mp/issues/164 Updated documentation.">
-      <option name="closed" value="true" />
-      <created>1706916706109</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1706916706109</updated>
+      <workItem from="1731622085783" duration="74038000" />
     </task>
     <task id="LOCAL-00011" summary="https://github.com/ncsa/oa4mp/issues/166 check for missing/empty refresh token explicitly in refresh endpoint and fail immediately if it is not there.">
       <option name="closed" value="true" />
@@ -1701,7 +1535,15 @@
       <option name="project" value="LOCAL" />
       <updated>1731356740850</updated>
     </task>
-    <option name="localTasksCounter" value="59" />
+    <task id="LOCAL-00059" summary="https://github.com/ncsa/oa4mp/issues/221, https://github.com/ncsa/oa4mp/issues/222">
+      <option name="closed" value="true" />
+      <created>1732051217401</created>
+      <option name="number" value="00059" />
+      <option name="presentableId" value="LOCAL-00059" />
+      <option name="project" value="LOCAL" />
+      <updated>1732051217401</updated>
+    </task>
+    <option name="localTasksCounter" value="60" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1712,7 +1554,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Fixes https://jira.ncsa.illinois.edu/browse/CIL-2019" />
     <MESSAGE value="https://github.com/ncsa/oa4mp/issues/196. Document the JWT util and added a startup script for OA4MP installs to create a set of signing keys." />
     <MESSAGE value="https://github.com/ncsa/oa4mp/issues/197, https://github.com/ncsa/oa4mp/issues/198" />
     <MESSAGE value="Update website" />
@@ -1737,7 +1578,8 @@
     <MESSAGE value="Updating help, website" />
     <MESSAGE value="Fix for https://github.com/ncsa/oa4mp/issues/218. Changed package and some class names related to virtual issuers." />
     <MESSAGE value="RFC 6749 §4.4 documentation, client credentials flow" />
-    <option name="LAST_COMMIT_MESSAGE" value="RFC 6749 §4.4 documentation, client credentials flow" />
+    <MESSAGE value="https://github.com/ncsa/oa4mp/issues/221, https://github.com/ncsa/oa4mp/issues/222" />
+    <option name="LAST_COMMIT_MESSAGE" value="https://github.com/ncsa/oa4mp/issues/221, https://github.com/ncsa/oa4mp/issues/222" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
   </component>
   <component name="XDebuggerManager">
diff --git a/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2AdminClientCommands.java b/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2AdminClientCommands.java
index abce0299f..6b4164a14 100644
--- a/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2AdminClientCommands.java
+++ b/server-admin/src/main/java/org/oa4mp/server/admin/myproxy/oauth2/tools/OA2AdminClientCommands.java
@@ -70,15 +70,15 @@ public void extraUpdates(Identifiable identifiable, int magicNumber) throws IOEx
         if (!isEmpty(issuer)) {
             client.setIssuer(issuer);
         }
-        String voURI;
+        String viURI;
         if (client.getVirtualIssuer() == null) {
-            voURI = getPropertyHelp(keys.voURI(), "Give the VO URI", null);
+            viURI = getPropertyHelp(keys.voURI(), "Give the VI URI", null);
         } else {
-            voURI = getPropertyHelp(keys.voURI(), "Give the VO URI", client.getVirtualIssuer().toString());
+            viURI = getPropertyHelp(keys.voURI(), "Give the VI URI", client.getVirtualIssuer().toString());
         }
-        if (!isEmpty(voURI)) {
+        if (!isEmpty(viURI)) {
             try {
-                URI z = URI.create(voURI);
+                URI z = URI.create(viURI);
                 client.setVirtualIssuer(BasicIdentifier.newID(z));
             } catch (Throwable t) {
                 if (DebugUtil.isEnabled()) {
diff --git a/server-api/src/main/java/org/oa4mp/server/api/admin/adminClient/AdminClient.java b/server-api/src/main/java/org/oa4mp/server/api/admin/adminClient/AdminClient.java
index bc1144002..0a4a5ea49 100644
--- a/server-api/src/main/java/org/oa4mp/server/api/admin/adminClient/AdminClient.java
+++ b/server-api/src/main/java/org/oa4mp/server/api/admin/adminClient/AdminClient.java
@@ -189,7 +189,7 @@ public String toString() {
                 "admin_id=" + getIdentifier() +
                 ", virtualIssuer=" + virtualIssuer +
                 ", issuer='" + issuer + '\'' +
-                ", externalVOName='" + externalVIName + '\'' +
+                ", externalVIName='" + externalVIName + '\'' +
                 ", maxClients=" + maxClients +
                 ", config=" + config +
                 ", allowQDL=" + allowQDL +
diff --git a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/OA2SE.java b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/OA2SE.java
index be44ad3b1..c66b0b886 100644
--- a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/OA2SE.java
+++ b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/OA2SE.java
@@ -602,9 +602,9 @@ public void setAuthorizationGrantLifetime(long authorizationGrantLifetime) {
     long authorizationGrantLifetime = AUTHORIZATION_GRANT_LIFETIME_DEFAULT;
 
     /**
-     * Given the client id, look up the admin and determine what (if any) the VO is.
-     * The returned value may be null,, meaning there is no VO.
-     * If the VO is disabled, it will not be returned either.<br/><br/>
+     * Given the client id, look up the admin and determine what (if any) the VI is.
+     * The returned value may be null,, meaning there is no VI.
+     * If the VI is disabled, it will not be returned either.<br/><br/>
      * This has its own call here because it involves multiple store lookups. It cannot
      * be done as a join in SQL or some such because there are no guarantees the stores
      * are all SQL -- some may be file stores or even in another unrelated database.
diff --git a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/claims/AbstractAccessTokenHandler.java b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/claims/AbstractAccessTokenHandler.java
index 14ab34d3e..f34474dbb 100644
--- a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/claims/AbstractAccessTokenHandler.java
+++ b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/claims/AbstractAccessTokenHandler.java
@@ -489,7 +489,7 @@ public void setAccountingInformation() {
         // hierarchy.
         // 1. If they passed it in explicitly, use that
         // 2. If it is set in the configuration, use that
-        // 3. If there is a VO, use that
+        // 3. If there is a VI, use that
         // 4. If all else fails, use the standard issuer
         if (transaction.hasAudience()) {
             atData.put(AUDIENCE, transaction.getAudience());
@@ -497,12 +497,12 @@ public void setAccountingInformation() {
             if (getATConfig().getAudience() != null && !getATConfig().getAudience().isEmpty()) {
                 atData.put(AUDIENCE, getATConfig().getAudience());
             } else{
-                VirtualIssuer vo = oa2se.getVI(client.getIdentifier());
-                if (vo == null) {
-                    // fail safe. No VO, no configuration, return this service as issuer.
+                VirtualIssuer vi = oa2se.getVI(client.getIdentifier());
+                if (vi == null) {
+                    // fail safe. No VI, no configuration, return this service as issuer.
                     atData.put(AUDIENCE, transaction.getClient().getIdentifierString());
                 } else {
-                    atData.put(AUDIENCE, vo.getAtIssuer());
+                    atData.put(AUDIENCE, vi.getAtIssuer());
                 }
                 // Note that at this point a default audience could be set, but different
                 // protocols have very different ideas. These are set in the individual handlers.
diff --git a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2RegistrationServlet.java b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2RegistrationServlet.java
index 66de05c39..6c09b66bf 100644
--- a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2RegistrationServlet.java
+++ b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2RegistrationServlet.java
@@ -44,7 +44,7 @@ public class OA2RegistrationServlet extends AbstractRegistrationServlet {
     public static final String CALLBACK_URI = "callbackURI";
     public static final String REFRESH_TOKEN_LIFETIME = "rtLifetime";
     public static final String REFRESH_TOKEN_FIELD_VISIBLE = "rtFieldVisible";
-    public static final String VO_NAME = "voName";
+    public static final String VI_NAME = "viName";
     public static final String LDAP_NAME = "ldap";
     public static final String ISSUER_NAME = "issuer";
     public static final String SCOPES_NAME = "scopes";
@@ -77,7 +77,7 @@ public void prepare(PresentableState state) throws Throwable {
             String[] scopes = new String[displayScopes.size()];
             displayScopes.toArray(scopes);
             request.setAttribute(SCOPES_NAME, scopes);
-            request.setAttribute(VO_NAME, VO_NAME);
+            request.setAttribute(VI_NAME, VI_NAME);
             request.setAttribute(LDAP_NAME, LDAP_NAME);
             request.setAttribute(ISSUER_NAME, ISSUER_NAME);
             request.setAttribute(CALLBACK_URI, CALLBACK_URI);
diff --git a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2TokenUtils.java b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2TokenUtils.java
index efbc0aed0..2f6f9b7bb 100644
--- a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2TokenUtils.java
+++ b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/servlet/OA2TokenUtils.java
@@ -53,7 +53,7 @@ public static JSONWebKeys getKeys(OA2SE oa2se, OA2Client client) {
 
         if (vo != null) {
             keys = vo.getJsonWebKeys();
-            ServletDebugUtil.trace(OA2TokenUtils.class, "Got VO for client " + client.getIdentifierString());
+            ServletDebugUtil.trace(OA2TokenUtils.class, "Got VI for client " + client.getIdentifierString());
         }
         return keys;
     }
diff --git a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/transactions/OA2ServiceTransaction.java b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/transactions/OA2ServiceTransaction.java
index fe71a0904..4c854b632 100644
--- a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/transactions/OA2ServiceTransaction.java
+++ b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/transactions/OA2ServiceTransaction.java
@@ -532,7 +532,7 @@ public Identifier getProvisioningAdminID() {
     /**
      * Sets the provisioning admin partly so we don't have to look it up again and partly so
      * that for very, very long lived transactions, there is absolutely no possibility
-     * that the VO can change.
+     * that the VI can change.
      *
      * @param provisioningAdminID
      */
diff --git a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/vi/VIConverter.java b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/vi/VIConverter.java
index 83602f846..99a304311 100644
--- a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/vi/VIConverter.java
+++ b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/vi/VIConverter.java
@@ -27,41 +27,41 @@ protected VISerializationKeys vok() {
 
     @Override
     public V fromMap(ConversionMap<String, Object> map, V v) {
-        V vo = super.fromMap(map, v);
+        V vi = super.fromMap(map, v);
 
-        vo.setCreationTS(new Date(map.getLong(vok().creationTS())));
-        vo.setLastModifiedTS(new Date(map.getLong(vok().lastModifiedTS())));
+        vi.setCreationTS(new Date(map.getLong(vok().creationTS())));
+        vi.setLastModifiedTS(new Date(map.getLong(vok().lastModifiedTS())));
 
         // Fixes https://github.com/ncsa/oa4mp/issues/149
-        vo.setLastAccessed(new Date(map.getLong(vok().lastAccessed())));
-        vo.setValid(map.getBoolean(vok().valid()));
+        vi.setLastAccessed(new Date(map.getLong(vok().lastAccessed())));
+        vi.setValid(map.getBoolean(vok().valid()));
 
         if (map.containsKey(vok().issuer()) && !isTrivial(map.getString(vok().issuer()))) {
-            vo.setIssuer(map.getString(vok().issuer()));
+            vi.setIssuer(map.getString(vok().issuer()));
         }
         if (map.containsKey(vok().atIssuer()) && !isTrivial(map.getString(vok().atIssuer()))) {
-            vo.setAtIssuer(map.getString(vok().atIssuer()));
+            vi.setAtIssuer(map.getString(vok().atIssuer()));
         }
         if (map.containsKey(vok().defaultKeyID()) && !isTrivial(map.getString(vok().defaultKeyID()))) {
-            vo.setDefaultKeyID(map.getString(vok().defaultKeyID()));
+            vi.setDefaultKeyID(map.getString(vok().defaultKeyID()));
         }
         if (map.containsKey(vok().jsonWebKeys()) && !isTrivial(map.getString(vok().jsonWebKeys()))) {
             try {
                 JSONWebKeys keys = JSONWebKeyUtil.fromJSON(map.getString(vok().jsonWebKeys()));
-                vo.setJsonWebKeys(keys);
+                vi.setJsonWebKeys(keys);
 
             } catch (Throwable e) {
-                DebugUtil.error(this, "Could not deserialize the JSON web keys for this VO.\"" + vo.getIdentifierString() + "\".", e);
+                DebugUtil.error(this, "Could not deserialize the JSON web keys for this VI.\"" + vi.getIdentifierString() + "\".", e);
             }
         }
         if (map.containsKey(vok().discoveryPath()) && !isTrivial(map.getString(vok().discoveryPath()))) {
-            vo.setDiscoveryPath(map.getString(vok().discoveryPath()));
+            vi.setDiscoveryPath(map.getString(vok().discoveryPath()));
         }
 
         if (map.containsKey(vok().title()) && !isTrivial(map.getString(vok().title()))) {
-            vo.setTitle(map.getString(vok().title()));
+            vi.setTitle(map.getString(vok().title()));
         }
-        return vo;
+        return vi;
     }
 
     @Override
diff --git a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/vi/VirtualIssuer.java b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/vi/VirtualIssuer.java
index fc4474853..dbcf40083 100644
--- a/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/vi/VirtualIssuer.java
+++ b/server-loader/src/main/java/org/oa4mp/server/loader/oauth2/storage/vi/VirtualIssuer.java
@@ -105,27 +105,27 @@ public void setTitle(String title) {
     }
 
     public void toXML(XMLStreamWriter xsw) throws XMLStreamException {
-        xsw.writeStartElement(VO_ENTRY);
+        xsw.writeStartElement(VI_ENTRY);
         xsw.writeAttribute(ID_ATTR, getIdentifierString());
-        xsw.writeAttribute(VO_CREATED, Long.toString(getCreationTS().getTime()));
-        xsw.writeAttribute(VO_LAST_MODIFIED, Long.toString(getLastModifiedTS().getTime()));
-        xsw.writeAttribute(VO_LAST_ACCESSED, Long.toString(getLastAccessed().getTime()));
+        xsw.writeAttribute(VI_CREATED, Long.toString(getCreationTS().getTime()));
+        xsw.writeAttribute(VI_LAST_MODIFIED, Long.toString(getLastModifiedTS().getTime()));
+        xsw.writeAttribute(VI_LAST_ACCESSED, Long.toString(getLastAccessed().getTime()));
         xsw.writeAttribute(IS_VALID_ATTR, Boolean.toString(valid));
         if (!isTrivial(issuer)) {
             xsw.writeAttribute(ISSUER, issuer);
         }
         if (!isTrivial(discoveryPath)) {
-            xsw.writeAttribute(VO_DISCOVERY_PATH, discoveryPath);
+            xsw.writeAttribute(VI_DISCOVERY_PATH, discoveryPath);
         }
         if (!isTrivial(title)) {
-            xsw.writeAttribute(VO_TITLE, title);
+            xsw.writeAttribute(VI_TITLE, title);
         }
         if (!isTrivial(defaultKeyID)) {
-            xsw.writeAttribute(VO_DEFAULT_KEY, defaultKeyID);
+            xsw.writeAttribute(VI_DEFAULT_KEY, defaultKeyID);
         }
         if (jsonWebKeys != null) {
             JSONObject json = JSONWebKeyUtil.toJSON(jsonWebKeys);
-            xsw.writeStartElement(VO_JSON_WEB_KEYS);
+            xsw.writeStartElement(VI_JSON_WEB_KEYS);
             // It is base 64 encoded so we don't have to grapple with escaping and such. All we need
             // is that it is faithfully stashed someplace.
             XMLUtils.write(xsw, Base64.encodeBase64String(json.toString().getBytes(StandardCharsets.UTF_8)));
@@ -143,14 +143,14 @@ public void fromXML(XMLEventReader xer) throws XMLStreamException {
             switch (xe.getEventType()) {
                 case XMLEvent.START_ELEMENT:
                     switch (xe.asStartElement().getName().getLocalPart()) {
-                        case VO_JSON_WEB_KEYS:
+                        case VI_JSON_WEB_KEYS:
                             String raw = xe.asCharacters().getData();
                             jsonWebKeys = JSONWebKeyUtil.fromJSON(new String(Base64.decodeBase64(raw)));
                             break;
                     } //end inner switch
                     break;
                 case XMLEvent.END_ELEMENT:
-                    if (xe.asEndElement().getName().getLocalPart().equals(VO_ENTRY)) {
+                    if (xe.asEndElement().getName().getLocalPart().equals(VI_ENTRY)) {
                         return;
                     }
                     break;
@@ -159,7 +159,7 @@ public void fromXML(XMLEventReader xer) throws XMLStreamException {
             xer.next();
 
         }
-        throw new IllegalStateException("Error: XML file corrupt. No end tag for " + VO_ENTRY);
+        throw new IllegalStateException("Error: XML file corrupt. No end tag for " + VI_ENTRY);
 
     }
 
@@ -173,26 +173,26 @@ private void doXMLAttributes(XMLEvent xe) {
                 case ID_ATTR:
                     setIdentifier(BasicIdentifier.newID(v));
                     break;
-                case VO_CREATED:
+                case VI_CREATED:
                     setCreationTS(new Date(Long.parseLong(v)));
                     break;
-                case VO_LAST_MODIFIED:
+                case VI_LAST_MODIFIED:
                     setLastModifiedTS(new Date(Long.parseLong(v)));
                     break;
-                case VO_LAST_ACCESSED:
+                case VI_LAST_ACCESSED:
                     setLastAccessed(new Date(Long.parseLong(v)));
                 case IS_VALID_ATTR:
                     break;
                 case ISSUER:
                     issuer = v;
                     break;
-                case VO_DEFAULT_KEY:
+                case VI_DEFAULT_KEY:
                     defaultKeyID = v;
                     break;
-                case VO_DISCOVERY_PATH:
+                case VI_DISCOVERY_PATH:
                     discoveryPath = v;
                     break;
-                case VO_TITLE:
+                case VI_TITLE:
                     title = v;
             }
         }
diff --git a/server-loader/src/main/java/org/oa4mp/server/loader/qdl/QDLXMLConstants.java b/server-loader/src/main/java/org/oa4mp/server/loader/qdl/QDLXMLConstants.java
index 1320e123a..33c1d21fd 100644
--- a/server-loader/src/main/java/org/oa4mp/server/loader/qdl/QDLXMLConstants.java
+++ b/server-loader/src/main/java/org/oa4mp/server/loader/qdl/QDLXMLConstants.java
@@ -22,14 +22,14 @@ public interface QDLXMLConstants extends SerializationConstants {
     String STATE = "state";
     String ID_ATTR = "id";
 
-    String VO_ENTRY = "virtual_issuer";
-    String VO_JSON_WEB_KEYS = "json_web_keys";
-    String VO_DEFAULT_KEY = "default_key";
-    String VO_TITLE = "title";
-    String VO_LAST_MODIFIED = "last_modified_at";
-    String VO_LAST_ACCESSED = "last_accessed_at";
-    String VO_CREATED = "created_at";
-    String VO_DISCOVERY_PATH = "discovery_path";
+    String VI_ENTRY = "virtual_issuer";
+    String VI_JSON_WEB_KEYS = "json_web_keys";
+    String VI_DEFAULT_KEY = "default_key";
+    String VI_TITLE = "title";
+    String VI_LAST_MODIFIED = "last_modified_at";
+    String VI_LAST_ACCESSED = "last_accessed_at";
+    String VI_CREATED = "created_at";
+    String VI_DISCOVERY_PATH = "discovery_path";
     // use issuer and id_attr from above
 
 }