KEYCLOAK-3196: Resolve conflicts. Port keycloak-server.json changes to xml

and cli
This commit is contained in:
Stan Silvert 2016-08-23 11:56:21 -04:00
parent 3abcf713e5
commit 09090cec24
2 changed files with 5 additions and 3 deletions

View file

@ -49,7 +49,9 @@ keycloak.server.subsys.default.config=\
<provider name="default" enabled="true">\
<properties>\
<property name="dataSource" value="java:jboss/datasources/KeycloakDS"/>\
<property name="databaseSchema" value="update"/>\
<property name="initializeEmpty" value="true"/>\
<property name="migrationStrategy" value="update"/>\
<property name="migrationExport" value="${jboss.home.dir}/keycloak-database-update.sql"/>\
</properties>\
</provider>\
</spi>\

View file

@ -12,10 +12,10 @@
/subsystem=keycloak-server/spi=connectionsHttpClient/:add
/subsystem=keycloak-server/spi=connectionsHttpClient/provider=default/:add(enabled=true)
/subsystem=keycloak-server/spi=connectionsJpa/:add
/subsystem=keycloak-server/spi=connectionsJpa/provider=default/:add(properties={dataSource => "java:jboss/datasources/KeycloakDS",databaseSchema => "update"},enabled=true)
/subsystem=keycloak-server/spi=connectionsJpa/provider=default/:add(properties={dataSource => "java:jboss/datasources/KeycloakDS",initializeEmpty => "true",migrationStrategy => "update",migrationExport => "${jboss.home.dir}/keycloak-database-update.sql"},enabled=true)
/subsystem=keycloak-server/spi=realmCache/:add
/subsystem=keycloak-server/spi=realmCache/provider=default/:add(enabled=true)
/subsystem=keycloak-server/spi=connectionsInfinispan/:add(default-provider=default)
/subsystem=keycloak-server/spi=connectionsInfinispan/provider=default/:add(properties={cacheContainer => "java:comp/env/infinispan/Keycloak"},enabled=true)
/subsystem=keycloak-server/spi=jta-lookup/:add
/subsystem=keycloak-server/spi=jta-lookup/:add(default-provider=${keycloak.jta.lookup.provider:jboss})
/subsystem=keycloak-server/spi=jta-lookup/provider=jboss/:add(enabled=true)