libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge remote-tracking branch 'upstream/master' into client-storage-spi

Browse source
This commit is contained in:
Bill Burke 2018-01-29 12:28:26 -05:00
commit 79f9de9de4
4 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
testsuite/integration-arquillian/servers/app-server/jboss/common/install-adapters.bat
View file

@ -23,13 +23,48 @@ goto wait_for_jboss
:install_adapters
call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%JBOSS_HOME%\bin\adapter-install.cli"
if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
if "%SAML_SUPPORTED%" == "true" (
call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%JBOSS_HOME%\bin\adapter-install-saml.cli"
if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
set ERROR=%ERRORLEVEL%
echo Installation of OIDC adapter ended with error code: "%ERROR%"
if %ERROR% neq 0 (
goto shutdown_jboss
)
if "%ELYTRON_SUPPORTED%" == "true" (
call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%JBOSS_HOME%\bin\adapter-elytron-install.cli"
set ERROR=%ERRORLEVEL%
echo Installation of elytron ended with error code: "%ERROR%"
if %ERROR% neq 0 (
goto shutdown_jboss
)
) else (
call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%CLI_PATH%\remove-elytron-subsystem.cli"
set ERROR=%ERRORLEVEL%
echo Removing elytron subsystem ended with error code: "%ERROR%"
if %ERROR% neq 0 (
goto shutdown_jboss
)
)
if "%SAML_SUPPORTED%" == "true" (
call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%JBOSS_HOME%\bin\adapter-install-saml.cli"
set ERROR=%ERRORLEVEL%
echo Installation of SAML adapter ended with error code: "%ERROR%"
if %ERROR% neq 0 (
goto shutdown_jboss
)
if "%ELYTRON_SUPPORTED%" == "true" (
call %JBOSS_HOME%\bin\jboss-cli.bat -c --file="%JBOSS_HOME%\bin\adapter-elytron-install-saml.cli"
set ERROR=%ERRORLEVEL%
echo Installation of saml elytron ended with error code: "%ERROR%"
if %ERROR% neq 0 (
goto shutdown_jboss
)
)
)
:shutdown_jboss
echo Shutting down with error code: "%ERROR%"
call %JBOSS_HOME%\bin\jboss-cli.bat -c --command=":shutdown"
exit /b %ERROR%

1
testsuite/integration-arquillian/servers/app-server/jboss/pom.xml
View file

@ -36,6 +36,7 @@
<security.xslt>security.xsl</security.xslt>
<oidc-adapter.version>${project.version}</oidc-adapter.version>
<saml-adapter.version>${project.version}</saml-adapter.version>
<app.server.elytron.adapter.supported>false</app.server.elytron.adapter.supported>
</properties>
<profiles>

5
testsuite/integration-arquillian/tests/base/pom.xml
View file

@ -253,13 +253,12 @@
<!--see KEYCLOAK-4793-->
<id>kie.maven.settings</id>
<activation>
<property>
<name>repo.url</name>
</property>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<maven.repo.local>${user.home}/.m2/repository</maven.repo.local>
<settings.path>${user.home}/.m2/settings.xml</settings.path>
<repo.url/>
<kie.maven.settings>
-Dkie.maven.settings.custom=${settings.path}
-Dkie.maven.repo.local=${maven.repo.local}

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/authorization/RulesPolicyManagementTest.java
View file

@ -97,7 +97,7 @@ public class RulesPolicyManagementTest extends AbstractPolicyManagementTest {
representation.setLogic(Logic.NEGATIVE);
representation.setArtifactGroupId("org.keycloak");
representation.setArtifactId("photoz-authz-policy");
representation.setArtifactVersion(Version.VERSION);
representation.setArtifactVersion(System.getProperty("project.version"));
representation.setModuleName("PhotozAuthzOwnerPolicy");
representation.setSessionName("MainOwnerSession");
representation.setScannerPeriod("1");