chore: sts modules refactor

eclipse-edc · Oct 26, 2023 · 6bee095 · 6bee095
1 parent 6d8937d
commit 6bee095
Show file tree

Hide file tree

Showing 25 changed files with 8 additions and 6 deletions.
diff --git a/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
     implementation(project(":extensions:common:crypto:ldp-verifiable-credentials"))
     implementation(project(":extensions:common:crypto:crypto-core"))
     implementation(project(":extensions:common:iam:identity-trust:identity-trust-service"))
-    implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts-embedded"))
+    implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-embedded"))
     implementation(libs.nimbus.jwt)
 
     testImplementation(testFixtures(project(":spi:common:identity-trust-spi")))

diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-sts/build.gradle.kts
@@ -18,6 +18,8 @@ plugins {
 }
 
 dependencies {
+    api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-embedded"))
+    api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-core"))
     api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-api"))
     api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-client-configuration"))
 }

diff --git a/.../identity-trust-sts-core/build.gradle.kts → .../identity-trust-sts-core/build.gradle.kts b/.../identity-trust-sts-core/build.gradle.kts → .../identity-trust-sts-core/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     api(project(":spi:common:transaction-spi"))
     api(project(":spi:common:identity-trust-spi"))
     api(project(":spi:common:identity-trust-sts-spi"))
-    implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts-embedded"))
+    implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-embedded"))
     implementation(project(":core:common:jwt-core"))
 
     testImplementation(testFixtures(project(":spi:common:identity-trust-sts-spi")))

diff --git a/...sts/core/StsDefaultServicesExtension.java → ...sts/core/StsDefaultServicesExtension.java b/...sts/core/StsDefaultServicesExtension.java → ...sts/core/StsDefaultServicesExtension.java
diff --git a/...t/sts/core/StsDefaultStoresExtension.java → ...t/sts/core/StsDefaultStoresExtension.java b/...t/sts/core/StsDefaultStoresExtension.java → ...t/sts/core/StsDefaultStoresExtension.java
diff --git a/...efaults/service/StsClientServiceImpl.java → ...efaults/service/StsClientServiceImpl.java b/...efaults/service/StsClientServiceImpl.java → ...efaults/service/StsClientServiceImpl.java
diff --git a/...e/StsClientTokenGeneratorServiceImpl.java → ...e/StsClientTokenGeneratorServiceImpl.java b/...e/StsClientTokenGeneratorServiceImpl.java → ...e/StsClientTokenGeneratorServiceImpl.java
diff --git a/...efaults/store/InMemoryStsClientStore.java → ...efaults/store/InMemoryStsClientStore.java b/...efaults/store/InMemoryStsClientStore.java → ...efaults/store/InMemoryStsClientStore.java
diff --git a/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension b/...g.eclipse.edc.spi.system.ServiceExtension → ...g.eclipse.edc.spi.system.ServiceExtension
diff --git a/...tsClientTokenIssuanceIntegrationTest.java → ...tsClientTokenIssuanceIntegrationTest.java b/...tsClientTokenIssuanceIntegrationTest.java → ...tsClientTokenIssuanceIntegrationTest.java
diff --git a/...ults/StsDefaultServicesExtensionTest.java → ...ults/StsDefaultServicesExtensionTest.java b/...ults/StsDefaultServicesExtensionTest.java → ...ults/StsDefaultServicesExtensionTest.java
diff --git a/...faults/StsDefaultStoresExtensionTest.java → ...faults/StsDefaultStoresExtensionTest.java b/...faults/StsDefaultStoresExtensionTest.java → ...faults/StsDefaultStoresExtensionTest.java
diff --git a/...lts/service/StsClientServiceImplTest.java → ...lts/service/StsClientServiceImplTest.java b/...lts/service/StsClientServiceImplTest.java → ...lts/service/StsClientServiceImplTest.java
diff --git a/...sClientTokenGeneratorServiceImplTest.java → ...sClientTokenGeneratorServiceImplTest.java b/...sClientTokenGeneratorServiceImplTest.java → ...sClientTokenGeneratorServiceImplTest.java
diff --git a/...lts/store/InMemoryStsClientStoreTest.java → ...lts/store/InMemoryStsClientStoreTest.java b/...lts/store/InMemoryStsClientStoreTest.java → ...lts/store/InMemoryStsClientStoreTest.java
diff --git a/...core/src/test/resources/ec-privatekey.pem → ...core/src/test/resources/ec-privatekey.pem b/...core/src/test/resources/ec-privatekey.pem → ...core/src/test/resources/ec-privatekey.pem
diff --git a/...ntity-trust-sts-embedded/build.gradle.kts → ...ntity-trust-sts-embedded/build.gradle.kts b/...ntity-trust-sts-embedded/build.gradle.kts → ...ntity-trust-sts-embedded/build.gradle.kts
diff --git a/.../embedded/EmbeddedSecureTokenService.java → .../embedded/EmbeddedSecureTokenService.java b/.../embedded/EmbeddedSecureTokenService.java → .../embedded/EmbeddedSecureTokenService.java
diff --git a/...ts/embedded/SelfIssuedTokenDecorator.java → ...ts/embedded/SelfIssuedTokenDecorator.java b/...ts/embedded/SelfIssuedTokenDecorator.java → ...ts/embedded/SelfIssuedTokenDecorator.java
diff --git a/...dedSecureTokenServiceIntegrationTest.java → ...dedSecureTokenServiceIntegrationTest.java b/...dedSecureTokenServiceIntegrationTest.java → ...dedSecureTokenServiceIntegrationTest.java
diff --git a/...edded/EmbeddedSecureTokenServiceTest.java → ...edded/EmbeddedSecureTokenServiceTest.java b/...edded/EmbeddedSecureTokenServiceTest.java → ...edded/EmbeddedSecureTokenServiceTest.java
diff --git a/...mbedded/SelfIssuedTokenDecoratorTest.java → ...mbedded/SelfIssuedTokenDecoratorTest.java b/...mbedded/SelfIssuedTokenDecoratorTest.java → ...mbedded/SelfIssuedTokenDecoratorTest.java
diff --git a/launchers/sts-server/build.gradle.kts b/launchers/sts-server/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
     implementation(project(":core:common:connector-core"))
     implementation(project(":core:common:jwt-core"))
     implementation(project(":extensions:common:http"))
-    implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts-core"))
+    implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-core"))
     implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-api"))
     api(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-client-configuration"))
     implementation(project(":extensions:common:configuration:configuration-filesystem"))

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -116,9 +116,9 @@ include(":extensions:common:iam:identity-trust")
 include(":extensions:common:iam:identity-trust:identity-trust-transform")
 include(":extensions:common:iam:identity-trust:identity-trust-service")
 include(":extensions:common:iam:identity-trust:identity-trust-core")
-include(":extensions:common:iam:identity-trust:identity-trust-sts-embedded")
-include(":extensions:common:iam:identity-trust:identity-trust-sts-core")
 include(":extensions:common:iam:identity-trust:identity-trust-sts")
+include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-embedded")
+include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-core")
 include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-api")
 include(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-client-configuration")
 

diff --git a/system-tests/sts-api/sts-api-test-runtime/build.gradle.kts b/system-tests/sts-api/sts-api-test-runtime/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 dependencies {
     implementation(project(":core:common:jwt-core"))
     implementation(project(":extensions:common:http"))
-    implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts-core"))
+    implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-core"))
     implementation(project(":extensions:common:iam:identity-trust:identity-trust-sts:identity-trust-sts-api"))
 }