keycloak-uncached

Merge pull request #4152 from pdrozd/2.5.x KEYCLOAK-4931

5/19/2017 3:27:24 PM

Details

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-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