Map Store Removal: Rename legacy modules

Closes keycloak#24107 Signed-off-by: Martin Kanis <[email protected]>
tnorimat · Jan 25, 2024 · 7797f77 · 7797f77
1 parent 28c9f98
commit 7797f77
Show file tree

Hide file tree

Showing 175 changed files with 45 additions and 37 deletions.
diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml
@@ -42,15 +42,15 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy</artifactId>
+            <artifactId>keycloak-model-storage</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-private</artifactId>
+            <artifactId>keycloak-model-storage-private</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-services</artifactId>
+            <artifactId>keycloak-model-storage-services</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>

diff --git a/docs/documentation/upgrading/topics/keycloak/changes-24_0_0.adoc b/docs/documentation/upgrading/topics/keycloak/changes-24_0_0.adoc
@@ -277,3 +277,11 @@ After removal of the Map Store the following configuration options were renamed:
 * `spi-connections-jpa-legacy-initialize-empty` to `spi-connections-jpa-quarkus-initialize-empty`
 * `spi-connections-jpa-legacy-migration-export` to `spi-connections-jpa-quarkus-migration-export`
 * `spi-connections-jpa-legacy-migration-strategy` to `spi-connections-jpa-quarkus-migration-strategy`
+
+= Renaming model modules
+
+After removal of the Map Store the following modules were renamed:
+
+* `org.keycloak:keycloak-model-legacy` to `org.keycloak:keycloak-model-storage`
+* `org.keycloak:keycloak-model-legacy-private` to `org.keycloak:keycloak-model-storage-private`
+* `org.keycloak:keycloak-model-legacy-services` to `org.keycloak:keycloak-model-storage-services`
diff --git a/federation/kerberos/pom.xml b/federation/kerberos/pom.xml
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-private</artifactId>
+            <artifactId>keycloak-model-storage-private</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/federation/ldap/pom.xml b/federation/ldap/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy</artifactId>
+            <artifactId>keycloak-model-storage</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -94,7 +94,7 @@
         <dependency>
             <!-- needed for InMemoryUserAdapter -->
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-private</artifactId>
+            <artifactId>keycloak-model-storage-private</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>

diff --git a/federation/sssd/pom.xml b/federation/sssd/pom.xml
@@ -87,7 +87,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-private</artifactId>
+            <artifactId>keycloak-model-storage-private</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/model/infinispan/pom.xml b/model/infinispan/pom.xml
@@ -46,11 +46,11 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy</artifactId>
+            <artifactId>keycloak-model-storage</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-private</artifactId>
+            <artifactId>keycloak-model-storage-private</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>

diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml
@@ -59,11 +59,11 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy</artifactId>
+            <artifactId>keycloak-model-storage</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-private</artifactId>
+            <artifactId>keycloak-model-storage-private</artifactId>
         </dependency>
         <dependency>
             <groupId>org.liquibase</groupId>

diff --git a/model/pom.xml b/model/pom.xml
@@ -31,9 +31,9 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>legacy</module>
-        <module>legacy-private</module>
-        <module>legacy-services</module>
+        <module>storage</module>
+        <module>storage-private</module>
+        <module>storage-services</module>
         <module>jpa</module>
         <module>infinispan</module>
     </modules>

diff --git a/model/legacy-private/pom.xml → model/storage-private/pom.xml b/model/legacy-private/pom.xml → model/storage-private/pom.xml
@@ -7,8 +7,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-model-legacy-private</artifactId>
-    <name>Keycloak Legacy Database Support - Private classes</name>
+    <artifactId>keycloak-model-storage-private</artifactId>
+    <name>Keycloak Database Support - Private classes</name>
     <description/>
 
     <dependencies>
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy</artifactId>
+            <artifactId>keycloak-model-storage</artifactId>
         </dependency>
         <dependency>
             <!-- needed for LegacyExportImportManager that is calling ValidationUtil.validateClient (which is in server-spi-private) might throw a BadRequestException -->

