chore: align packages and create additional lib modules for shared cl…

…asses (#4074)

Package move

data-protocols/dsp/dsp-api-configuration/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
     api(project(":data-protocols:dsp:dsp-spi"))
     api(project(":data-protocols:dsp:dsp-http-spi"))
 
-    implementation(project(":extensions:common:lib:jersey-providers-lib"))
+    implementation(project(":extensions:common:http:lib:jersey-providers-lib"))
     implementation(project(":core:common:lib:transform-lib"))
     implementation(project(":core:control-plane:control-plane-transform"))
 

data-protocols/dsp/dsp-api-configuration/src/main/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtension.java

@@ -39,8 +39,8 @@
 import org.eclipse.edc.transform.transformer.edc.to.JsonObjectToCriterionTransformer;
 import org.eclipse.edc.transform.transformer.edc.to.JsonObjectToQuerySpecTransformer;
 import org.eclipse.edc.transform.transformer.edc.to.JsonValueToGenericTypeTransformer;
-import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor;
-import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider;
+import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor;
+import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider;
 import org.eclipse.edc.web.spi.WebServer;
 import org.eclipse.edc.web.spi.WebService;
 import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer;

data-protocols/dsp/dsp-api-configuration/src/test/java/org/eclipse/edc/protocol/dsp/api/configuration/DspApiConfigurationExtensionTest.java

@@ -20,8 +20,8 @@
 import org.eclipse.edc.spi.system.configuration.ConfigFactory;
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
-import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor;
-import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider;
+import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor;
+import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider;
 import org.eclipse.edc.web.spi.WebServer;
 import org.eclipse.edc.web.spi.WebService;
 import org.eclipse.edc.web.spi.configuration.WebServiceConfiguration;
@@ -108,5 +108,5 @@ void initialize_shouldRegisterWebServiceProviders(DspApiConfigurationExtension e
         verify(webService).registerResource(eq(CONTEXT_ALIAS), isA(ObjectMapperProvider.class));
         verify(webService).registerResource(eq(CONTEXT_ALIAS), isA(JerseyJsonLdInterceptor.class));
     }
-    
+
 }

extensions/common/api/management-api-configuration/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
     api(project(":spi:common:web-spi"))
     api(project(":spi:control-plane:contract-spi"))
 
-    implementation(project(":extensions:common:lib:jersey-providers-lib"))
+    implementation(project(":extensions:common:http:lib:jersey-providers-lib"))
     implementation(project(":extensions:common:api:api-core"))
     implementation(project(":core:common:lib:transform-lib"))
     implementation(project(":core:control-plane:control-plane-transform"))

extensions/common/api/management-api-configuration/src/main/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtension.java

@@ -38,8 +38,8 @@
 import org.eclipse.edc.transform.transformer.edc.to.JsonObjectToDataAddressTransformer;
 import org.eclipse.edc.transform.transformer.edc.to.JsonObjectToQuerySpecTransformer;
 import org.eclipse.edc.transform.transformer.edc.to.JsonValueToGenericTypeTransformer;
-import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor;
-import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider;
+import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor;
+import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider;
 import org.eclipse.edc.web.spi.WebServer;
 import org.eclipse.edc.web.spi.WebService;
 import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer;

extensions/common/api/management-api-configuration/src/test/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtensionTest.java

@@ -23,8 +23,8 @@
 import org.eclipse.edc.spi.system.configuration.Config;
 import org.eclipse.edc.spi.system.configuration.ConfigFactory;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
-import org.eclipse.edc.web.jersey.jsonld.JerseyJsonLdInterceptor;
-import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider;
+import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor;
+import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider;
 import org.eclipse.edc.web.spi.WebService;
 import org.eclipse.edc.web.spi.configuration.WebServiceConfiguration;
 import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer;

extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java

