From f5c9e3e3dce8e7c7cf853f74bd7f88f829d33d54 Mon Sep 17 00:00:00 2001 From: jjg-123 Date: Thu, 12 Sep 2024 13:00:50 -0500 Subject: [PATCH] https://github.com/ncsa/oa4mp/issues/205 --- .idea/workspace.xml | 2645 +++-------------- README.md | 4 +- client-api/pom.xml | 20 +- .../client/api/AbstractOA4MPService.java | 8 +- .../oa4mp/client/api/ClientEnvironment.java | 4 +- .../api/loader/AbstractClientLoader.java | 2 +- client-installer/buildNumber.properties | 4 +- client-installer/pom.xml | 15 +- client-loader/pom.xml | 30 +- .../client/loader/OA2ClientEnvironment.java | 2 +- .../oa4mp/client/loader/OA2ClientLoader.java | 2 +- .../client/loader/OA2ClientLoaderImpl.java | 2 +- .../org/oa4mp/client/loader/OA2MPService.java | 24 +- client-oauth2/pom.xml | 22 +- client-test/pom.xml | 34 +- client-webapp/pom.xml | 12 +- client/pom.xml | 10 +- .../AbstractClientEnvironment.java | 2 +- .../AbstractDelegationServiceProvider.java | 2 +- .../{ => client}/DelegationService.java | 8 +- .../{ => client}/request/AGRequest.java | 4 +- .../{ => client}/request/AGResponse.java | 2 +- .../{ => client}/request/ATRequest.java | 4 +- .../{ => client}/request/ATResponse.java | 2 +- .../{ => client}/request/BasicRequest.java | 2 +- .../{ => client}/request/BasicResponse.java | 2 +- .../{ => client}/request/CallbackRequest.java | 4 +- .../request/CallbackResponse.java | 2 +- .../request/DelegatedAssetRequest.java | 4 +- .../request/DelegatedAssetResponse.java | 2 +- .../request/DelegationRequest.java | 4 +- .../request/DelegationResponse.java | 2 +- .../{ => client}/request/PARequest.java | 4 +- .../{ => client}/request/PAResponse.java | 2 +- .../{ => client}/request/RFC7009Request.java | 4 +- .../{ => client}/request/RFC7009Response.java | 2 +- .../{ => client}/request/RFC7523Request.java | 2 +- .../{ => client}/request/RFC7523Response.java | 2 +- .../{ => client}/request/RFC7662Request.java | 6 +- .../{ => client}/request/RFC7662Response.java | 2 +- .../{ => client}/request/RTRequest.java | 4 +- .../{ => client}/request/RTResponse.java | 2 +- .../{ => client}/request/UIRequest.java | 4 +- .../{ => client}/request/UIResponse.java | 2 +- .../{ => client}/server/AGServer.java | 6 +- .../{ => client}/server/ATServer.java | 6 +- .../{ => client}/server/CBServer.java | 6 +- .../{ => client}/server/PAServer.java | 6 +- .../{ => client}/server/RFC7009Server.java | 6 +- .../{ => client}/server/RFC7662Server.java | 6 +- .../{ => client}/server/RTServer.java | 4 +- .../{ => client}/server/ResourceOwner.java | 2 +- .../{ => client}/server/UIServer.java | 6 +- .../{ => client}/server/package.html | 0 common/pom.xml | 12 +- .../oa4mp/delegation/common/OA4MPVersion.java | 2 +- docs/apidocs/constant-values.html | 62 +- .../oa4mp/client/ClientEnvironment.html | 8 +- .../client/storage/class-use/AssetStore.html | 4 +- .../oa4mp/oauth2/cm/ManagerFacade.html | 4 +- ...nLoader.OA2MultiDSClientStoreProvider.html | 2 +- .../servlet/AbstractAccessTokenServlet2.html | 2 +- .../oauth2/servlet/ActiveTokenServlet.html | 2 +- .../oauth2/servlet/BearerTokenServlet.html | 2 +- .../oauth2/servlet/MultiAuthServlet.html | 2 +- .../servlet/OA2AdminRegistrationServlet.html | 2 +- .../oauth2/servlet/OA2AuthorizedServlet.html | 8 +- .../servlet/OA2AuthorizedServletUtil.html | 4 +- .../servlet/OA2AutoRegistrationServlet.html | 2 +- .../oa4mp/oauth2/servlet/OA2CertServlet.html | 8 +- .../oa4mp/oauth2/servlet/OA2ClientUtils.html | 4 +- .../oauth2/servlet/OA2DiscoveryServlet.html | 2 +- .../servlet/OA2RegistrationServlet.html | 2 +- .../myproxy/oa4mp/oauth2/servlet/RFC7009.html | 2 +- .../myproxy/oa4mp/oauth2/servlet/RFC7662.html | 2 +- .../oauth2/servlet/TokenManagerServlet.html | 8 +- .../oa4mp/oauth2/servlet/UserInfoServlet.html | 8 +- .../storage/clients/OA2ClientMemoryStore.html | 6 +- .../storage/clients/class-use/OA2Client.html | 8 +- .../storage/transactions/OA2SQLTStore.html | 6 +- .../storage/transactions/OA2TConverter.html | 8 +- .../transactions/OA2TransactionKeys.html | 6 +- .../transactions/OA2TransactionTable.html | 2 +- .../class-use/OA2ServiceTransaction.html | 2 +- .../class-use/OA2TransactionKeys.html | 2 +- .../oauth2/storage/tx/TXRecordConverter.html | 4 +- .../admin/adminClient/AdminClientFS.html | 14 +- .../adminClient/AdminClientMemoryStore.html | 14 +- .../adminClient/AdminClientSQLStore.html | 10 +- .../admin/adminClient/AdminClientStore.html | 4 +- .../class-use/PermissionsStore.html | 2 +- .../transactions/DSSQLTransactionStore.html | 6 +- .../admin/transactions/DSTransactionKeys.html | 6 +- .../transactions/DSTransactionTable.html | 2 +- .../transactions/TransactionConverter.html | 12 +- .../myproxy/oa4mp/server/servlet/ACS2.html | 2 +- .../servlet/AbstractAccessTokenServlet.html | 2 +- .../servlet/AbstractAuthorizationServlet.html | 8 +- .../server/servlet/AbstractCertServlet.html | 2 +- .../server/servlet/AbstractInitServlet.html | 2 +- .../servlet/AbstractRegistrationServlet.html | 8 +- .../servlet/AbstractVerifierServlet.html | 2 +- .../AuthorizationControllerServlet.html | 8 +- .../server/servlet/AuthorizedServlet.html | 2 +- .../servlet/AutoRegistrationServlet.html | 2 +- .../oa4mp/server/servlet/CRServlet.html | 2 +- .../server/servlet/DiscoveryServlet.html | 8 +- .../oa4mp/server/servlet/ErrorServlet.html | 8 +- .../servlet/IssuerTransactionState.html | 8 +- .../servlet/MyProxyDelegationServlet.html | 4 +- .../server/servlet/RegistrationServlet.html | 2 +- .../storage/MultiDSClientStoreProvider.html | 2 +- .../filestore/DSFSClientApprovalStore.html | 6 +- .../storage/filestore/DSFSClientStore.html | 6 +- .../storage/sql/SQLClientApprovalStore.html | 2 +- .../server/storage/sql/SQLClientStore.html | 10 +- .../server/util/ClientApproverConverter.html | 4 +- .../oauth2/base/BaseClientStoreCommands.html | 8 +- .../base/ClientApprovalStoreCommands.html | 4 +- .../oauth2/base/ClientStoreCommands.html | 2 +- .../ClientApprovalStoreCommands.html | 2 +- .../oauth2/tools/OA2AdminClientCommands.html | 6 +- .../oauth2/tools/OA2ClientCommands.html | 6 +- .../oauth2/tools/migrate/FSMigrater.html | 4 +- .../ncsa/oa2/qdl/storage/ApprovalStemMC.html | 4 +- .../qdl/storage/PermissionStoreFacade.html | 2 +- .../ncsa/oa2/qdl/storage/StoreFacade.html | 4 +- .../uiuc/ncsa/oa2/qdl/storage/TXRStemMC.html | 4 +- .../oa2/qdl/storage/TransactionStemMC.html | 4 +- .../storage/class-use/TransactionStemMC.html | 2 +- .../uiuc/ncsa/oa2/servlet/OA2ATServlet.html | 8 +- .../oa2/servlet/OA2AuthorizationServer.html | 2 +- .../oa2/servlet/ProxyCallbackServlet.html | 8 +- .../uiuc/ncsa/oa2/servlet/RFC8628Servlet.html | 12 +- .../client/AbstractClientEnvironment.html | 6 +- .../AbstractDelegationServiceProvider.html | 2 +- .../delegation/client/DelegationService.html | 26 +- .../class-use/AbstractClientEnvironment.html | 8 +- .../AbstractDelegationServiceProvider.html | 8 +- .../client/class-use/DelegationService.html | 6 +- .../delegation/client/request/AGRequest.html | 6 +- .../delegation/client/request/AGResponse.html | 6 +- .../delegation/client/request/ATRequest.html | 10 +- .../delegation/client/request/ATResponse.html | 6 +- .../client/request/BasicRequest.html | 2 +- .../client/request/BasicResponse.html | 2 +- .../client/request/CallbackRequest.html | 6 +- .../client/request/CallbackResponse.html | 6 +- .../client/request/DelegatedAssetRequest.html | 6 +- .../request/DelegatedAssetResponse.html | 6 +- .../client/request/DelegationRequest.html | 6 +- .../client/request/DelegationResponse.html | 6 +- .../delegation/client/request/PARequest.html | 6 +- .../delegation/client/request/PAResponse.html | 6 +- .../client/request/RFC7009Request.html | 10 +- .../client/request/RFC7009Response.html | 6 +- .../client/request/RFC7523Request.html | 6 +- .../client/request/RFC7523Response.html | 6 +- .../client/request/RFC7662Request.html | 6 +- .../client/request/RFC7662Response.html | 6 +- .../delegation/client/request/RTRequest.html | 6 +- .../delegation/client/request/RTResponse.html | 22 +- .../delegation/client/request/UIRequest.html | 6 +- .../delegation/client/request/UIResponse.html | 10 +- .../client/request/class-use/AGRequest.html | 10 +- .../client/request/class-use/AGResponse.html | 14 +- .../client/request/class-use/ATRequest.html | 14 +- .../client/request/class-use/ATResponse.html | 16 +- .../request/class-use/BasicRequest.html | 8 +- .../request/class-use/BasicResponse.html | 6 +- .../request/class-use/CallbackRequest.html | 8 +- .../request/class-use/CallbackResponse.html | 8 +- .../class-use/DelegatedAssetRequest.html | 12 +- .../class-use/DelegatedAssetResponse.html | 10 +- .../request/class-use/DelegationRequest.html | 14 +- .../request/class-use/DelegationResponse.html | 10 +- .../client/request/class-use/PARequest.html | 10 +- .../client/request/class-use/PAResponse.html | 10 +- .../request/class-use/RFC7009Request.html | 12 +- .../request/class-use/RFC7009Response.html | 12 +- .../request/class-use/RFC7523Request.html | 10 +- .../request/class-use/RFC7523Response.html | 10 +- .../request/class-use/RFC7662Request.html | 12 +- .../request/class-use/RFC7662Response.html | 12 +- .../client/request/class-use/RTRequest.html | 14 +- .../client/request/class-use/RTResponse.html | 10 +- .../client/request/class-use/UIRequest.html | 12 +- .../client/request/class-use/UIResponse.html | 12 +- .../delegation/client/server/AGServer.html | 4 +- .../delegation/client/server/ATServer.html | 4 +- .../delegation/client/server/CBServer.html | 4 +- .../delegation/client/server/PAServer.html | 4 +- .../client/server/RFC7009Server.html | 4 +- .../client/server/RFC7662Server.html | 4 +- .../delegation/client/server/RTServer.html | 4 +- .../delegation/client/server/UIServer.html | 4 +- .../common/services/class-use/Response.html | 2 +- .../common/storage/class-use/BaseClient.html | 4 +- .../common/storage/class-use/Client.html | 2 +- .../storage/clients/class-use/BaseClient.html | 4 +- .../storage/clients/class-use/Client.html | 2 +- .../token/impl/class-use/AccessTokenImpl.html | 2 +- .../token/impl/class-use/IDTokenImpl.html | 2 +- .../oa4mp/delegation/oa2/OA2TokenForge.html | 8 +- .../delegation/oa2/client/AGServer2.html | 6 +- .../delegation/oa2/client/ATResponse2.html | 14 +- .../delegation/oa2/client/ATServer2.html | 12 +- .../ncsa/oa4mp/delegation/oa2/client/DS2.html | 40 +- .../delegation/oa2/client/PAServer2.html | 6 +- .../delegation/oa2/client/RFC7009Server2.html | 8 +- .../delegation/oa2/client/RFC7523Server.html | 6 +- .../delegation/oa2/client/RFC7662Server2.html | 8 +- .../delegation/oa2/client/RFC8623Server.html | 2 +- .../delegation/oa2/client/RTServer2.html | 12 +- .../oa2/client/TokenAwareServer.html | 4 +- .../delegation/oa2/client/UIServer2.html | 6 +- .../oa2/client/class-use/ATResponse2.html | 2 +- .../oa4mp/delegation/oa2/server/AGI2.html | 12 +- .../delegation/oa2/server/AGIResponse2.html | 2 +- .../delegation/oa2/server/AGRequest2.html | 10 +- .../oa4mp/delegation/oa2/server/ATI2.html | 12 +- .../delegation/oa2/server/ATIResponse2.html | 4 +- .../delegation/oa2/server/IResponse2.html | 2 +- .../oa4mp/delegation/oa2/server/PAI2.html | 12 +- .../delegation/oa2/server/PAIResponse2.html | 2 +- .../oa4mp/delegation/oa2/server/RTI2.html | 10 +- .../delegation/oa2/server/RTIRequest.html | 6 +- .../oa4mp/delegation/oa2/server/UII2.html | 6 +- .../delegation/oa2/server/UIIRequest2.html | 6 +- .../oa2/server/class-use/IResponse2.html | 2 +- .../delegation/server/issuers/AGIssuer.html | 4 +- .../delegation/server/issuers/ATIssuer.html | 4 +- .../server/issuers/AbstractIssuer.html | 2 +- .../delegation/server/issuers/CBIssuer.html | 4 +- .../server/issuers/IssuerProvider.html | 2 +- .../delegation/server/issuers/PAIssuer.html | 4 +- .../server/issuers/class-use/AGIssuer.html | 6 +- .../server/issuers/class-use/ATIssuer.html | 6 +- .../issuers/class-use/AbstractIssuer.html | 6 +- .../server/issuers/class-use/CBIssuer.html | 8 +- .../issuers/class-use/IssuerProvider.html | 8 +- .../server/issuers/class-use/PAIssuer.html | 6 +- .../delegation/server/request/AGRequest.html | 8 +- .../delegation/server/request/AGResponse.html | 2 +- .../delegation/server/request/ATRequest.html | 8 +- .../delegation/server/request/ATResponse.html | 2 +- .../delegation/server/request/CBRequest.html | 8 +- .../delegation/server/request/CBResponse.html | 2 +- .../server/request/IssuerRequest.html | 14 +- .../delegation/server/request/PARequest.html | 8 +- .../delegation/server/request/PAResponse.html | 2 +- .../server/request/class-use/AGRequest.html | 10 +- .../server/request/class-use/AGResponse.html | 6 +- .../server/request/class-use/ATRequest.html | 12 +- .../server/request/class-use/ATResponse.html | 10 +- .../server/request/class-use/CBRequest.html | 8 +- .../server/request/class-use/CBResponse.html | 8 +- .../request/class-use/IssuerRequest.html | 10 +- .../request/class-use/IssuerResponse.html | 10 +- .../server/request/class-use/PARequest.html | 10 +- .../server/request/class-use/PAResponse.html | 10 +- .../server/storage/AggregateCAStore.html | 4 +- .../server/storage/AggregateClientStore.html | 18 +- .../server/storage/BaseClientSQLStore.html | 30 +- .../storage/BaseClientStore.UUCResponse.html | 2 +- .../server/storage/BaseClientStore.html | 8 +- .../server/storage/ClientApproval.Status.html | 2 +- .../server/storage/ClientApproval.html | 8 +- .../server/storage/ClientStore.html | 4 +- .../storage/SQLServiceTransactionStore.html | 4 +- .../storage/class-use/AggregateCAStore.html | 8 +- .../class-use/AggregateClientStore.html | 8 +- .../storage/class-use/BaseClientSQLStore.html | 8 +- .../BaseClientStore.UUCResponse.html | 16 +- .../storage/class-use/BaseClientStore.html | 16 +- .../class-use/ClientApproval.Status.html | 8 +- .../storage/class-use/ClientApproval.html | 14 +- .../class-use/ClientApprovalStore.html | 34 +- .../server/storage/class-use/ClientStore.html | 8 +- .../class-use/SQLServiceTransactionStore.html | 8 +- .../storage/impl/ClientMemoryStore.html | 18 +- .../storage/impl/ClientStoreProvider.html | 2 +- .../storage/impl/FSClientApprovalStore.html | 4 +- .../server/storage/impl/FSClientStore.html | 16 +- .../storage/impl/GenericClientStoreUtils.html | 22 +- .../impl/class-use/ClientMemoryStore.html | 8 +- .../impl/class-use/ClientStoreProvider.html | 8 +- .../impl/class-use/FSClientApprovalStore.html | 8 +- .../storage/impl/class-use/FSClientStore.html | 8 +- .../class-use/GenericClientStoreUtils.html | 8 +- .../support/ServiceTransactionConverter.html | 2 +- .../support/ServiceTransactionKeys.html | 2 +- .../support/ServiceTransactionTable.html | 6 +- .../ServiceTransactionConverter.html | 8 +- .../class-use/ServiceTransactionKeys.html | 8 +- .../class-use/ServiceTransactionTable.html | 8 +- .../server/storage/upkeep/UpkeepThread.html | 2 +- .../upkeep/class-use/UpkeepThread.html | 8 +- .../server/storage/uuc/AbandonedRule.html | 12 +- .../server/storage/uuc/DateThingy.html | 2 +- .../delegation/server/storage/uuc/GPRule.html | 8 +- .../server/storage/uuc/ListRule.html | 12 +- .../server/storage/uuc/MetaRule.html | 6 +- .../server/storage/uuc/ResultStats.html | 2 +- .../server/storage/uuc/RuleFilter.html | 34 +- .../server/storage/uuc/UUCConfiguration.html | 38 +- .../server/storage/uuc/UUCResponse.html | 2 +- .../storage/uuc/UUCRetentionPolicy.html | 6 +- .../server/storage/uuc/UUCThread.html | 6 +- .../server/storage/uuc/UnusedRule.html | 12 +- .../storage/uuc/class-use/AbandonedRule.html | 8 +- .../storage/uuc/class-use/DateThingy.html | 12 +- .../server/storage/uuc/class-use/GPRule.html | 6 +- .../storage/uuc/class-use/ListRule.html | 10 +- .../storage/uuc/class-use/MetaRule.html | 6 +- .../storage/uuc/class-use/ResultStats.html | 6 +- .../storage/uuc/class-use/RuleFilter.html | 18 +- .../uuc/class-use/UUCConfiguration.html | 20 +- .../storage/uuc/class-use/UUCResponse.html | 8 +- .../uuc/class-use/UUCRetentionPolicy.html | 8 +- .../storage/uuc/class-use/UUCThread.html | 8 +- .../storage/uuc/class-use/UnusedRule.html | 8 +- .../oauth2/client/OA2ClientEnvironment.html | 8 +- docs/apidocs/index-all.html | 166 +- docs/apidocs/serialized-form.html | 8 +- docs/dependencies.html | 2 +- installer/pom.xml | 9 +- myproxy-logon/pom.xml | 10 +- myproxy-website/pom.xml | 6 +- oa4mp-server-oauth2/buildNumber.properties | 4 +- oa4mp-server-oauth2/pom.xml | 28 +- oa4mp-server-test/pom.xml | 28 +- .../server/test/AGTestStoreProvider.java | 2 +- .../org/oa4mp/server/test/CAStoreTest.java | 6 +- .../oa4mp/server/test/ClientStoreTest.java | 2 +- .../org/oa4mp/server/test/NewCAStoreTest.java | 8 +- .../oa4mp/server/test/NewClientStoreTest.java | 2 +- .../oa4mp/server/test/NewTransactionTest.java | 2 +- .../oa4mp/server/test/ServiceConfigTest.java | 6 +- .../oa4mp/server/test/TestStoreProvider.java | 6 +- .../test/TestStoreProviderInterface.java | 6 +- .../oa4mp/server/test/file/FSCAStoreTest.java | 4 +- oa4mp-webapp/pom.xml | 8 +- oauth2/pom.xml | 22 +- .../delegation/server/OA2TokenForge.java | 5 +- .../delegation/server/client/AGServer2.java | 12 +- .../delegation/server/client/ATResponse2.java | 2 +- .../delegation/server/client/ATServer2.java | 16 +- .../oa4mp/delegation/server/client/DS2.java | 10 +- .../delegation/server/client/PAServer2.java | 14 +- .../server/client/RFC7009Server2.java | 8 +- .../server/client/RFC7523Server.java | 4 +- .../server/client/RFC7662Server2.java | 10 +- .../delegation/server/client/RTServer2.java | 12 +- .../server/client/TokenAwareServer.java | 2 +- .../delegation/server/client/UIServer2.java | 8 +- .../oa4mp/delegation/server/server/AGI2.java | 8 +- .../server/server/AGIResponse2.java | 4 +- .../delegation/server/server/AGRequest2.java | 2 +- .../oa4mp/delegation/server/server/ATI2.java | 8 +- .../server/server/ATIResponse2.java | 2 +- .../server/server/IDTokenResponse.java | 2 +- .../delegation/server/server/IResponse2.java | 2 +- .../oa4mp/delegation/server/server/PAI2.java | 8 +- .../server/server/PAIResponse2.java | 2 +- .../oa4mp/delegation/server/server/RTI2.java | 6 +- .../delegation/server/server/RTIRequest.java | 4 +- .../oa4mp/delegation/server/server/UII2.java | 2 +- .../delegation/server/server/UIIRequest2.java | 4 +- .../server/server/UIIResponse2.java | 2 +- .../server/server/claims/ClaimSource.java | 2 +- .../oa4mp/delegation/server/test/TF2Test.java | 4 +- pom.xml | 16 +- proxy/pom.xml | 51 +- .../org/oa4mp/server/proxy/OA2ATServlet.java | 6 +- .../server/proxy/OA2AuthorizationServer.java | 2 +- .../oa4mp/server/proxy/OA2CertServlet.java | 4 +- .../server/proxy/ProxyCallbackServlet.java | 4 +- .../oa4mp/server/proxy/RFC8628Servlet.java | 6 +- qdl/buildNumber.properties | 4 +- qdl/pom.xml | 14 +- .../server/qdl/ClientManagementCommands.java | 2 +- .../server/qdl/storage/ApprovalStemMC.java | 2 +- .../oa4mp/server/qdl/storage/StoreFacade.java | 2 +- .../oa4mp/server/qdl/storage/TXRStemMC.java | 2 +- .../server/qdl/storage/TransactionStemMC.java | 2 +- server-admin/pom.xml | 22 +- .../oauth2/base/BaseClientStoreCommands.java | 8 +- .../base/ClientApprovalStoreCommands.java | 2 +- .../oauth2/base/ClientStoreCommands.java | 2 +- .../oauth2/tools/OA2AdminClientCommands.java | 4 +- .../myproxy/oauth2/tools/OA2CLCCommands.java | 2 +- .../oauth2/tools/OA2ClientCommands.java | 4 +- .../oauth2/tools/migrate/FSMigrater.java | 6 +- .../src/main/scripts/installer/version.txt | 2 +- server-api/pom.xml | 22 +- .../server/api/ClientApprovalProvider.java | 2 +- .../server/api/OA4MPServiceTransaction.java | 2 +- .../oa4mp/server/api/ServiceEnvironment.java | 21 +- .../server/api/ServiceEnvironmentImpl.java | 14 +- .../api/admin/adminClient/AdminClientFS.java | 4 +- .../adminClient/AdminClientMemoryStore.java | 4 +- .../adminClient/AdminClientSQLStore.java | 2 +- .../admin/adminClient/AdminClientStore.java | 2 +- .../transactions/DSSQLTransactionStore.java | 2 +- .../DSSQLTransactionStoreProvider.java | 2 +- .../admin/transactions/DSTransactionKeys.java | 2 +- .../transactions/DSTransactionProvider.java | 2 +- .../transactions/DSTransactionTable.java | 2 +- .../transactions/TransactionConverter.java | 4 +- .../TransactionStoreProviders.java | 2 +- .../MultiDSClientApprovalStoreProvider.java | 4 +- .../storage/MultiDSClientStoreProvider.java | 6 +- .../filestore/DSFSClientApprovalStore.java | 4 +- .../storage/filestore/DSFSClientStore.java | 2 +- .../server/api/storage/servlet/ACS2.java | 8 +- .../servlet/AbstractAccessTokenServlet.java | 6 +- .../servlet/AbstractAuthorizationServlet.java | 4 +- .../storage/servlet/AbstractCertServlet.java | 8 +- .../servlet/AbstractConfigurationLoader.java | 4 +- .../storage/servlet/AbstractInitServlet.java | 8 +- .../servlet/AbstractRegistrationServlet.java | 6 +- .../AuthorizationControllerServlet.java | 4 +- .../storage/servlet/AuthorizedServlet.java | 2 +- .../servlet/AutoRegistrationServlet.java | 2 +- .../server/api/storage/servlet/CRServlet.java | 4 +- .../servlet/ConfigurationLoaderInterface.java | 10 +- .../api/storage/servlet/DiscoveryServlet.java | 4 +- .../api/storage/servlet/ErrorServlet.java | 4 +- .../servlet/IssuerTransactionState.java | 2 +- .../servlet/MyProxyDelegationServlet.java | 12 +- .../servlet/OA4MPExceptionHandler.java | 2 +- .../storage/sql/SQLClientApprovalStore.java | 4 +- .../api/storage/sql/SQLClientStore.java | 4 +- .../server/api/util/AbstractCLIApprover.java | 2 +- .../api/util/ClientApprovalMemoryStore.java | 4 +- .../api/util/ClientApproverConverter.java | 2 +- .../server/api/util/ClientDebugUtil.java | 2 +- server-installer/buildNumber.properties | 4 +- server-installer/pom.xml | 19 +- server-loader/pom.xml | 26 +- .../org/oa4mp/server/loader/oauth2/OA2SE.java | 10 +- .../oauth2/claims/BasicClaimsSourceImpl.java | 2 +- .../loader/oauth2/claims/FSClaimSource.java | 2 +- .../oauth2/claims/HTTPHeaderClaimsSource.java | 2 +- .../oauth2/claims/LDAPClaimsSource.java | 2 +- .../oauth2/claims/QDLHeadersClaimsSource.java | 2 +- .../loader/oauth2/claims/TestClaimSource.java | 2 +- .../loader/oauth2/cm/ManagerFacade.java | 2 +- .../oauth2/cm/oidc_cm/OIDCCMServlet.java | 6 +- .../oauth2/cm/util/AbstractDDServer.java | 6 +- .../oauth2/cm/util/client/ClientServer.java | 2 +- .../oauth2/loader/OA2ConfigurationLoader.java | 12 +- .../oauth2/loader/OA2ServletInitializer.java | 2 +- .../servlet/AbstractAccessTokenServlet2.java | 6 +- .../oauth2/servlet/MultiAuthServlet.java | 2 +- .../servlet/OA2AdminRegistrationServlet.java | 2 +- .../oauth2/servlet/OA2AuthorizedServlet.java | 4 +- .../servlet/OA2AuthorizedServletUtil.java | 8 +- .../servlet/OA2AutoRegistrationServlet.java | 2 +- .../loader/oauth2/servlet/OA2ClientUtils.java | 2 +- .../oauth2/servlet/OA2ExceptionHandler.java | 4 +- .../servlet/OA2RegistrationServlet.java | 2 +- .../server/loader/oauth2/servlet/RFC7009.java | 2 +- .../oauth2/servlet/TokenManagerServlet.java | 4 +- .../oauth2/servlet/UserInfoServlet.java | 4 +- .../storage/clients/OA2ClientMemoryStore.java | 2 +- .../storage/transactions/OA2TConverter.java | 2 +- .../oauth2/storage/tx/TXRecordConverter.java | 2 +- server-test/buildNumber.properties | 4 +- server-test/pom.xml | 52 +- .../oa4mp/server}/test/AdminClientTest.java | 17 +- .../server}/test/AttributeServerTest.java | 2 +- .../server}/test/ClientConfigurationTest.java | 2 +- .../oa4mp/server}/test/ClientManagerTest.java | 6 +- .../oa4mp/server}/test/ClientServerTest.java | 4 +- .../oa4mp/server}/test/CommandLine.java | 2 +- .../oa4mp/server}/test/DDServerTests.java | 6 +- .../oa4mp/server}/test/HTTPTester.java | 2 +- .../oa4mp/server}/test/OA2FunctorTests.java | 2 +- .../server}/test/OA2JSONPreprocessorTest.java | 2 +- .../oa4mp/server}/test/OA2ParserTest.java | 5 +- .../server}/test/PermissionServerTest.java | 2 +- .../oa4mp/server}/test/PermissionTest.java | 4 +- .../oa4mp/server}/test/QDLTestUtils.java | 2 +- .../{ => org/oa4mp/server}/test/QDLTests.java | 2 +- .../server}/test/RefreshTokenStoreTest.java | 4 +- .../oa4mp/server}/test/ServiceTestSuite2.java | 2 +- .../{ => org/oa4mp/server}/test/TestAD.java | 2 +- .../server}/test/TestStoreProvider2.java | 2 +- .../server}/test/TestSuiteInitializer.java | 2 +- .../oa4mp/server}/test/ThingTester.java | 2 +- .../oa4mp/server}/test/TokenTest2.java | 2 +- server/pom.xml | 14 +- .../delegation/server/ExceptionWrapper.java | 2 +- .../server/MissingTokenException.java | 2 +- .../server/NoSuchClientException.java | 2 +- .../delegation/server/ServiceTransaction.java | 2 +- .../server/ServiceTransactionProvider.java | 2 +- .../server/UnapprovedClientException.java | 2 +- .../server/WrongPasswordException.java | 2 +- .../delegation/server/issuers/AGIssuer.java | 6 +- .../delegation/server/issuers/ATIssuer.java | 6 +- .../server/issuers/AbstractIssuer.java | 2 +- .../delegation/server/issuers/CBIssuer.java | 6 +- .../server/issuers/IssuerProvider.java | 2 +- .../delegation/server/issuers/PAIssuer.java | 6 +- .../oa4mp/delegation/server/package.html | 0 .../delegation/server/request/AGRequest.java | 6 +- .../delegation/server/request/AGResponse.java | 4 +- .../delegation/server/request/ATRequest.java | 6 +- .../delegation/server/request/ATResponse.java | 2 +- .../delegation/server/request/CBRequest.java | 6 +- .../delegation/server/request/CBResponse.java | 2 +- .../server/request/IssuerRequest.java | 4 +- .../server/request/IssuerResponse.java | 2 +- .../delegation/server/request/PARequest.java | 6 +- .../delegation/server/request/PAResponse.java | 2 +- .../server/storage/AggregateCAStore.java | 2 +- .../server/storage/AggregateClientStore.java | 4 +- .../server/storage/BaseClientSQLStore.java | 8 +- .../server/storage/BaseClientStore.java | 2 +- .../server/storage/ClientApproval.java | 2 +- .../server/storage/ClientApprovalStore.java | 2 +- .../server/storage/ClientStore.java | 2 +- .../storage/SQLServiceTransactionStore.java | 4 +- .../storage/impl/ClientMemoryStore.java | 6 +- .../storage/impl/ClientStoreProvider.java | 4 +- .../storage/impl/FSClientApprovalStore.java | 6 +- .../server/storage/impl/FSClientStore.java | 6 +- .../storage/impl/GenericClientStoreUtils.java | 14 +- .../support/ServiceTransactionConverter.java | 4 +- .../support/ServiceTransactionKeys.java | 2 +- .../support/ServiceTransactionTable.java | 2 +- .../server/storage/upkeep/UpkeepThread.java | 2 +- .../server/storage/uuc/AbandonedRule.java | 2 +- .../server/storage/uuc/DateThingy.java | 2 +- .../delegation/server/storage/uuc/GPRule.java | 2 +- .../server/storage/uuc/ListRule.java | 2 +- .../server/storage/uuc/MetaRule.java | 2 +- .../server/storage/uuc/ResultStats.java | 2 +- .../server/storage/uuc/RuleFilter.java | 2 +- .../server/storage/uuc/UUCConfiguration.java | 2 +- .../server/storage/uuc/UUCResponse.java | 2 +- .../storage/uuc/UUCRetentionPolicy.java | 2 +- .../server/storage/uuc/UUCThread.java | 4 +- .../server/storage/uuc/UnusedRule.java | 2 +- skin/pom.xml | 9 +- website/pom.xml | 56 +- website/src/site/site.xml | 4 +- .../xhtml/client/manuals/api-reference.xhtml | 4 +- .../common/configuration/derby-store.xhtml | 2 +- .../server/dtd/server-dtd-content-tags.xhtml | 12 +- .../src/site/xhtml/server/manuals/cli.xhtml | 2 +- .../server/manuals/getting-started.xhtml | 2 +- 555 files changed, 2236 insertions(+), 4216 deletions(-) rename client/src/main/java/org/oa4mp/delegation/{ => client}/AbstractClientEnvironment.java (96%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/AbstractDelegationServiceProvider.java (95%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/DelegationService.java (96%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/AGRequest.java (81%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/AGResponse.java (92%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/ATRequest.java (95%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/ATResponse.java (91%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/BasicRequest.java (98%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/BasicResponse.java (92%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/CallbackRequest.java (94%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/CallbackResponse.java (94%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/DelegatedAssetRequest.java (94%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/DelegatedAssetResponse.java (96%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/DelegationRequest.java (89%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/DelegationResponse.java (94%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/PARequest.java (87%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/PAResponse.java (95%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/RFC7009Request.java (82%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/RFC7009Response.java (73%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/RFC7523Request.java (89%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/RFC7523Response.java (94%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/RFC7662Request.java (90%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/RFC7662Response.java (88%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/RTRequest.java (92%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/RTResponse.java (98%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/UIRequest.java (90%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/request/UIResponse.java (93%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/server/AGServer.java (67%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/server/ATServer.java (69%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/server/CBServer.java (67%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/server/PAServer.java (67%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/server/RFC7009Server.java (51%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/server/RFC7662Server.java (51%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/server/RTServer.java (76%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/server/ResourceOwner.java (89%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/server/UIServer.java (69%) rename client/src/main/java/org/oa4mp/delegation/{ => client}/server/package.html (100%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/AdminClientTest.java (97%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/AttributeServerTest.java (99%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/ClientConfigurationTest.java (99%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/ClientManagerTest.java (98%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/ClientServerTest.java (99%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/CommandLine.java (98%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/DDServerTests.java (98%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/HTTPTester.java (98%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/OA2FunctorTests.java (99%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/OA2JSONPreprocessorTest.java (99%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/OA2ParserTest.java (98%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/PermissionServerTest.java (99%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/PermissionTest.java (98%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/QDLTestUtils.java (98%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/QDLTests.java (99%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/RefreshTokenStoreTest.java (97%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/ServiceTestSuite2.java (99%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/TestAD.java (98%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/TestStoreProvider2.java (96%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/TestSuiteInitializer.java (99%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/ThingTester.java (99%) rename server-test/src/test/java/{ => org/oa4mp/server}/test/TokenTest2.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/ExceptionWrapper.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/MissingTokenException.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/NoSuchClientException.java (91%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/ServiceTransaction.java (98%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/ServiceTransactionProvider.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/UnapprovedClientException.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/WrongPasswordException.java (91%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/issuers/AGIssuer.java (59%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/issuers/ATIssuer.java (59%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/issuers/AbstractIssuer.java (95%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/issuers/CBIssuer.java (59%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/issuers/IssuerProvider.java (91%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/issuers/PAIssuer.java (58%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/package.html (100%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/request/AGRequest.java (80%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/request/AGResponse.java (78%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/request/ATRequest.java (89%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/request/ATResponse.java (87%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/request/CBRequest.java (91%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/request/CBResponse.java (70%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/request/IssuerRequest.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/request/IssuerResponse.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/request/PARequest.java (85%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/request/PAResponse.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/AggregateCAStore.java (96%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/AggregateClientStore.java (87%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/BaseClientSQLStore.java (98%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/BaseClientStore.java (94%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/ClientApproval.java (98%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/ClientApprovalStore.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/ClientStore.java (86%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/SQLServiceTransactionStore.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/impl/ClientMemoryStore.java (90%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/impl/ClientStoreProvider.java (83%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/impl/FSClientApprovalStore.java (91%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/impl/FSClientStore.java (90%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/impl/GenericClientStoreUtils.java (90%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/support/ServiceTransactionConverter.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/support/ServiceTransactionKeys.java (95%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/support/ServiceTransactionTable.java (95%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/upkeep/UpkeepThread.java (98%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/AbandonedRule.java (89%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/DateThingy.java (92%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/GPRule.java (89%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/ListRule.java (97%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/MetaRule.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/ResultStats.java (93%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/RuleFilter.java (99%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/UUCConfiguration.java (99%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/UUCResponse.java (96%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/UUCRetentionPolicy.java (98%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/UUCThread.java (94%) rename server/src/main/java/{edu/uiuc/ncsa => org}/oa4mp/delegation/server/storage/uuc/UnusedRule.java (83%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 03a682c94..dd8310205 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,511 +10,72 @@