keycloak-aplcache

diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index 6507a5e..05c0b7e 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -479,17 +479,17 @@
             <id>mongo</id>
             <activation>
                 <property>
-                    <name>keycloak.model.provider</name>
+                    <name>keycloak.realm.provider</name>
                     <value>mongo</value>
                 </property>
             </activation>
 
             <properties>
-                <keycloak.model.mongo.host>localhost</keycloak.model.mongo.host>
-                <keycloak.model.mongo.port>27018</keycloak.model.mongo.port>
-                <keycloak.model.mongo.db>keycloak</keycloak.model.mongo.db>
-                <keycloak.model.mongo.clearOnStartup>true</keycloak.model.mongo.clearOnStartup>
-                <keycloak.model.mongo.bindIp>127.0.0.1</keycloak.model.mongo.bindIp>
+                <keycloak.connectionsMongo.host>localhost</keycloak.connectionsMongo.host>
+                <keycloak.connectionsMongo.port>27018</keycloak.connectionsMongo.port>
+                <keycloak.connectionsMongo.db>keycloak</keycloak.connectionsMongo.db>
+                <keycloak.connectionsMongo.clearOnStartup>true</keycloak.connectionsMongo.clearOnStartup>
+                <keycloak.connectionsMongo.bindIp>127.0.0.1</keycloak.connectionsMongo.bindIp>
             </properties>
 
             <build>
@@ -508,12 +508,15 @@
                                 </goals>
                                 <configuration>
                                     <systemPropertyVariables>
-                                        <keycloak.model.provider>mongo</keycloak.model.provider>
-                                        <keycloak.model.mongo.host>${keycloak.model.mongo.host}</keycloak.model.mongo.host>
-                                        <keycloak.model.mongo.port>${keycloak.model.mongo.port}</keycloak.model.mongo.port>
-                                        <keycloak.model.mongo.db>${keycloak.model.mongo.db}</keycloak.model.mongo.db>
-                                        <keycloak.model.mongo.clearOnStartup>${keycloak.model.mongo.clearOnStartup}</keycloak.model.mongo.clearOnStartup>
-                                        <keycloak.model.mongo.bindIp>${keycloak.model.mongo.bindIp}</keycloak.model.mongo.bindIp>
+                                        <keycloak.realm.provider>mongo</keycloak.realm.provider>
+                                        <keycloak.user.provider>mongo</keycloak.user.provider>
+                                        <keycloak.audit.provider>mongo</keycloak.audit.provider>
+                                        <!--<keycloak.userSessions.provider>mongo</keycloak.userSessions.provider>-->
+                                        <keycloak.connectionsMongo.host>${keycloak.connectionsMongo.host}</keycloak.connectionsMongo.host>
+                                        <keycloak.connectionsMongo.port>${keycloak.connectionsMongo.port}</keycloak.connectionsMongo.port>
+                                        <keycloak.connectionsMongo.db>${keycloak.connectionsMongo.db}</keycloak.connectionsMongo.db>
+                                        <keycloak.connectionsMongo.clearOnStartup>${keycloak.connectionsMongo.clearOnStartup}</keycloak.connectionsMongo.clearOnStartup>
+                                        <keycloak.connectionsMongo.bindIp>${keycloak.connectionsMongo.bindIp}</keycloak.connectionsMongo.bindIp>
                                     </systemPropertyVariables>
                                 </configuration>
                             </execution>
@@ -538,10 +541,10 @@
                                     <goal>start</goal>
                                 </goals>
                                 <configuration>
-                                    <port>${keycloak.model.mongo.port}</port>
+                                    <port>${keycloak.connectionsMongo.port}</port>
                                     <logging>file</logging>
                                     <logFile>${project.build.directory}/mongodb.log</logFile>
-                                    <bindIp>${keycloak.model.mongo.bindIp}</bindIp>
+                                    <bindIp>${keycloak.connectionsMongo.bindIp}</bindIp>
                                 </configuration>
                             </execution>
                             <execution>

diff --git a/testsuite/integration/src/main/resources/META-INF/keycloak-server.json b/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
index 1c8ff16..c5f9677 100755
--- a/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
+++ b/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
@@ -4,7 +4,7 @@
     },
 
     "audit": {
-        "provider": "${keycloak.audit.provider,keycloak.model.provider:jpa}"
+        "provider": "${keycloak.audit.provider:jpa}"
     },
 
     "realm": {
@@ -58,10 +58,10 @@
 
     "connectionsMongo": {
         "default": {
-            "host": "${keycloak.model.mongo.host:127.0.0.1}",
-            "port": "${keycloak.model.mongo.port:27017}",
-            "db": "${keycloak.model.mongo.db:keycloak}",
-            "clearOnStartup": "${keycloak.model.mongo.clearOnStartup:false}"
+            "host": "${keycloak.connectionsMongo.host:127.0.0.1}",
+            "port": "${keycloak.connectionsMongo.port:27017}",
+            "db": "${keycloak.connectionsMongo.db:keycloak}",
+            "clearOnStartup": "${keycloak.connectionsMongo.clearOnStartup:false}"
         }
     }
 

diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
index 81b4c39..9f6f4de 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
@@ -69,7 +69,7 @@ public class ExportImportTest {
     // We want data to be persisted among server restarts
     private static ExternalResource mongoRule = new ExternalResource() {
 
-        private static final String MONGO_CLEAR_ON_STARTUP_PROP_NAME = "keycloak.model.mongo.clearOnStartup";
+        private static final String MONGO_CLEAR_ON_STARTUP_PROP_NAME = "keycloak.connectionsMongo.clearOnStartup";
         private String previousMongoClearOnStartup;
 
         @Override