diff --git a/...cloak/cluster/ClusterProviderFactory.java → ...cloak/cluster/ClusterProviderFactory.java b/...cloak/cluster/ClusterProviderFactory.java → ...cloak/cluster/ClusterProviderFactory.java
diff --git a/...java/org/keycloak/cluster/ClusterSpi.java → ...java/org/keycloak/cluster/ClusterSpi.java b/...java/org/keycloak/cluster/ClusterSpi.java → ...java/org/keycloak/cluster/ClusterSpi.java
diff --git a/...ycloak/exportimport/util/ExportUtils.java → ...ycloak/exportimport/util/ExportUtils.java b/...ycloak/exportimport/util/ExportUtils.java → ...ycloak/exportimport/util/ExportUtils.java
diff --git a/...loak/migration/MigrationModelManager.java → ...loak/migration/MigrationModelManager.java b/...loak/migration/MigrationModelManager.java → ...loak/migration/MigrationModelManager.java
diff --git a/.../migration/migrators/MigrateTo12_0_0.java → .../migration/migrators/MigrateTo12_0_0.java b/.../migration/migrators/MigrateTo12_0_0.java → .../migration/migrators/MigrateTo12_0_0.java
diff --git a/.../migration/migrators/MigrateTo14_0_0.java → .../migration/migrators/MigrateTo14_0_0.java b/.../migration/migrators/MigrateTo14_0_0.java → .../migration/migrators/MigrateTo14_0_0.java
diff --git a/.../migration/migrators/MigrateTo18_0_0.java → .../migration/migrators/MigrateTo18_0_0.java b/.../migration/migrators/MigrateTo18_0_0.java → .../migration/migrators/MigrateTo18_0_0.java
diff --git a/...k/migration/migrators/MigrateTo1_2_0.java → ...k/migration/migrators/MigrateTo1_2_0.java b/...k/migration/migrators/MigrateTo1_2_0.java → ...k/migration/migrators/MigrateTo1_2_0.java
diff --git a/...k/migration/migrators/MigrateTo1_3_0.java → ...k/migration/migrators/MigrateTo1_3_0.java b/...k/migration/migrators/MigrateTo1_3_0.java → ...k/migration/migrators/MigrateTo1_3_0.java
diff --git a/...k/migration/migrators/MigrateTo1_4_0.java → ...k/migration/migrators/MigrateTo1_4_0.java b/...k/migration/migrators/MigrateTo1_4_0.java → ...k/migration/migrators/MigrateTo1_4_0.java
diff --git a/...k/migration/migrators/MigrateTo1_5_0.java → ...k/migration/migrators/MigrateTo1_5_0.java b/...k/migration/migrators/MigrateTo1_5_0.java → ...k/migration/migrators/MigrateTo1_5_0.java
diff --git a/...k/migration/migrators/MigrateTo1_6_0.java → ...k/migration/migrators/MigrateTo1_6_0.java b/...k/migration/migrators/MigrateTo1_6_0.java → ...k/migration/migrators/MigrateTo1_6_0.java
diff --git a/...k/migration/migrators/MigrateTo1_7_0.java → ...k/migration/migrators/MigrateTo1_7_0.java b/...k/migration/migrators/MigrateTo1_7_0.java → ...k/migration/migrators/MigrateTo1_7_0.java
diff --git a/...k/migration/migrators/MigrateTo1_8_0.java → ...k/migration/migrators/MigrateTo1_8_0.java b/...k/migration/migrators/MigrateTo1_8_0.java → ...k/migration/migrators/MigrateTo1_8_0.java
diff --git a/...k/migration/migrators/MigrateTo1_9_0.java → ...k/migration/migrators/MigrateTo1_9_0.java b/...k/migration/migrators/MigrateTo1_9_0.java → ...k/migration/migrators/MigrateTo1_9_0.java
diff --git a/...k/migration/migrators/MigrateTo1_9_2.java → ...k/migration/migrators/MigrateTo1_9_2.java b/...k/migration/migrators/MigrateTo1_9_2.java → ...k/migration/migrators/MigrateTo1_9_2.java
diff --git a/.../migration/migrators/MigrateTo20_0_0.java → .../migration/migrators/MigrateTo20_0_0.java b/.../migration/migrators/MigrateTo20_0_0.java → .../migration/migrators/MigrateTo20_0_0.java
diff --git a/.../migration/migrators/MigrateTo21_0_0.java → .../migration/migrators/MigrateTo21_0_0.java b/.../migration/migrators/MigrateTo21_0_0.java → .../migration/migrators/MigrateTo21_0_0.java
diff --git a/.../migration/migrators/MigrateTo22_0_0.java → .../migration/migrators/MigrateTo22_0_0.java b/.../migration/migrators/MigrateTo22_0_0.java → .../migration/migrators/MigrateTo22_0_0.java
diff --git a/.../migration/migrators/MigrateTo23_0_0.java → .../migration/migrators/MigrateTo23_0_0.java b/.../migration/migrators/MigrateTo23_0_0.java → .../migration/migrators/MigrateTo23_0_0.java
diff --git a/.../migration/migrators/MigrateTo24_0_0.java → .../migration/migrators/MigrateTo24_0_0.java b/.../migration/migrators/MigrateTo24_0_0.java → .../migration/migrators/MigrateTo24_0_0.java
diff --git a/...k/migration/migrators/MigrateTo2_0_0.java → ...k/migration/migrators/MigrateTo2_0_0.java b/...k/migration/migrators/MigrateTo2_0_0.java → ...k/migration/migrators/MigrateTo2_0_0.java
diff --git a/...k/migration/migrators/MigrateTo2_1_0.java → ...k/migration/migrators/MigrateTo2_1_0.java b/...k/migration/migrators/MigrateTo2_1_0.java → ...k/migration/migrators/MigrateTo2_1_0.java
diff --git a/...k/migration/migrators/MigrateTo2_2_0.java → ...k/migration/migrators/MigrateTo2_2_0.java b/...k/migration/migrators/MigrateTo2_2_0.java → ...k/migration/migrators/MigrateTo2_2_0.java
diff --git a/...k/migration/migrators/MigrateTo2_3_0.java → ...k/migration/migrators/MigrateTo2_3_0.java b/...k/migration/migrators/MigrateTo2_3_0.java → ...k/migration/migrators/MigrateTo2_3_0.java
diff --git a/...k/migration/migrators/MigrateTo2_5_0.java → ...k/migration/migrators/MigrateTo2_5_0.java b/...k/migration/migrators/MigrateTo2_5_0.java → ...k/migration/migrators/MigrateTo2_5_0.java
diff --git a/...k/migration/migrators/MigrateTo3_0_0.java → ...k/migration/migrators/MigrateTo3_0_0.java b/...k/migration/migrators/MigrateTo3_0_0.java → ...k/migration/migrators/MigrateTo3_0_0.java
diff --git a/...k/migration/migrators/MigrateTo3_1_0.java → ...k/migration/migrators/MigrateTo3_1_0.java b/...k/migration/migrators/MigrateTo3_1_0.java → ...k/migration/migrators/MigrateTo3_1_0.java
diff --git a/...k/migration/migrators/MigrateTo3_2_0.java → ...k/migration/migrators/MigrateTo3_2_0.java b/...k/migration/migrators/MigrateTo3_2_0.java → ...k/migration/migrators/MigrateTo3_2_0.java
diff --git a/...k/migration/migrators/MigrateTo3_4_0.java → ...k/migration/migrators/MigrateTo3_4_0.java b/...k/migration/migrators/MigrateTo3_4_0.java → ...k/migration/migrators/MigrateTo3_4_0.java
diff --git a/...k/migration/migrators/MigrateTo3_4_1.java → ...k/migration/migrators/MigrateTo3_4_1.java b/...k/migration/migrators/MigrateTo3_4_1.java → ...k/migration/migrators/MigrateTo3_4_1.java
diff --git a/...k/migration/migrators/MigrateTo3_4_2.java → ...k/migration/migrators/MigrateTo3_4_2.java b/...k/migration/migrators/MigrateTo3_4_2.java → ...k/migration/migrators/MigrateTo3_4_2.java
diff --git a/...k/migration/migrators/MigrateTo4_0_0.java → ...k/migration/migrators/MigrateTo4_0_0.java b/...k/migration/migrators/MigrateTo4_0_0.java → ...k/migration/migrators/MigrateTo4_0_0.java
diff --git a/...k/migration/migrators/MigrateTo4_2_0.java → ...k/migration/migrators/MigrateTo4_2_0.java b/...k/migration/migrators/MigrateTo4_2_0.java → ...k/migration/migrators/MigrateTo4_2_0.java
diff --git a/...k/migration/migrators/MigrateTo4_6_0.java → ...k/migration/migrators/MigrateTo4_6_0.java b/...k/migration/migrators/MigrateTo4_6_0.java → ...k/migration/migrators/MigrateTo4_6_0.java
diff --git a/...k/migration/migrators/MigrateTo6_0_0.java → ...k/migration/migrators/MigrateTo6_0_0.java b/...k/migration/migrators/MigrateTo6_0_0.java → ...k/migration/migrators/MigrateTo6_0_0.java
diff --git a/...k/migration/migrators/MigrateTo8_0_0.java → ...k/migration/migrators/MigrateTo8_0_0.java b/...k/migration/migrators/MigrateTo8_0_0.java → ...k/migration/migrators/MigrateTo8_0_0.java
diff --git a/...k/migration/migrators/MigrateTo8_0_2.java → ...k/migration/migrators/MigrateTo8_0_2.java b/...k/migration/migrators/MigrateTo8_0_2.java → ...k/migration/migrators/MigrateTo8_0_2.java
diff --git a/...k/migration/migrators/MigrateTo9_0_0.java → ...k/migration/migrators/MigrateTo9_0_0.java b/...k/migration/migrators/MigrateTo9_0_0.java → ...k/migration/migrators/MigrateTo9_0_0.java
diff --git a/...k/migration/migrators/MigrateTo9_0_4.java → ...k/migration/migrators/MigrateTo9_0_4.java b/...k/migration/migrators/MigrateTo9_0_4.java → ...k/migration/migrators/MigrateTo9_0_4.java
diff --git a/.../models/cache/CachePublicKeyProvider.java → .../models/cache/CachePublicKeyProvider.java b/.../models/cache/CachePublicKeyProvider.java → .../models/cache/CachePublicKeyProvider.java
diff --git a/.../cache/CachePublicKeyProviderFactory.java → .../cache/CachePublicKeyProviderFactory.java b/.../cache/CachePublicKeyProviderFactory.java → .../cache/CachePublicKeyProviderFactory.java
diff --git a/...dels/cache/CachePublicKeyProviderSpi.java → ...dels/cache/CachePublicKeyProviderSpi.java b/...dels/cache/CachePublicKeyProviderSpi.java → ...dels/cache/CachePublicKeyProviderSpi.java
diff --git a/...loak/models/cache/CacheRealmProvider.java → ...loak/models/cache/CacheRealmProvider.java b/...loak/models/cache/CacheRealmProvider.java → ...loak/models/cache/CacheRealmProvider.java
diff --git a/...dels/cache/CacheRealmProviderFactory.java → ...dels/cache/CacheRealmProviderFactory.java b/...dels/cache/CacheRealmProviderFactory.java → ...dels/cache/CacheRealmProviderFactory.java
diff --git a/...k/models/cache/CacheRealmProviderSpi.java → ...k/models/cache/CacheRealmProviderSpi.java b/...k/models/cache/CacheRealmProviderSpi.java → ...k/models/cache/CacheRealmProviderSpi.java
diff --git a/...ak/models/cache/CacheUserProviderSpi.java → ...ak/models/cache/CacheUserProviderSpi.java b/...ak/models/cache/CacheUserProviderSpi.java → ...ak/models/cache/CacheUserProviderSpi.java
diff --git a/...ycloak/models/cache/CachedRealmModel.java → ...ycloak/models/cache/CachedRealmModel.java b/...ycloak/models/cache/CachedRealmModel.java → ...ycloak/models/cache/CachedRealmModel.java
diff --git a/...odels/cache/UserCacheProviderFactory.java → ...odels/cache/UserCacheProviderFactory.java b/...odels/cache/UserCacheProviderFactory.java → ...odels/cache/UserCacheProviderFactory.java
diff --git a/...keycloak/models/dblock/DBLockManager.java → ...keycloak/models/dblock/DBLockManager.java b/...keycloak/models/dblock/DBLockManager.java → ...keycloak/models/dblock/DBLockManager.java
diff --git a/...eycloak/models/dblock/DBLockProvider.java → ...eycloak/models/dblock/DBLockProvider.java b/...eycloak/models/dblock/DBLockProvider.java → ...eycloak/models/dblock/DBLockProvider.java
diff --git a/.../models/dblock/DBLockProviderFactory.java → .../models/dblock/DBLockProviderFactory.java b/.../models/dblock/DBLockProviderFactory.java → .../models/dblock/DBLockProviderFactory.java
diff --git a/...org/keycloak/models/dblock/DBLockSpi.java → ...org/keycloak/models/dblock/DBLockSpi.java b/...org/keycloak/models/dblock/DBLockSpi.java → ...org/keycloak/models/dblock/DBLockSpi.java
diff --git a/...DisabledUserSessionPersisterProvider.java → ...DisabledUserSessionPersisterProvider.java b/...DisabledUserSessionPersisterProvider.java → ...DisabledUserSessionPersisterProvider.java
diff --git a/...entAuthenticatedClientSessionAdapter.java → ...entAuthenticatedClientSessionAdapter.java b/...entAuthenticatedClientSessionAdapter.java → ...entAuthenticatedClientSessionAdapter.java
diff --git a/...session/PersistentClientSessionModel.java → ...session/PersistentClientSessionModel.java b/...session/PersistentClientSessionModel.java → ...session/PersistentClientSessionModel.java
diff --git a/...session/PersistentUserSessionAdapter.java → ...session/PersistentUserSessionAdapter.java b/...session/PersistentUserSessionAdapter.java → ...session/PersistentUserSessionAdapter.java
diff --git a/...s/session/PersistentUserSessionModel.java → ...s/session/PersistentUserSessionModel.java b/...s/session/PersistentUserSessionModel.java → ...s/session/PersistentUserSessionModel.java
diff --git a/...session/UserSessionPersisterProvider.java → ...session/UserSessionPersisterProvider.java b/...session/UserSessionPersisterProvider.java → ...session/UserSessionPersisterProvider.java
diff --git a/.../UserSessionPersisterProviderFactory.java → .../UserSessionPersisterProviderFactory.java b/.../UserSessionPersisterProviderFactory.java → .../UserSessionPersisterProviderFactory.java
diff --git a/...dels/session/UserSessionPersisterSpi.java → ...dels/session/UserSessionPersisterSpi.java b/...dels/session/UserSessionPersisterSpi.java → ...dels/session/UserSessionPersisterSpi.java
diff --git a/...es/scheduled/ClearExpiredAdminEvents.java → ...es/scheduled/ClearExpiredAdminEvents.java b/...es/scheduled/ClearExpiredAdminEvents.java → ...es/scheduled/ClearExpiredAdminEvents.java
diff --git a/...learExpiredClientInitialAccessTokens.java → ...learExpiredClientInitialAccessTokens.java b/...learExpiredClientInitialAccessTokens.java → ...learExpiredClientInitialAccessTokens.java
diff --git a/...ervices/scheduled/ClearExpiredEvents.java → ...ervices/scheduled/ClearExpiredEvents.java b/...ervices/scheduled/ClearExpiredEvents.java → ...ervices/scheduled/ClearExpiredEvents.java
diff --git a/...s/scheduled/ClearExpiredUserSessions.java → ...s/scheduled/ClearExpiredUserSessions.java b/...s/scheduled/ClearExpiredUserSessions.java → ...s/scheduled/ClearExpiredUserSessions.java
diff --git a/...uled/ClusterAwareScheduledTaskRunner.java → ...uled/ClusterAwareScheduledTaskRunner.java b/...uled/ClusterAwareScheduledTaskRunner.java → ...uled/ClusterAwareScheduledTaskRunner.java
diff --git a/...ak/storage/ClientScopeStorageManager.java → ...ak/storage/ClientScopeStorageManager.java b/...ak/storage/ClientScopeStorageManager.java → ...ak/storage/ClientScopeStorageManager.java
diff --git a/...eycloak/storage/ClientStorageManager.java → ...eycloak/storage/ClientStorageManager.java b/...eycloak/storage/ClientStorageManager.java → ...eycloak/storage/ClientStorageManager.java
diff --git a/...keycloak/storage/GroupStorageManager.java → ...keycloak/storage/GroupStorageManager.java b/...keycloak/storage/GroupStorageManager.java → ...keycloak/storage/GroupStorageManager.java
diff --git a/...rg/keycloak/storage/MigrationManager.java → ...rg/keycloak/storage/MigrationManager.java b/...rg/keycloak/storage/MigrationManager.java → ...rg/keycloak/storage/MigrationManager.java
diff --git a/.../keycloak/storage/RoleStorageManager.java → .../keycloak/storage/RoleStorageManager.java b/.../keycloak/storage/RoleStorageManager.java → .../keycloak/storage/RoleStorageManager.java
diff --git a/.../keycloak/storage/UserStorageManager.java → .../keycloak/storage/UserStorageManager.java b/.../keycloak/storage/UserStorageManager.java → .../keycloak/storage/UserStorageManager.java
diff --git a/...cloak/storage/UserStoragePrivateUtil.java → ...cloak/storage/UserStoragePrivateUtil.java b/...cloak/storage/UserStoragePrivateUtil.java → ...cloak/storage/UserStoragePrivateUtil.java
diff --git a/.../storage/adapter/InMemoryUserAdapter.java → .../storage/adapter/InMemoryUserAdapter.java b/.../storage/adapter/InMemoryUserAdapter.java → .../storage/adapter/InMemoryUserAdapter.java
diff --git a/.../client/AbstractClientStorageAdapter.java → .../client/AbstractClientStorageAdapter.java b/.../client/AbstractClientStorageAdapter.java → .../client/AbstractClientStorageAdapter.java
diff --git a/...t/AbstractReadOnlyClientScopeAdapter.java → ...t/AbstractReadOnlyClientScopeAdapter.java b/...t/AbstractReadOnlyClientScopeAdapter.java → ...t/AbstractReadOnlyClientScopeAdapter.java
diff --git a/...AbstractReadOnlyClientStorageAdapter.java → ...AbstractReadOnlyClientStorageAdapter.java b/...AbstractReadOnlyClientStorageAdapter.java → ...AbstractReadOnlyClientStorageAdapter.java
diff --git a/.../client/ClientStorageProviderFactory.java → .../client/ClientStorageProviderFactory.java b/.../client/ClientStorageProviderFactory.java → .../client/ClientStorageProviderFactory.java
diff --git a/...rage/client/ClientStorageProviderSpi.java → ...rage/client/ClientStorageProviderSpi.java b/...rage/client/ClientStorageProviderSpi.java → ...rage/client/ClientStorageProviderSpi.java
diff --git a/...portedOperationsClientStorageAdapter.java → ...portedOperationsClientStorageAdapter.java b/...portedOperationsClientStorageAdapter.java → ...portedOperationsClientStorageAdapter.java
diff --git a/...ientscope/ClientScopeStorageProvider.java → ...ientscope/ClientScopeStorageProvider.java b/...ientscope/ClientScopeStorageProvider.java → ...ientscope/ClientScopeStorageProvider.java
diff --git a/...pe/ClientScopeStorageProviderFactory.java → ...pe/ClientScopeStorageProviderFactory.java b/...pe/ClientScopeStorageProviderFactory.java → ...pe/ClientScopeStorageProviderFactory.java
diff --git a/...cope/ClientScopeStorageProviderModel.java → ...cope/ClientScopeStorageProviderModel.java b/...cope/ClientScopeStorageProviderModel.java → ...cope/ClientScopeStorageProviderModel.java
diff --git a/...tscope/ClientScopeStorageProviderSpi.java → ...tscope/ClientScopeStorageProviderSpi.java b/...tscope/ClientScopeStorageProviderSpi.java → ...tscope/ClientScopeStorageProviderSpi.java
diff --git a/...e/datastore/DefaultDatastoreProvider.java → ...e/datastore/DefaultDatastoreProvider.java b/...e/datastore/DefaultDatastoreProvider.java → ...e/datastore/DefaultDatastoreProvider.java
diff --git a/...tore/DefaultDatastoreProviderFactory.java → ...tore/DefaultDatastoreProviderFactory.java b/...tore/DefaultDatastoreProviderFactory.java → ...tore/DefaultDatastoreProviderFactory.java
diff --git a/...datastore/DefaultExportImportManager.java → ...datastore/DefaultExportImportManager.java b/...datastore/DefaultExportImportManager.java → ...datastore/DefaultExportImportManager.java
diff --git a/...ge/datastore/DefaultMigrationManager.java → ...ge/datastore/DefaultMigrationManager.java b/...ge/datastore/DefaultMigrationManager.java → ...ge/datastore/DefaultMigrationManager.java
diff --git a/.../datastore/PeriodicEventInvalidation.java → .../datastore/PeriodicEventInvalidation.java b/.../datastore/PeriodicEventInvalidation.java → .../datastore/PeriodicEventInvalidation.java
diff --git a/...ge/group/GroupStorageProviderFactory.java → ...ge/group/GroupStorageProviderFactory.java b/...ge/group/GroupStorageProviderFactory.java → ...ge/group/GroupStorageProviderFactory.java
diff --git a/...torage/group/GroupStorageProviderSpi.java → ...torage/group/GroupStorageProviderSpi.java b/...torage/group/GroupStorageProviderSpi.java → ...torage/group/GroupStorageProviderSpi.java
diff --git a/...rage/managers/UserStorageSyncManager.java → ...rage/managers/UserStorageSyncManager.java b/...rage/managers/UserStorageSyncManager.java → ...rage/managers/UserStorageSyncManager.java
diff --git a/...ssion.UserSessionPersisterProviderFactory → ...ssion.UserSessionPersisterProviderFactory b/...ssion.UserSessionPersisterProviderFactory → ...ssion.UserSessionPersisterProviderFactory
diff --git a/...TA-INF/services/org.keycloak.provider.Spi → ...TA-INF/services/org.keycloak.provider.Spi b/...TA-INF/services/org.keycloak.provider.Spi → ...TA-INF/services/org.keycloak.provider.Spi
diff --git a/...keycloak.storage.DatastoreProviderFactory → ...keycloak.storage.DatastoreProviderFactory b/...keycloak.storage.DatastoreProviderFactory → ...keycloak.storage.DatastoreProviderFactory
diff --git a/...odels/datastore/MigrationManagerTest.java → ...odels/datastore/MigrationManagerTest.java b/...odels/datastore/MigrationManagerTest.java → ...odels/datastore/MigrationManagerTest.java
diff --git a/model/legacy-services/pom.xml → model/storage-services/pom.xml b/model/legacy-services/pom.xml → model/storage-services/pom.xml
@@ -7,8 +7,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-model-legacy-services</artifactId>
-    <name>Keycloak Legacy Database Support - REST services</name>
+    <artifactId>keycloak-model-storage-services</artifactId>
+    <name>Keycloak Database Support - REST services</name>
     <description/>
 
     <dependencies>
