From 7797f778d1b32fe45922eb170c9a7c1910a964ce Mon Sep 17 00:00:00 2001 From: Martin Kanis Date: Wed, 24 Jan 2024 15:39:29 +0100 Subject: [PATCH] Map Store Removal: Rename legacy modules Closes #24107 Signed-off-by: Martin Kanis --- dependencies/server-all/pom.xml | 6 +++--- .../upgrading/topics/keycloak/changes-24_0_0.adoc | 8 ++++++++ federation/kerberos/pom.xml | 2 +- federation/ldap/pom.xml | 4 ++-- federation/sssd/pom.xml | 2 +- model/infinispan/pom.xml | 4 ++-- model/jpa/pom.xml | 4 ++-- model/pom.xml | 6 +++--- model/{legacy-private => storage-private}/pom.xml | 6 +++--- .../java/org/keycloak/cluster/ClusterProviderFactory.java | 0 .../src/main/java/org/keycloak/cluster/ClusterSpi.java | 0 .../java/org/keycloak/exportimport/util/ExportUtils.java | 0 .../org/keycloak/migration/MigrationModelManager.java | 0 .../org/keycloak/migration/migrators/MigrateTo12_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo14_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo18_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo1_2_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo1_3_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo1_4_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo1_5_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo1_6_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo1_7_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo1_8_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo1_9_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo1_9_2.java | 0 .../org/keycloak/migration/migrators/MigrateTo20_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo21_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo22_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo23_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo24_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo2_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo2_1_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo2_2_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo2_3_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo2_5_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo3_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo3_1_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo3_2_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo3_4_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo3_4_1.java | 0 .../org/keycloak/migration/migrators/MigrateTo3_4_2.java | 0 .../org/keycloak/migration/migrators/MigrateTo4_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo4_2_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo4_6_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo6_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo8_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo8_0_2.java | 0 .../org/keycloak/migration/migrators/MigrateTo9_0_0.java | 0 .../org/keycloak/migration/migrators/MigrateTo9_0_4.java | 0 .../org/keycloak/models/cache/CachePublicKeyProvider.java | 0 .../models/cache/CachePublicKeyProviderFactory.java | 0 .../keycloak/models/cache/CachePublicKeyProviderSpi.java | 0 .../org/keycloak/models/cache/CacheRealmProvider.java | 0 .../keycloak/models/cache/CacheRealmProviderFactory.java | 0 .../org/keycloak/models/cache/CacheRealmProviderSpi.java | 0 .../org/keycloak/models/cache/CacheUserProviderSpi.java | 0 .../java/org/keycloak/models/cache/CachedRealmModel.java | 0 .../keycloak/models/cache/UserCacheProviderFactory.java | 0 .../java/org/keycloak/models/dblock/DBLockManager.java | 0 .../java/org/keycloak/models/dblock/DBLockProvider.java | 0 .../org/keycloak/models/dblock/DBLockProviderFactory.java | 0 .../main/java/org/keycloak/models/dblock/DBLockSpi.java | 0 .../session/DisabledUserSessionPersisterProvider.java | 0 .../PersistentAuthenticatedClientSessionAdapter.java | 0 .../models/session/PersistentClientSessionModel.java | 0 .../models/session/PersistentUserSessionAdapter.java | 0 .../models/session/PersistentUserSessionModel.java | 0 .../models/session/UserSessionPersisterProvider.java | 0 .../session/UserSessionPersisterProviderFactory.java | 0 .../keycloak/models/session/UserSessionPersisterSpi.java | 0 .../services/scheduled/ClearExpiredAdminEvents.java | 0 .../scheduled/ClearExpiredClientInitialAccessTokens.java | 0 .../keycloak/services/scheduled/ClearExpiredEvents.java | 0 .../services/scheduled/ClearExpiredUserSessions.java | 0 .../scheduled/ClusterAwareScheduledTaskRunner.java | 0 .../org/keycloak/storage/ClientScopeStorageManager.java | 0 .../java/org/keycloak/storage/ClientStorageManager.java | 0 .../java/org/keycloak/storage/GroupStorageManager.java | 0 .../main/java/org/keycloak/storage/MigrationManager.java | 0 .../java/org/keycloak/storage/RoleStorageManager.java | 0 .../java/org/keycloak/storage/UserStorageManager.java | 0 .../java/org/keycloak/storage/UserStoragePrivateUtil.java | 0 .../org/keycloak/storage/adapter/InMemoryUserAdapter.java | 0 .../storage/client/AbstractClientStorageAdapter.java | 0 .../client/AbstractReadOnlyClientScopeAdapter.java | 0 .../client/AbstractReadOnlyClientStorageAdapter.java | 0 .../storage/client/ClientStorageProviderFactory.java | 0 .../keycloak/storage/client/ClientStorageProviderSpi.java | 0 .../client/UnsupportedOperationsClientStorageAdapter.java | 0 .../storage/clientscope/ClientScopeStorageProvider.java | 0 .../clientscope/ClientScopeStorageProviderFactory.java | 0 .../clientscope/ClientScopeStorageProviderModel.java | 0 .../clientscope/ClientScopeStorageProviderSpi.java | 0 .../storage/datastore/DefaultDatastoreProvider.java | 0 .../datastore/DefaultDatastoreProviderFactory.java | 0 .../storage/datastore/DefaultExportImportManager.java | 0 .../storage/datastore/DefaultMigrationManager.java | 0 .../storage/datastore/PeriodicEventInvalidation.java | 0 .../storage/group/GroupStorageProviderFactory.java | 0 .../keycloak/storage/group/GroupStorageProviderSpi.java | 0 .../keycloak/storage/managers/UserStorageSyncManager.java | 0 ...oak.models.session.UserSessionPersisterProviderFactory | 0 .../resources/META-INF/services/org.keycloak.provider.Spi | 0 .../org.keycloak.storage.DatastoreProviderFactory | 0 .../keycloak/models/datastore/MigrationManagerTest.java | 0 model/{legacy-services => storage-services}/pom.xml | 6 +++--- .../exportimport/AbstractFileBasedImportProvider.java | 0 .../org/keycloak/exportimport/dir/DirExportProvider.java | 0 .../exportimport/dir/DirExportProviderFactory.java | 0 .../org/keycloak/exportimport/dir/DirImportProvider.java | 0 .../exportimport/dir/DirImportProviderFactory.java | 0 .../exportimport/singlefile/SingleFileExportProvider.java | 0 .../singlefile/SingleFileExportProviderFactory.java | 0 .../exportimport/singlefile/SingleFileImportProvider.java | 0 .../singlefile/SingleFileImportProviderFactory.java | 0 .../exportimport/util/ExportImportSessionTask.java | 0 .../java/org/keycloak/exportimport/util/ImportUtils.java | 0 .../exportimport/util/MultipleStepsExportProvider.java | 0 .../resources/admin/ClearKeysCacheRealmAdminProvider.java | 0 .../services/resources/admin/ClearKeysCacheResource.java | 0 .../admin/ClearRealmCacheRealmAdminProvider.java | 0 .../services/resources/admin/ClearRealmCacheResource.java | 0 .../resources/admin/ClearUserCacheRealmAdminProvider.java | 0 .../services/resources/admin/ClearUserCacheResource.java | 0 .../resources/admin/ClientStorageProviderResource.java | 0 .../admin/UserStorageProviderRealmAdminProvider.java | 0 .../resources/admin/UserStorageProviderResource.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../org.keycloak.exportimport.ExportProviderFactory | 0 .../org.keycloak.exportimport.ImportProviderFactory | 0 ....resources.admin.ext.AdminRealmResourceProviderFactory | 0 model/{legacy => storage}/pom.xml | 4 ++-- .../org/keycloak/credential/UserCredentialManager.java | 0 .../org/keycloak/models/StorageProviderRealmModel.java | 0 .../main/java/org/keycloak/models/cache/CachedObject.java | 0 .../java/org/keycloak/models/cache/CachedUserModel.java | 0 .../main/java/org/keycloak/models/cache/OnUserCache.java | 0 .../main/java/org/keycloak/models/cache/UserCache.java | 0 .../java/org/keycloak/storage/AbstractStorageManager.java | 0 .../keycloak/storage/CacheableStorageProviderModel.java | 0 .../src/main/java/org/keycloak/storage/StoreManagers.java | 0 .../java/org/keycloak/storage/UserStorageProvider.java | 0 .../org/keycloak/storage/UserStorageProviderFactory.java | 0 .../org/keycloak/storage/UserStorageProviderModel.java | 0 .../java/org/keycloak/storage/UserStorageProviderSpi.java | 0 .../main/java/org/keycloak/storage/UserStorageUtil.java | 0 .../org/keycloak/storage/adapter/AbstractUserAdapter.java | 0 .../adapter/AbstractUserAdapterFederatedStorage.java | 0 .../keycloak/storage/client/ClientStorageProvider.java | 0 .../storage/client/ClientStorageProviderModel.java | 0 .../storage/federated/UserAttributeFederatedStorage.java | 0 .../storage/federated/UserBrokerLinkFederatedStorage.java | 0 .../storage/federated/UserConsentFederatedStorage.java | 0 .../storage/federated/UserFederatedStorageProvider.java | 0 .../federated/UserFederatedStorageProviderFactory.java | 0 .../federated/UserFederatedStorageProviderSpi.java | 0 .../federated/UserFederatedUserCredentialStore.java | 0 .../federated/UserGroupMembershipFederatedStorage.java | 0 .../storage/federated/UserNotBeforeFederatedStorage.java | 0 .../federated/UserRequiredActionsFederatedStorage.java | 0 .../federated/UserRoleMappingsFederatedStorage.java | 0 .../org/keycloak/storage/group/GroupStorageProvider.java | 0 .../keycloak/storage/group/GroupStorageProviderModel.java | 0 .../keycloak/storage/role/RoleStorageProviderModel.java | 0 .../org/keycloak/storage/user/ImportSynchronization.java | 0 .../org/keycloak/storage/user/ImportedUserValidation.java | 0 .../src/main/java/org/keycloak/utils/ServicesUtils.java | 0 .../resources/META-INF/services/org.keycloak.provider.Spi | 0 pom.xml | 6 +++--- quarkus/runtime/pom.xml | 6 +++--- services/pom.xml | 2 +- .../auth-server/services/testsuite-providers/pom.xml | 2 +- .../main/module.xml | 6 +++--- testsuite/integration-arquillian/tests/base/pom.xml | 2 +- .../src/test/resources/jboss-deployment-structure.xml | 6 +++--- 175 files changed, 45 insertions(+), 37 deletions(-) rename model/{legacy-private => storage-private}/pom.xml (91%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/cluster/ClusterProviderFactory.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/cluster/ClusterSpi.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/exportimport/util/ExportUtils.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/MigrationModelManager.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo12_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo14_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo18_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_2_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_6_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_2.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo20_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo21_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo22_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo23_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo2_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo2_1_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo2_2_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo2_3_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo2_5_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo3_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo3_1_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo3_2_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_1.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_2.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo4_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo4_2_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo4_6_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo6_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_2.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_0.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_4.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/cache/CachePublicKeyProvider.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/cache/CachePublicKeyProviderFactory.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/cache/CachePublicKeyProviderSpi.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/cache/CacheUserProviderSpi.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/cache/CachedRealmModel.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/cache/UserCacheProviderFactory.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/dblock/DBLockManager.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/dblock/DBLockProvider.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/dblock/DBLockProviderFactory.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/dblock/DBLockSpi.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/services/scheduled/ClearExpiredAdminEvents.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/services/scheduled/ClearExpiredClientInitialAccessTokens.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/services/scheduled/ClearExpiredEvents.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/services/scheduled/ClusterAwareScheduledTaskRunner.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/ClientScopeStorageManager.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/ClientStorageManager.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/GroupStorageManager.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/MigrationManager.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/RoleStorageManager.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/UserStorageManager.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/UserStoragePrivateUtil.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/adapter/InMemoryUserAdapter.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/client/AbstractClientStorageAdapter.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientScopeAdapter.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientStorageAdapter.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/client/ClientStorageProviderFactory.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/client/ClientStorageProviderSpi.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/client/UnsupportedOperationsClientStorageAdapter.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProvider.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProviderFactory.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/datastore/DefaultExportImportManager.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/datastore/DefaultMigrationManager.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/datastore/PeriodicEventInvalidation.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java (100%) rename model/{legacy-private => storage-private}/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java (100%) rename model/{legacy-private => storage-private}/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory (100%) rename model/{legacy-private => storage-private}/src/main/resources/META-INF/services/org.keycloak.provider.Spi (100%) rename model/{legacy-private => storage-private}/src/main/resources/META-INF/services/org.keycloak.storage.DatastoreProviderFactory (100%) rename model/{legacy-private => storage-private}/src/test/java/org/keycloak/models/datastore/MigrationManagerTest.java (100%) rename model/{legacy-services => storage-services}/pom.xml (90%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/AbstractFileBasedImportProvider.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/util/ImportUtils.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheRealmAdminProvider.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheRealmAdminProvider.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheRealmAdminProvider.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderRealmAdminProvider.java (100%) rename model/{legacy-services => storage-services}/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java (100%) rename model/{legacy-services => storage-services}/src/main/resources/META-INF/beans.xml (100%) rename model/{legacy-services => storage-services}/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory (100%) rename model/{legacy-services => storage-services}/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory (100%) rename model/{legacy-services => storage-services}/src/main/resources/META-INF/services/org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory (100%) rename model/{legacy => storage}/pom.xml (94%) rename model/{legacy => storage}/src/main/java/org/keycloak/credential/UserCredentialManager.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/models/StorageProviderRealmModel.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/models/cache/CachedObject.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/models/cache/CachedUserModel.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/models/cache/OnUserCache.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/models/cache/UserCache.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/AbstractStorageManager.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/CacheableStorageProviderModel.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/StoreManagers.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/UserStorageProvider.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/UserStorageProviderFactory.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/UserStorageProviderModel.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/UserStorageProviderSpi.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/UserStorageUtil.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapter.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/client/ClientStorageProvider.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/client/ClientStorageProviderModel.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserAttributeFederatedStorage.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserBrokerLinkFederatedStorage.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserConsentFederatedStorage.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProvider.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProviderFactory.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProviderSpi.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserFederatedUserCredentialStore.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserGroupMembershipFederatedStorage.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserNotBeforeFederatedStorage.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserRequiredActionsFederatedStorage.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/federated/UserRoleMappingsFederatedStorage.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/role/RoleStorageProviderModel.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/user/ImportSynchronization.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/storage/user/ImportedUserValidation.java (100%) rename model/{legacy => storage}/src/main/java/org/keycloak/utils/ServicesUtils.java (100%) rename model/{legacy => storage}/src/main/resources/META-INF/services/org.keycloak.provider.Spi (100%) diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml index d175607fce..c25827c2a3 100755 --- a/dependencies/server-all/pom.xml +++ b/dependencies/server-all/pom.xml @@ -42,15 +42,15 @@ org.keycloak - keycloak-model-legacy + keycloak-model-storage org.keycloak - keycloak-model-legacy-private + keycloak-model-storage-private org.keycloak - keycloak-model-legacy-services + keycloak-model-storage-services org.keycloak diff --git a/docs/documentation/upgrading/topics/keycloak/changes-24_0_0.adoc b/docs/documentation/upgrading/topics/keycloak/changes-24_0_0.adoc index 3ece2dff2c..db887c8651 100644 --- 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 index fa11c18ca6..95e483b06b 100755 --- a/federation/kerberos/pom.xml +++ b/federation/kerberos/pom.xml @@ -47,7 +47,7 @@ org.keycloak - keycloak-model-legacy-private + keycloak-model-storage-private provided diff --git a/federation/ldap/pom.xml b/federation/ldap/pom.xml index 702d5bfa24..c998ee7054 100755 --- a/federation/ldap/pom.xml +++ b/federation/ldap/pom.xml @@ -48,7 +48,7 @@ org.keycloak - keycloak-model-legacy + keycloak-model-storage provided @@ -94,7 +94,7 @@ org.keycloak - keycloak-model-legacy-private + keycloak-model-storage-private org.keycloak diff --git a/federation/sssd/pom.xml b/federation/sssd/pom.xml index 0999294dc5..72e1c71365 100644 --- a/federation/sssd/pom.xml +++ b/federation/sssd/pom.xml @@ -87,7 +87,7 @@ org.keycloak - keycloak-model-legacy-private + keycloak-model-storage-private provided diff --git a/model/infinispan/pom.xml b/model/infinispan/pom.xml index 83774d1a3b..79ffa042d2 100755 --- a/model/infinispan/pom.xml +++ b/model/infinispan/pom.xml @@ -46,11 +46,11 @@ org.keycloak - keycloak-model-legacy + keycloak-model-storage org.keycloak - keycloak-model-legacy-private + keycloak-model-storage-private org.keycloak diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml index bcb41c90dc..5775ae5d09 100755 --- a/model/jpa/pom.xml +++ b/model/jpa/pom.xml @@ -59,11 +59,11 @@ org.keycloak - keycloak-model-legacy + keycloak-model-storage org.keycloak - keycloak-model-legacy-private + keycloak-model-storage-private org.liquibase diff --git a/model/pom.xml b/model/pom.xml index c6a428efc1..373f164947 100755 --- a/model/pom.xml +++ b/model/pom.xml @@ -31,9 +31,9 @@ pom - legacy - legacy-private - legacy-services + storage + storage-private + storage-services jpa infinispan diff --git a/model/legacy-private/pom.xml b/model/storage-private/pom.xml similarity index 91% rename from model/legacy-private/pom.xml rename to model/storage-private/pom.xml index e30049067a..5fc2834830 100644 --- a/model/legacy-private/pom.xml +++ b/model/storage-private/pom.xml @@ -7,8 +7,8 @@ 4.0.0 - keycloak-model-legacy-private - Keycloak Legacy Database Support - Private classes + keycloak-model-storage-private + Keycloak Database Support - Private classes @@ -26,7 +26,7 @@ org.keycloak - keycloak-model-legacy + keycloak-model-storage diff --git a/model/legacy-private/src/main/java/org/keycloak/cluster/ClusterProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/cluster/ClusterProviderFactory.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/cluster/ClusterProviderFactory.java rename to model/storage-private/src/main/java/org/keycloak/cluster/ClusterProviderFactory.java diff --git a/model/legacy-private/src/main/java/org/keycloak/cluster/ClusterSpi.java b/model/storage-private/src/main/java/org/keycloak/cluster/ClusterSpi.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/cluster/ClusterSpi.java rename to model/storage-private/src/main/java/org/keycloak/cluster/ClusterSpi.java diff --git a/model/legacy-private/src/main/java/org/keycloak/exportimport/util/ExportUtils.java b/model/storage-private/src/main/java/org/keycloak/exportimport/util/ExportUtils.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/exportimport/util/ExportUtils.java rename to model/storage-private/src/main/java/org/keycloak/exportimport/util/ExportUtils.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/MigrationModelManager.java b/model/storage-private/src/main/java/org/keycloak/migration/MigrationModelManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/MigrationModelManager.java rename to model/storage-private/src/main/java/org/keycloak/migration/MigrationModelManager.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo12_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo12_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo12_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo12_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo14_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo14_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo14_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo14_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo18_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo18_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo18_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo18_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_2_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_2_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_2_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_2_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_5_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_6_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_6_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_6_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_6_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_2.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_2.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_2.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_2.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo20_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo20_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo20_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo20_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo21_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo21_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo21_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo21_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo22_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo22_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo22_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo22_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo23_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo23_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo23_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo23_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_1_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_1_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_1_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_1_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_2_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_2_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_2_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_2_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_3_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_3_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_3_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_3_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_5_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_5_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_5_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_5_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_1_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_1_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_1_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_1_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_2_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_2_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_2_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_2_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_1.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_1.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_1.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_1.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_2.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_2.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_2.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_2.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_2_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_2_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_2_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_2_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_6_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_6_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_6_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_6_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo6_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo6_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo6_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo6_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_2.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_2.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_2.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_2.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_0.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_0.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_0.java diff --git a/model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_4.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_4.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_4.java rename to model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_4.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProvider.java b/model/storage-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProvider.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProvider.java rename to model/storage-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProvider.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProviderFactory.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProviderFactory.java rename to model/storage-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProviderFactory.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProviderSpi.java b/model/storage-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProviderSpi.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProviderSpi.java rename to model/storage-private/src/main/java/org/keycloak/models/cache/CachePublicKeyProviderSpi.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java b/model/storage-private/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java rename to model/storage-private/src/main/java/org/keycloak/models/cache/CacheRealmProvider.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java rename to model/storage-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderFactory.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java b/model/storage-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java rename to model/storage-private/src/main/java/org/keycloak/models/cache/CacheRealmProviderSpi.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/cache/CacheUserProviderSpi.java b/model/storage-private/src/main/java/org/keycloak/models/cache/CacheUserProviderSpi.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/cache/CacheUserProviderSpi.java rename to model/storage-private/src/main/java/org/keycloak/models/cache/CacheUserProviderSpi.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/cache/CachedRealmModel.java b/model/storage-private/src/main/java/org/keycloak/models/cache/CachedRealmModel.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/cache/CachedRealmModel.java rename to model/storage-private/src/main/java/org/keycloak/models/cache/CachedRealmModel.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/cache/UserCacheProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/models/cache/UserCacheProviderFactory.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/cache/UserCacheProviderFactory.java rename to model/storage-private/src/main/java/org/keycloak/models/cache/UserCacheProviderFactory.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockManager.java b/model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockManager.java rename to model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockManager.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockProvider.java b/model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockProvider.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockProvider.java rename to model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockProvider.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockProviderFactory.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockProviderFactory.java rename to model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockProviderFactory.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockSpi.java b/model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockSpi.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/dblock/DBLockSpi.java rename to model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockSpi.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java b/model/storage-private/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java rename to model/storage-private/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java b/model/storage-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java rename to model/storage-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java b/model/storage-private/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java rename to model/storage-private/src/main/java/org/keycloak/models/session/PersistentClientSessionModel.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java b/model/storage-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java rename to model/storage-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java b/model/storage-private/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java rename to model/storage-private/src/main/java/org/keycloak/models/session/PersistentUserSessionModel.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java b/model/storage-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java rename to model/storage-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java rename to model/storage-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProviderFactory.java diff --git a/model/legacy-private/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java b/model/storage-private/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java rename to model/storage-private/src/main/java/org/keycloak/models/session/UserSessionPersisterSpi.java diff --git a/model/legacy-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredAdminEvents.java b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredAdminEvents.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredAdminEvents.java rename to model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredAdminEvents.java diff --git a/model/legacy-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredClientInitialAccessTokens.java b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredClientInitialAccessTokens.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredClientInitialAccessTokens.java rename to model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredClientInitialAccessTokens.java diff --git a/model/legacy-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredEvents.java b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredEvents.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredEvents.java rename to model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredEvents.java diff --git a/model/legacy-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java rename to model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java diff --git a/model/legacy-private/src/main/java/org/keycloak/services/scheduled/ClusterAwareScheduledTaskRunner.java b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClusterAwareScheduledTaskRunner.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/services/scheduled/ClusterAwareScheduledTaskRunner.java rename to model/storage-private/src/main/java/org/keycloak/services/scheduled/ClusterAwareScheduledTaskRunner.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/ClientScopeStorageManager.java b/model/storage-private/src/main/java/org/keycloak/storage/ClientScopeStorageManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/ClientScopeStorageManager.java rename to model/storage-private/src/main/java/org/keycloak/storage/ClientScopeStorageManager.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/ClientStorageManager.java b/model/storage-private/src/main/java/org/keycloak/storage/ClientStorageManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/ClientStorageManager.java rename to model/storage-private/src/main/java/org/keycloak/storage/ClientStorageManager.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/GroupStorageManager.java b/model/storage-private/src/main/java/org/keycloak/storage/GroupStorageManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/GroupStorageManager.java rename to model/storage-private/src/main/java/org/keycloak/storage/GroupStorageManager.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/MigrationManager.java b/model/storage-private/src/main/java/org/keycloak/storage/MigrationManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/MigrationManager.java rename to model/storage-private/src/main/java/org/keycloak/storage/MigrationManager.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/RoleStorageManager.java b/model/storage-private/src/main/java/org/keycloak/storage/RoleStorageManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/RoleStorageManager.java rename to model/storage-private/src/main/java/org/keycloak/storage/RoleStorageManager.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/UserStorageManager.java b/model/storage-private/src/main/java/org/keycloak/storage/UserStorageManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/UserStorageManager.java rename to model/storage-private/src/main/java/org/keycloak/storage/UserStorageManager.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/UserStoragePrivateUtil.java b/model/storage-private/src/main/java/org/keycloak/storage/UserStoragePrivateUtil.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/UserStoragePrivateUtil.java rename to model/storage-private/src/main/java/org/keycloak/storage/UserStoragePrivateUtil.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/adapter/InMemoryUserAdapter.java b/model/storage-private/src/main/java/org/keycloak/storage/adapter/InMemoryUserAdapter.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/adapter/InMemoryUserAdapter.java rename to model/storage-private/src/main/java/org/keycloak/storage/adapter/InMemoryUserAdapter.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/client/AbstractClientStorageAdapter.java b/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractClientStorageAdapter.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/client/AbstractClientStorageAdapter.java rename to model/storage-private/src/main/java/org/keycloak/storage/client/AbstractClientStorageAdapter.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientScopeAdapter.java b/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientScopeAdapter.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientScopeAdapter.java rename to model/storage-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientScopeAdapter.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientStorageAdapter.java b/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientStorageAdapter.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientStorageAdapter.java rename to model/storage-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientStorageAdapter.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderFactory.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderFactory.java rename to model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderFactory.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderSpi.java b/model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderSpi.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderSpi.java rename to model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderSpi.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/client/UnsupportedOperationsClientStorageAdapter.java b/model/storage-private/src/main/java/org/keycloak/storage/client/UnsupportedOperationsClientStorageAdapter.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/client/UnsupportedOperationsClientStorageAdapter.java rename to model/storage-private/src/main/java/org/keycloak/storage/client/UnsupportedOperationsClientStorageAdapter.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java b/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java rename to model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProvider.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java rename to model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java b/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java rename to model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderModel.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java b/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java rename to model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProvider.java b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProvider.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProvider.java rename to model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProvider.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProviderFactory.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProviderFactory.java rename to model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProviderFactory.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/datastore/DefaultExportImportManager.java b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultExportImportManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/datastore/DefaultExportImportManager.java rename to model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultExportImportManager.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/datastore/DefaultMigrationManager.java b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultMigrationManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/datastore/DefaultMigrationManager.java rename to model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultMigrationManager.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/datastore/PeriodicEventInvalidation.java b/model/storage-private/src/main/java/org/keycloak/storage/datastore/PeriodicEventInvalidation.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/datastore/PeriodicEventInvalidation.java rename to model/storage-private/src/main/java/org/keycloak/storage/datastore/PeriodicEventInvalidation.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java rename to model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java b/model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java rename to model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java b/model/storage-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java similarity index 100% rename from model/legacy-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java rename to model/storage-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java diff --git a/model/legacy-private/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory b/model/storage-private/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory similarity index 100% rename from model/legacy-private/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory rename to model/storage-private/src/main/resources/META-INF/services/org.keycloak.models.session.UserSessionPersisterProviderFactory diff --git a/model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/model/storage-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi similarity index 100% rename from model/legacy-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi rename to model/storage-private/src/main/resources/META-INF/services/org.keycloak.provider.Spi diff --git a/model/legacy-private/src/main/resources/META-INF/services/org.keycloak.storage.DatastoreProviderFactory b/model/storage-private/src/main/resources/META-INF/services/org.keycloak.storage.DatastoreProviderFactory similarity index 100% rename from model/legacy-private/src/main/resources/META-INF/services/org.keycloak.storage.DatastoreProviderFactory rename to model/storage-private/src/main/resources/META-INF/services/org.keycloak.storage.DatastoreProviderFactory diff --git a/model/legacy-private/src/test/java/org/keycloak/models/datastore/MigrationManagerTest.java b/model/storage-private/src/test/java/org/keycloak/models/datastore/MigrationManagerTest.java similarity index 100% rename from model/legacy-private/src/test/java/org/keycloak/models/datastore/MigrationManagerTest.java rename to model/storage-private/src/test/java/org/keycloak/models/datastore/MigrationManagerTest.java diff --git a/model/legacy-services/pom.xml b/model/storage-services/pom.xml similarity index 90% rename from model/legacy-services/pom.xml rename to model/storage-services/pom.xml index 2190e26295..761a8392f8 100644 --- a/model/legacy-services/pom.xml +++ b/model/storage-services/pom.xml @@ -7,8 +7,8 @@ 4.0.0 - keycloak-model-legacy-services - Keycloak Legacy Database Support - REST services + keycloak-model-storage-services + Keycloak Database Support - REST services @@ -18,7 +18,7 @@ org.keycloak - keycloak-model-legacy-private + keycloak-model-storage-private org.keycloak diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/AbstractFileBasedImportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/AbstractFileBasedImportProvider.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/AbstractFileBasedImportProvider.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/AbstractFileBasedImportProvider.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java b/model/storage-services/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java b/model/storage-services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java diff --git a/model/legacy-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java rename to model/storage-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheRealmAdminProvider.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheRealmAdminProvider.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheRealmAdminProvider.java rename to model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheRealmAdminProvider.java diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java rename to model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheRealmAdminProvider.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheRealmAdminProvider.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheRealmAdminProvider.java rename to model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheRealmAdminProvider.java diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java rename to model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheRealmAdminProvider.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheRealmAdminProvider.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheRealmAdminProvider.java rename to model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheRealmAdminProvider.java diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java rename to model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java rename to model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderRealmAdminProvider.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderRealmAdminProvider.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderRealmAdminProvider.java rename to model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderRealmAdminProvider.java diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java similarity index 100% rename from model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java rename to model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java diff --git a/model/legacy-services/src/main/resources/META-INF/beans.xml b/model/storage-services/src/main/resources/META-INF/beans.xml similarity index 100% rename from model/legacy-services/src/main/resources/META-INF/beans.xml rename to model/storage-services/src/main/resources/META-INF/beans.xml diff --git a/model/legacy-services/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory b/model/storage-services/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory similarity index 100% rename from model/legacy-services/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory rename to model/storage-services/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory diff --git a/model/legacy-services/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory b/model/storage-services/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory similarity index 100% rename from model/legacy-services/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory rename to model/storage-services/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory diff --git a/model/legacy-services/src/main/resources/META-INF/services/org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory b/model/storage-services/src/main/resources/META-INF/services/org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory similarity index 100% rename from model/legacy-services/src/main/resources/META-INF/services/org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory rename to model/storage-services/src/main/resources/META-INF/services/org.keycloak.services.resources.admin.ext.AdminRealmResourceProviderFactory diff --git a/model/legacy/pom.xml b/model/storage/pom.xml similarity index 94% rename from model/legacy/pom.xml rename to model/storage/pom.xml index 4f1c02fc16..bbdb17870d 100644 --- a/model/legacy/pom.xml +++ b/model/storage/pom.xml @@ -7,8 +7,8 @@ 4.0.0 - keycloak-model-legacy - Keycloak Legacy Database Support + keycloak-model-storage + Keycloak Database Support diff --git a/model/legacy/src/main/java/org/keycloak/credential/UserCredentialManager.java b/model/storage/src/main/java/org/keycloak/credential/UserCredentialManager.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/credential/UserCredentialManager.java rename to model/storage/src/main/java/org/keycloak/credential/UserCredentialManager.java diff --git a/model/legacy/src/main/java/org/keycloak/models/StorageProviderRealmModel.java b/model/storage/src/main/java/org/keycloak/models/StorageProviderRealmModel.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/models/StorageProviderRealmModel.java rename to model/storage/src/main/java/org/keycloak/models/StorageProviderRealmModel.java diff --git a/model/legacy/src/main/java/org/keycloak/models/cache/CachedObject.java b/model/storage/src/main/java/org/keycloak/models/cache/CachedObject.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/models/cache/CachedObject.java rename to model/storage/src/main/java/org/keycloak/models/cache/CachedObject.java diff --git a/model/legacy/src/main/java/org/keycloak/models/cache/CachedUserModel.java b/model/storage/src/main/java/org/keycloak/models/cache/CachedUserModel.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/models/cache/CachedUserModel.java rename to model/storage/src/main/java/org/keycloak/models/cache/CachedUserModel.java diff --git a/model/legacy/src/main/java/org/keycloak/models/cache/OnUserCache.java b/model/storage/src/main/java/org/keycloak/models/cache/OnUserCache.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/models/cache/OnUserCache.java rename to model/storage/src/main/java/org/keycloak/models/cache/OnUserCache.java diff --git a/model/legacy/src/main/java/org/keycloak/models/cache/UserCache.java b/model/storage/src/main/java/org/keycloak/models/cache/UserCache.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/models/cache/UserCache.java rename to model/storage/src/main/java/org/keycloak/models/cache/UserCache.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/AbstractStorageManager.java b/model/storage/src/main/java/org/keycloak/storage/AbstractStorageManager.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/AbstractStorageManager.java rename to model/storage/src/main/java/org/keycloak/storage/AbstractStorageManager.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/CacheableStorageProviderModel.java b/model/storage/src/main/java/org/keycloak/storage/CacheableStorageProviderModel.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/CacheableStorageProviderModel.java rename to model/storage/src/main/java/org/keycloak/storage/CacheableStorageProviderModel.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/StoreManagers.java b/model/storage/src/main/java/org/keycloak/storage/StoreManagers.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/StoreManagers.java rename to model/storage/src/main/java/org/keycloak/storage/StoreManagers.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/UserStorageProvider.java b/model/storage/src/main/java/org/keycloak/storage/UserStorageProvider.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/UserStorageProvider.java rename to model/storage/src/main/java/org/keycloak/storage/UserStorageProvider.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/UserStorageProviderFactory.java b/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderFactory.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/UserStorageProviderFactory.java rename to model/storage/src/main/java/org/keycloak/storage/UserStorageProviderFactory.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/UserStorageProviderModel.java b/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderModel.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/UserStorageProviderModel.java rename to model/storage/src/main/java/org/keycloak/storage/UserStorageProviderModel.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/UserStorageProviderSpi.java b/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderSpi.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/UserStorageProviderSpi.java rename to model/storage/src/main/java/org/keycloak/storage/UserStorageProviderSpi.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/UserStorageUtil.java b/model/storage/src/main/java/org/keycloak/storage/UserStorageUtil.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/UserStorageUtil.java rename to model/storage/src/main/java/org/keycloak/storage/UserStorageUtil.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapter.java b/model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapter.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapter.java rename to model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapter.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java rename to model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/client/ClientStorageProvider.java b/model/storage/src/main/java/org/keycloak/storage/client/ClientStorageProvider.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/client/ClientStorageProvider.java rename to model/storage/src/main/java/org/keycloak/storage/client/ClientStorageProvider.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/client/ClientStorageProviderModel.java b/model/storage/src/main/java/org/keycloak/storage/client/ClientStorageProviderModel.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/client/ClientStorageProviderModel.java rename to model/storage/src/main/java/org/keycloak/storage/client/ClientStorageProviderModel.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserAttributeFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserAttributeFederatedStorage.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserAttributeFederatedStorage.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserAttributeFederatedStorage.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserBrokerLinkFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserBrokerLinkFederatedStorage.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserBrokerLinkFederatedStorage.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserBrokerLinkFederatedStorage.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserConsentFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserConsentFederatedStorage.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserConsentFederatedStorage.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserConsentFederatedStorage.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProvider.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProvider.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProvider.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProvider.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProviderFactory.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProviderFactory.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProviderFactory.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProviderFactory.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProviderSpi.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProviderSpi.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProviderSpi.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProviderSpi.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserFederatedUserCredentialStore.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedUserCredentialStore.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserFederatedUserCredentialStore.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedUserCredentialStore.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserGroupMembershipFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserGroupMembershipFederatedStorage.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserGroupMembershipFederatedStorage.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserGroupMembershipFederatedStorage.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserNotBeforeFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserNotBeforeFederatedStorage.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserNotBeforeFederatedStorage.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserNotBeforeFederatedStorage.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserRequiredActionsFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserRequiredActionsFederatedStorage.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserRequiredActionsFederatedStorage.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserRequiredActionsFederatedStorage.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/federated/UserRoleMappingsFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserRoleMappingsFederatedStorage.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/federated/UserRoleMappingsFederatedStorage.java rename to model/storage/src/main/java/org/keycloak/storage/federated/UserRoleMappingsFederatedStorage.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java b/model/storage/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java rename to model/storage/src/main/java/org/keycloak/storage/group/GroupStorageProvider.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java b/model/storage/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java rename to model/storage/src/main/java/org/keycloak/storage/group/GroupStorageProviderModel.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/role/RoleStorageProviderModel.java b/model/storage/src/main/java/org/keycloak/storage/role/RoleStorageProviderModel.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/role/RoleStorageProviderModel.java rename to model/storage/src/main/java/org/keycloak/storage/role/RoleStorageProviderModel.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/user/ImportSynchronization.java b/model/storage/src/main/java/org/keycloak/storage/user/ImportSynchronization.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/user/ImportSynchronization.java rename to model/storage/src/main/java/org/keycloak/storage/user/ImportSynchronization.java diff --git a/model/legacy/src/main/java/org/keycloak/storage/user/ImportedUserValidation.java b/model/storage/src/main/java/org/keycloak/storage/user/ImportedUserValidation.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/storage/user/ImportedUserValidation.java rename to model/storage/src/main/java/org/keycloak/storage/user/ImportedUserValidation.java diff --git a/model/legacy/src/main/java/org/keycloak/utils/ServicesUtils.java b/model/storage/src/main/java/org/keycloak/utils/ServicesUtils.java similarity index 100% rename from model/legacy/src/main/java/org/keycloak/utils/ServicesUtils.java rename to model/storage/src/main/java/org/keycloak/utils/ServicesUtils.java diff --git a/model/legacy/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/model/storage/src/main/resources/META-INF/services/org.keycloak.provider.Spi similarity index 100% rename from model/legacy/src/main/resources/META-INF/services/org.keycloak.provider.Spi rename to model/storage/src/main/resources/META-INF/services/org.keycloak.provider.Spi diff --git a/pom.xml b/pom.xml index b5f5cd53e8..6fe45caa81 100644 --- a/pom.xml +++ b/pom.xml @@ -1222,17 +1222,17 @@ org.keycloak - keycloak-model-legacy + keycloak-model-storage ${project.version} org.keycloak - keycloak-model-legacy-private + keycloak-model-storage-private ${project.version} org.keycloak - keycloak-model-legacy-services + keycloak-model-storage-services ${project.version} diff --git a/quarkus/runtime/pom.xml b/quarkus/runtime/pom.xml index 3252308f81..1b3049732c 100644 --- a/quarkus/runtime/pom.xml +++ b/quarkus/runtime/pom.xml @@ -239,7 +239,7 @@ org.keycloak - keycloak-model-legacy + keycloak-model-storage * @@ -249,7 +249,7 @@ org.keycloak - keycloak-model-legacy-private + keycloak-model-storage-private * @@ -259,7 +259,7 @@ org.keycloak - keycloak-model-legacy-services + keycloak-model-storage-services * diff --git a/services/pom.xml b/services/pom.xml index 91bbd268be..9d92d0d272 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -220,7 +220,7 @@ org.keycloak - keycloak-model-legacy-private + keycloak-model-storage-private 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 index 688f16e79c..d99959a670 100644 --- 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 @@ org.keycloak - keycloak-model-legacy-services + keycloak-model-storage-services org.wildfly.core diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main/module.xml b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main/module.xml index 77f8a2ab31..bcf78aa91f 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main/module.xml +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/resources/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main/module.xml @@ -38,9 +38,9 @@ - - - + + + diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index af158bf48f..c663fc5205 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -118,7 +118,7 @@ org.keycloak - keycloak-model-legacy-services + keycloak-model-storage-services org.keycloak.testsuite diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/jboss-deployment-structure.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/jboss-deployment-structure.xml index 00e41f7c97..97f918647e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/jboss-deployment-structure.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/jboss-deployment-structure.xml @@ -29,9 +29,9 @@ - - - + + +