eclipse-edc · stefan-ettl · Apr 20, 2022 · Apr 14, 2022 · Apr 20, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,7 +21,7 @@ in the detailed section referring to by linking pull requests or issues.
 
 #### Changed
 
-*
+* Restructure sql extension folder tree (#1154)
 
 #### Removed
 

diff --git a/extensions/sql/asset/README.md → extensions/sql/asset-index-sql/README.md b/extensions/sql/asset/README.md → extensions/sql/asset-index-sql/README.md
diff --git a/extensions/sql/asset/index/build.gradle.kts → ...ions/sql/asset-index-sql/build.gradle.kts b/extensions/sql/asset/index/build.gradle.kts → ...ions/sql/asset-index-sql/build.gradle.kts
@@ -25,20 +25,20 @@ dependencies {
     implementation(project(":extensions:dataloading"))
     implementation(project(":extensions:transaction:transaction-spi"))
     implementation(project(":extensions:transaction:transaction-datasource-spi"))
-    implementation(project(":extensions:sql:common"))
+    implementation(project(":extensions:sql:common-sql"))
 
     testImplementation(testFixtures(project(":launchers:junit")))
     testImplementation(project(":core:base"))
-    testImplementation(project(":extensions:sql:pool:apache-commons-pool"))
+    testImplementation(project(":extensions:sql:pool:apache-commons-pool-sql"))
     testImplementation(project(":extensions:transaction:transaction-local"))
     testImplementation("com.h2database:h2:${h2Version}")
     testImplementation("org.assertj:assertj-core:${assertj}")
 }
 
 publishing {
     publications {
-        create<MavenPublication>("sql-asset-index") {
-            artifactId = "sql-asset-index"
+        create<MavenPublication>("asset-index-sql") {
+            artifactId = "asset-index-sql"
             from(components["java"])
         }
     }

diff --git a/extensions/sql/asset/docs/er.puml → extensions/sql/asset-index-sql/docs/er.puml b/extensions/sql/asset/docs/er.puml → extensions/sql/asset-index-sql/docs/er.puml
diff --git a/extensions/sql/asset/docs/schema.sql → ...sions/sql/asset-index-sql/docs/schema.sql b/extensions/sql/asset/docs/schema.sql → ...sions/sql/asset-index-sql/docs/schema.sql
diff --git a/...or/sql/asset/index/ConfigurationKeys.java → ...or/sql/asset/index/ConfigurationKeys.java b/...or/sql/asset/index/ConfigurationKeys.java → ...or/sql/asset/index/ConfigurationKeys.java
diff --git a/.../asset/index/PostgresSqlAssetQueries.java → .../asset/index/PostgresSqlAssetQueries.java b/.../asset/index/PostgresSqlAssetQueries.java → .../asset/index/PostgresSqlAssetQueries.java
diff --git a/...nector/sql/asset/index/SqlAssetIndex.java → ...nector/sql/asset/index/SqlAssetIndex.java b/...nector/sql/asset/index/SqlAssetIndex.java → ...nector/sql/asset/index/SqlAssetIndex.java
diff --git a/.../index/SqlAssetIndexServiceExtension.java → .../index/SqlAssetIndexServiceExtension.java b/.../index/SqlAssetIndexServiceExtension.java → .../index/SqlAssetIndexServiceExtension.java
diff --git a/...ctor/sql/asset/index/SqlAssetQueries.java → ...ctor/sql/asset/index/SqlAssetQueries.java b/...ctor/sql/asset/index/SqlAssetQueries.java → ...ctor/sql/asset/index/SqlAssetQueries.java
diff --git a/...ector/sql/asset/index/SqlAssetTables.java → ...ector/sql/asset/index/SqlAssetTables.java b/...ector/sql/asset/index/SqlAssetTables.java → ...ector/sql/asset/index/SqlAssetTables.java
diff --git a/...l/asset/index/SqlConditionExpression.java → ...l/asset/index/SqlConditionExpression.java b/...l/asset/index/SqlConditionExpression.java → ...l/asset/index/SqlConditionExpression.java
diff --git a/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension b/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension
diff --git a/...or/sql/asset/index/SqlAssetIndexTest.java → ...or/sql/asset/index/SqlAssetIndexTest.java b/...or/sql/asset/index/SqlAssetIndexTest.java → ...or/sql/asset/index/SqlAssetIndexTest.java
diff --git a/...set/index/SqlConditionExpressionTest.java → ...set/index/SqlConditionExpressionTest.java b/...set/index/SqlConditionExpressionTest.java → ...set/index/SqlConditionExpressionTest.java
diff --git a/...asset/index/src/test/resources/schema.sql → ...t-index-sql/src/test/resources/schema.sql b/...asset/index/src/test/resources/schema.sql → ...t-index-sql/src/test/resources/schema.sql
diff --git a/extensions/sql/build.gradle.kts b/extensions/sql/build.gradle.kts
@@ -18,11 +18,13 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":extensions:sql:contract-definition"))
-    implementation(project(":extensions:sql:contract-negotiation-store"))
-    implementation(project(":extensions:sql:lease"))
-    implementation(project(":extensions:sql:pool"))
-    implementation(project(":extensions:sql:transfer-process-store"))
+    implementation(project(":extensions:sql:asset-index-sql"))
+    implementation(project(":extensions:sql:common-sql"))
+    implementation(project(":extensions:sql:contract-definition-store-sql"))
+    implementation(project(":extensions:sql:contract-negotiation-store-sql"))
+    implementation(project(":extensions:sql:lease-sql"))
+    implementation(project(":extensions:sql:policy-store-sql"))
+    implementation(project(":extensions:sql:transfer-process-store-sql"))
 }
 
 publishing {

diff --git a/extensions/sql/common/README.md → extensions/sql/common-sql/README.md b/extensions/sql/common/README.md → extensions/sql/common-sql/README.md
diff --git a/extensions/sql/common/build.gradle.kts → extensions/sql/common-sql/build.gradle.kts b/extensions/sql/common/build.gradle.kts → extensions/sql/common-sql/build.gradle.kts
@@ -27,8 +27,8 @@ dependencies {
 
 publishing {
     publications {
-        create<MavenPublication>("sql-common") {
-            artifactId = "sql-common"
+        create<MavenPublication>("common-sql") {
+            artifactId = "common-sql"
             from(components["java"])
         }
     }

diff --git a/...taspaceconnector/sql/ArgumentHandler.java → ...taspaceconnector/sql/ArgumentHandler.java b/...taspaceconnector/sql/ArgumentHandler.java → ...taspaceconnector/sql/ArgumentHandler.java
diff --git a/...aspaceconnector/sql/ArgumentHandlers.java → ...aspaceconnector/sql/ArgumentHandlers.java b/...aspaceconnector/sql/ArgumentHandlers.java → ...aspaceconnector/sql/ArgumentHandlers.java
diff --git a/...spaceconnector/sql/ConnectionFactory.java → ...spaceconnector/sql/ConnectionFactory.java b/...spaceconnector/sql/ConnectionFactory.java → ...spaceconnector/sql/ConnectionFactory.java
diff --git a/...taspaceconnector/sql/ResultSetMapper.java → ...taspaceconnector/sql/ResultSetMapper.java b/...taspaceconnector/sql/ResultSetMapper.java → ...taspaceconnector/sql/ResultSetMapper.java
diff --git a/...aspaceconnector/sql/SqlQueryExecutor.java → ...aspaceconnector/sql/SqlQueryExecutor.java b/...aspaceconnector/sql/SqlQueryExecutor.java → ...aspaceconnector/sql/SqlQueryExecutor.java
diff --git a/...tasource/ConnectionFactoryDataSource.java → ...tasource/ConnectionFactoryDataSource.java b/...tasource/ConnectionFactoryDataSource.java → ...tasource/ConnectionFactoryDataSource.java
diff --git a/.../datasource/ConnectionPoolDataSource.java → .../datasource/ConnectionPoolDataSource.java b/.../datasource/ConnectionPoolDataSource.java → .../datasource/ConnectionPoolDataSource.java
diff --git a/...atasource/PooledDataSourceConnection.java → ...atasource/PooledDataSourceConnection.java b/...atasource/PooledDataSourceConnection.java → ...atasource/PooledDataSourceConnection.java
diff --git a/...aceconnector/sql/pool/ConnectionPool.java → ...aceconnector/sql/pool/ConnectionPool.java b/...aceconnector/sql/pool/ConnectionPool.java → ...aceconnector/sql/pool/ConnectionPool.java
diff --git a/.../sql/SqlQueryExecutorIntegrationTest.java → .../sql/SqlQueryExecutorIntegrationTest.java b/.../sql/SqlQueryExecutorIntegrationTest.java → .../sql/SqlQueryExecutorIntegrationTest.java
diff --git a/...ceconnector/sql/SqlQueryExecutorTest.java → ...ceconnector/sql/SqlQueryExecutorTest.java b/...ceconnector/sql/SqlQueryExecutorTest.java → ...ceconnector/sql/SqlQueryExecutorTest.java
diff --git a/...urce/ConnectionFactoryDataSourceTest.java → ...urce/ConnectionFactoryDataSourceTest.java b/...urce/ConnectionFactoryDataSourceTest.java → ...urce/ConnectionFactoryDataSourceTest.java
diff --git a/...asource/ConnectionPoolDataSourceTest.java → ...asource/ConnectionPoolDataSourceTest.java b/...asource/ConnectionPoolDataSourceTest.java → ...asource/ConnectionPoolDataSourceTest.java
diff --git a/...ource/PooledDataSourceConnectionTest.java → ...ource/PooledDataSourceConnectionTest.java b/...ource/PooledDataSourceConnectionTest.java → ...ource/PooledDataSourceConnectionTest.java
diff --git a/...ontract-definition/store/build.gradle.kts → ...act-definition-store-sql/build.gradle.kts b/...ontract-definition/store/build.gradle.kts → ...act-definition-store-sql/build.gradle.kts
@@ -26,20 +26,20 @@ dependencies {
     implementation(project(":extensions:dataloading"))
     implementation(project(":extensions:transaction:transaction-spi"))
     implementation(project(":extensions:transaction:transaction-datasource-spi"))
-    implementation(project(":extensions:sql:common"))
+    implementation(project(":extensions:sql:common-sql"))
 
     testImplementation(testFixtures(project(":launchers:junit")))
     testImplementation(project(":core:base"))
-    testImplementation(project(":extensions:sql:pool:apache-commons-pool"))
+    testImplementation(project(":extensions:sql:pool:apache-commons-pool-sql"))
     testImplementation(project(":extensions:transaction:transaction-local"))
     testImplementation("com.h2database:h2:${h2Version}")
     testImplementation("org.assertj:assertj-core:${assertj}")
 }
 
 publishing {
     publications {
-        create<MavenPublication>("sql-contractdefinition-store") {
-            artifactId = "sql-contractdefinition-store"
+        create<MavenPublication>("contractdefinition-store-sql") {
+            artifactId = "contractdefinition-store-sql"
             from(components["java"])
         }
     }

diff --git a/...ns/sql/contract-definition/docs/README.md → ...tract-definition-store-sql/docs/README.md b/...ns/sql/contract-definition/docs/README.md → ...tract-definition-store-sql/docs/README.md
diff --git a/...sions/sql/contract-definition/docs/er.png → ...contract-definition-store-sql/docs/er.png b/...sions/sql/contract-definition/docs/er.png → ...contract-definition-store-sql/docs/er.png
diff --git a/...ions/sql/contract-definition/docs/er.puml → ...ontract-definition-store-sql/docs/er.puml b/...ions/sql/contract-definition/docs/er.puml → ...ontract-definition-store-sql/docs/er.puml
diff --git a/...s/sql/contract-definition/docs/schema.sql → ...ract-definition-store-sql/docs/schema.sql b/...s/sql/contract-definition/docs/schema.sql → ...ract-definition-store-sql/docs/schema.sql
diff --git a/...n/store/ContractDefinitionStatements.java → ...n/store/ContractDefinitionStatements.java b/...n/store/ContractDefinitionStatements.java → ...n/store/ContractDefinitionStatements.java
diff --git a/...tdefinition/store/PostgresStatements.java → ...tdefinition/store/PostgresStatements.java b/...tdefinition/store/PostgresStatements.java → ...tdefinition/store/PostgresStatements.java
diff --git a/...ion/store/SqlContractDefinitionStore.java → ...ion/store/SqlContractDefinitionStore.java b/...ion/store/SqlContractDefinitionStore.java → ...ion/store/SqlContractDefinitionStore.java
diff --git a/.../SqlContractDefinitionStoreExtension.java → .../SqlContractDefinitionStoreExtension.java b/.../SqlContractDefinitionStoreExtension.java → .../SqlContractDefinitionStoreExtension.java
diff --git a/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension b/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension
diff --git a/...store/SqlContractDefinitionStoreTest.java → ...store/SqlContractDefinitionStoreTest.java b/...store/SqlContractDefinitionStoreTest.java → ...store/SqlContractDefinitionStoreTest.java
diff --git a/...ition/store/src/test/resources/schema.sql → ...n-store-sql/src/test/resources/schema.sql b/...ition/store/src/test/resources/schema.sql → ...n-store-sql/src/test/resources/schema.sql
diff --git a/...ntract-negotiation-store/build.gradle.kts → ...ct-negotiation-store-sql/build.gradle.kts b/...ntract-negotiation-store/build.gradle.kts → ...ct-negotiation-store-sql/build.gradle.kts
@@ -26,23 +26,23 @@ dependencies {
     implementation(project(":extensions:dataloading"))
     implementation(project(":extensions:transaction:transaction-spi"))
     implementation(project(":extensions:transaction:transaction-datasource-spi"))
-    implementation(project(":extensions:sql:common"))
-    implementation(project(":extensions:sql:lease"))
+    implementation(project(":extensions:sql:common-sql"))
+    implementation(project(":extensions:sql:lease-sql"))
 
     testImplementation(testFixtures(project(":launchers:junit")))
     testImplementation(project(":core:base"))
     testImplementation(project(":core:contract"))
-    testImplementation(project(":extensions:sql:pool:apache-commons-pool"))
+    testImplementation(project(":extensions:sql:pool:apache-commons-pool-sql"))
     testImplementation(project(":extensions:transaction:transaction-local"))
-    testImplementation(testFixtures(project(":extensions:sql:lease")))
+    testImplementation(testFixtures(project(":extensions:sql:lease-sql")))
     testImplementation("com.h2database:h2:${h2Version}")
     testImplementation("org.assertj:assertj-core:${assertj}")
 }
 
 publishing {
     publications {
-        create<MavenPublication>("sql-contractnegotiation-store") {
-            artifactId = "sql-contractnegotiation-store"
+        create<MavenPublication>("contractnegotiation-store-sql") {
+            artifactId = "contractnegotiation-store-sql"
             from(components["java"])
         }
     }

diff --git a/...contract-negotiation-store/docs/README.md → ...ract-negotiation-store-sql/docs/README.md b/...contract-negotiation-store/docs/README.md → ...ract-negotiation-store-sql/docs/README.md
diff --git a/...t-negotiation-store/docs/ddl_postgres.sql → ...gotiation-store-sql/docs/ddl_postgres.sql b/...t-negotiation-store/docs/ddl_postgres.sql → ...gotiation-store-sql/docs/ddl_postgres.sql
diff --git a/...SqlContractNegotiationStoreExtension.java → ...SqlContractNegotiationStoreExtension.java b/...SqlContractNegotiationStoreExtension.java → ...SqlContractNegotiationStoreExtension.java
diff --git a/.../store/ContractNegotiationStatements.java → .../store/ContractNegotiationStatements.java b/.../store/ContractNegotiationStatements.java → .../store/ContractNegotiationStatements.java
diff --git a/...negotiation/store/PostgresStatements.java → ...negotiation/store/PostgresStatements.java b/...negotiation/store/PostgresStatements.java → ...negotiation/store/PostgresStatements.java
diff --git a/...on/store/SqlContractNegotiationStore.java → ...on/store/SqlContractNegotiationStore.java b/...on/store/SqlContractNegotiationStore.java → ...on/store/SqlContractNegotiationStore.java
diff --git a/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension b/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension
diff --git a/...ontractNegotiationStoreExtensionTest.java → ...ontractNegotiationStoreExtensionTest.java b/...ontractNegotiationStoreExtensionTest.java → ...ontractNegotiationStoreExtensionTest.java
diff --git a/...ql/contractnegotiation/TestFunctions.java → ...ql/contractnegotiation/TestFunctions.java b/...ql/contractnegotiation/TestFunctions.java → ...ql/contractnegotiation/TestFunctions.java
diff --git a/...tore/SqlContractNegotiationStoreTest.java → ...tore/SqlContractNegotiationStoreTest.java b/...tore/SqlContractNegotiationStoreTest.java → ...tore/SqlContractNegotiationStoreTest.java
diff --git a/...ation-store/src/test/resources/schema.sql → ...n-store-sql/src/test/resources/schema.sql b/...ation-store/src/test/resources/schema.sql → ...n-store-sql/src/test/resources/schema.sql
diff --git a/extensions/sql/lease/build.gradle.kts → extensions/sql/lease-sql/build.gradle.kts b/extensions/sql/lease/build.gradle.kts → extensions/sql/lease-sql/build.gradle.kts
@@ -26,21 +26,21 @@ val assertj: String by project
 dependencies {
     api(project(":extensions:transaction:transaction-datasource-spi"))
     api(project(":extensions:transaction:transaction-spi"))
-    api(project(":extensions:sql:common"))
+    api(project(":extensions:sql:common-sql"))
 
 
     testImplementation(testFixtures(project(":launchers:junit")))
     testImplementation(project(":core:base"))
     testImplementation(project(":extensions:transaction:transaction-local"))
-    testImplementation(testFixtures(project(":extensions:sql:lease")))
+    testImplementation(testFixtures(project(":extensions:sql:lease-sql")))
     testImplementation("com.h2database:h2:${h2Version}")
     testImplementation("org.assertj:assertj-core:${assertj}")
 }
 
 publishing {
     publications {
-        create<MavenPublication>("sql-lease") {
-            artifactId = "sql-lease"
+        create<MavenPublication>("lease-sql") {
+            artifactId = "lease-sql"
             from(components["java"])
         }
     }

diff --git a/...econnector/sql/lease/LeaseStatements.java → ...econnector/sql/lease/LeaseStatements.java b/...econnector/sql/lease/LeaseStatements.java → ...econnector/sql/lease/LeaseStatements.java
diff --git a/...ataspaceconnector/sql/lease/SqlLease.java → ...ataspaceconnector/sql/lease/SqlLease.java b/...ataspaceconnector/sql/lease/SqlLease.java → ...ataspaceconnector/sql/lease/SqlLease.java
diff --git a/...econnector/sql/lease/SqlLeaseContext.java → ...econnector/sql/lease/SqlLeaseContext.java b/...econnector/sql/lease/SqlLeaseContext.java → ...econnector/sql/lease/SqlLeaseContext.java
diff --git a/...tor/sql/lease/SqlLeaseContextBuilder.java → ...tor/sql/lease/SqlLeaseContextBuilder.java b/...tor/sql/lease/SqlLeaseContextBuilder.java → ...tor/sql/lease/SqlLeaseContextBuilder.java
diff --git a/...nector/sql/lease/SqlLeaseContextTest.java → ...nector/sql/lease/SqlLeaseContextTest.java b/...nector/sql/lease/SqlLeaseContextTest.java → ...nector/sql/lease/SqlLeaseContextTest.java
diff --git a/...s/sql/lease/src/test/resources/schema.sql → ...l/lease-sql/src/test/resources/schema.sql b/...s/sql/lease/src/test/resources/schema.sql → ...l/lease-sql/src/test/resources/schema.sql
diff --git a/...taspaceconnector/sql/lease/LeaseUtil.java → ...taspaceconnector/sql/lease/LeaseUtil.java b/...taspaceconnector/sql/lease/LeaseUtil.java → ...taspaceconnector/sql/lease/LeaseUtil.java
diff --git a/extensions/sql/policy/store/build.gradle.kts → ...ons/sql/policy-store-sql/build.gradle.kts b/extensions/sql/policy/store/build.gradle.kts → ...ons/sql/policy-store-sql/build.gradle.kts
@@ -26,17 +26,17 @@ dependencies {
     implementation(project(":extensions:dataloading"))
     implementation(project(":extensions:transaction:transaction-spi"))
     implementation(project(":extensions:transaction:transaction-datasource-spi"))
-    implementation(project(":extensions:sql:common"))
+    implementation(project(":extensions:sql:common-sql"))
 
-    testImplementation(project(":extensions:sql:pool:apache-commons-pool"))
+    testImplementation(project(":extensions:sql:pool:apache-commons-pool-sql"))
     testImplementation(project(":extensions:transaction:transaction-local"))
     testImplementation("com.h2database:h2:${h2Version}")
 }
 
 publishing {
     publications {
-        create<MavenPublication>("sql-policy-store") {
-            artifactId = "sql-policy-store"
+        create<MavenPublication>("policy-store-sql") {
+            artifactId = "policy-store-sql"
             from(components["java"])
         }
     }

diff --git a/extensions/sql/policy/docs/README.md → ...sions/sql/policy-store-sql/docs/README.md b/extensions/sql/policy/docs/README.md → ...sions/sql/policy-store-sql/docs/README.md
diff --git a/extensions/sql/policy/docs/er.png → extensions/sql/policy-store-sql/docs/er.png b/extensions/sql/policy/docs/er.png → extensions/sql/policy-store-sql/docs/er.png
diff --git a/extensions/sql/policy/docs/er.puml → extensions/sql/policy-store-sql/docs/er.puml b/extensions/sql/policy/docs/er.puml → extensions/sql/policy-store-sql/docs/er.puml
diff --git a/extensions/sql/policy/docs/schema.sql → ...ions/sql/policy-store-sql/docs/schema.sql b/extensions/sql/policy/docs/schema.sql → ...ions/sql/policy-store-sql/docs/schema.sql
diff --git a/...r/sql/policy/SqlPolicyStoreExtension.java → ...r/sql/policy/SqlPolicyStoreExtension.java b/...r/sql/policy/SqlPolicyStoreExtension.java → ...r/sql/policy/SqlPolicyStoreExtension.java
diff --git a/...sql/policy/store/PostgressStatements.java → ...sql/policy/store/PostgressStatements.java b/...sql/policy/store/PostgressStatements.java → ...sql/policy/store/PostgressStatements.java
diff --git a/...ctor/sql/policy/store/SqlPolicyStore.java → ...ctor/sql/policy/store/SqlPolicyStore.java b/...ctor/sql/policy/store/SqlPolicyStore.java → ...ctor/sql/policy/store/SqlPolicyStore.java
diff --git a/...olicy/store/SqlPolicyStoreStatements.java → ...olicy/store/SqlPolicyStoreStatements.java b/...olicy/store/SqlPolicyStoreStatements.java → ...olicy/store/SqlPolicyStoreStatements.java
diff --git a/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension b/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension
diff --git a/.../slq/policy/store/SqlPolicyStoreTest.java → .../slq/policy/store/SqlPolicyStoreTest.java b/.../slq/policy/store/SqlPolicyStoreTest.java → .../slq/policy/store/SqlPolicyStoreTest.java
diff --git a/...olicy/store/src/test/resources/schema.sql → ...y-store-sql/src/test/resources/schema.sql b/...olicy/store/src/test/resources/schema.sql → ...y-store-sql/src/test/resources/schema.sql
diff --git a/...ns/sql/pool/apache-commons-pool/README.md → ...ql/pool/apache-commons-pool-sql/README.md b/...ns/sql/pool/apache-commons-pool/README.md → ...ql/pool/apache-commons-pool-sql/README.md
diff --git a/...pool/apache-commons-pool/build.gradle.kts → .../apache-commons-pool-sql/build.gradle.kts b/...pool/apache-commons-pool/build.gradle.kts → .../apache-commons-pool-sql/build.gradle.kts
@@ -24,7 +24,7 @@ val mockitoVersion: String by project
 dependencies {
     api(project((":spi")))
     api(project(":extensions:transaction:transaction-datasource-spi"))
-    api(project(":extensions:sql:common"))
+    api(project(":extensions:sql:common-sql"))
 
     implementation("org.apache.commons:commons-pool2:${apacheCommonsPool2Version}")
 
@@ -38,8 +38,8 @@ dependencies {
 
 publishing {
     publications {
-        create<MavenPublication>("sql-pool-apache-commons-pool") {
-            artifactId = "sql-pool-apache-commons-pool"
+        create<MavenPublication>("apache-commons-pool-sql") {
+            artifactId = "apache-commons-pool-sql"
             from(components["java"])
         }
     }

diff --git a/...l/pool/commons/CommonsConnectionPool.java → ...l/pool/commons/CommonsConnectionPool.java b/...l/pool/commons/CommonsConnectionPool.java → ...l/pool/commons/CommonsConnectionPool.java
diff --git a/.../commons/CommonsConnectionPoolConfig.java → .../commons/CommonsConnectionPoolConfig.java b/.../commons/CommonsConnectionPoolConfig.java → .../commons/CommonsConnectionPoolConfig.java
diff --git a/...mons/CommonsConnectionPoolConfigKeys.java → ...mons/CommonsConnectionPoolConfigKeys.java b/...mons/CommonsConnectionPoolConfigKeys.java → ...mons/CommonsConnectionPoolConfigKeys.java
diff --git a/...ommonsConnectionPoolServiceExtension.java → ...ommonsConnectionPoolServiceExtension.java b/...ommonsConnectionPoolServiceExtension.java → ...ommonsConnectionPoolServiceExtension.java
diff --git a/...mmons/DriverManagerConnectionFactory.java → ...mmons/DriverManagerConnectionFactory.java b/...mmons/DriverManagerConnectionFactory.java → ...mmons/DriverManagerConnectionFactory.java
diff --git a/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension b/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension
diff --git a/...nsConnectionPoolServiceExtensionTest.java → ...nsConnectionPoolServiceExtensionTest.java b/...nsConnectionPoolServiceExtensionTest.java → ...nsConnectionPoolServiceExtensionTest.java
diff --git a/...mons/CommonsConnectionPoolConfigTest.java → ...mons/CommonsConnectionPoolConfigTest.java b/...mons/CommonsConnectionPoolConfigTest.java → ...mons/CommonsConnectionPoolConfigTest.java
diff --git a/...nsConnectionPoolServiceExtensionTest.java → ...nsConnectionPoolServiceExtensionTest.java b/...nsConnectionPoolServiceExtensionTest.java → ...nsConnectionPoolServiceExtensionTest.java
diff --git a/...ol/commons/CommonsConnectionPoolTest.java → ...ol/commons/CommonsConnectionPoolTest.java b/...ol/commons/CommonsConnectionPoolTest.java → ...ol/commons/CommonsConnectionPoolTest.java
diff --git a/...l/transfer-process-store/build.gradle.kts → ...ansfer-process-store-sql/build.gradle.kts b/...l/transfer-process-store/build.gradle.kts → ...ansfer-process-store-sql/build.gradle.kts
@@ -28,13 +28,13 @@ dependencies {
     implementation(project(":extensions:dataloading"))
     implementation(project(":extensions:transaction:transaction-spi"))
     implementation(project(":extensions:transaction:transaction-datasource-spi"))
-    implementation(project(":extensions:sql:common"))
-    implementation(project(":extensions:sql:lease"))
+    implementation(project(":extensions:sql:common-sql"))
+    implementation(project(":extensions:sql:lease-sql"))
 
     testImplementation(testFixtures(project(":launchers:junit")))
-    testImplementation(testFixtures(project(":extensions:sql:lease")))
+    testImplementation(testFixtures(project(":extensions:sql:lease-sql")))
     testImplementation(project(":core:base"))
-    testImplementation(project(":extensions:sql:pool:apache-commons-pool"))
+    testImplementation(project(":extensions:sql:pool:apache-commons-pool-sql"))
     testImplementation(project(":extensions:transaction:transaction-local"))
     testImplementation("com.h2database:h2:${h2Version}")
     testImplementation("org.assertj:assertj-core:${assertj}")
@@ -43,8 +43,8 @@ dependencies {
 
 publishing {
     publications {
-        create<MavenPublication>("sql-transferprocess-store") {
-            artifactId = "sql-transferprocess-store"
+        create<MavenPublication>("transfer-process-store-sql") {
+            artifactId = "transfer-process-store-sql"
             from(components["java"])
         }
     }

diff --git a/.../sql/transfer-process-store/doc/README.md → .../transfer-process-store-sql/doc/README.md b/.../sql/transfer-process-store/doc/README.md → .../transfer-process-store-sql/doc/README.md
diff --git a/...ansfer-process-store/doc/ddl_postgres.sql → ...er-process-store-sql/doc/ddl_postgres.sql b/...ansfer-process-store/doc/ddl_postgres.sql → ...er-process-store-sql/doc/ddl_postgres.sql
diff --git a/...ess/SqlTransferProcessStoreExtension.java → ...ess/SqlTransferProcessStoreExtension.java b/...ess/SqlTransferProcessStoreExtension.java → ...ess/SqlTransferProcessStoreExtension.java
diff --git a/...sferprocess/store/PostgresStatements.java → ...sferprocess/store/PostgresStatements.java b/...sferprocess/store/PostgresStatements.java → ...sferprocess/store/PostgresStatements.java
diff --git a/...rocess/store/SqlTransferProcessStore.java → ...rocess/store/SqlTransferProcessStore.java b/...rocess/store/SqlTransferProcessStore.java → ...rocess/store/SqlTransferProcessStore.java
diff --git a/...store/TransferProcessStoreStatements.java → ...store/TransferProcessStoreStatements.java b/...store/TransferProcessStoreStatements.java → ...store/TransferProcessStoreStatements.java
diff --git a/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension b/...paceconnector.spi.system.ServiceExtension → ...paceconnector.spi.system.ServiceExtension
diff --git a/...ss/store/SqlTransferProcessStoreTest.java → ...ss/store/SqlTransferProcessStoreTest.java b/...ss/store/SqlTransferProcessStoreTest.java → ...ss/store/SqlTransferProcessStoreTest.java
diff --git a/.../transferprocess/store/TestFunctions.java → .../transferprocess/store/TestFunctions.java b/.../transferprocess/store/TestFunctions.java → .../transferprocess/store/TestFunctions.java
diff --git a/...ocess-store/src/test/resources/schema.sql → ...s-store-sql/src/test/resources/schema.sql b/...ocess-store/src/test/resources/schema.sql → ...s-store-sql/src/test/resources/schema.sql
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -43,10 +43,6 @@ include(":data-protocols:ids:ids-transform-v1")
 include(":data-protocols:ids:ids-token-validation")
 include(":data-protocols:ids:ids-api-configuration")
 
-include("extensions:sql:contract-definition:store")
-include("extensions:sql:contract-negotiation-store")
-include("extensions:sql:policy:store")
-
 // modules for technology- or cloud-provider extensions
 include(":extensions:aws")
 include(":extensions:api:control")
@@ -143,14 +139,18 @@ include(":extensions:azure:data-plane:common")
 include(":extensions:azure:data-plane:storage")
 include(":extensions:data-plane:data-plane-api")
 include(":extensions:data-plane:integration-tests")
-include(":extensions:sql:common")
-include(":extensions:sql:lease")
-include(":extensions:sql:pool:apache-commons-pool")
-include(":extensions:sql:asset:index")
-include(":extensions:sql:transfer-process-store")
 include(":extensions:http-receiver")
 include(":extensions:http-provisioner")
 
+include(":extensions:sql:asset-index-sql")
+include(":extensions:sql:common-sql")
+include(":extensions:sql:contract-definition-store-sql")
+include(":extensions:sql:contract-negotiation-store-sql")
+include(":extensions:sql:lease-sql")
+include(":extensions:sql:policy-store-sql")
+include(":extensions:sql:pool:apache-commons-pool-sql")
+include(":extensions:sql:transfer-process-store-sql")
+
 // modules for launchers, i.e. runnable compositions of the app
 include(":launchers:basic")
 include(":launchers:junit")
-Original file line number
+Diff line change
@@ Expand Up @@
     #### Changed
-    *
+    * Restructure sql extension folder tree (#1154)
     #### Removed
@@ Expand Down @@