@@ -18,7 +18,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-private</artifactId>
+            <artifactId>keycloak-model-storage-private</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>

diff --git a/...port/AbstractFileBasedImportProvider.java → ...port/AbstractFileBasedImportProvider.java b/...port/AbstractFileBasedImportProvider.java → ...port/AbstractFileBasedImportProvider.java
diff --git a/...k/exportimport/dir/DirExportProvider.java → ...k/exportimport/dir/DirExportProvider.java b/...k/exportimport/dir/DirExportProvider.java → ...k/exportimport/dir/DirExportProvider.java
diff --git a/...timport/dir/DirExportProviderFactory.java → ...timport/dir/DirExportProviderFactory.java b/...timport/dir/DirExportProviderFactory.java → ...timport/dir/DirExportProviderFactory.java
diff --git a/...k/exportimport/dir/DirImportProvider.java → ...k/exportimport/dir/DirImportProvider.java b/...k/exportimport/dir/DirImportProvider.java → ...k/exportimport/dir/DirImportProvider.java
diff --git a/...timport/dir/DirImportProviderFactory.java → ...timport/dir/DirImportProviderFactory.java b/...timport/dir/DirImportProviderFactory.java → ...timport/dir/DirImportProviderFactory.java
diff --git a/.../singlefile/SingleFileExportProvider.java → .../singlefile/SingleFileExportProvider.java b/.../singlefile/SingleFileExportProvider.java → .../singlefile/SingleFileExportProvider.java
diff --git a/...file/SingleFileExportProviderFactory.java → ...file/SingleFileExportProviderFactory.java b/...file/SingleFileExportProviderFactory.java → ...file/SingleFileExportProviderFactory.java
diff --git a/.../singlefile/SingleFileImportProvider.java → .../singlefile/SingleFileImportProvider.java b/.../singlefile/SingleFileImportProvider.java → .../singlefile/SingleFileImportProvider.java
diff --git a/...file/SingleFileImportProviderFactory.java → ...file/SingleFileImportProviderFactory.java b/...file/SingleFileImportProviderFactory.java → ...file/SingleFileImportProviderFactory.java
diff --git a/...timport/util/ExportImportSessionTask.java → ...timport/util/ExportImportSessionTask.java b/...timport/util/ExportImportSessionTask.java → ...timport/util/ExportImportSessionTask.java
diff --git a/...ycloak/exportimport/util/ImportUtils.java → ...ycloak/exportimport/util/ImportUtils.java b/...ycloak/exportimport/util/ImportUtils.java → ...ycloak/exportimport/util/ImportUtils.java
diff --git a/...ort/util/MultipleStepsExportProvider.java → ...ort/util/MultipleStepsExportProvider.java b/...ort/util/MultipleStepsExportProvider.java → ...ort/util/MultipleStepsExportProvider.java
diff --git a/...min/ClearKeysCacheRealmAdminProvider.java → ...min/ClearKeysCacheRealmAdminProvider.java b/...min/ClearKeysCacheRealmAdminProvider.java → ...min/ClearKeysCacheRealmAdminProvider.java
diff --git a/...sources/admin/ClearKeysCacheResource.java → ...sources/admin/ClearKeysCacheResource.java b/...sources/admin/ClearKeysCacheResource.java → ...sources/admin/ClearKeysCacheResource.java
diff --git a/...in/ClearRealmCacheRealmAdminProvider.java → ...in/ClearRealmCacheRealmAdminProvider.java b/...in/ClearRealmCacheRealmAdminProvider.java → ...in/ClearRealmCacheRealmAdminProvider.java
diff --git a/...ources/admin/ClearRealmCacheResource.java → ...ources/admin/ClearRealmCacheResource.java b/...ources/admin/ClearRealmCacheResource.java → ...ources/admin/ClearRealmCacheResource.java
diff --git a/...min/ClearUserCacheRealmAdminProvider.java → ...min/ClearUserCacheRealmAdminProvider.java b/...min/ClearUserCacheRealmAdminProvider.java → ...min/ClearUserCacheRealmAdminProvider.java
diff --git a/...sources/admin/ClearUserCacheResource.java → ...sources/admin/ClearUserCacheResource.java b/...sources/admin/ClearUserCacheResource.java → ...sources/admin/ClearUserCacheResource.java
diff --git a/.../admin/ClientStorageProviderResource.java → .../admin/ClientStorageProviderResource.java b/.../admin/ClientStorageProviderResource.java → .../admin/ClientStorageProviderResource.java
diff --git a/...serStorageProviderRealmAdminProvider.java → ...serStorageProviderRealmAdminProvider.java b/...serStorageProviderRealmAdminProvider.java → ...serStorageProviderRealmAdminProvider.java
diff --git a/...es/admin/UserStorageProviderResource.java → ...es/admin/UserStorageProviderResource.java b/...es/admin/UserStorageProviderResource.java → ...es/admin/UserStorageProviderResource.java
diff --git a/...ces/src/main/resources/META-INF/beans.xml → ...ces/src/main/resources/META-INF/beans.xml b/...ces/src/main/resources/META-INF/beans.xml → ...ces/src/main/resources/META-INF/beans.xml
diff --git a/...ycloak.exportimport.ExportProviderFactory → ...ycloak.exportimport.ExportProviderFactory b/...ycloak.exportimport.ExportProviderFactory → ...ycloak.exportimport.ExportProviderFactory
diff --git a/...ycloak.exportimport.ImportProviderFactory → ...ycloak.exportimport.ImportProviderFactory b/...ycloak.exportimport.ImportProviderFactory → ...ycloak.exportimport.ImportProviderFactory
diff --git a/...min.ext.AdminRealmResourceProviderFactory → ...min.ext.AdminRealmResourceProviderFactory b/...min.ext.AdminRealmResourceProviderFactory → ...min.ext.AdminRealmResourceProviderFactory
diff --git a/model/legacy/pom.xml → model/storage/pom.xml b/model/legacy/pom.xml → model/storage/pom.xml
@@ -7,8 +7,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-model-legacy</artifactId>
-    <name>Keycloak Legacy Database Support</name>
+    <artifactId>keycloak-model-storage</artifactId>
+    <name>Keycloak Database Support</name>
     <description/>
 
     <dependencies>

