keycloak-memoizeit

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-adduser/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-adduser/main/module.xml
index 178470b..88744ac 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-adduser/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-adduser/main/module.xml
@@ -29,8 +29,9 @@
     <dependencies>
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-server-spi-private"/>
+        <module name="org.keycloak.keycloak-server-spi" services="import"/>
+        <module name="org.keycloak.keycloak-server-spi-private" services="import"/>
+        <module name="org.keycloak.keycloak-services" services="import"/>
         <module name="org.jboss.aesh"/>
         <module name="org.jboss.as.domain-management"/>
         <module name="com.fasterxml.jackson.core.jackson-core"/>

diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/install-patch.bat b/testsuite/integration-arquillian/servers/app-server/jboss/common/install-patch.bat
index ee0ed4f..5c7ce9f 100644
--- a/testsuite/integration-arquillian/servers/app-server/jboss/common/install-patch.bat
+++ b/testsuite/integration-arquillian/servers/app-server/jboss/common/install-patch.bat
@@ -1,9 +1,14 @@
 set NOPAUSE=true
+setlocal EnableDelayedExpansion
 
-for %%a in ("%APP_PATCH_ZIPS:,=" "%") do (
-  call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %%~a"
-
-  if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
-)
-
-exit /b %ERROR%
\ No newline at end of file
+ for %%a in (%APP_PATCH_ZIPS%) do (
+   set patch=%%a
+   if "!patch:~0,4!"=="http" (
+      powershell -command "& { iwr %%a -OutFile %cd%\patch.zip }"
+      call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %cd%\patch.zip
+   )  else (
+      call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %%a"
+   )
+   if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
+ )
+ exit /b %ERROR%
\ No newline at end of file

diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/install-patch.sh b/testsuite/integration-arquillian/servers/app-server/jboss/common/install-patch.sh
index eb23344..bf091d5 100755
--- a/testsuite/integration-arquillian/servers/app-server/jboss/common/install-patch.sh
+++ b/testsuite/integration-arquillian/servers/app-server/jboss/common/install-patch.sh
@@ -12,6 +12,11 @@ RESULT=0
 patches=$(echo $APP_PATCH_ZIPS | tr "," "\n")
 for patch in $patches
 do
+    if [[ $patch == http* ]];
+    then
+       wget -O ./patch.zip $patch >/dev/null 2>&1
+       patch=./patch.zip
+    fi
     ./jboss-cli.sh --command="patch apply $patch"
     if [ $? -ne 0 ]; then exit 1; fi
 done

diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.bat b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.bat
index 735b5f2..496c837 100644
--- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.bat
+++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.bat
@@ -1,7 +1,9 @@
 set NOPAUSE=true
 
 call %JBOSS_HOME%\bin\jboss-cli.bat --file=keycloak-install.cli
+call %JBOSS_HOME%\bin\jboss-cli.bat --file=keycloak-install-ha.cli
 
 if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
+
 exit /b %ERROR%
 

diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.sh b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.sh
index af7cebe..8f95237 100755
--- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.sh
+++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.sh
@@ -10,8 +10,8 @@ cd $JBOSS_HOME/bin
 
 RESULT=0
 ./jboss-cli.sh --file=keycloak-install.cli
-if [ $? -ne 0 ]; then RESULT=1; fi
-   exit $RESULT
-fi
+if [ $? -ne 0 ]; then exit 1; fi
+./jboss-cli.sh --file=keycloak-install-ha.cli
+if [ $? -ne 0 ]; then exit 1; fi
 
-exit 1
+exit 0

diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.bat b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.bat
index ee0ed4f..d1c48ae 100644
--- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.bat
+++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.bat
@@ -1,9 +1,14 @@
 set NOPAUSE=true
+setlocal EnableDelayedExpansion
 
-for %%a in ("%APP_PATCH_ZIPS:,=" "%") do (
-  call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %%~a"
-
-  if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
-)
-
-exit /b %ERROR%
\ No newline at end of file
+ for %%a in (%AUTH_PATCH_ZIPS%) do (
+   set patch=%%a
+   if "!patch:~0,4!"=="http" (
+      powershell -command "& { iwr %%a -OutFile %cd%\patch.zip }"
+      call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %cd%\patch.zip
+   )  else (
+      call %JBOSS_HOME%\bin\jboss-cli.bat --command="patch apply %%a"
+   )
+   if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
+ )
+ exit /b %ERROR%
\ No newline at end of file

diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.sh b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.sh
index 3d1820b..f1dff06 100755
--- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.sh
+++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.sh
@@ -12,6 +12,11 @@ RESULT=0
 patches=$(echo $AUTH_PATCH_ZIPS | tr "," "\n")
 for patch in $patches
 do
+    if [[ $patch == http* ]];
+    then
+       wget -O ./patch.zip $patch >/dev/null 2>&1
+       patch=./patch.zip
+    fi
     ./jboss-cli.sh --command="patch apply $patch"
     if [ $? -ne 0 ]; then exit 1; fi
 done

diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml
index 349eda3..e12af5a 100644
--- a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml
+++ b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml
@@ -100,6 +100,7 @@
                                             <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
                                         </artifactItem>
                                     </artifactItems>
+                                    <excludes>**/product.conf</excludes>
                                 </configuration>
                             </execution>
                             <execution>
@@ -303,6 +304,7 @@
                                                 <artifactId>${auth.server.overlay.artifactId}</artifactId>
                                                 <version>${auth.server.overlay.version}</version>
                                                 <type>zip</type>
+                                                <overWrite>true</overWrite>
                                                 <outputDirectory>${project.build.directory}/unpacked/${overlaid.container.unpacked.folder.name}</outputDirectory>
                                             </artifactItem>
                                         </artifactItems>

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/LegacyImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/LegacyImportTest.java
index 3dcffcd..b5549e1 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/LegacyImportTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/LegacyImportTest.java
@@ -42,6 +42,7 @@ import org.keycloak.admin.client.resource.RealmResource;
 import org.keycloak.exportimport.Strategy;
 import static org.keycloak.testsuite.Assert.assertNames;
 import static org.keycloak.testsuite.migration.MigrationTest.MIGRATION;
+import static org.keycloak.testsuite.migration.MigrationTest.MIGRATION2;
 
 /**
  * Test importing JSON files exported from previous adminClient versions
@@ -85,6 +86,7 @@ public class LegacyImportTest extends AbstractExportImportTest {
             assertNames(imported.groups().groups(), "migration-test-group");
         } finally {
             removeRealm(MIGRATION);
+            removeRealm(MIGRATION2);
         }
     }