From 09090cec2465f16624954a29916743e9306b0d3e Mon Sep 17 00:00:00 2001
From: Stan Silvert <ssilvert@redhat.com>
Date: Tue, 23 Aug 2016 11:56:21 -0400
Subject: [PATCH] KEYCLOAK-3196: Resolve conflicts. Port keycloak-server.json
 changes to xml and cli

---
 .../src/main/config/default-server-subsys-config.properties   | 4 +++-
 .../src/main/resources/cli/default-keycloak-subsys-config.cli | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wildfly/server-subsystem/src/main/config/default-server-subsys-config.properties b/wildfly/server-subsystem/src/main/config/default-server-subsys-config.properties
index 61084f93b9..2355ab0e7e 100644
--- a/wildfly/server-subsystem/src/main/config/default-server-subsys-config.properties
+++ b/wildfly/server-subsystem/src/main/config/default-server-subsys-config.properties
@@ -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>\
diff --git a/wildfly/server-subsystem/src/main/resources/cli/default-keycloak-subsys-config.cli b/wildfly/server-subsystem/src/main/resources/cli/default-keycloak-subsys-config.cli
index 8bfefa14ad..6adef01e49 100644
--- a/wildfly/server-subsystem/src/main/resources/cli/default-keycloak-subsys-config.cli
+++ b/wildfly/server-subsystem/src/main/resources/cli/default-keycloak-subsys-config.cli
@@ -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)
\ No newline at end of file