@@ -17,8 +17,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nimbusds.jwt.SignedJWT;
-import org.eclipse.edc.identitytrust.verification.CredentialVerifier;
-import org.eclipse.edc.identitytrust.verification.VerifierContext;
+import org.eclipse.edc.iam.identitytrust.spi.verification.CredentialVerifier;
+import org.eclipse.edc.iam.identitytrust.spi.verification.VerifierContext;
 import org.eclipse.edc.keys.spi.PublicKeyResolver;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.eclipse.edc.spi.result.Result;

extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/rules/TokenNotNullRule.java

@@ -23,7 +23,7 @@
 
 import java.util.Map;
 
-import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM;
+import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM;
 
 /**
  * Verifies that the "token" claim is present (= non-empty)

extensions/common/crypto/jwt-verifiable-credentials/src/test/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifierTest.java

@@ -21,7 +21,7 @@
 import com.nimbusds.jose.jwk.Curve;
 import com.nimbusds.jose.jwk.ECKey;
 import com.nimbusds.jose.jwk.gen.ECKeyGenerator;
-import org.eclipse.edc.identitytrust.verification.VerifierContext;
+import org.eclipse.edc.iam.identitytrust.spi.verification.VerifierContext;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
 import org.eclipse.edc.junit.annotations.ComponentTest;
 import org.eclipse.edc.keys.spi.PublicKeyResolver;
@@ -38,7 +38,6 @@
 
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
 import static org.eclipse.edc.spi.result.Result.success;
-import static org.eclipse.edc.verifiablecredentials.TestFunctions.createPublicKey;
 import static org.eclipse.edc.verifiablecredentials.jwt.JwtPresentationVerifier.JWT_VP_TOKEN_CONTEXT;
 import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.CENTRAL_ISSUER_DID;
 import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.CENTRAL_ISSUER_KEY_ID;
@@ -48,6 +47,7 @@
 import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.VC_CONTENT_DEGREE_EXAMPLE;
 import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.VP_CONTENT_TEMPLATE;
 import static org.eclipse.edc.verifiablecredentials.jwt.TestConstants.VP_HOLDER_ID;
+import static org.eclipse.edc.verifiablecredentials.jwt.TestFunctions.createPublicKey;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

extensions/common/crypto/jwt-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/TestFunctions.java → extensions/common/crypto/jwt-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/jwt/TestFunctions.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.verifiablecredentials;
+package org.eclipse.edc.verifiablecredentials.jwt;
 
 import com.nimbusds.jose.jwk.ECKey;
 import com.nimbusds.jose.jwk.KeyConverter;

extensions/common/crypto/ldp-verifiable-credentials/build.gradle.kts

@@ -29,14 +29,14 @@ dependencies {
     }
 
     testImplementation(testFixtures(project(":core:common:junit")))
-    testImplementation(project(":extensions:common:crypto:jws2020"))
+    testImplementation(project(":extensions:common:crypto:lib:jws2020-lib"))
     testImplementation(project(":core:common:lib:json-ld-lib"))
 
     // deps for test fixtures
     testFixturesImplementation(project(":spi:common:json-ld-spi"))
     testFixturesImplementation(project(":core:common:lib:json-ld-lib"))
     testFixturesApi(libs.nimbus.jwt)
-    testFixturesApi(testFixtures(project(":extensions:common:crypto:jws2020")))
+    testFixturesApi(testFixtures(project(":extensions:common:crypto:lib:jws2020-lib")))
 
 
 }

extensions/common/crypto/ldp-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifier.java

@@ -39,9 +39,9 @@
 import jakarta.json.Json;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;
-import org.eclipse.edc.identitytrust.verification.CredentialVerifier;
-import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry;
-import org.eclipse.edc.identitytrust.verification.VerifierContext;
+import org.eclipse.edc.iam.identitytrust.spi.verification.CredentialVerifier;
+import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry;
+import org.eclipse.edc.iam.identitytrust.spi.verification.VerifierContext;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.jsonld.spi.JsonLdKeywords;
 import org.eclipse.edc.spi.result.Result;

extensions/common/crypto/ldp-verifiable-credentials/src/test/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpVerifierTest.java

@@ -26,15 +26,13 @@
 import com.nimbusds.jose.jwk.ECKey;
 import com.nimbusds.jose.jwk.gen.ECKeyGenerator;
 import jakarta.json.JsonObject;
-import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry;
-import org.eclipse.edc.identitytrust.verification.VerifierContext;
+import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry;
+import org.eclipse.edc.iam.identitytrust.spi.verification.VerifierContext;
 import org.eclipse.edc.jsonld.TitaniumJsonLd;
 import org.eclipse.edc.security.signature.jws2020.JwkMethod;
 import org.eclipse.edc.security.signature.jws2020.JwsSignature2020Suite;
 import org.eclipse.edc.security.signature.jws2020.TestDocumentLoader;
 import org.eclipse.edc.security.signature.jws2020.TestFunctions;
-import org.eclipse.edc.verifiablecredentials.verfiablecredentials.LdpCreationUtils;
-import org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -47,11 +45,11 @@
 
 import static org.eclipse.edc.jsonld.util.JacksonJsonLd.createObjectMapper;
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
-import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.MEMBERSHIP_CREDENTIAL_ISSUER;
-import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.NAME_CREDENTIAL_ISSUER;
-import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.VC_CONTENT_CERTIFICATE_EXAMPLE;
-import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.createMembershipCredential;
-import static org.eclipse.edc.verifiablecredentials.verfiablecredentials.TestData.createNameCredential;
+import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.MEMBERSHIP_CREDENTIAL_ISSUER;
+import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.NAME_CREDENTIAL_ISSUER;
+import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.VC_CONTENT_CERTIFICATE_EXAMPLE;
+import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.createMembershipCredential;
+import static org.eclipse.edc.verifiablecredentials.linkeddata.TestData.createNameCredential;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.mock;

extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/verfiablecredentials/LdpCreationUtils.java → extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/linkeddata/LdpCreationUtils.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.verifiablecredentials.verfiablecredentials;
+package org.eclipse.edc.verifiablecredentials.linkeddata;
 
 import com.apicatalog.jsonld.loader.DocumentLoader;
 import com.apicatalog.ld.DocumentError;

extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/verfiablecredentials/TestData.java → extensions/common/crypto/ldp-verifiable-credentials/src/testFixtures/java/org/eclipse/edc/verifiablecredentials/linkeddata/TestData.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.verifiablecredentials.verfiablecredentials;
+package org.eclipse.edc.verifiablecredentials.linkeddata;
 
 import jakarta.json.Json;
 import jakarta.json.JsonObject;

extensions/common/http/jersey-core/build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 dependencies {
     api(project(":spi:common:web-spi"))
 
-    implementation(project(":extensions:common:lib:jersey-providers-lib"))
+    implementation(project(":extensions:common:http:lib:jersey-providers-lib"))
 
     implementation(libs.bundles.jersey.core)
     implementation(libs.jetty.jakarta.servlet.api)
@@ -34,7 +34,7 @@ dependencies {
     testFixturesApi(project(":core:common:junit"))
     testFixturesApi(project(":extensions:common:http:jetty-core"))
     testFixturesApi(project(":extensions:common:json-ld"))
-    testFixturesImplementation(project(":extensions:common:lib:jersey-providers-lib"))
+    testFixturesImplementation(project(":extensions:common:http:lib:jersey-providers-lib"))
     testFixturesApi(libs.jakarta.rsApi)
     testFixturesApi(libs.jackson.datatype.jakarta.jsonp)
     testFixturesApi(libs.junit.jupiter.api)

extensions/common/http/jersey-core/src/main/java/org/eclipse/edc/web/jersey/JerseyRestService.java

@@ -18,9 +18,9 @@
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.types.TypeManager;
-import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider;
 import org.eclipse.edc.web.jersey.mapper.EdcApiExceptionMapper;
 import org.eclipse.edc.web.jersey.mapper.UnexpectedExceptionMapper;
+import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider;
 import org.eclipse.edc.web.spi.WebServer;
 import org.eclipse.edc.web.spi.WebService;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;

extensions/common/http/jersey-core/src/testFixtures/java/org/eclipse/edc/web/jersey/testfixtures/RestControllerTestBase.java

@@ -20,7 +20,7 @@
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.web.jersey.JerseyConfiguration;
 import org.eclipse.edc.web.jersey.JerseyRestService;
-import org.eclipse.edc.web.jersey.jsonld.ObjectMapperProvider;
+import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider;
 import org.eclipse.edc.web.jetty.JettyConfiguration;
 import org.eclipse.edc.web.jetty.JettyService;
 import org.eclipse.edc.web.jetty.PortMapping;

extensions/common/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/jsonld/JerseyJsonLdInterceptor.java → extensions/common/http/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/providers/jsonld/JerseyJsonLdInterceptor.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.web.jersey.jsonld;
+package org.eclipse.edc.web.jersey.providers.jsonld;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.JsonArray;

extensions/common/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/jsonld/ObjectMapperProvider.java → extensions/common/http/lib/jersey-providers-lib/src/main/java/org/eclipse/edc/web/jersey/providers/jsonld/ObjectMapperProvider.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.web.jersey.jsonld;
+package org.eclipse.edc.web.jersey.providers.jsonld;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.ws.rs.ext.ContextResolver;
@@ -22,13 +22,13 @@
  * Jakarta JSON API is required to allow JsonObject as a controller parameter.
  */
 public class ObjectMapperProvider implements ContextResolver<ObjectMapper> {
-    
+
     private final ObjectMapper objectMapper;
-    
+
     public ObjectMapperProvider(ObjectMapper objectMapper) {
         this.objectMapper = objectMapper;
     }
-    
+
     @Override
     public ObjectMapper getContext(Class<?> type) {
         return objectMapper;

extensions/common/lib/jersey-providers-lib/src/test/java/org/eclipse/edc/web/jersey/jsonld/JerseyJsonLdInterceptorTest.java → extensions/common/http/lib/jersey-providers-lib/src/test/java/org/eclipse/edc/web/jersey/providers/jsonld/JerseyJsonLdInterceptorTest.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.web.jersey.jsonld;
+package org.eclipse.edc.web.jersey.providers.jsonld;
 
 import jakarta.json.Json;
 import jakarta.json.JsonArray;

extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     implementation(project(":core:common:lib:util-lib"))
     implementation(project(":core:common:lib:crypto-common-lib"))
     implementation(project(":core:common:token-core"))
-    implementation(project(":extensions:common:crypto:jws2020"))
+    implementation(project(":extensions:common:crypto:lib:jws2020-lib"))
     implementation(project(":extensions:common:crypto:jwt-verifiable-credentials"))
     implementation(project(":extensions:common:crypto:ldp-verifiable-credentials"))
     implementation(project(":extensions:common:iam:identity-trust:identity-trust-service"))

extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java

@@ -18,13 +18,13 @@
 import org.eclipse.edc.iam.identitytrust.core.defaults.DefaultTrustedIssuerRegistry;
 import org.eclipse.edc.iam.identitytrust.core.defaults.InMemorySignatureSuiteRegistry;
 import org.eclipse.edc.iam.identitytrust.core.scope.IatpScopeExtractorRegistry;
+import org.eclipse.edc.iam.identitytrust.spi.ClaimTokenCreatorFunction;
+import org.eclipse.edc.iam.identitytrust.spi.IatpParticipantAgentServiceExtension;
+import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService;
+import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry;
+import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractorRegistry;
+import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry;
 import org.eclipse.edc.iam.identitytrust.sts.embedded.EmbeddedSecureTokenService;
-import org.eclipse.edc.identitytrust.ClaimTokenCreatorFunction;
-import org.eclipse.edc.identitytrust.IatpParticipantAgentServiceExtension;
-import org.eclipse.edc.identitytrust.SecureTokenService;
-import org.eclipse.edc.identitytrust.TrustedIssuerRegistry;
-import org.eclipse.edc.identitytrust.scope.ScopeExtractorRegistry;
-import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry;
 import org.eclipse.edc.keys.spi.PrivateKeyResolver;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;

extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtension.java

@@ -15,7 +15,7 @@
 package org.eclipse.edc.iam.identitytrust.core;
 
 import org.eclipse.edc.iam.identitytrust.core.scope.IatpScopeExtractorFunction;
-import org.eclipse.edc.identitytrust.scope.ScopeExtractorRegistry;
+import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractorRegistry;
 import org.eclipse.edc.policy.engine.spi.PolicyEngine;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;

extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtension.java

@@ -18,18 +18,18 @@
 import org.eclipse.edc.http.spi.EdcHttpClient;
 import org.eclipse.edc.iam.did.spi.resolution.DidPublicKeyResolver;
 import org.eclipse.edc.iam.did.spi.resolution.DidResolverRegistry;
-import org.eclipse.edc.iam.identitytrust.DidCredentialServiceUrlResolver;
-import org.eclipse.edc.iam.identitytrust.IdentityAndTrustService;
 import org.eclipse.edc.iam.identitytrust.core.defaults.DefaultCredentialServiceClient;
-import org.eclipse.edc.iam.identitytrust.verification.MultiFormatPresentationVerifier;
-import org.eclipse.edc.identitytrust.ClaimTokenCreatorFunction;
-import org.eclipse.edc.identitytrust.CredentialServiceClient;
-import org.eclipse.edc.identitytrust.IatpParticipantAgentServiceExtension;
-import org.eclipse.edc.identitytrust.SecureTokenService;
-import org.eclipse.edc.identitytrust.TrustedIssuerRegistry;
-import org.eclipse.edc.identitytrust.validation.TokenValidationAction;
-import org.eclipse.edc.identitytrust.verification.PresentationVerifier;
-import org.eclipse.edc.identitytrust.verification.SignatureSuiteRegistry;
+import org.eclipse.edc.iam.identitytrust.service.DidCredentialServiceUrlResolver;
+import org.eclipse.edc.iam.identitytrust.service.IdentityAndTrustService;
+import org.eclipse.edc.iam.identitytrust.service.verification.MultiFormatPresentationVerifier;
+import org.eclipse.edc.iam.identitytrust.spi.ClaimTokenCreatorFunction;
+import org.eclipse.edc.iam.identitytrust.spi.CredentialServiceClient;
+import org.eclipse.edc.iam.identitytrust.spi.IatpParticipantAgentServiceExtension;
+import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService;
+import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry;
+import org.eclipse.edc.iam.identitytrust.spi.validation.TokenValidationAction;
+import org.eclipse.edc.iam.identitytrust.spi.verification.PresentationVerifier;
+import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;

extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java

@@ -22,13 +22,13 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import org.eclipse.edc.http.spi.EdcHttpClient;
-import org.eclipse.edc.identitytrust.CredentialServiceClient;
-import org.eclipse.edc.identitytrust.VcConstants;
-import org.eclipse.edc.identitytrust.model.CredentialFormat;
-import org.eclipse.edc.identitytrust.model.VerifiablePresentation;
-import org.eclipse.edc.identitytrust.model.VerifiablePresentationContainer;
-import org.eclipse.edc.identitytrust.model.credentialservice.PresentationQueryMessage;
-import org.eclipse.edc.identitytrust.model.credentialservice.PresentationResponseMessage;
+import org.eclipse.edc.iam.identitytrust.spi.CredentialServiceClient;
+import org.eclipse.edc.iam.identitytrust.spi.VcConstants;
+import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat;
+import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentation;
+import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer;
+import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage;
+import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.jsonld.spi.JsonLdKeywords;
 import org.eclipse.edc.spi.monitor.Monitor;

extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java

@@ -14,9 +14,9 @@
 
 package org.eclipse.edc.iam.identitytrust.core.defaults;
 
-import org.eclipse.edc.identitytrust.IatpParticipantAgentServiceExtension;
-import org.eclipse.edc.identitytrust.model.CredentialSubject;
-import org.eclipse.edc.identitytrust.model.VerifiableCredential;
+import org.eclipse.edc.iam.identitytrust.spi.IatpParticipantAgentServiceExtension;
+import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject;
+import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.jetbrains.annotations.NotNull;