diff --git a/...oak/credential/UserCredentialManager.java → ...oak/credential/UserCredentialManager.java b/...oak/credential/UserCredentialManager.java → ...oak/credential/UserCredentialManager.java
diff --git a/...oak/models/StorageProviderRealmModel.java → ...oak/models/StorageProviderRealmModel.java b/...oak/models/StorageProviderRealmModel.java → ...oak/models/StorageProviderRealmModel.java
diff --git a/...g/keycloak/models/cache/CachedObject.java → ...g/keycloak/models/cache/CachedObject.java b/...g/keycloak/models/cache/CachedObject.java → ...g/keycloak/models/cache/CachedObject.java
diff --git a/...eycloak/models/cache/CachedUserModel.java → ...eycloak/models/cache/CachedUserModel.java b/...eycloak/models/cache/CachedUserModel.java → ...eycloak/models/cache/CachedUserModel.java
diff --git a/...rg/keycloak/models/cache/OnUserCache.java → ...rg/keycloak/models/cache/OnUserCache.java b/...rg/keycloak/models/cache/OnUserCache.java → ...rg/keycloak/models/cache/OnUserCache.java
diff --git a/.../org/keycloak/models/cache/UserCache.java → .../org/keycloak/models/cache/UserCache.java b/.../org/keycloak/models/cache/UserCache.java → .../org/keycloak/models/cache/UserCache.java
diff --git a/...cloak/storage/AbstractStorageManager.java → ...cloak/storage/AbstractStorageManager.java b/...cloak/storage/AbstractStorageManager.java → ...cloak/storage/AbstractStorageManager.java
diff --git a/...torage/CacheableStorageProviderModel.java → ...torage/CacheableStorageProviderModel.java b/...torage/CacheableStorageProviderModel.java → ...torage/CacheableStorageProviderModel.java
diff --git a/...a/org/keycloak/storage/StoreManagers.java → ...a/org/keycloak/storage/StoreManagers.java b/...a/org/keycloak/storage/StoreManagers.java → ...a/org/keycloak/storage/StoreManagers.java
diff --git a/...keycloak/storage/UserStorageProvider.java → ...keycloak/storage/UserStorageProvider.java b/...keycloak/storage/UserStorageProvider.java → ...keycloak/storage/UserStorageProvider.java
diff --git a/...k/storage/UserStorageProviderFactory.java → ...k/storage/UserStorageProviderFactory.java b/...k/storage/UserStorageProviderFactory.java → ...k/storage/UserStorageProviderFactory.java
diff --git a/...oak/storage/UserStorageProviderModel.java → ...oak/storage/UserStorageProviderModel.java b/...oak/storage/UserStorageProviderModel.java → ...oak/storage/UserStorageProviderModel.java
diff --git a/...cloak/storage/UserStorageProviderSpi.java → ...cloak/storage/UserStorageProviderSpi.java b/...cloak/storage/UserStorageProviderSpi.java → ...cloak/storage/UserStorageProviderSpi.java
diff --git a/...org/keycloak/storage/UserStorageUtil.java → ...org/keycloak/storage/UserStorageUtil.java b/...org/keycloak/storage/UserStorageUtil.java → ...org/keycloak/storage/UserStorageUtil.java
diff --git a/.../storage/adapter/AbstractUserAdapter.java → .../storage/adapter/AbstractUserAdapter.java b/.../storage/adapter/AbstractUserAdapter.java → .../storage/adapter/AbstractUserAdapter.java
diff --git a/.../AbstractUserAdapterFederatedStorage.java → .../AbstractUserAdapterFederatedStorage.java b/.../AbstractUserAdapterFederatedStorage.java → .../AbstractUserAdapterFederatedStorage.java
diff --git a/...storage/client/ClientStorageProvider.java → ...storage/client/ClientStorageProvider.java b/...storage/client/ClientStorageProvider.java → ...storage/client/ClientStorageProvider.java
diff --git a/...ge/client/ClientStorageProviderModel.java → ...ge/client/ClientStorageProviderModel.java b/...ge/client/ClientStorageProviderModel.java → ...ge/client/ClientStorageProviderModel.java
diff --git a/...erated/UserAttributeFederatedStorage.java → ...erated/UserAttributeFederatedStorage.java b/...erated/UserAttributeFederatedStorage.java → ...erated/UserAttributeFederatedStorage.java
diff --git a/...rated/UserBrokerLinkFederatedStorage.java → ...rated/UserBrokerLinkFederatedStorage.java b/...rated/UserBrokerLinkFederatedStorage.java → ...rated/UserBrokerLinkFederatedStorage.java
diff --git a/...ederated/UserConsentFederatedStorage.java → ...ederated/UserConsentFederatedStorage.java b/...ederated/UserConsentFederatedStorage.java → ...ederated/UserConsentFederatedStorage.java
diff --git a/...derated/UserFederatedStorageProvider.java → ...derated/UserFederatedStorageProvider.java b/...derated/UserFederatedStorageProvider.java → ...derated/UserFederatedStorageProvider.java
diff --git a/.../UserFederatedStorageProviderFactory.java → .../UserFederatedStorageProviderFactory.java b/.../UserFederatedStorageProviderFactory.java → .../UserFederatedStorageProviderFactory.java
diff --git a/...ated/UserFederatedStorageProviderSpi.java → ...ated/UserFederatedStorageProviderSpi.java b/...ated/UserFederatedStorageProviderSpi.java → ...ated/UserFederatedStorageProviderSpi.java
diff --git a/...ted/UserFederatedUserCredentialStore.java → ...ted/UserFederatedUserCredentialStore.java b/...ted/UserFederatedUserCredentialStore.java → ...ted/UserFederatedUserCredentialStore.java
diff --git a/.../UserGroupMembershipFederatedStorage.java → .../UserGroupMembershipFederatedStorage.java b/.../UserGroupMembershipFederatedStorage.java → .../UserGroupMembershipFederatedStorage.java
diff --git a/...erated/UserNotBeforeFederatedStorage.java → ...erated/UserNotBeforeFederatedStorage.java b/...erated/UserNotBeforeFederatedStorage.java → ...erated/UserNotBeforeFederatedStorage.java
diff --git a/.../UserRequiredActionsFederatedStorage.java → .../UserRequiredActionsFederatedStorage.java b/.../UserRequiredActionsFederatedStorage.java → .../UserRequiredActionsFederatedStorage.java
diff --git a/...ted/UserRoleMappingsFederatedStorage.java → ...ted/UserRoleMappingsFederatedStorage.java b/...ted/UserRoleMappingsFederatedStorage.java → ...ted/UserRoleMappingsFederatedStorage.java
diff --git a/...k/storage/group/GroupStorageProvider.java → ...k/storage/group/GroupStorageProvider.java b/...k/storage/group/GroupStorageProvider.java → ...k/storage/group/GroupStorageProvider.java
diff --git a/...rage/group/GroupStorageProviderModel.java → ...rage/group/GroupStorageProviderModel.java b/...rage/group/GroupStorageProviderModel.java → ...rage/group/GroupStorageProviderModel.java
diff --git a/...torage/role/RoleStorageProviderModel.java → ...torage/role/RoleStorageProviderModel.java b/...torage/role/RoleStorageProviderModel.java → ...torage/role/RoleStorageProviderModel.java
diff --git a/...k/storage/user/ImportSynchronization.java → ...k/storage/user/ImportSynchronization.java b/...k/storage/user/ImportSynchronization.java → ...k/storage/user/ImportSynchronization.java
diff --git a/.../storage/user/ImportedUserValidation.java → .../storage/user/ImportedUserValidation.java b/.../storage/user/ImportedUserValidation.java → .../storage/user/ImportedUserValidation.java
diff --git a/...ava/org/keycloak/utils/ServicesUtils.java → ...ava/org/keycloak/utils/ServicesUtils.java b/...ava/org/keycloak/utils/ServicesUtils.java → ...ava/org/keycloak/utils/ServicesUtils.java
diff --git a/...TA-INF/services/org.keycloak.provider.Spi → ...TA-INF/services/org.keycloak.provider.Spi b/...TA-INF/services/org.keycloak.provider.Spi → ...TA-INF/services/org.keycloak.provider.Spi
diff --git a/pom.xml b/pom.xml
@@ -1222,17 +1222,17 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-model-legacy</artifactId>
+                <artifactId>keycloak-model-storage</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-model-legacy-private</artifactId>
+                <artifactId>keycloak-model-storage-private</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-model-legacy-services</artifactId>
+                <artifactId>keycloak-model-storage-services</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

