libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Rename providers from jpa-map-storage to jpa

Browse source 
Closes #12098
This commit is contained in:
vramik 2022-05-19 19:23:22 +02:00 committed by Hynek Mlnařík
parent 0c3aa597f9
commit 24171d2e47
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java
View file

@ -115,7 +115,7 @@ public class JpaMapStorageProviderFactory implements
MapStorageProviderFactory, MapStorageProviderFactory,
EnvironmentDependentProviderFactory { EnvironmentDependentProviderFactory {
public static final String PROVIDER_ID = "jpa-map-storage"; public static final String PROVIDER_ID = "jpa";
private static final String SESSION_TX_PREFIX = "jpa-map-tx-"; private static final String SESSION_TX_PREFIX = "jpa-map-tx-";
private static final AtomicInteger ENUMERATOR = new AtomicInteger(0); private static final AtomicInteger ENUMERATOR = new AtomicInteger(0);
private static final Logger logger = Logger.getLogger(JpaMapStorageProviderFactory.class); private static final Logger logger = Logger.getLogger(JpaMapStorageProviderFactory.class);

14
testsuite/integration-arquillian/tests/base/pom.xml
View file

@ -880,13 +880,13 @@
<keycloak.map.storage.connectionsJpa.user>${keycloak.map.storage.connectionsJpa.user}</keycloak.map.storage.connectionsJpa.user> <keycloak.map.storage.connectionsJpa.user>${keycloak.map.storage.connectionsJpa.user}</keycloak.map.storage.connectionsJpa.user>
<keycloak.map.storage.connectionsJpa.password>${keycloak.map.storage.connectionsJpa.password}</keycloak.map.storage.connectionsJpa.password> <keycloak.map.storage.connectionsJpa.password>${keycloak.map.storage.connectionsJpa.password}</keycloak.map.storage.connectionsJpa.password>
<keycloak.authSession.map.storage.provider>jpa-map-storage</keycloak.authSession.map.storage.provider> <keycloak.authSession.map.storage.provider>jpa</keycloak.authSession.map.storage.provider>
<keycloak.client.map.storage.provider>jpa-map-storage</keycloak.client.map.storage.provider> <keycloak.client.map.storage.provider>jpa</keycloak.client.map.storage.provider>
<keycloak.clientScope.map.storage.provider>jpa-map-storage</keycloak.clientScope.map.storage.provider> <keycloak.clientScope.map.storage.provider>jpa</keycloak.clientScope.map.storage.provider>
<keycloak.group.map.storage.provider>jpa-map-storage</keycloak.group.map.storage.provider> <keycloak.group.map.storage.provider>jpa</keycloak.group.map.storage.provider>
<keycloak.loginFailure.map.storage.provider>jpa-map-storage</keycloak.loginFailure.map.storage.provider> <keycloak.loginFailure.map.storage.provider>jpa</keycloak.loginFailure.map.storage.provider>
<keycloak.realm.map.storage.provider>jpa-map-storage</keycloak.realm.map.storage.provider> <keycloak.realm.map.storage.provider>jpa</keycloak.realm.map.storage.provider>
<keycloak.role.map.storage.provider>jpa-map-storage</keycloak.role.map.storage.provider> <keycloak.role.map.storage.provider>jpa</keycloak.role.map.storage.provider>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>

2
testsuite/integration-arquillian/tests/base/src/test/resources/META-INF/keycloak-server.json
View file

@ -148,7 +148,7 @@
"keyType.realms": "string", "keyType.realms": "string",
"keyType.authz-resource-servers": "string" "keyType.authz-resource-servers": "string"
}, },
"jpa-map-storage": { "jpa": {
"url": "${keycloak.map.storage.connectionsJpa.url:}", "url": "${keycloak.map.storage.connectionsJpa.url:}",
"user": "${keycloak.map.storage.connectionsJpa.user:}", "user": "${keycloak.map.storage.connectionsJpa.user:}",
"password": "${keycloak.map.storage.connectionsJpa.password:}", "password": "${keycloak.map.storage.connectionsJpa.password:}",

2
testsuite/utils/src/main/resources/META-INF/keycloak-server.json
View file

@ -110,7 +110,7 @@
"keyType.realms": "string", "keyType.realms": "string",
"keyType.authz-resource-servers": "string" "keyType.authz-resource-servers": "string"
}, },
"jpa-map-storage": { "jpa": {
"url": "${keycloak.map.storage.connectionsJpa.url:}", "url": "${keycloak.map.storage.connectionsJpa.url:}",
"user": "${keycloak.map.storage.connectionsJpa.user:}", "user": "${keycloak.map.storage.connectionsJpa.user:}",
"password": "${keycloak.map.storage.connectionsJpa.password:}", "password": "${keycloak.map.storage.connectionsJpa.password:}",