[java-idp-plugin-vci] 07/08: Refactor packages and file locations
Codeberg
noreply at shibboleth.net
Fri Sep 4 08:37:36 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch dev/CHECKSTYLE
in repository java-idp-plugin-vci.
View the commit online:
https://codeberg.org/Shibboleth/java-idp-plugin-vci/commit/74988735281ed3a315aadf48be3b18f232eaf742
commit 74988735281ed3a315aadf48be3b18f232eaf742
Author: Janne Lauros <janne.lauros at csc.fi>
AuthorDate: Fri Sep 4 10:21:09 2026 +0300
Refactor packages and file locations
---
openid-vci-api/pom.xml | 20 ++++++++++++++++++++
.../profile}/config/OpenIDVCIConfiguration.java | 2 +-
.../statuslist/MonthlyBucketStrategy.java | 2 +-
.../statuslist/StatusListBucket.java | 2 +-
.../statuslist/StatusListCodec.java | 2 +-
.../statuslist/StatusListParameters.java | 2 +-
.../statuslist/context/StatusListContext.java | 2 +-
.../statuslist/context/StatusListTokenContext.java | 2 +-
.../statuslist/messaging/error/StatusListError.java | 2 +-
.../statuslist/profile/StatusListEventIds.java | 2 +-
.../impl}/SelectiveDisclosureClaimSetUtil.java | 2 +-
.../impl}/SelectiveDisclosureClaimTree.java | 2 +-
.../config/impl/AbstractOpenIDVCIConfiguration.java | 4 ++--
...DefaultOpenIDVCICredentialOfferConfiguration.java | 4 ++--
.../DefaultOpenIDVCICredentialsConfiguration.java | 4 ++--
.../DefaultOpenIDVCIIssuerMetadataConfiguration.java | 2 +-
.../impl/DefaultOpenIDVCINonceConfiguration.java | 4 ++--
.../impl/DefaultOpenIDVCITokenConfiguration.java | 4 ++--
...lSignatureSigningConfigurationLookupFunction.java | 6 +++---
...aSignatureSigningConfigurationLookupFunction.java | 4 ++--
.../navigate/ProofNonceGeneratorLookupFunction.java | 4 ++--
...gnatureValidationConfigurationLookupFunction.java | 4 ++--
.../openidvci/profile/impl/AddCredentialShell.java | 6 +++---
.../profile/impl/BuildCredentialOfferToken.java | 2 +-
.../FormJsonLdSelectiveDisclosureJWTCredential.java | 4 ++--
.../impl/FormOutboundNonceResponseMessage.java | 2 +-
.../impl/FormSelectiveDisclosureJWTCredential.java | 2 +-
.../plugin/openidvci/profile/impl/ParseProof.java | 2 +-
.../profile/impl/ResolveCredentialLifetime.java | 2 +-
.../openidvci/profile/impl/SignJWTCredential.java | 2 +-
.../logic/CredentialIssuerLookupFunction.java | 2 +-
.../security/impl}/DidJwkSupport.java | 2 +-
.../JWTMessageSignaturesSecurityHandler.java | 2 +-
.../security/{ => impl}/TokenKeyTrustEngine.java | 2 +-
...rithmRestrictedSignatureSigningConfiguration.java | 2 +-
.../impl/StatusListAssignmentsRequestDecoder.java | 4 ++--
.../impl/StatusListRevokeRequestDecoder.java | 6 +++---
.../messaging/impl/StatusListAssignmentsRequest.java | 2 +-
.../impl/StatusListAssignmentsSuccessResponse.java | 4 ++--
.../messaging/impl/StatusListRevokeRequest.java | 4 ++--
.../impl/StatusListRevokeSuccessResponse.java | 2 +-
.../messaging/impl/StatusListSuccessResponse.java | 2 +-
.../DefaultStatusListAssignmentsConfiguration.java | 4 ++--
.../config/impl}/DefaultStatusListConfiguration.java | 2 +-
.../impl}/DefaultStatusListRevokeConfiguration.java | 4 ++--
...tSignatureSigningConfigurationLookupFunction.java | 4 ++--
.../statuslist/profile/impl/AllocateIndex.java | 12 ++++++------
.../statuslist/profile/impl/AssignIndex.java | 10 +++++-----
...OutboundStatusListAssignmentsResponseMessage.java | 10 +++++-----
.../impl/FormOutboundStatusListResponseMessage.java | 6 +++---
.../FormOutboundStatusListRevokeResponseMessage.java | 4 ++--
.../statuslist/profile/impl/FormStatusListToken.java | 18 +++++++++---------
.../profile/impl/RevokeStatusListIndex.java | 12 ++++++------
.../statuslist/profile/impl/SignStatusListToken.java | 6 +++---
.../statuslist/storage/FeistelIndexPermutation.java | 2 +-
.../statuslist/storage/StatusListAssignment.java | 2 +-
.../storage/StatusListAssignmentStore.java | 2 +-
.../statuslist/storage/StatusListAssignments.java | 2 +-
.../statuslist/storage/StatusListIndexAllocator.java | 6 +++---
.../statuslist/storage/StatusListStore.java | 10 +++++-----
.../flows/oauth/status-list/assign/assign-beans.xml | 8 ++++----
.../status-list/assignments/assignments-beans.xml | 6 +++---
.../idp/flows/oauth/status-list/list/list-beans.xml | 20 ++++++++++----------
.../flows/oauth/status-list/revoke/revoke-beans.xml | 8 ++++----
.../openid/vci/credentials/credentials-beans.xml | 8 ++++----
.../vci/issuer-metadata/issuer-metadata-beans.xml | 2 +-
.../idp/service/relying-party/postconfig.xml | 20 ++++++++++----------
.../impl}/SelectiveDisclosureClaimSetUtilTest.java | 2 +-
.../impl}/SelectiveDisclosureClaimTreeTest.java | 2 +-
.../logic/CredentialIssuerLookupFunctionTest.java | 2 +-
.../security/impl}/DidJwkSupportTest.java | 2 +-
.../statuslist/StatusListCodecTest.java | 2 +-
.../statuslist/profile/impl/AllocateIndexTest.java | 8 ++++----
.../storage/FeistelIndexPermutationTest.java | 4 ++--
.../storage/StatusListAssignmentStoreTest.java | 2 +-
.../storage/StatusListIndexAllocatorTest.java | 4 ++--
.../statuslist/storage/StatusListStoreTest.java | 8 ++++----
77 files changed, 191 insertions(+), 171 deletions(-)
diff --git a/openid-vci-api/pom.xml b/openid-vci-api/pom.xml
index 5de1ebc..fa8ea60 100644
--- a/openid-vci-api/pom.xml
+++ b/openid-vci-api/pom.xml
@@ -50,6 +50,26 @@
<artifactId>opensaml-profile-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-profile.groupId}</groupId>
+ <artifactId>shib-profile-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>${oidc-common.groupId}</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.testng</groupId>
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/OpenIDVCIConfiguration.java b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/OpenIDVCIConfiguration.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/OpenIDVCIConfiguration.java
rename to openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/OpenIDVCIConfiguration.java
index 4498346..b2ed24d 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/OpenIDVCIConfiguration.java
+++ b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/OpenIDVCIConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config;
+package org.geant.shibboleth.plugin.openidvci.profile.config;
import java.time.Duration;
import java.util.function.Function;
diff --git a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/MonthlyBucketStrategy.java b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/MonthlyBucketStrategy.java
similarity index 97%
rename from openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/MonthlyBucketStrategy.java
rename to openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/MonthlyBucketStrategy.java
index 5e5de32..0b1aa65 100644
--- a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/MonthlyBucketStrategy.java
+++ b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/MonthlyBucketStrategy.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist;
+package org.geant.shibboleth.plugin.openidvci.statuslist;
import java.time.Instant;
import java.time.YearMonth;
diff --git a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListBucket.java b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListBucket.java
similarity index 95%
rename from openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListBucket.java
rename to openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListBucket.java
index 8a3d844..e04d416 100644
--- a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListBucket.java
+++ b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListBucket.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist;
+package org.geant.shibboleth.plugin.openidvci.statuslist;
import java.time.Instant;
diff --git a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListCodec.java b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListCodec.java
similarity index 98%
rename from openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListCodec.java
rename to openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListCodec.java
index 2ca2bc9..b0c1cd0 100644
--- a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListCodec.java
+++ b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListCodec.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist;
+package org.geant.shibboleth.plugin.openidvci.statuslist;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListParameters.java b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListParameters.java
similarity index 98%
rename from openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListParameters.java
rename to openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListParameters.java
index 505d8f2..1e3f504 100644
--- a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListParameters.java
+++ b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListParameters.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist;
+package org.geant.shibboleth.plugin.openidvci.statuslist;
import java.time.Duration;
diff --git a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/context/StatusListContext.java b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/context/StatusListContext.java
similarity index 97%
rename from openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/context/StatusListContext.java
rename to openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/context/StatusListContext.java
index 0030101..a865de3 100644
--- a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/context/StatusListContext.java
+++ b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/context/StatusListContext.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.context;
+package org.geant.shibboleth.plugin.openidvci.statuslist.context;
import java.util.List;
diff --git a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/context/StatusListTokenContext.java b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/context/StatusListTokenContext.java
similarity index 96%
rename from openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/context/StatusListTokenContext.java
rename to openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/context/StatusListTokenContext.java
index 1d0954d..bb165a5 100644
--- a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/context/StatusListTokenContext.java
+++ b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/context/StatusListTokenContext.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.context;
+package org.geant.shibboleth.plugin.openidvci.statuslist.context;
import javax.annotation.Nullable;
diff --git a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/error/StatusListError.java b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/error/StatusListError.java
similarity index 95%
rename from openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/error/StatusListError.java
rename to openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/error/StatusListError.java
index 61160e9..0994148 100644
--- a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/error/StatusListError.java
+++ b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/error/StatusListError.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.messaging.error;
+package org.geant.shibboleth.plugin.openidvci.statuslist.messaging.error;
import javax.annotation.Nonnull;
diff --git a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/StatusListEventIds.java b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/StatusListEventIds.java
similarity index 94%
rename from openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/StatusListEventIds.java
rename to openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/StatusListEventIds.java
index e06e57d..f4d7170 100644
--- a/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/StatusListEventIds.java
+++ b/openid-vci-api/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/StatusListEventIds.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.profile;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile;
import javax.annotation.Nonnull;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimSetUtil.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimSetUtil.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimSetUtil.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimSetUtil.java
index 1c0d76a..c01b398 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimSetUtil.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimSetUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.util;
+package org.geant.shibboleth.plugin.openidvci.credential.impl;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimTree.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimTree.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimTree.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimTree.java
index 5f70872..564e2e4 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimTree.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimTree.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.util;
+package org.geant.shibboleth.plugin.openidvci.credential.impl;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/AbstractOpenIDVCIConfiguration.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/AbstractOpenIDVCIConfiguration.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/AbstractOpenIDVCIConfiguration.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/AbstractOpenIDVCIConfiguration.java
index b5daee7..f0e105d 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/AbstractOpenIDVCIConfiguration.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/AbstractOpenIDVCIConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config.impl;
+package org.geant.shibboleth.plugin.openidvci.profile.config.impl;
import java.time.Duration;
import java.util.function.Function;
@@ -22,7 +22,7 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.oidc.jwt.claims.ClaimsValidator;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCICredentialOfferConfiguration.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCICredentialOfferConfiguration.java
similarity index 84%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCICredentialOfferConfiguration.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCICredentialOfferConfiguration.java
index 0a85358..985d655 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCICredentialOfferConfiguration.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCICredentialOfferConfiguration.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config.impl;
+package org.geant.shibboleth.plugin.openidvci.profile.config.impl;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
public class DefaultOpenIDVCICredentialOfferConfiguration extends AbstractOpenIDVCIConfiguration{
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCICredentialsConfiguration.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCICredentialsConfiguration.java
similarity index 84%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCICredentialsConfiguration.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCICredentialsConfiguration.java
index 4b0a6e7..9961e38 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCICredentialsConfiguration.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCICredentialsConfiguration.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config.impl;
+package org.geant.shibboleth.plugin.openidvci.profile.config.impl;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
public class DefaultOpenIDVCICredentialsConfiguration extends AbstractOpenIDVCIConfiguration{
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCIIssuerMetadataConfiguration.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCIIssuerMetadataConfiguration.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCIIssuerMetadataConfiguration.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCIIssuerMetadataConfiguration.java
index 7026d7f..3034ffe 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCIIssuerMetadataConfiguration.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCIIssuerMetadataConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config.impl;
+package org.geant.shibboleth.plugin.openidvci.profile.config.impl;
import java.util.function.Function;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCINonceConfiguration.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCINonceConfiguration.java
similarity index 84%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCINonceConfiguration.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCINonceConfiguration.java
index 417abab..7ab4a30 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCINonceConfiguration.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCINonceConfiguration.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config.impl;
+package org.geant.shibboleth.plugin.openidvci.profile.config.impl;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
public class DefaultOpenIDVCINonceConfiguration extends AbstractOpenIDVCIConfiguration{
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCITokenConfiguration.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCITokenConfiguration.java
similarity index 84%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCITokenConfiguration.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCITokenConfiguration.java
index a332e31..44a7618 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/impl/DefaultOpenIDVCITokenConfiguration.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/impl/DefaultOpenIDVCITokenConfiguration.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config.impl;
+package org.geant.shibboleth.plugin.openidvci.profile.config.impl;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
public class DefaultOpenIDVCITokenConfiguration extends AbstractOpenIDVCIConfiguration{
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/CredentialSignatureSigningConfigurationLookupFunction.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/CredentialSignatureSigningConfigurationLookupFunction.java
similarity index 95%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/CredentialSignatureSigningConfigurationLookupFunction.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/CredentialSignatureSigningConfigurationLookupFunction.java
index 89c637e..ef13df1 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/CredentialSignatureSigningConfigurationLookupFunction.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/CredentialSignatureSigningConfigurationLookupFunction.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config.navigate;
+package org.geant.shibboleth.plugin.openidvci.profile.config.navigate;
import java.util.List;
import java.util.function.Function;
@@ -21,10 +21,10 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
import org.geant.shibboleth.plugin.openidvci.credential.CredentialConfiguration;
import org.geant.shibboleth.plugin.openidvci.messaging.context.CredentialsContext;
-import org.geant.shibboleth.plugin.openidvci.security.jose.AlgorithmRestrictedSignatureSigningConfiguration;
+import org.geant.shibboleth.plugin.openidvci.security.jose.impl.AlgorithmRestrictedSignatureSigningConfiguration;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.context.navigate.InboundMessageContextLookup;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/IssuerMetadataSignatureSigningConfigurationLookupFunction.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/IssuerMetadataSignatureSigningConfigurationLookupFunction.java
similarity index 92%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/IssuerMetadataSignatureSigningConfigurationLookupFunction.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/IssuerMetadataSignatureSigningConfigurationLookupFunction.java
index 6502feb..836d97f 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/IssuerMetadataSignatureSigningConfigurationLookupFunction.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/IssuerMetadataSignatureSigningConfigurationLookupFunction.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config.navigate;
+package org.geant.shibboleth.plugin.openidvci.profile.config.navigate;
import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.openidvci.config.impl.DefaultOpenIDVCIIssuerMetadataConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.impl.DefaultOpenIDVCIIssuerMetadataConfiguration;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/ProofNonceGeneratorLookupFunction.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/ProofNonceGeneratorLookupFunction.java
similarity index 92%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/ProofNonceGeneratorLookupFunction.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/ProofNonceGeneratorLookupFunction.java
index 7512244..e46ff8f 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/ProofNonceGeneratorLookupFunction.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/ProofNonceGeneratorLookupFunction.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config.navigate;
+package org.geant.shibboleth.plugin.openidvci.profile.config.navigate;
import java.util.function.Function;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.profile.config.ProfileConfiguration;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/ProofSignatureValidationConfigurationLookupFunction.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/ProofSignatureValidationConfigurationLookupFunction.java
similarity index 93%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/ProofSignatureValidationConfigurationLookupFunction.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/ProofSignatureValidationConfigurationLookupFunction.java
index 9f6b25a..352d28a 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/config/navigate/ProofSignatureValidationConfigurationLookupFunction.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/config/navigate/ProofSignatureValidationConfigurationLookupFunction.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.config.navigate;
+package org.geant.shibboleth.plugin.openidvci.profile.config.navigate;
import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.profile.config.ProfileConfiguration;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/AddCredentialShell.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/AddCredentialShell.java
index 8e962c8..6386ef9 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/AddCredentialShell.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/AddCredentialShell.java
@@ -35,9 +35,9 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
-import org.geant.shibboleth.plugin.oauth.profile.logic.CredentialIssuerLookupFunction;
-import org.geant.shibboleth.plugin.oauth.statuslist.context.StatusListContext;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.logic.CredentialIssuerLookupFunction;
+import org.geant.shibboleth.plugin.openidvci.statuslist.context.StatusListContext;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
import org.geant.shibboleth.plugin.openidvci.messaging.context.CredentialsContext;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.ActionSupport;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/BuildCredentialOfferToken.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/BuildCredentialOfferToken.java
index 95eac6c..e88754e 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/BuildCredentialOfferToken.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/BuildCredentialOfferToken.java
@@ -22,7 +22,7 @@ import java.time.Instant;
import java.util.function.Function;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
import org.geant.shibboleth.plugin.openidvci.messaging.impl.CredentialOfferRequest;
import org.geant.shibboleth.plugin.openidvci.messaging.context.CredentialOfferContext;
import org.geant.shibboleth.plugin.openidvci.storage.CredentialOfferObject;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormJsonLdSelectiveDisclosureJWTCredential.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormJsonLdSelectiveDisclosureJWTCredential.java
index ba7bc5e..83207a2 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormJsonLdSelectiveDisclosureJWTCredential.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormJsonLdSelectiveDisclosureJWTCredential.java
@@ -23,11 +23,11 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.oauth.profile.logic.CredentialIssuerLookupFunction;
+import org.geant.shibboleth.plugin.openidvci.profile.logic.CredentialIssuerLookupFunction;
import org.geant.shibboleth.plugin.openidvci.messaging.context.CredentialsContext;
import org.geant.shibboleth.plugin.openidvci.messaging.impl.CredentialOfferRequestedCredential;
import org.geant.shibboleth.plugin.openidvci.profile.OpenIDVCIEventIds;
-import org.geant.shibboleth.plugin.openidvci.util.SelectiveDisclosureClaimTree;
+import org.geant.shibboleth.plugin.openidvci.credential.impl.SelectiveDisclosureClaimTree;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormOutboundNonceResponseMessage.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormOutboundNonceResponseMessage.java
index 059e33a..aaa5b61 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormOutboundNonceResponseMessage.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormOutboundNonceResponseMessage.java
@@ -20,7 +20,7 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
import org.geant.shibboleth.plugin.openidvci.messaging.impl.NonceSuccessResponse;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.ActionSupport;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormSelectiveDisclosureJWTCredential.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormSelectiveDisclosureJWTCredential.java
index 490df3b..9444e2f 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormSelectiveDisclosureJWTCredential.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/FormSelectiveDisclosureJWTCredential.java
@@ -24,7 +24,7 @@ import javax.annotation.Nonnull;
import org.geant.shibboleth.plugin.openidvci.messaging.context.CredentialsContext;
import org.geant.shibboleth.plugin.openidvci.messaging.impl.CredentialOfferRequestedCredential;
import org.geant.shibboleth.plugin.openidvci.profile.OpenIDVCIEventIds;
-import org.geant.shibboleth.plugin.openidvci.util.SelectiveDisclosureClaimTree;
+import org.geant.shibboleth.plugin.openidvci.credential.impl.SelectiveDisclosureClaimTree;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/ParseProof.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/ParseProof.java
index d86ac67..dd49b84 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/ParseProof.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/ParseProof.java
@@ -25,7 +25,7 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
import org.geant.shibboleth.plugin.openidvci.messaging.context.CredentialsContext;
import org.geant.shibboleth.plugin.openidvci.messaging.impl.OpenIDVCICredentialsRequest;
import org.geant.shibboleth.plugin.openidvci.profile.OpenIDVCIEventIds;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/ResolveCredentialLifetime.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/ResolveCredentialLifetime.java
index 0ff21bb..b6cf2fa 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/ResolveCredentialLifetime.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/ResolveCredentialLifetime.java
@@ -30,7 +30,7 @@ import net.shibboleth.profile.context.RelyingPartyContext;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
-import org.geant.shibboleth.plugin.openidvci.config.OpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.OpenIDVCIConfiguration;
import org.geant.shibboleth.plugin.openidvci.messaging.context.CredentialsContext;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.ActionSupport;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/SignJWTCredential.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/SignJWTCredential.java
index 8b0bbb8..9d0b5f2 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/SignJWTCredential.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/impl/SignJWTCredential.java
@@ -23,7 +23,7 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.oauth.security.DidJwkSupport;
+import org.geant.shibboleth.plugin.openidvci.security.impl.DidJwkSupport;
import org.geant.shibboleth.plugin.openidvci.messaging.context.CredentialsContext;
import org.geant.shibboleth.plugin.openidvci.messaging.impl.OpenIDVCICredentialsRequest;
import org.geant.shibboleth.plugin.openidvci.profile.OpenIDVCIEventIds;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/profile/logic/CredentialIssuerLookupFunction.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/logic/CredentialIssuerLookupFunction.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/profile/logic/CredentialIssuerLookupFunction.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/logic/CredentialIssuerLookupFunction.java
index 3481ce4..3ebb165 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/profile/logic/CredentialIssuerLookupFunction.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/profile/logic/CredentialIssuerLookupFunction.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.profile.logic;
+package org.geant.shibboleth.plugin.openidvci.profile.logic;
import java.security.PublicKey;
import java.security.interfaces.ECPublicKey;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/security/DidJwkSupport.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/impl/DidJwkSupport.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/security/DidJwkSupport.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/impl/DidJwkSupport.java
index 29de09e..7509889 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/security/DidJwkSupport.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/impl/DidJwkSupport.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.security;
+package org.geant.shibboleth.plugin.openidvci.security.impl;
import java.security.PrivateKey;
import java.security.PublicKey;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/JWTMessageSignaturesSecurityHandler.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/impl/JWTMessageSignaturesSecurityHandler.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/JWTMessageSignaturesSecurityHandler.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/impl/JWTMessageSignaturesSecurityHandler.java
index 5223444..ecba1a1 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/JWTMessageSignaturesSecurityHandler.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/impl/JWTMessageSignaturesSecurityHandler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.security;
+package org.geant.shibboleth.plugin.openidvci.security.impl;
import java.text.ParseException;
import java.util.List;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/TokenKeyTrustEngine.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/impl/TokenKeyTrustEngine.java
similarity index 97%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/TokenKeyTrustEngine.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/impl/TokenKeyTrustEngine.java
index 771e256..5311a30 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/TokenKeyTrustEngine.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/impl/TokenKeyTrustEngine.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.security;
+package org.geant.shibboleth.plugin.openidvci.security.impl;
import java.security.PublicKey;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/jose/AlgorithmRestrictedSignatureSigningConfiguration.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/jose/impl/AlgorithmRestrictedSignatureSigningConfiguration.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/jose/AlgorithmRestrictedSignatureSigningConfiguration.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/jose/impl/AlgorithmRestrictedSignatureSigningConfiguration.java
index c684504..15fab32 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/jose/AlgorithmRestrictedSignatureSigningConfiguration.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/security/jose/impl/AlgorithmRestrictedSignatureSigningConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.security.jose;
+package org.geant.shibboleth.plugin.openidvci.security.jose.impl;
import java.util.Collection;
import java.util.List;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/decoding/impl/StatusListAssignmentsRequestDecoder.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/decoding/impl/StatusListAssignmentsRequestDecoder.java
similarity index 92%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/decoding/impl/StatusListAssignmentsRequestDecoder.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/decoding/impl/StatusListAssignmentsRequestDecoder.java
index ccfa594..1e2a2f4 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/decoding/impl/StatusListAssignmentsRequestDecoder.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/decoding/impl/StatusListAssignmentsRequestDecoder.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.decoding.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.decoding.impl;
import java.io.IOException;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl.StatusListAssignmentsRequest;
+import org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl.StatusListAssignmentsRequest;
import org.geant.shibboleth.plugin.openidvci.decoding.impl.BaseOpenIDVCIRequestDecoder;
import net.shibboleth.idp.plugin.oidc.op.decoding.impl.RequestUtil;
import org.opensaml.messaging.decoder.MessageDecodingException;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/decoding/impl/StatusListRevokeRequestDecoder.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/decoding/impl/StatusListRevokeRequestDecoder.java
similarity index 89%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/decoding/impl/StatusListRevokeRequestDecoder.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/decoding/impl/StatusListRevokeRequestDecoder.java
index dd8d144..76c25bd 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/decoding/impl/StatusListRevokeRequestDecoder.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/decoding/impl/StatusListRevokeRequestDecoder.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.decoding.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.decoding.impl;
import java.io.IOException;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListParameters;
-import org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl.StatusListRevokeRequest;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListParameters;
+import org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl.StatusListRevokeRequest;
import org.geant.shibboleth.plugin.openidvci.decoding.impl.BaseOpenIDVCIRequestDecoder;
import net.shibboleth.idp.plugin.oidc.op.decoding.impl.RequestUtil;
import org.opensaml.messaging.decoder.MessageDecodingException;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListAssignmentsRequest.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListAssignmentsRequest.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListAssignmentsRequest.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListAssignmentsRequest.java
index 48e8397..bda4bea 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListAssignmentsRequest.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListAssignmentsRequest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListAssignmentsSuccessResponse.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListAssignmentsSuccessResponse.java
similarity index 93%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListAssignmentsSuccessResponse.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListAssignmentsSuccessResponse.java
index bb6e6cc..0e06350 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListAssignmentsSuccessResponse.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListAssignmentsSuccessResponse.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListAssignments;
+import org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListAssignments;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.nimbusds.common.contenttype.ContentType;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListRevokeRequest.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListRevokeRequest.java
similarity index 97%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListRevokeRequest.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListRevokeRequest.java
index 88f7ee8..40c64fb 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListRevokeRequest.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListRevokeRequest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl;
import java.net.URI;
import java.net.URISyntaxException;
@@ -23,7 +23,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListParameters;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListParameters;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListRevokeSuccessResponse.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListRevokeSuccessResponse.java
similarity index 94%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListRevokeSuccessResponse.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListRevokeSuccessResponse.java
index 0321466..8d03def 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListRevokeSuccessResponse.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListRevokeSuccessResponse.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl;
import com.nimbusds.oauth2.sdk.SuccessResponse;
import com.nimbusds.oauth2.sdk.http.HTTPResponse;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListSuccessResponse.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListSuccessResponse.java
similarity index 97%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListSuccessResponse.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListSuccessResponse.java
index 5192dd8..1cdb5e4 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/messaging/impl/StatusListSuccessResponse.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/messaging/impl/StatusListSuccessResponse.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl;
import java.text.ParseException;
import java.time.ZonedDateTime;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/DefaultStatusListAssignmentsConfiguration.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/impl/DefaultStatusListAssignmentsConfiguration.java
similarity index 87%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/DefaultStatusListAssignmentsConfiguration.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/impl/DefaultStatusListAssignmentsConfiguration.java
index f9643b5..3d2138c 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/DefaultStatusListAssignmentsConfiguration.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/impl/DefaultStatusListAssignmentsConfiguration.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.config;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.config.impl;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.openidvci.config.impl.AbstractOpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.impl.AbstractOpenIDVCIConfiguration;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/DefaultStatusListConfiguration.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/impl/DefaultStatusListConfiguration.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/DefaultStatusListConfiguration.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/impl/DefaultStatusListConfiguration.java
index 0ed6b15..e944b20 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/DefaultStatusListConfiguration.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/impl/DefaultStatusListConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.config;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.config.impl;
import java.util.function.Function;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/DefaultStatusListRevokeConfiguration.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/impl/DefaultStatusListRevokeConfiguration.java
similarity index 87%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/DefaultStatusListRevokeConfiguration.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/impl/DefaultStatusListRevokeConfiguration.java
index d7e1220..9a42ec5 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/DefaultStatusListRevokeConfiguration.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/impl/DefaultStatusListRevokeConfiguration.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.config;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.config.impl;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.openidvci.config.impl.AbstractOpenIDVCIConfiguration;
+import org.geant.shibboleth.plugin.openidvci.profile.config.impl.AbstractOpenIDVCIConfiguration;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/navigate/StatusListSignatureSigningConfigurationLookupFunction.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/navigate/StatusListSignatureSigningConfigurationLookupFunction.java
similarity index 92%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/navigate/StatusListSignatureSigningConfigurationLookupFunction.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/navigate/StatusListSignatureSigningConfigurationLookupFunction.java
index b1b9d76..c61ed83 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/config/navigate/StatusListSignatureSigningConfigurationLookupFunction.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/config/navigate/StatusListSignatureSigningConfigurationLookupFunction.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.config.navigate;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.config.navigate;
import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.oauth.statuslist.config.DefaultStatusListConfiguration;
+import org.geant.shibboleth.plugin.openidvci.statuslist.profile.config.impl.DefaultStatusListConfiguration;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/AllocateIndex.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/AllocateIndex.java
similarity index 95%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/AllocateIndex.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/AllocateIndex.java
index 00a3918..a09170a 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/AllocateIndex.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/AllocateIndex.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.profile.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl;
import java.io.IOException;
import java.net.URI;
@@ -26,11 +26,11 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.oauth.statuslist.MonthlyBucketStrategy;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListBucket;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListParameters;
-import org.geant.shibboleth.plugin.oauth.statuslist.context.StatusListContext;
-import org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListIndexAllocator;
+import org.geant.shibboleth.plugin.openidvci.statuslist.MonthlyBucketStrategy;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListBucket;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListParameters;
+import org.geant.shibboleth.plugin.openidvci.statuslist.context.StatusListContext;
+import org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListIndexAllocator;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/AssignIndex.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/AssignIndex.java
similarity index 93%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/AssignIndex.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/AssignIndex.java
index d418df3..3c45eb8 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/AssignIndex.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/AssignIndex.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.profile.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl;
import java.io.IOException;
import java.time.Instant;
@@ -31,10 +31,10 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
-import org.geant.shibboleth.plugin.oauth.statuslist.MonthlyBucketStrategy;
-import org.geant.shibboleth.plugin.oauth.statuslist.context.StatusListContext;
-import org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListAssignment;
-import org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListAssignmentStore;
+import org.geant.shibboleth.plugin.openidvci.statuslist.MonthlyBucketStrategy;
+import org.geant.shibboleth.plugin.openidvci.statuslist.context.StatusListContext;
+import org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListAssignment;
+import org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListAssignmentStore;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormOutboundStatusListAssignmentsResponseMessage.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormOutboundStatusListAssignmentsResponseMessage.java
similarity index 89%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormOutboundStatusListAssignmentsResponseMessage.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormOutboundStatusListAssignmentsResponseMessage.java
index 8ae8607..820ab13 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormOutboundStatusListAssignmentsResponseMessage.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormOutboundStatusListAssignmentsResponseMessage.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.profile.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl;
import java.io.IOException;
@@ -27,10 +27,10 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
-import org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl.StatusListAssignmentsRequest;
-import org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl.StatusListAssignmentsSuccessResponse;
-import org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListAssignmentStore;
-import org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListAssignments;
+import org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl.StatusListAssignmentsRequest;
+import org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl.StatusListAssignmentsSuccessResponse;
+import org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListAssignmentStore;
+import org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListAssignments;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormOutboundStatusListResponseMessage.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormOutboundStatusListResponseMessage.java
similarity index 93%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormOutboundStatusListResponseMessage.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormOutboundStatusListResponseMessage.java
index 4ecd2ea..ffba9e1 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormOutboundStatusListResponseMessage.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormOutboundStatusListResponseMessage.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.profile.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl;
import java.util.function.Function;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.oauth.statuslist.context.StatusListTokenContext;
-import org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl.StatusListSuccessResponse;
+import org.geant.shibboleth.plugin.openidvci.statuslist.context.StatusListTokenContext;
+import org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl.StatusListSuccessResponse;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormOutboundStatusListRevokeResponseMessage.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormOutboundStatusListRevokeResponseMessage.java
similarity index 86%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormOutboundStatusListRevokeResponseMessage.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormOutboundStatusListRevokeResponseMessage.java
index 2c08bdd..5a949b9 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormOutboundStatusListRevokeResponseMessage.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormOutboundStatusListRevokeResponseMessage.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.profile.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl.StatusListRevokeSuccessResponse;
+import org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl.StatusListRevokeSuccessResponse;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.AbstractProfileAction;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormStatusListToken.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormStatusListToken.java
similarity index 91%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormStatusListToken.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormStatusListToken.java
index 4a6256b..ceae6fc 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/FormStatusListToken.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/FormStatusListToken.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.profile.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl;
import java.io.IOException;
import java.time.Duration;
@@ -26,13 +26,13 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.oauth.statuslist.MonthlyBucketStrategy;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListBucket;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListCodec;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListParameters;
-import org.geant.shibboleth.plugin.oauth.statuslist.context.StatusListTokenContext;
-import org.geant.shibboleth.plugin.oauth.statuslist.profile.StatusListEventIds;
-import org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListStore;
+import org.geant.shibboleth.plugin.openidvci.statuslist.MonthlyBucketStrategy;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListBucket;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListCodec;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListParameters;
+import org.geant.shibboleth.plugin.openidvci.statuslist.context.StatusListTokenContext;
+import org.geant.shibboleth.plugin.openidvci.statuslist.profile.StatusListEventIds;
+import org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListStore;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
@@ -48,7 +48,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
-import org.geant.shibboleth.plugin.oauth.profile.logic.CredentialIssuerLookupFunction;
+import org.geant.shibboleth.plugin.openidvci.profile.logic.CredentialIssuerLookupFunction;
/**
* Action that forms claims of a Status List Token and sets them to
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/RevokeStatusListIndex.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/RevokeStatusListIndex.java
similarity index 90%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/RevokeStatusListIndex.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/RevokeStatusListIndex.java
index 09ba87a..9b097a1 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/RevokeStatusListIndex.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/RevokeStatusListIndex.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.profile.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl;
import java.io.IOException;
import javax.annotation.Nonnull;
-import org.geant.shibboleth.plugin.oauth.statuslist.MonthlyBucketStrategy;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListBucket;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListParameters;
-import org.geant.shibboleth.plugin.oauth.statuslist.messaging.impl.StatusListRevokeRequest;
-import org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListStore;
+import org.geant.shibboleth.plugin.openidvci.statuslist.MonthlyBucketStrategy;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListBucket;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListParameters;
+import org.geant.shibboleth.plugin.openidvci.statuslist.messaging.impl.StatusListRevokeRequest;
+import org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListStore;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/SignStatusListToken.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/SignStatusListToken.java
similarity index 96%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/SignStatusListToken.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/SignStatusListToken.java
index 976afb7..1646ad2 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/SignStatusListToken.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/SignStatusListToken.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.profile.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl;
import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.shibboleth.plugin.oauth.security.DidJwkSupport;
-import org.geant.shibboleth.plugin.oauth.statuslist.context.StatusListTokenContext;
+import org.geant.shibboleth.plugin.openidvci.security.impl.DidJwkSupport;
+import org.geant.shibboleth.plugin.openidvci.statuslist.context.StatusListTokenContext;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/FeistelIndexPermutation.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/FeistelIndexPermutation.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/FeistelIndexPermutation.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/FeistelIndexPermutation.java
index 2d8e418..294547b 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/FeistelIndexPermutation.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/FeistelIndexPermutation.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.storage;
+package org.geant.shibboleth.plugin.openidvci.statuslist.storage;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignment.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignment.java
similarity index 98%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignment.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignment.java
index 63a19ca..f442875 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignment.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.storage;
+package org.geant.shibboleth.plugin.openidvci.statuslist.storage;
import java.util.List;
import java.util.Map;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignmentStore.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignmentStore.java
similarity index 99%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignmentStore.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignmentStore.java
index 35d9b1a..2048a5b 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignmentStore.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignmentStore.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.storage;
+package org.geant.shibboleth.plugin.openidvci.statuslist.storage;
import java.io.IOException;
import java.time.Duration;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignments.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignments.java
similarity index 97%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignments.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignments.java
index 271e136..b650615 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignments.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignments.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.storage;
+package org.geant.shibboleth.plugin.openidvci.statuslist.storage;
import java.util.List;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListIndexAllocator.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListIndexAllocator.java
similarity index 97%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListIndexAllocator.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListIndexAllocator.java
index 808c5f8..bae8b1a 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListIndexAllocator.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListIndexAllocator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.storage;
+package org.geant.shibboleth.plugin.openidvci.statuslist.storage;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -31,8 +31,8 @@ import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponen
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListBucket;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListParameters;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListBucket;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListParameters;
import org.opensaml.storage.StorageCapabilities;
import org.opensaml.storage.StorageRecord;
import org.opensaml.storage.StorageService;
diff --git a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListStore.java b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListStore.java
similarity index 96%
rename from openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListStore.java
rename to openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListStore.java
index 9280c07..8700799 100644
--- a/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListStore.java
+++ b/openid-vci-impl/src/main/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListStore.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.storage;
+package org.geant.shibboleth.plugin.openidvci.statuslist.storage;
import java.io.IOException;
@@ -28,9 +28,9 @@ import net.shibboleth.shared.component.AbstractIdentifiableInitializableComponen
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListBucket;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListCodec;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListParameters;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListBucket;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListCodec;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListParameters;
import org.opensaml.storage.StorageCapabilities;
import org.opensaml.storage.StorageRecord;
import org.opensaml.storage.StorageService;
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
* {@link StorageService}.
*
* A list is stored per {@link StatusListBucket} in
- * {@value org.geant.shibboleth.plugin.oauth.statuslist.StatusListParameters#CHUNKS}
+ * {@value org.geant.shibboleth.plugin.openidvci.statuslist.StatusListParameters#CHUNKS}
* pieces of fixed size, keyed by the bucket identifier and the number of the
* piece. Records expire when no credential of the bucket can be valid anymore.
*/
diff --git a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/assign/assign-beans.xml b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/assign/assign-beans.xml
index 3c55919..efe384e 100644
--- a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/assign/assign-beans.xml
+++ b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/assign/assign-beans.xml
@@ -12,14 +12,14 @@
default-init-method="initialize" default-destroy-method="destroy">
<bean id="oauth.StatusListIndexAllocator"
- class="org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListIndexAllocator"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListIndexAllocator"
depends-on="shibboleth.LoggingService"
p:id="oauth.StatusListIndexAllocator"
p:storage-ref="#{'%{oauth.StatusListIndexAllocator:shibboleth.StorageService}'.trim()}"
p:permutationKey="%{oauth.statuslist.indexPermutationKey:}" />
<bean id="AllocateIndex"
- class="org.geant.shibboleth.plugin.oauth.statuslist.profile.impl.AllocateIndex"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl.AllocateIndex"
scope="prototype"
p:statusListAllocator-ref="oauth.StatusListIndexAllocator"
p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier">
@@ -32,14 +32,14 @@
</bean>
<bean id="oauth.StatusListAssignmentStore"
- class="org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListAssignmentStore"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListAssignmentStore"
depends-on="shibboleth.LoggingService"
p:id="oauth.StatusListAssignmentStore"
p:retention="%{oauth.statuslist.assignmentRetention:P7D}"
p:storage-ref="#{'%{oauth.StatusListAssignmentStore:shibboleth.StorageService}'.trim()}" />
<bean id="AssignIndex"
- class="org.geant.shibboleth.plugin.oauth.statuslist.profile.impl.AssignIndex"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl.AssignIndex"
scope="prototype"
p:statusListAssignmentStore-ref="oauth.StatusListAssignmentStore">
<property name="expirationLookupStrategy">
diff --git a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/assignments/assignments-beans.xml b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/assignments/assignments-beans.xml
index 520dfa2..bde4ace 100644
--- a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/assignments/assignments-beans.xml
+++ b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/assignments/assignments-beans.xml
@@ -16,7 +16,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
- <bean class="org.geant.shibboleth.plugin.oauth.statuslist.decoding.impl.StatusListAssignmentsRequestDecoder"
+ <bean class="org.geant.shibboleth.plugin.openidvci.statuslist.decoding.impl.StatusListAssignmentsRequestDecoder"
scope="prototype" p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
</constructor-arg>
</bean>
@@ -29,14 +29,14 @@
class="net.shibboleth.idp.plugin.oidc.op.messaging.context.navigate.TokenRequestClientIDLookupFunction" />
<bean id="oauth.StatusListAssignmentStore"
- class="org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListAssignmentStore"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListAssignmentStore"
depends-on="shibboleth.LoggingService"
p:id="oauth.StatusListAssignmentStore"
p:retention="%{oauth.statuslist.assignmentRetention:P7D}"
p:storage-ref="#{'%{oauth.StatusListAssignmentStore:shibboleth.StorageService}'.trim()}" />
<bean id="FormOutboundMessage"
- class="org.geant.shibboleth.plugin.oauth.statuslist.profile.impl.FormOutboundStatusListAssignmentsResponseMessage"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl.FormOutboundStatusListAssignmentsResponseMessage"
scope="prototype"
p:statusListAssignmentStore-ref="oauth.StatusListAssignmentStore" />
diff --git a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/list/list-beans.xml b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/list/list-beans.xml
index 135a6cf..655c8e6 100644
--- a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/list/list-beans.xml
+++ b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/list/list-beans.xml
@@ -22,7 +22,7 @@
c:strategy-ref="shibboleth.MessageContextLookup.Outbound">
<property name="configurationLookupStrategy">
<bean lazy-init="true"
- class="org.geant.shibboleth.plugin.oauth.statuslist.config.navigate.StatusListSignatureSigningConfigurationLookupFunction" />
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.config.navigate.StatusListSignatureSigningConfigurationLookupFunction" />
</property>
<!--
Status List Token is signed with issuer's own key. Basic resolver is used, client
@@ -35,17 +35,17 @@
</bean>
<bean id="openidvci.IssuerLookupStrategy"
- class="org.geant.shibboleth.plugin.oauth.profile.logic.CredentialIssuerLookupFunction"
+ class="org.geant.shibboleth.plugin.openidvci.profile.logic.CredentialIssuerLookupFunction"
p:issuer="%{openidvci.issuer:}" />
<bean id="oauth.StatusListStore"
- class="org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListStore"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListStore"
depends-on="shibboleth.LoggingService"
p:id="oauth.StatusListStore"
p:storage-ref="#{'%{oauth.StatusListStore:shibboleth.StorageService}'.trim()}" />
<bean id="FormStatusListToken"
- class="org.geant.shibboleth.plugin.oauth.statuslist.profile.impl.FormStatusListToken"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl.FormStatusListToken"
scope="prototype"
p:statusListStore-ref="oauth.StatusListStore"
p:ttl="%{oauth.statuslist.ttl:PT1H}"
@@ -53,11 +53,11 @@
p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
<bean id="SignStatusListToken"
- class="org.geant.shibboleth.plugin.oauth.statuslist.profile.impl.SignStatusListToken"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl.SignStatusListToken"
scope="prototype" />
<bean id="FormOutboundMessage"
- class="org.geant.shibboleth.plugin.oauth.statuslist.profile.impl.FormOutboundStatusListResponseMessage"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl.FormOutboundStatusListResponseMessage"
scope="prototype" />
<bean id="BuildErrorResponseFromEvent" class="net.shibboleth.oidc.profile.impl.BuildJSONErrorResponseFromEvent"
scope="prototype" p:defaultStatusCode="400" p:defaultCode="invalid_request"
@@ -68,10 +68,10 @@
<property name="mappedErrors">
<map value-type="com.nimbusds.oauth2.sdk.ErrorObject">
<!-- Unknown list is 404 and a retired list is 410, so a verifier can tell them apart. -->
- <entry key="#{T(org.geant.shibboleth.plugin.oauth.statuslist.profile.StatusListEventIds).NO_STATUS_LIST}"
- value="#{T(org.geant.shibboleth.plugin.oauth.statuslist.messaging.error.StatusListError).UNKNOWN_STATUS_LIST}" />
- <entry key="#{T(org.geant.shibboleth.plugin.oauth.statuslist.profile.StatusListEventIds).STATUS_LIST_RETIRED}"
- value="#{T(org.geant.shibboleth.plugin.oauth.statuslist.messaging.error.StatusListError).RETIRED_STATUS_LIST}" />
+ <entry key="#{T(org.geant.shibboleth.plugin.openidvci.statuslist.profile.StatusListEventIds).NO_STATUS_LIST}"
+ value="#{T(org.geant.shibboleth.plugin.openidvci.statuslist.messaging.error.StatusListError).UNKNOWN_STATUS_LIST}" />
+ <entry key="#{T(org.geant.shibboleth.plugin.openidvci.statuslist.profile.StatusListEventIds).STATUS_LIST_RETIRED}"
+ value="#{T(org.geant.shibboleth.plugin.openidvci.statuslist.messaging.error.StatusListError).RETIRED_STATUS_LIST}" />
<entry key="#{T(org.opensaml.profile.action.EventIds).IO_ERROR}"
value="#{T(com.nimbusds.oauth2.sdk.OAuth2Error).SERVER_ERROR}" />
</map>
diff --git a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/revoke/revoke-beans.xml b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/revoke/revoke-beans.xml
index 10deaed..eb4daf0 100644
--- a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/revoke/revoke-beans.xml
+++ b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth/status-list/revoke/revoke-beans.xml
@@ -16,7 +16,7 @@
<bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
<constructor-arg>
- <bean class="org.geant.shibboleth.plugin.oauth.statuslist.decoding.impl.StatusListRevokeRequestDecoder"
+ <bean class="org.geant.shibboleth.plugin.openidvci.statuslist.decoding.impl.StatusListRevokeRequestDecoder"
scope="prototype" p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" />
</constructor-arg>
</bean>
@@ -29,18 +29,18 @@
class="net.shibboleth.idp.plugin.oidc.op.messaging.context.navigate.TokenRequestClientIDLookupFunction" />
<bean id="oauth.StatusListStore"
- class="org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListStore"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListStore"
depends-on="shibboleth.LoggingService"
p:id="oauth.StatusListStore"
p:storage-ref="#{'%{oauth.StatusListStore:shibboleth.StorageService}'.trim()}" />
<bean id="RevokeStatusListIndex"
- class="org.geant.shibboleth.plugin.oauth.statuslist.profile.impl.RevokeStatusListIndex"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl.RevokeStatusListIndex"
scope="prototype"
p:statusListStore-ref="oauth.StatusListStore" />
<bean id="FormOutboundMessage"
- class="org.geant.shibboleth.plugin.oauth.statuslist.profile.impl.FormOutboundStatusListRevokeResponseMessage"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl.FormOutboundStatusListRevokeResponseMessage"
scope="prototype" />
<bean id="BuildErrorResponseFromEvent" class="net.shibboleth.oidc.profile.impl.BuildJSONErrorResponseFromEvent"
diff --git a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/openid/vci/credentials/credentials-beans.xml b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/openid/vci/credentials/credentials-beans.xml
index 26fe0be..6ede675 100644
--- a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/openid/vci/credentials/credentials-beans.xml
+++ b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/openid/vci/credentials/credentials-beans.xml
@@ -65,7 +65,7 @@
c:strategy-ref="shibboleth.MessageContextLookup.Inbound"
p:securityParametersContextLookupStrategy-ref="ProofSecurityParametersContextProfileRequestContextLookup">
<property name="configurationLookupStrategy">
- <bean class="org.geant.shibboleth.plugin.openidvci.config.navigate.ProofSignatureValidationConfigurationLookupFunction" />
+ <bean class="org.geant.shibboleth.plugin.openidvci.profile.config.navigate.ProofSignatureValidationConfigurationLookupFunction" />
</property>
<property name="signatureValidationParametersResolver">
<bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureValidationParametersResolver" />
@@ -83,7 +83,7 @@
<bean class="org.opensaml.messaging.handler.impl.BasicMessageHandlerChain">
<property name="handlers">
<list>
- <bean class="org.geant.shibboleth.plugin.openidvci.security.JWTMessageSignaturesSecurityHandler"
+ <bean class="org.geant.shibboleth.plugin.openidvci.security.impl.JWTMessageSignaturesSecurityHandler"
scope="prototype"
p:securityParametersContextLookupStrategy-ref="ProofSecurityParametersContextMessageContextLookup">
<property name="jwtTokenLookupStrategy">
@@ -115,7 +115,7 @@
c:strategy-ref="shibboleth.MessageContextLookup.Inbound">
<property name="configurationLookupStrategy">
<bean lazy-init="true"
- class="org.geant.shibboleth.plugin.openidvci.config.navigate.CredentialSignatureSigningConfigurationLookupFunction" />
+ class="org.geant.shibboleth.plugin.openidvci.profile.config.navigate.CredentialSignatureSigningConfigurationLookupFunction" />
</property>
<!--
Credential is signed with issuer's own key. Basic resolver is used, client
@@ -137,7 +137,7 @@
scope="prototype" />
<bean id="openidvci.IssuerLookupStrategy"
- class="org.geant.shibboleth.plugin.oauth.profile.logic.CredentialIssuerLookupFunction"
+ class="org.geant.shibboleth.plugin.openidvci.profile.logic.CredentialIssuerLookupFunction"
p:issuer="%{openidvci.issuer:}" />
<bean id="AddCredentialShell" class="org.geant.shibboleth.plugin.openidvci.profile.impl.AddCredentialShell"
diff --git a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/openid/vci/issuer-metadata/issuer-metadata-beans.xml b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/openid/vci/issuer-metadata/issuer-metadata-beans.xml
index 3d95bc9..d238566 100644
--- a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/openid/vci/issuer-metadata/issuer-metadata-beans.xml
+++ b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/openid/vci/issuer-metadata/issuer-metadata-beans.xml
@@ -23,7 +23,7 @@
c:strategy-ref="shibboleth.MessageContextLookup.Outbound">
<property name="configurationLookupStrategy">
<bean lazy-init="true"
- class="org.geant.shibboleth.plugin.openidvci.config.navigate.IssuerMetadataSignatureSigningConfigurationLookupFunction" />
+ class="org.geant.shibboleth.plugin.openidvci.profile.config.navigate.IssuerMetadataSignatureSigningConfigurationLookupFunction" />
</property>
<!-- Metadata is signed with the issuer's own key, there is no client to have one. -->
<property name="signatureSigningParametersResolver">
diff --git a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index 7d055b4..32e4956 100644
--- a/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/openid-vci-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -37,36 +37,36 @@
p:proofClaimsValidator="#{getObject('openidvci.DefaultProofBodyClaimsValidator')}" />
<bean id="OpenID.VCI.CredentialOffer" parent="AbstractVCIProfile" lazy-init="true"
- class="org.geant.shibboleth.plugin.openidvci.config.impl.DefaultOpenIDVCICredentialOfferConfiguration" />
+ class="org.geant.shibboleth.plugin.openidvci.profile.config.impl.DefaultOpenIDVCICredentialOfferConfiguration" />
<bean id="OpenID.VCI.Token" parent="AbstractVCIProfile" lazy-init="true"
- class="org.geant.shibboleth.plugin.openidvci.config.impl.DefaultOpenIDVCITokenConfiguration" />
+ class="org.geant.shibboleth.plugin.openidvci.profile.config.impl.DefaultOpenIDVCITokenConfiguration" />
<bean id="OpenID.VCI.Nonce" parent="AbstractVCIProfile" lazy-init="true"
- class="org.geant.shibboleth.plugin.openidvci.config.impl.DefaultOpenIDVCINonceConfiguration" />
+ class="org.geant.shibboleth.plugin.openidvci.profile.config.impl.DefaultOpenIDVCINonceConfiguration" />
<bean id="OpenID.VCI.Credentials" parent="AbstractVCIProfile" lazy-init="true"
- class="org.geant.shibboleth.plugin.openidvci.config.impl.DefaultOpenIDVCICredentialsConfiguration" />
+ class="org.geant.shibboleth.plugin.openidvci.profile.config.impl.DefaultOpenIDVCICredentialsConfiguration" />
<!--
Endpoint publishing Credential Issuer metadata. Serves wallets before there is a
client, so there is nothing of the VCI profile settings to inherit here.
-->
<bean id="OpenID.VCI.IssuerMetadata" lazy-init="true"
- class="org.geant.shibboleth.plugin.openidvci.config.impl.DefaultOpenIDVCIIssuerMetadataConfiguration"
+ class="org.geant.shibboleth.plugin.openidvci.profile.config.impl.DefaultOpenIDVCIIssuerMetadataConfiguration"
p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}"
p:issuerMetadataSignatureSigningConfiguration-ref="openidvci.issuerMetadata.SigningConfiguration" />
<bean id="OAuth.StatusList" lazy-init="true"
- class="org.geant.shibboleth.plugin.oauth.statuslist.config.DefaultStatusListConfiguration"
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.config.impl.DefaultStatusListConfiguration"
p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}"
p:statusListSignatureSigningConfiguration="#{getObject('oauth.statuslist.SigningConfiguration')}" />
<bean id="OAuth.StatusList.Revoke" parent="AbstractVCIProfile" lazy-init="true"
- class="org.geant.shibboleth.plugin.oauth.statuslist.config.DefaultStatusListRevokeConfiguration" />
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.config.impl.DefaultStatusListRevokeConfiguration" />
<bean id="OAuth.StatusList.Assignments" parent="AbstractVCIProfile" lazy-init="true"
- class="org.geant.shibboleth.plugin.oauth.statuslist.config.DefaultStatusListAssignmentsConfiguration" />
+ class="org.geant.shibboleth.plugin.openidvci.statuslist.profile.config.impl.DefaultStatusListAssignmentsConfiguration" />
<!-- The generator does not tie client id to nonce to accomodate unprotected Nonce endpoint. -->
<bean id="openidvci.DefaultOpenIDVCINonceGenerator" parent="DefaultOAuth2DPoPNonceGenerator" lazy-init="true"
@@ -85,7 +85,7 @@
p:claimValidators-ref="openidvci.ProofBodyClaimsValidator" />
<bean id="openidvci.ProofNonceGeneratorLookupFunction"
- class="org.geant.shibboleth.plugin.openidvci.config.navigate.ProofNonceGeneratorLookupFunction" />
+ class="org.geant.shibboleth.plugin.openidvci.profile.config.navigate.ProofNonceGeneratorLookupFunction" />
<util:list id="openidvci.ProofBodyClaimsValidator" value-type="net.shibboleth.oidc.jwt.claims.ClaimsValidator">
<bean id="openidvci.ProofNonceValidator"
@@ -133,7 +133,7 @@
p:signatureTrustEngine-ref="openidvci.TokenKeyTrustEngineForProofJWT"/>
<bean id="openidvci.TokenKeyTrustEngineForProofJWT"
- class="org.geant.shibboleth.plugin.openidvci.security.TokenKeyTrustEngine">
+ class="org.geant.shibboleth.plugin.openidvci.security.impl.TokenKeyTrustEngine">
<constructor-arg>
<bean class="org.geant.shibboleth.plugin.openidvci.security.credential.impl.ExtendedJOSEObjectCredentialResolver"/>
</constructor-arg>
diff --git a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimSetUtilTest.java b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimSetUtilTest.java
similarity index 99%
rename from openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimSetUtilTest.java
rename to openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimSetUtilTest.java
index 50d5b99..998f36d 100644
--- a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimSetUtilTest.java
+++ b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimSetUtilTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.util;
+package org.geant.shibboleth.plugin.openidvci.credential.impl;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
diff --git a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimTreeTest.java b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimTreeTest.java
similarity index 99%
rename from openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimTreeTest.java
rename to openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimTreeTest.java
index afcaf0f..3f328af 100644
--- a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/util/SelectiveDisclosureClaimTreeTest.java
+++ b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/credential/impl/SelectiveDisclosureClaimTreeTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.openidvci.util;
+package org.geant.shibboleth.plugin.openidvci.credential.impl;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
diff --git a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/profile/logic/CredentialIssuerLookupFunctionTest.java b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/profile/logic/CredentialIssuerLookupFunctionTest.java
similarity index 97%
rename from openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/profile/logic/CredentialIssuerLookupFunctionTest.java
rename to openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/profile/logic/CredentialIssuerLookupFunctionTest.java
index 8bf475c..063e0f7 100644
--- a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/profile/logic/CredentialIssuerLookupFunctionTest.java
+++ b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/profile/logic/CredentialIssuerLookupFunctionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.profile.logic;
+package org.geant.shibboleth.plugin.openidvci.profile.logic;
import java.security.interfaces.ECPublicKey;
diff --git a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/security/DidJwkSupportTest.java b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/security/impl/DidJwkSupportTest.java
similarity index 98%
rename from openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/security/DidJwkSupportTest.java
rename to openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/security/impl/DidJwkSupportTest.java
index 70cc2f5..1703a34 100644
--- a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/security/DidJwkSupportTest.java
+++ b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/security/impl/DidJwkSupportTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.security;
+package org.geant.shibboleth.plugin.openidvci.security.impl;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListCodecTest.java b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListCodecTest.java
similarity index 99%
rename from openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListCodecTest.java
rename to openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListCodecTest.java
index 1fb44a0..3e1d11c 100644
--- a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/StatusListCodecTest.java
+++ b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/StatusListCodecTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist;
+package org.geant.shibboleth.plugin.openidvci.statuslist;
import java.io.ByteArrayOutputStream;
import java.util.zip.Inflater;
diff --git a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/AllocateIndexTest.java b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/AllocateIndexTest.java
similarity index 97%
rename from openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/AllocateIndexTest.java
rename to openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/AllocateIndexTest.java
index 5a6afd5..d43a2aa 100644
--- a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/profile/impl/AllocateIndexTest.java
+++ b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/profile/impl/AllocateIndexTest.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.profile.impl;
+package org.geant.shibboleth.plugin.openidvci.statuslist.profile.impl;
import java.io.IOException;
import java.time.Instant;
import java.util.HashSet;
import java.util.List;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListBucket;
-import org.geant.shibboleth.plugin.oauth.statuslist.context.StatusListContext;
-import org.geant.shibboleth.plugin.oauth.statuslist.storage.StatusListIndexAllocator;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListBucket;
+import org.geant.shibboleth.plugin.openidvci.statuslist.context.StatusListContext;
+import org.geant.shibboleth.plugin.openidvci.statuslist.storage.StatusListIndexAllocator;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/FeistelIndexPermutationTest.java b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/FeistelIndexPermutationTest.java
similarity index 97%
rename from openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/FeistelIndexPermutationTest.java
rename to openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/FeistelIndexPermutationTest.java
index acefc37..f521281 100644
--- a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/FeistelIndexPermutationTest.java
+++ b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/FeistelIndexPermutationTest.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.storage;
+package org.geant.shibboleth.plugin.openidvci.statuslist.storage;
import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListParameters;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListParameters;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignmentStoreTest.java b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignmentStoreTest.java
similarity index 99%
rename from openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignmentStoreTest.java
rename to openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignmentStoreTest.java
index 2f504fa..302566f 100644
--- a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListAssignmentStoreTest.java
+++ b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListAssignmentStoreTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.storage;
+package org.geant.shibboleth.plugin.openidvci.statuslist.storage;
import java.io.IOException;
import java.time.Duration;
diff --git a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListIndexAllocatorTest.java b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListIndexAllocatorTest.java
similarity index 98%
rename from openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListIndexAllocatorTest.java
rename to openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListIndexAllocatorTest.java
index 13fa1eb..69a5493 100644
--- a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListIndexAllocatorTest.java
+++ b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListIndexAllocatorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.storage;
+package org.geant.shibboleth.plugin.openidvci.statuslist.storage;
import java.io.IOException;
import java.time.Duration;
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListBucket;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListBucket;
import org.opensaml.storage.StorageRecord;
import org.opensaml.storage.impl.MemoryStorageService;
import org.opensaml.storage.impl.client.ClientStorageService;
diff --git a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListStoreTest.java b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListStoreTest.java
similarity index 95%
rename from openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListStoreTest.java
rename to openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListStoreTest.java
index 927b4bb..3f77d8f 100644
--- a/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/oauth/statuslist/storage/StatusListStoreTest.java
+++ b/openid-vci-impl/src/test/java/org/geant/shibboleth/plugin/openidvci/statuslist/storage/StatusListStoreTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.geant.shibboleth.plugin.oauth.statuslist.storage;
+package org.geant.shibboleth.plugin.openidvci.statuslist.storage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -22,9 +22,9 @@ import java.time.Duration;
import java.time.Instant;
import java.util.zip.Inflater;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListBucket;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListCodec;
-import org.geant.shibboleth.plugin.oauth.statuslist.StatusListParameters;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListBucket;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListCodec;
+import org.geant.shibboleth.plugin.openidvci.statuslist.StatusListParameters;
import org.opensaml.storage.StorageRecord;
import org.opensaml.storage.impl.MemoryStorageService;
import org.testng.Assert;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list