diff --git a/quarkus/runtime/pom.xml b/quarkus/runtime/pom.xml
@@ -239,7 +239,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy</artifactId>
+            <artifactId>keycloak-model-storage</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -249,7 +249,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-private</artifactId>
+            <artifactId>keycloak-model-storage-private</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -259,7 +259,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-services</artifactId>
+            <artifactId>keycloak-model-storage-services</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>

diff --git a/services/pom.xml b/services/pom.xml
@@ -220,7 +220,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-private</artifactId>
+            <artifactId>keycloak-model-storage-private</artifactId>
         </dependency>
     </dependencies>
     <build>

diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-services</artifactId>
+            <artifactId>keycloak-model-storage-services</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wildfly.core</groupId>

diff --git a/...sources/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main/module.xml b/...sources/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main/module.xml
@@ -38,9 +38,9 @@
         <module name="org.keycloak.keycloak-saml-core-public"/>
         <module name="org.keycloak.keycloak-server-spi"/>
         <module name="org.keycloak.keycloak-server-spi-private"/>
-        <module name="org.keycloak.keycloak-model-legacy"/>
-        <module name="org.keycloak.keycloak-model-legacy-private"/>
-        <module name="org.keycloak.keycloak-model-legacy-services"/>
+        <module name="org.keycloak.keycloak-model-storage"/>
+        <module name="org.keycloak.keycloak-model-storage-private"/>
+        <module name="org.keycloak.keycloak-model-storage-services"/>
         <module name="org.keycloak.keycloak-services"/>
         <module name="org.keycloak.keycloak-model-infinispan"/>
         <module name="org.keycloak.keycloak-model-jpa"/>

diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -118,7 +118,7 @@
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy-services</artifactId>
+            <artifactId>keycloak-model-storage-services</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak.testsuite</groupId>

diff --git a/...suite/integration-arquillian/tests/base/src/test/resources/jboss-deployment-structure.xml b/...suite/integration-arquillian/tests/base/src/test/resources/jboss-deployment-structure.xml
@@ -29,9 +29,9 @@
             <module name="org.keycloak.keycloak-server-spi"/>
             <module name="org.keycloak.keycloak-server-spi-private"/>
             <module name="org.keycloak.keycloak-services" services="import"/>
-            <module name="org.keycloak.keycloak-model-legacy"/>
-            <module name="org.keycloak.keycloak-model-legacy-private"/>
-            <module name="org.keycloak.keycloak-model-legacy-services"/>
+            <module name="org.keycloak.keycloak-model-storage"/>
+            <module name="org.keycloak.keycloak-model-storage-private"/>
+            <module name="org.keycloak.keycloak-model-storage-services"/>
             <module name="org.keycloak.keycloak-model-infinispan"/>
             <module name="org.keycloak.keycloak-model-jpa"/>
             <module name="org.keycloak.keycloak-ldap-federation"/>