From a20d6e2f1f9ad8d3464930e0d9caa2cf6ce21954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Barto=C5=A1?= Date: Fri, 30 Sep 2022 03:41:57 -0400 Subject: [PATCH] Remove JBoss-based auth servers from the testsuite (#14317) Closes #14299 --- docs/tests-db.md | 8 +- .../integration-arquillian/HOW-TO-RUN.md | 26 +- testsuite/integration-arquillian/README.md | 15 +- .../servers/app-server/README.md | 3 - .../servers/app-server/jboss/pom.xml | 12 - .../app-server/jboss/relative/eap/pom.xml | 37 - .../relative/eap/src/saml-adapter-supported | 1 - .../servers/app-server/jboss/relative/pom.xml | 61 -- .../app-server/jboss/relative/wildfly/pom.xml | 37 - .../wildfly/src/saml-adapter-supported | 1 - .../servers/auth-server/README.md | 46 +- .../{jboss => }/common/keycloak-add-user.json | 0 .../{jboss => }/common/keystore/ca.crt | 0 .../{jboss => }/common/keystore/client-ca.jks | Bin .../{jboss => }/common/keystore/client.crt | 0 .../{jboss => }/common/keystore/client.jks | Bin .../{jboss => }/common/keystore/client.key | 0 .../{jboss => }/common/keystore/client.p12 | Bin .../{jboss => }/common/keystore/empty.crl | 0 .../keystore/hotrod-client-truststore.jks | Bin .../common/keystore/intermediate-ca-3.crl | 0 .../intermediate-ca-invalid-signature.crl | 0 .../common/keystore/intermediate-ca.crl | 0 .../{jboss => }/common/keystore/keycloak.jks | Bin .../common/keystore/keycloak.truststore | Bin .../common/keystore/ocsp/certs/ca-chain.crt | 0 .../keystore/ocsp/certs/intermediate-ca.crt | 0 .../common/keystore/ocsp/index.txt | 0 .../common/keystore/ocsp/index.txt.attr | 0 .../keystore/ocsp/private/intermediate-ca.key | 0 .../common/keystore/other_client.jks | Bin .../test-user-cert-intermediary-ca.jks | Bin .../common/keystore/test-user-obb.jks | Bin .../{jboss => }/common/pki/README.md | 0 .../common/pki/root/ca/certs/ca.cert.pem | 0 .../certs/clients/test-user-ca@localhost.csr | 0 .../clients/test-user-ca@localhost.key.pem | 0 .../certs/clients/test-user-ca@localhost.p12 | Bin .../certs/clients/test-user-ca@localhost.pem | 0 .../clients/test-user-obb@localhost.cert.pem | 0 .../clients/test-user-obb@localhost.csr.pem | 0 .../clients/test-user-obb@localhost.key.pem | 0 .../certs/clients/test-user-obb@localhost.p12 | Bin .../clients/test-user-san@localhost.cert.pem | 0 .../certs/clients/test-user-san@localhost.p12 | Bin .../certs/clients/test-user@localhost.key.pem | 0 .../{jboss => }/common/pki/root/ca/index.txt | 0 .../common/pki/root/ca/index.txt.attr | 0 .../common/pki/root/ca/index.txt.attr.old | 0 .../common/pki/root/ca/index.txt.old | 0 .../common/pki/root/ca/intermediate/1 | 0 .../ca/intermediate/certs/ca-chain.cert.pem | 0 .../intermediate/certs/intermediate.cert.pem | 0 .../common/pki/root/ca/intermediate/crlnumber | 0 .../pki/root/ca/intermediate/crlnumber.old | 0 .../ca/intermediate/csr/intermediate.csr.pem | 0 .../common/pki/root/ca/intermediate/index.txt | 0 .../pki/root/ca/intermediate/index.txt.attr | 0 .../root/ca/intermediate/index.txt.attr.old | 0 .../pki/root/ca/intermediate/index.txt.old | 0 .../root/ca/intermediate/newcerts/1000.pem | 0 .../root/ca/intermediate/newcerts/2009.pem | 0 .../root/ca/intermediate/newcerts/200A.pem | 0 .../pki/root/ca/intermediate/openssl-obb.cnf | 0 .../pki/root/ca/intermediate/openssl-san.cnf | 0 .../pki/root/ca/intermediate/openssl.cnf | 0 .../intermediate/private/intermediate.key.pem | 0 .../common/pki/root/ca/intermediate/serial | 0 .../pki/root/ca/intermediate/serial.old | 0 .../common/pki/root/ca/newcerts/1000.pem | 0 .../common/pki/root/ca/newcerts/1001.pem | 0 .../root/ca/newcerts/intermediate-ca-3.crt | 0 .../root/ca/newcerts/intermediate-ca-3.key | 0 .../common/pki/root/ca/openssl.cnf | 0 .../common/pki/root/ca/private/ca.key.pem | 0 .../{jboss => }/common/pki/root/ca/serial | 0 .../{jboss => }/common/pki/root/ca/serial.old | 0 .../admin-client-test_ldap__bindCredential | 0 .../common/vault/consumer_oidc__idp | 0 .../common/vault/master_ldap__bindCredential | 0 .../{jboss => }/common/vault/master_smtp__key | 0 .../common/vault/master_smtp__password | 0 .../common/vault/test_ldap__bindCredential | 0 .../{jboss => }/common/vault/test_smtp__key | 0 .../servers/auth-server/jboss/assembly.xml | 46 - .../jboss/common/ant/configure.xml | 274 ------ .../jboss/common/install-keycloak.bat | 9 - .../jboss/common/install-keycloak.sh | 17 - .../jboss/common/install-patch.bat | 14 - .../auth-server/jboss/common/install-patch.sh | 23 - .../jboss/common/jboss-cli/add-log-level.cli | 10 - .../common/jboss-cli/configure-server-jpa.cli | 23 - .../jboss/common/jboss-cli/cross-dc-setup.cli | 151 ---- .../jboss-cli/cross-dc-setup_cache-auth.cli | 125 --- .../jboss-cli/deploy-nashorn-module.cli | 5 - .../auth-server/jboss/common/jboss-cli/io.cli | 4 - .../common/jboss-cli/ispn-cache-owners.cli | 10 - .../jboss-cli/keycloak-server-subsystem.cli | 28 - .../migration/configure-server-jpa-legacy.cli | 21 - .../common/jboss-cli/replace-jdbc-url.cli | 3 - .../set-manual-migration-strategy.cli | 5 - .../jboss/common/jboss-cli/truststore.cli | 8 - .../undertow-subsystem-cluster-setup.cli | 3 - .../common/jboss-cli/update-jpa-schema.cli | 3 - .../jboss/common/mgmt-users.properties | 1 - .../servers/auth-server/jboss/eap/pom.xml | 112 --- .../auth-server/jboss/eap/src/.dont-delete | 1 - .../auth-server/jboss/legacy/assembly.xml | 46 - .../servers/auth-server/jboss/legacy/pom.xml | 110 --- .../auth-server/jboss/legacy/src/.dont-delete | 1 - .../servers/auth-server/jboss/pom.xml | 793 ------------------ .../servers/auth-server/jboss/wildfly/pom.xml | 57 -- .../jboss/wildfly/src/.dont-delete | 1 - .../servers/auth-server/pom.xml | 1 - .../servers/auth-server/quarkus/pom.xml | 2 +- .../servers/auth-server/undertow/pom.xml | 2 +- .../integration-arquillian/tests/base/pom.xml | 2 +- .../arquillian/AuthServerTestEnricher.java | 130 +-- .../arquillian/CrossDCTestEnricher.java | 3 +- .../keycloak/testsuite/util/LogChecker.java | 53 -- .../util/SpiProvidersSwitchingUtils.java | 48 +- .../keycloak/testsuite/util/VaultUtils.java | 27 +- .../admin/client/ClientSearchTest.java | 32 +- .../cli/admin/KcAdmTruststoreTest.java | 2 +- .../cli/registration/KcRegTruststoreTest.java | 2 +- .../cluster/AbstractClusterTest.java | 3 - .../testsuite/url/AbstractHostnameTest.java | 34 - .../other/adapters/jboss/relative/eap/pom.xml | 66 -- .../adapter/RelativeEAPOIDCAdapterTest.java | 11 - .../RelativeEAPOIDCSessionAdapterTest.java | 11 - .../adapter/RelativeEAPSAMLAdapterTest.java | 10 - .../other/adapters/jboss/relative/pom.xml | 72 -- .../adapters/jboss/relative/wildfly/pom.xml | 66 -- .../RelativeWildflyOIDCAdapterTest.java | 11 - ...RelativeWildflyOIDCSessionAdapterTest.java | 11 - .../RelativeWildflySAMLAdapterTest.java | 10 - ...iveWildflyBasicAuthExampleAdapterTest.java | 9 - ...RelativeWildflyCorsExampleAdapterTest.java | 9 - ...RelativeWildflyDemoExampleAdapterTest.java | 9 - ...RelativeWildflySAMLExampleAdapterTest.java | 9 - .../wildfly/src/test/resources/web.xml | 26 - .../integration-arquillian/tests/pom.xml | 223 ----- 142 files changed, 43 insertions(+), 3002 deletions(-) delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/relative/eap/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/relative/eap/src/saml-adapter-supported delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/relative/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/relative/wildfly/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/relative/wildfly/src/saml-adapter-supported rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keycloak-add-user.json (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/ca.crt (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/client-ca.jks (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/client.crt (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/client.jks (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/client.key (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/client.p12 (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/empty.crl (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/hotrod-client-truststore.jks (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/intermediate-ca-3.crl (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/intermediate-ca-invalid-signature.crl (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/intermediate-ca.crl (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/keycloak.jks (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/keycloak.truststore (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/ocsp/certs/ca-chain.crt (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/ocsp/certs/intermediate-ca.crt (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/ocsp/index.txt (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/ocsp/index.txt.attr (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/ocsp/private/intermediate-ca.key (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/other_client.jks (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/test-user-cert-intermediary-ca.jks (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/keystore/test-user-obb.jks (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/README.md (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/ca.cert.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user-ca@localhost.csr (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user-ca@localhost.key.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user-ca@localhost.p12 (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user-ca@localhost.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user-obb@localhost.cert.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user-obb@localhost.csr.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user-obb@localhost.key.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user-obb@localhost.p12 (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user-san@localhost.cert.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user-san@localhost.p12 (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/certs/clients/test-user@localhost.key.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/index.txt (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/index.txt.attr (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/index.txt.attr.old (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/index.txt.old (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/1 (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/certs/ca-chain.cert.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/certs/intermediate.cert.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/crlnumber (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/crlnumber.old (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/csr/intermediate.csr.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/index.txt (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/index.txt.attr (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/index.txt.attr.old (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/index.txt.old (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/newcerts/1000.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/newcerts/2009.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/newcerts/200A.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/openssl-obb.cnf (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/openssl-san.cnf (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/openssl.cnf (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/private/intermediate.key.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/serial (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/intermediate/serial.old (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/newcerts/1000.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/newcerts/1001.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/newcerts/intermediate-ca-3.crt (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/newcerts/intermediate-ca-3.key (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/openssl.cnf (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/private/ca.key.pem (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/serial (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/pki/root/ca/serial.old (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/vault/admin-client-test_ldap__bindCredential (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/vault/consumer_oidc__idp (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/vault/master_ldap__bindCredential (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/vault/master_smtp__key (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/vault/master_smtp__password (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/vault/test_ldap__bindCredential (100%) rename testsuite/integration-arquillian/servers/auth-server/{jboss => }/common/vault/test_smtp__key (100%) delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/assembly.xml delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.bat delete mode 100755 testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.sh delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.bat delete mode 100755 testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.sh delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/add-log-level.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/configure-server-jpa.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup_cache-auth.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/deploy-nashorn-module.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/io.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/ispn-cache-owners.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/keycloak-server-subsystem.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/migration/configure-server-jpa-legacy.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/replace-jdbc-url.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/set-manual-migration-strategy.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/truststore.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/undertow-subsystem-cluster-setup.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/update-jpa-schema.cli delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/mgmt-users.properties delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/eap/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/eap/src/.dont-delete delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/legacy/assembly.xml delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/legacy/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/legacy/src/.dont-delete delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/src/.dont-delete delete mode 100644 testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LogChecker.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/pom.xml delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCSessionAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPSAMLAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/pom.xml delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/pom.xml delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCSessionAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflySAMLAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyBasicAuthExampleAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyCorsExampleAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyDemoExampleAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflySAMLExampleAdapterTest.java delete mode 100644 testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/resources/web.xml diff --git a/docs/tests-db.md b/docs/tests-db.md index 68f18e54b5..62fdf44345 100644 --- a/docs/tests-db.md +++ b/docs/tests-db.md @@ -67,9 +67,9 @@ As an example, to run tests using a MySQL docker container on Undertow auth-serv If you want to run tests using a pre-configured Keycloak distribution (instead of Undertow): - mvn -f testsuite/integration-arquillian clean verify -Pdb-mysql,jpa,auth-server-wildfly + mvn -f testsuite/integration-arquillian clean verify -Pdb-mysql,jpa,auth-server-quarkus -Note that you must always activate the `jpa` profile when using auth-server-wildfly. +Note that you must always activate the `jpa` profile when using auth-server-quarkus. If the mvn command fails for any reason, it may also fail to remove the container which must be then removed manually. @@ -102,11 +102,11 @@ the allocation and deallocation need to happen when building the `integration-ar it happens in other cases). In order to use the DB Allocator Service, you must use the `jpa` profile with one of the `db-allocator-*`. Here's a full example to -run JPA with Auth Server Wildfly and MSSQL 2016: +run JPA with Auth Server Quarkus and MSSQL 2016: ``` mvn -f testsuite/integration-arquillian/pom.xml clean verify \ - -Pjpa,auth-server-wildfly,db-allocator-db-mssql2016 \ + -Pjpa,auth-server-quarkus,db-allocator-db-mssql2016 \ -Ddballocator.uri=<> \ -Ddballocator.user=<> \ -Dmaven.test.failure.ignore=true diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md index 312adacb69..99b47ad179 100644 --- a/testsuite/integration-arquillian/HOW-TO-RUN.md +++ b/testsuite/integration-arquillian/HOW-TO-RUN.md @@ -34,12 +34,12 @@ And then re-run the LoginTest (or any other test you wish) and the changes shoul If you use Intellij Idea, you don't even need to re-build anything with the maven. After doing any change in the codebase, the change is immediately effective when running the test with Junit runner. -### Running tests in the production mode (Keycloak on Wildfly) +### Running tests in the production mode (Keycloak on Quarkus) -For the "production" testing, it is possible to run the Keycloak server deployed on real Wildfly server. -This can be achieved by add the `auth-server-wildfly` profile when running the testsuite. +For the "production" testing, it is possible to run the Keycloak server deployed on real Quarkus server. +This can be achieved by add the `auth-server-quarkus` profile when running the testsuite. - mvn -f testsuite/integration-arquillian/pom.xml -Pauth-server-wildfly clean install + mvn -f testsuite/integration-arquillian/pom.xml -Pauth-server-quarkus clean install Unlike the "development" setup described above, this requires re-build the whole distribution after doing any change in the code. @@ -424,18 +424,6 @@ The setup includes: * a load balancer on embedded Undertow (SimpleUndertowLoadBalancer) * two clustered nodes of Keycloak server on Wildfly/EAP or on embedded undertow * shared DB - -### Cluster tests with Keycloak on Wildfly - -After you build the distribution, you run this command to setup servers and run cluster tests using shared Docker database: - - mvn -f testsuite/integration-arquillian/pom.xml \ - -Pauth-server-wildfly,auth-server-cluster,db-mysql,jpa \ - -Dsession.cache.owners=2 \ - -Dbackends.console.output=true \ - -Dauth.server.log.check=false \ - -Dfrontend.console.output=true \ - -Dtest=org.keycloak.testsuite.cluster.**.*Test clean install ### Cluster tests with Keycloak on Quarkus @@ -574,6 +562,8 @@ For Data Grid 7 and older use: `-Dfile=jboss-datagrid-${DATAGRID_VERSION}-server ### Run Cross-DC Tests from Maven +Warning: The Cross-DC tests doesn't work with Quarkus distribution + Note: Profile `auth-servers-crossdc-undertow` currently doesn't work (see [KEYCLOAK-18335](https://issues.redhat.com/browse/KEYCLOAK-18335)). Use `-Pauth-servers-crossdc-jboss,auth-server-wildfly` instead. @@ -770,11 +760,11 @@ Then, before running the test, setup Keycloak Server distribution for the tests: mvn -f testsuite/integration-arquillian/servers/pom.xml \ clean install \ - -Pauth-server-wildfly + -Pauth-server-quarkus When running the test, add the following arguments to the command line: - -Pauth-server-wildfly -Pauth-server-enable-disable-feature -Dfeature.name=docker -Dfeature.value=enabled + -Pauth-server-quarkus -Pauth-server-enable-disable-feature -Dfeature.name=docker -Dfeature.value=enabled ## Java 11 support Java 11 requires some arguments to be passed to JVM. Those can be activated using `-Pjava11-auth-server` and diff --git a/testsuite/integration-arquillian/README.md b/testsuite/integration-arquillian/README.md index dae196cb9d..3b0f954387 100644 --- a/testsuite/integration-arquillian/README.md +++ b/testsuite/integration-arquillian/README.md @@ -16,24 +16,17 @@ Keycloak server is automatically started by the testsuite on the `BeforeSuite` e By default the server runs in embedded Undertow. -#### Wildfly/EAP - -Testsuite supports running server on Wildfly/EAP. For this it's necessary to: -- build the project including the `distribution` module - (artifact `keycloak-server-dist`/`-overlay` needs to be available before running the testsuite), -- activate profile `auth-server-wildfly` or `auth-server-eap7`. - [More details...](servers/auth-server/README.md) #### Cluster Setup -The cluster setup for server can be enabled by activating profile `auth-server-cluster`. +The cluster setup for server can be enabled by activating profile `auth-server-cluster-quarkus`. -The cluster setup is not supported for server on Undertow. Profile `auth-server-wildfly` or `auth-server-eap` needs to be activated. +The cluster setup is not supported for server on Undertow. The setup includes: -- a `mod_cluster` load balancer on Wildfly -- two clustered nodes of Keycloak server on Wildfly/EAP +- a `mod_cluster` load balancer on Quarkus +- two clustered nodes of Keycloak server on Quarkus Clustering tests require MULTICAST to be enabled on machine's `loopback` network interface. This can be done by running the following commands under root privileges: diff --git a/testsuite/integration-arquillian/servers/app-server/README.md b/testsuite/integration-arquillian/servers/app-server/README.md index 496832e66f..1d5726781c 100644 --- a/testsuite/integration-arquillian/servers/app-server/README.md +++ b/testsuite/integration-arquillian/servers/app-server/README.md @@ -18,9 +18,6 @@ Submodules are enabled with profiles: `-Papp-server-MODULE` * __`wildfly` Wildfly 11__ * __`eap6` EAP 6__ Requires access to EAP product repo, or setting `-Deap6.version` to public EAP 6 Alpha. * __`eap` EAP 7__ Requires access to EAP product repo. -* __`relative`__ Activate with `-Papp-server-relative`. - * __`wildfly` Relative Wildfly 10__ Based on [`auth-server/jboss/wildfly`](../auth-server/README.md). Activate with `-Pauth-server-wildfly`. - * __`eap` Relative EAP 7__ Based on [`auth-server/jboss/eap`](../auth-server/README.md). Activate with `-Pauth-server-eap`. ### Adapter Configs Location diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml index 35a7cf8144..3967311acc 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml @@ -759,18 +759,6 @@ wildfly - - app-server-relative - - - app.server - relative - - - - relative - - diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/relative/eap/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/relative/eap/pom.xml deleted file mode 100644 index 2038f37ea3..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/relative/eap/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-jboss-relative - 999-SNAPSHOT - - 4.0.0 - - integration-arquillian-servers-app-server-relative-eap - pom - App Server - JBoss - Relative EAP - - - eap - integration-arquillian-servers-auth-server-eap - - - diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/relative/eap/src/saml-adapter-supported b/testsuite/integration-arquillian/servers/app-server/jboss/relative/eap/src/saml-adapter-supported deleted file mode 100644 index 8b13789179..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/relative/eap/src/saml-adapter-supported +++ /dev/null @@ -1 +0,0 @@ - diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/relative/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/relative/pom.xml deleted file mode 100644 index 360ce562e6..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/relative/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-jboss - 999-SNAPSHOT - - 4.0.0 - - integration-arquillian-servers-app-server-jboss-relative - pom - App Server - JBoss - Relative - - - ${project.parent.parent.basedir}/common - ${project.parent.parent.basedir}/assembly.xml - - relative-${auth.server.jboss} - - org.keycloak.testsuite - ${project.version} - auth-server-${auth.server.jboss} - - keycloak-wildfly-adapter-dist - keycloak-saml-wildfly-adapter-dist - - - - - auth-server-wildfly - - wildfly - - - - auth-server-eap - - eap - - - - - diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/relative/wildfly/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/relative/wildfly/pom.xml deleted file mode 100644 index fad6e1a8a0..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/relative/wildfly/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-jboss-relative - 999-SNAPSHOT - - 4.0.0 - - integration-arquillian-servers-app-server-relative-wildfly - pom - App Server - JBoss - Relative Wildfly - - - wildfly - integration-arquillian-servers-auth-server-wildfly - - - diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/relative/wildfly/src/saml-adapter-supported b/testsuite/integration-arquillian/servers/app-server/jboss/relative/wildfly/src/saml-adapter-supported deleted file mode 100644 index 8b13789179..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/relative/wildfly/src/saml-adapter-supported +++ /dev/null @@ -1 +0,0 @@ - diff --git a/testsuite/integration-arquillian/servers/auth-server/README.md b/testsuite/integration-arquillian/servers/auth-server/README.md index ba3c598d9a..d4c32a52cb 100644 --- a/testsuite/integration-arquillian/servers/auth-server/README.md +++ b/testsuite/integration-arquillian/servers/auth-server/README.md @@ -5,42 +5,18 @@ - Keycloak Arquillian Integration TestSuite - Test Servers - Auth Server - [Keycloak Arquillian Integration TestSuite - Test Servers - App Servers](../app-server/README.md) -## Auth Server - JBoss +### Common directory + - Contains all necessary files for all Auth servers -Common configurations of Keycloak server on JBoss-based container (Wildfly/EAP). +### Auth Server Services +- Contains usually test providers and its associated factories used in the testsuite -### Submodules +## Auth servers -#### `wildfly` Wildfly latest - - Builds keycloak server on top of latest Wildfly. - - Activated by __`-Pauth-server-wildfly`__ +### Undertow +- Arquillian extension for running Keycloak server in embedded Undertow. +- Activated by default, or explicitly by __`-Pauth-server-undertow`__ -#### `eap` EAP 7 - - Builds keycloak server on top of latest EAP. - - Activated by __`-Pauth-server-eap`__ - - Requires access to product repo. - - Requires additional properties: - - `product.version` - - `product.unpacked.folder.name` (optional; the default value is based on the POM versions) - - `product` to activate the product profile; NOT required if `product.unpacked.folder.name` is specified - -### Server dist vs overlay - -By default `keycloak-server-dist` artifact is used for the build. -By setting `-Dserver-overlay=true` you can switch to server overlay instead. See profile `server-overlay`. - -### JPA - -Configures Keycloak JDBC datasource in `standalone.xml`. See profile `jpa`. - -### Cluster - -Configures in `standalone-ha.xml`: -- h2 datasource over TCP (if not executed together with jpa) -- parameters of Keycloak Infinispan caches - -See profile `auth-server-cluster`. - -## Auth Server - Undertow - -Arquillian extension for running Keycloak server in embedded Undertow. +### Quarkus + - Builds keycloak server on top of used Quarkus with a particular version. + - Activated by __`-Pauth-server-quarkus`__ diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keycloak-add-user.json b/testsuite/integration-arquillian/servers/auth-server/common/keycloak-add-user.json similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keycloak-add-user.json rename to testsuite/integration-arquillian/servers/auth-server/common/keycloak-add-user.json diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ca.crt b/testsuite/integration-arquillian/servers/auth-server/common/keystore/ca.crt similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ca.crt rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/ca.crt diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/client-ca.jks b/testsuite/integration-arquillian/servers/auth-server/common/keystore/client-ca.jks similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/client-ca.jks rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/client-ca.jks diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/client.crt b/testsuite/integration-arquillian/servers/auth-server/common/keystore/client.crt similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/client.crt rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/client.crt diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/client.jks b/testsuite/integration-arquillian/servers/auth-server/common/keystore/client.jks similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/client.jks rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/client.jks diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/client.key b/testsuite/integration-arquillian/servers/auth-server/common/keystore/client.key similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/client.key rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/client.key diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/client.p12 b/testsuite/integration-arquillian/servers/auth-server/common/keystore/client.p12 similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/client.p12 rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/client.p12 diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/empty.crl b/testsuite/integration-arquillian/servers/auth-server/common/keystore/empty.crl similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/empty.crl rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/empty.crl diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/hotrod-client-truststore.jks b/testsuite/integration-arquillian/servers/auth-server/common/keystore/hotrod-client-truststore.jks similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/hotrod-client-truststore.jks rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/hotrod-client-truststore.jks diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/intermediate-ca-3.crl b/testsuite/integration-arquillian/servers/auth-server/common/keystore/intermediate-ca-3.crl similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/intermediate-ca-3.crl rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/intermediate-ca-3.crl diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/intermediate-ca-invalid-signature.crl b/testsuite/integration-arquillian/servers/auth-server/common/keystore/intermediate-ca-invalid-signature.crl similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/intermediate-ca-invalid-signature.crl rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/intermediate-ca-invalid-signature.crl diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/intermediate-ca.crl b/testsuite/integration-arquillian/servers/auth-server/common/keystore/intermediate-ca.crl similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/intermediate-ca.crl rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/intermediate-ca.crl diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/keycloak.jks b/testsuite/integration-arquillian/servers/auth-server/common/keystore/keycloak.jks similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/keycloak.jks rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/keycloak.jks diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/keycloak.truststore b/testsuite/integration-arquillian/servers/auth-server/common/keystore/keycloak.truststore similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/keycloak.truststore rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/keycloak.truststore diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ocsp/certs/ca-chain.crt b/testsuite/integration-arquillian/servers/auth-server/common/keystore/ocsp/certs/ca-chain.crt similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ocsp/certs/ca-chain.crt rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/ocsp/certs/ca-chain.crt diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ocsp/certs/intermediate-ca.crt b/testsuite/integration-arquillian/servers/auth-server/common/keystore/ocsp/certs/intermediate-ca.crt similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ocsp/certs/intermediate-ca.crt rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/ocsp/certs/intermediate-ca.crt diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ocsp/index.txt b/testsuite/integration-arquillian/servers/auth-server/common/keystore/ocsp/index.txt similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ocsp/index.txt rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/ocsp/index.txt diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ocsp/index.txt.attr b/testsuite/integration-arquillian/servers/auth-server/common/keystore/ocsp/index.txt.attr similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ocsp/index.txt.attr rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/ocsp/index.txt.attr diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ocsp/private/intermediate-ca.key b/testsuite/integration-arquillian/servers/auth-server/common/keystore/ocsp/private/intermediate-ca.key similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/ocsp/private/intermediate-ca.key rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/ocsp/private/intermediate-ca.key diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/other_client.jks b/testsuite/integration-arquillian/servers/auth-server/common/keystore/other_client.jks similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/other_client.jks rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/other_client.jks diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/test-user-cert-intermediary-ca.jks b/testsuite/integration-arquillian/servers/auth-server/common/keystore/test-user-cert-intermediary-ca.jks similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/test-user-cert-intermediary-ca.jks rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/test-user-cert-intermediary-ca.jks diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/test-user-obb.jks b/testsuite/integration-arquillian/servers/auth-server/common/keystore/test-user-obb.jks similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/keystore/test-user-obb.jks rename to testsuite/integration-arquillian/servers/auth-server/common/keystore/test-user-obb.jks diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/README.md b/testsuite/integration-arquillian/servers/auth-server/common/pki/README.md similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/README.md rename to testsuite/integration-arquillian/servers/auth-server/common/pki/README.md diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/ca.cert.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/ca.cert.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/ca.cert.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/ca.cert.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-ca@localhost.csr b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-ca@localhost.csr similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-ca@localhost.csr rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-ca@localhost.csr diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-ca@localhost.key.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-ca@localhost.key.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-ca@localhost.key.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-ca@localhost.key.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-ca@localhost.p12 b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-ca@localhost.p12 similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-ca@localhost.p12 rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-ca@localhost.p12 diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-ca@localhost.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-ca@localhost.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-ca@localhost.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-ca@localhost.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-obb@localhost.cert.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-obb@localhost.cert.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-obb@localhost.cert.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-obb@localhost.cert.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-obb@localhost.csr.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-obb@localhost.csr.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-obb@localhost.csr.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-obb@localhost.csr.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-obb@localhost.key.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-obb@localhost.key.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-obb@localhost.key.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-obb@localhost.key.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-obb@localhost.p12 b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-obb@localhost.p12 similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-obb@localhost.p12 rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-obb@localhost.p12 diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-san@localhost.cert.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-san@localhost.cert.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-san@localhost.cert.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-san@localhost.cert.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-san@localhost.p12 b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-san@localhost.p12 similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user-san@localhost.p12 rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user-san@localhost.p12 diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user@localhost.key.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user@localhost.key.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/certs/clients/test-user@localhost.key.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/certs/clients/test-user@localhost.key.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/index.txt b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/index.txt similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/index.txt rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/index.txt diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/index.txt.attr b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/index.txt.attr similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/index.txt.attr rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/index.txt.attr diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/index.txt.attr.old b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/index.txt.attr.old similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/index.txt.attr.old rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/index.txt.attr.old diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/index.txt.old b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/index.txt.old similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/index.txt.old rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/index.txt.old diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/1 b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/1 similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/1 rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/1 diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/certs/ca-chain.cert.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/certs/ca-chain.cert.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/certs/ca-chain.cert.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/certs/ca-chain.cert.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/certs/intermediate.cert.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/certs/intermediate.cert.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/certs/intermediate.cert.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/certs/intermediate.cert.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/crlnumber b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/crlnumber similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/crlnumber rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/crlnumber diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/crlnumber.old b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/crlnumber.old similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/crlnumber.old rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/crlnumber.old diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/csr/intermediate.csr.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/csr/intermediate.csr.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/csr/intermediate.csr.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/csr/intermediate.csr.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/index.txt b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/index.txt similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/index.txt rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/index.txt diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/index.txt.attr b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/index.txt.attr similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/index.txt.attr rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/index.txt.attr diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/index.txt.attr.old b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/index.txt.attr.old similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/index.txt.attr.old rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/index.txt.attr.old diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/index.txt.old b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/index.txt.old similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/index.txt.old rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/index.txt.old diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/newcerts/1000.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/newcerts/1000.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/newcerts/1000.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/newcerts/1000.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/newcerts/2009.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/newcerts/2009.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/newcerts/2009.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/newcerts/2009.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/newcerts/200A.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/newcerts/200A.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/newcerts/200A.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/newcerts/200A.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/openssl-obb.cnf b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/openssl-obb.cnf similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/openssl-obb.cnf rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/openssl-obb.cnf diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/openssl-san.cnf b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/openssl-san.cnf similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/openssl-san.cnf rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/openssl-san.cnf diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/openssl.cnf b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/openssl.cnf similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/openssl.cnf rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/openssl.cnf diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/private/intermediate.key.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/private/intermediate.key.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/private/intermediate.key.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/private/intermediate.key.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/serial b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/serial similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/serial rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/serial diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/serial.old b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/serial.old similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/intermediate/serial.old rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/intermediate/serial.old diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/newcerts/1000.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/newcerts/1000.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/newcerts/1000.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/newcerts/1000.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/newcerts/1001.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/newcerts/1001.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/newcerts/1001.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/newcerts/1001.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/newcerts/intermediate-ca-3.crt b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/newcerts/intermediate-ca-3.crt similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/newcerts/intermediate-ca-3.crt rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/newcerts/intermediate-ca-3.crt diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/newcerts/intermediate-ca-3.key b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/newcerts/intermediate-ca-3.key similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/newcerts/intermediate-ca-3.key rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/newcerts/intermediate-ca-3.key diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/openssl.cnf b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/openssl.cnf similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/openssl.cnf rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/openssl.cnf diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/private/ca.key.pem b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/private/ca.key.pem similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/private/ca.key.pem rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/private/ca.key.pem diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/serial b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/serial similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/serial rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/serial diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/serial.old b/testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/serial.old similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/pki/root/ca/serial.old rename to testsuite/integration-arquillian/servers/auth-server/common/pki/root/ca/serial.old diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/admin-client-test_ldap__bindCredential b/testsuite/integration-arquillian/servers/auth-server/common/vault/admin-client-test_ldap__bindCredential similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/admin-client-test_ldap__bindCredential rename to testsuite/integration-arquillian/servers/auth-server/common/vault/admin-client-test_ldap__bindCredential diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/consumer_oidc__idp b/testsuite/integration-arquillian/servers/auth-server/common/vault/consumer_oidc__idp similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/consumer_oidc__idp rename to testsuite/integration-arquillian/servers/auth-server/common/vault/consumer_oidc__idp diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/master_ldap__bindCredential b/testsuite/integration-arquillian/servers/auth-server/common/vault/master_ldap__bindCredential similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/master_ldap__bindCredential rename to testsuite/integration-arquillian/servers/auth-server/common/vault/master_ldap__bindCredential diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/master_smtp__key b/testsuite/integration-arquillian/servers/auth-server/common/vault/master_smtp__key similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/master_smtp__key rename to testsuite/integration-arquillian/servers/auth-server/common/vault/master_smtp__key diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/master_smtp__password b/testsuite/integration-arquillian/servers/auth-server/common/vault/master_smtp__password similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/master_smtp__password rename to testsuite/integration-arquillian/servers/auth-server/common/vault/master_smtp__password diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/test_ldap__bindCredential b/testsuite/integration-arquillian/servers/auth-server/common/vault/test_ldap__bindCredential similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/test_ldap__bindCredential rename to testsuite/integration-arquillian/servers/auth-server/common/vault/test_ldap__bindCredential diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/test_smtp__key b/testsuite/integration-arquillian/servers/auth-server/common/vault/test_smtp__key similarity index 100% rename from testsuite/integration-arquillian/servers/auth-server/jboss/common/vault/test_smtp__key rename to testsuite/integration-arquillian/servers/auth-server/common/vault/test_smtp__key diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/assembly.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/assembly.xml deleted file mode 100644 index 47b82154db..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/assembly.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - ${auth.server.jboss} - - - zip - - - false - - - - ${auth.server.home} - auth-server-${auth.server.jboss} - - **/*.sh - - - - ${auth.server.home} - auth-server-${auth.server.jboss} - - **/*.sh - - 0755 - - - - diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml deleted file mode 100644 index a1ff10b5eb..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/ant/configure.xml +++ /dev/null @@ -1,274 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - server.config: ${server.config} - - - - - - - - - - - - - - - - - - - - - - - -
- embed-server --server-config=${server.config} -
- - - - - - - - - - - - - - - - - cli scripts for standalone prepared - - - - cli scripts for cluster prepared - - - - cli scripts for crossdc prepared - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Updating schema?: ${update.schema} - keycloak.connectionsJpa.schema: ${keycloak.connectionsJpa.schema} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Updating log level?: ${set.log.level} - infinispan.log.level: ${infinispan.log.level} - sheduled.tasks.log.level: ${scheduled.tasks.log.level} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Nashorn module deployed - - - 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 deleted file mode 100644 index 496c837b2b..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.bat +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100755 index 8f952371c1..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -echo "JBOSS_HOME=$JBOSS_HOME" - -if [ ! -d "$JBOSS_HOME/bin" ] ; then - >&2 echo "JBOSS_HOME/bin doesn't exist" - exit 1 -fi - -cd $JBOSS_HOME/bin - -RESULT=0 -./jboss-cli.sh --file=keycloak-install.cli -if [ $? -ne 0 ]; then exit 1; fi -./jboss-cli.sh --file=keycloak-install-ha.cli -if [ $? -ne 0 ]; then exit 1; fi - -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 deleted file mode 100644 index d1c48aeb5e..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.bat +++ /dev/null @@ -1,14 +0,0 @@ -set NOPAUSE=true -setlocal EnableDelayedExpansion - - 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 deleted file mode 100755 index f1dff06ea3..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-patch.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -echo "JBOSS_HOME=$JBOSS_HOME" - -if [ ! -d "$JBOSS_HOME/bin" ] ; then - >&2 echo "JBOSS_HOME/bin doesn't exist" - exit 1 -fi - -cd $JBOSS_HOME/bin - -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 -exit 0 diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/add-log-level.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/add-log-level.cli deleted file mode 100644 index 6af965811a..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/add-log-level.cli +++ /dev/null @@ -1,10 +0,0 @@ - -echo *** Adding infinispan logger *** -/subsystem=logging/logger=org.infinispan:add(level=@INFINISPAN_LOG_LEVEL@) - -echo *** Adding scheduled tasks logger *** -/subsystem=logging/logger=org.keycloak.services.scheduled:add(level=@SCHEDULED_TASKS_LOG_LEVEL@) - -echo *** Switching console handler logger to TRACE *** -/subsystem=logging/console-handler=CONSOLE:change-log-level(level=TRACE) - diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/configure-server-jpa.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/configure-server-jpa.cli deleted file mode 100644 index 83ffdd41b1..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/configure-server-jpa.cli +++ /dev/null @@ -1,23 +0,0 @@ - -echo *** Creating module.xml in modules *** -module add --module-root-dir=../modules/system/layers/base/ \ - --name=test.jdbc.@DATABASE@ \ - --resources=@DRIVER_TMP_DIR@/@DATABASE@-@DRIVER_VERSION@.jar \ - --dependencies=javax.api,javax.transaction.api,javax.xml.bind.api - -echo *** Updating datasource subsystem *** -echo ** Adding driver definition ** -/subsystem=datasources/jdbc-driver=@DATABASE@:add(driver-name=@DATABASE@,driver-module-name=test.jdbc.@DATABASE@) - -echo ** Updating connection properties ** -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=connection-url,value="@JDBC_URL@") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=driver-name,value="@DATABASE@") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=user-name,value="@USER@") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=password,value="@PASSWORD@") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=min-pool-size,value="10") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=max-pool-size,value="50") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=pool-prefill,value="true") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=idle-timeout-minutes,value="5") - -echo *** Adding dialect logger *** -/subsystem=logging/logger=org.hibernate.dialect:add(level=${org.hibernate.dialect.Dialect:ALL}) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup.cli deleted file mode 100644 index 030f4edc8f..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup.cli +++ /dev/null @@ -1,151 +0,0 @@ - -echo *** Update jgroups subsystem *** -/subsystem=jgroups/stack=udp/transport=UDP:write-attribute(name=site, value=${jboss.site.name}) - -echo *** Update infinispan subsystem *** -/subsystem=infinispan/cache-container=keycloak:write-attribute(name=module, value=org.keycloak.keycloak-model-infinispan) - -echo ** Add remote socket binding to infinispan server ** -/socket-binding-group=standard-sockets/remote-destination-outbound-socket-binding=remote-cache:add(host=${remote.cache.host:localhost}, port=${remote.cache.port:11222}) - -echo ** Update replicated-cache work element ** -/subsystem=infinispan/cache-container=keycloak/replicated-cache=work/store=remote:add( \ - passivation=false, \ - fetch-state=false, \ - purge=false, \ - preload=false, \ - shared=true, \ - remote-servers=["remote-cache"], \ - cache=work, \ - properties={ \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) - -/subsystem=infinispan/cache-container=keycloak/replicated-cache=work:write-attribute(name=statistics-enabled,value=true) - -echo ** Update distributed-cache sessions element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions/store=remote:add( \ - passivation=false, \ - fetch-state=false, \ - purge=false, \ - preload=false, \ - shared=true, \ - remote-servers=["remote-cache"], \ - cache=sessions, \ - properties={ \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) -/subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions:write-attribute(name=statistics-enabled,value=true) - -echo ** Update distributed-cache offlineSessions element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineSessions/store=remote:add( \ - passivation=false, \ - fetch-state=false, \ - purge=false, \ - preload=false, \ - shared=true, \ - remote-servers=["remote-cache"], \ - cache=offlineSessions, \ - properties={ \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) -/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineSessions:write-attribute(name=statistics-enabled,value=true) - -echo ** Update distributed-cache clientSessions element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=clientSessions/store=remote:add( \ - passivation=false, \ - fetch-state=false, \ - purge=false, \ - preload=false, \ - shared=true, \ - remote-servers=["remote-cache"], \ - cache=clientSessions, \ - properties={ \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) -/subsystem=infinispan/cache-container=keycloak/distributed-cache=clientSessions:write-attribute(name=statistics-enabled,value=true) - -echo ** Update distributed-cache offlineClientSessions element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineClientSessions/store=remote:add( \ - passivation=false, \ - fetch-state=false, \ - purge=false, \ - preload=false, \ - shared=true, \ - remote-servers=["remote-cache"], \ - cache=offlineClientSessions, \ - properties={ \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) -/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineClientSessions:write-attribute(name=statistics-enabled,value=true) - -echo ** Update distributed-cache loginFailures element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures/store=remote:add( \ - passivation=false, \ - fetch-state=false, \ - purge=false, \ - preload=false, \ - shared=true, \ - remote-servers=["remote-cache"], \ - cache=loginFailures, \ - properties={ \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) -/subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures:write-attribute(name=statistics-enabled,value=true) - -echo ** Update distributed-cache actionTokens element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=actionTokens/store=remote:add( \ - passivation=false, \ - fetch-state=false, \ - purge=false, \ - preload=false, \ - shared=true, \ - cache=actionTokens, \ - remote-servers=["remote-cache"], \ - properties={ \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) -/subsystem=infinispan/cache-container=keycloak/distributed-cache=actionTokens:write-attribute(name=statistics-enabled,value=true) - -echo ** Update distributed-cache authenticationSessions element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=authenticationSessions:write-attribute(name=statistics-enabled,value=true) - -echo *** Enable debug logging *** -/subsystem=logging/logger=org.keycloak.cluster.infinispan:add(level=DEBUG) - -/subsystem=logging/logger=org.keycloak.connections.infinispan:add(level=DEBUG) - -/subsystem=logging/logger=org.keycloak.models.cache.infinispan:add(level=DEBUG) - -/subsystem=logging/logger=org.keycloak.models.sessions.infinispan:add(level=DEBUG) - -echo *** Update undertow subsystem *** -/subsystem=undertow/server=default-server/http-listener=default:write-attribute(name=proxy-address-forwarding,value=true) - -echo *** Update keycloak-server subsystem, infinispan remoteStoreSecurity *** -/subsystem=keycloak-server/spi=connectionsInfinispan/provider=default:map-put(name=properties,key=remoteStoreSecurityEnabled,value=${keycloak.connectionsInfinispan.default.remoteStoreSecurityEnabled:true}) - -echo *** Enable offline user session preloading *** -/subsystem=keycloak-server/spi=userSessions:add(default-provider=infinispan) -/subsystem=keycloak-server/spi=userSessions/provider=infinispan:add(properties={preloadOfflineSessionsFromDatabase => @PRELOADING_ENABLED@},enabled=true) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup_cache-auth.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup_cache-auth.cli deleted file mode 100644 index 31bb050fc1..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/cross-dc-setup_cache-auth.cli +++ /dev/null @@ -1,125 +0,0 @@ -echo ** Update replicated-cache work element ** -/subsystem=infinispan/cache-container=keycloak/replicated-cache=work/store=remote:write-attribute( \ - name=properties, \ - value={ \ - infinispan.client.hotrod.auth_username=myuser, \ - infinispan.client.hotrod.auth_password=qwer1234!, \ - infinispan.client.hotrod.auth_realm=default, \ - infinispan.client.hotrod.auth_server_name=infinispan, \ - infinispan.client.hotrod.sasl_mechanism=@HOTROD_SASL_MECHANISM@, \ - infinispan.client.hotrod.trust_store_file_name=${jboss.server.config.dir}/hotrod-client-truststore.jks, \ - infinispan.client.hotrod.trust_store_type=JKS, \ - infinispan.client.hotrod.trust_store_password=password, \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) - -echo ** Update distributed-cache sessions element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions/store=remote:write-attribute( \ - name=properties, \ - value={ \ - infinispan.client.hotrod.auth_username=myuser, \ - infinispan.client.hotrod.auth_password=qwer1234!, \ - infinispan.client.hotrod.auth_realm=default, \ - infinispan.client.hotrod.auth_server_name=infinispan, \ - infinispan.client.hotrod.sasl_mechanism=@HOTROD_SASL_MECHANISM@, \ - infinispan.client.hotrod.trust_store_file_name=${jboss.server.config.dir}/hotrod-client-truststore.jks, \ - infinispan.client.hotrod.trust_store_type=JKS, \ - infinispan.client.hotrod.trust_store_password=password, \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) - -echo ** Update distributed-cache offlineSessions element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineSessions/store=remote:write-attribute( \ - name=properties, \ - value={ \ - infinispan.client.hotrod.auth_username=myuser, \ - infinispan.client.hotrod.auth_password=qwer1234!, \ - infinispan.client.hotrod.auth_realm=default, \ - infinispan.client.hotrod.auth_server_name=infinispan, \ - infinispan.client.hotrod.sasl_mechanism=@HOTROD_SASL_MECHANISM@, \ - infinispan.client.hotrod.trust_store_file_name=${jboss.server.config.dir}/hotrod-client-truststore.jks, \ - infinispan.client.hotrod.trust_store_type=JKS, \ - infinispan.client.hotrod.trust_store_password=password, \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) - -echo ** Update distributed-cache clientSessions element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=clientSessions/store=remote:write-attribute( \ - name=properties, \ - value={ \ - infinispan.client.hotrod.auth_username=myuser, \ - infinispan.client.hotrod.auth_password=qwer1234!, \ - infinispan.client.hotrod.auth_realm=default, \ - infinispan.client.hotrod.auth_server_name=infinispan, \ - infinispan.client.hotrod.sasl_mechanism=@HOTROD_SASL_MECHANISM@, \ - infinispan.client.hotrod.trust_store_file_name=${jboss.server.config.dir}/hotrod-client-truststore.jks, \ - infinispan.client.hotrod.trust_store_type=JKS, \ - infinispan.client.hotrod.trust_store_password=password, \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) - -echo ** Update distributed-cache offlineClientSessions element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineClientSessions/store=remote:write-attribute( \ - name=properties, \ - value={ \ - infinispan.client.hotrod.auth_username=myuser, \ - infinispan.client.hotrod.auth_password=qwer1234!, \ - infinispan.client.hotrod.auth_realm=default, \ - infinispan.client.hotrod.auth_server_name=infinispan, \ - infinispan.client.hotrod.sasl_mechanism=@HOTROD_SASL_MECHANISM@, \ - infinispan.client.hotrod.trust_store_file_name=${jboss.server.config.dir}/hotrod-client-truststore.jks, \ - infinispan.client.hotrod.trust_store_type=JKS, \ - infinispan.client.hotrod.trust_store_password=password, \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) - -echo ** Update distributed-cache loginFailures element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures/store=remote:write-attribute( \ - name=properties, \ - value={ \ - infinispan.client.hotrod.auth_username=myuser, \ - infinispan.client.hotrod.auth_password=qwer1234!, \ - infinispan.client.hotrod.auth_realm=default, \ - infinispan.client.hotrod.auth_server_name=infinispan, \ - infinispan.client.hotrod.sasl_mechanism=@HOTROD_SASL_MECHANISM@, \ - infinispan.client.hotrod.trust_store_file_name=${jboss.server.config.dir}/hotrod-client-truststore.jks, \ - infinispan.client.hotrod.trust_store_type=JKS, \ - infinispan.client.hotrod.trust_store_password=password, \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) - -echo ** Update distributed-cache actionTokens element ** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=actionTokens/store=remote:write-attribute( \ - name=properties, \ - value={ \ - infinispan.client.hotrod.auth_username=myuser, \ - infinispan.client.hotrod.auth_password=qwer1234!, \ - infinispan.client.hotrod.auth_realm=default, \ - infinispan.client.hotrod.auth_server_name=infinispan, \ - infinispan.client.hotrod.sasl_mechanism=@HOTROD_SASL_MECHANISM@, \ - infinispan.client.hotrod.trust_store_file_name=${jboss.server.config.dir}/hotrod-client-truststore.jks, \ - infinispan.client.hotrod.trust_store_type=JKS, \ - infinispan.client.hotrod.trust_store_password=password, \ - rawValues=true, \ - marshaller=org.keycloak.cluster.infinispan.KeycloakHotRodMarshallerFactory, \ - protocolVersion=${keycloak.connectionsInfinispan.hotrodProtocolVersion} \ - } \ -) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/deploy-nashorn-module.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/deploy-nashorn-module.cli deleted file mode 100644 index ef70d5ff76..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/deploy-nashorn-module.cli +++ /dev/null @@ -1,5 +0,0 @@ -echo *** Installing nashorn-core module *** -module add --module-root-dir=../modules/system/layers/keycloak/ \ - --name=org.openjdk.nashorn.nashorn-core \ - --resources=@NASHORN_JAR@ \ - --dependencies=asm.asm,jdk.dynalink \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/io.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/io.cli deleted file mode 100644 index e978a225a5..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/io.cli +++ /dev/null @@ -1,4 +0,0 @@ - -echo *** Update io subsystem *** -/subsystem=io/worker=default:write-attribute(name=io-threads,value=@IO_WORKER_IO_THREADS@) -/subsystem=io/worker=default:write-attribute(name=task-max-threads,value=@IO_WORKER_TASK_MAX_THREADS@) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/ispn-cache-owners.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/ispn-cache-owners.cli deleted file mode 100644 index ee6a434b03..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/ispn-cache-owners.cli +++ /dev/null @@ -1,10 +0,0 @@ - -echo *** Updating infinispan cache owners *** -/subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions:write-attribute(name=owners, value=@SESSION_CACHE_OWNERS@) -/subsystem=infinispan/cache-container=keycloak/distributed-cache=authenticationSessions:write-attribute(name=owners, value=@SESSION_CACHE_OWNERS@) -/subsystem=infinispan/cache-container=keycloak/distributed-cache=clientSessions:write-attribute(name=owners, value=@SESSION_CACHE_OWNERS@) - -/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineSessions:write-attribute(name=owners, value=@OFFLINE_SESSION_CACHE_OWNERS@) -/subsystem=infinispan/cache-container=keycloak/distributed-cache=offlineClientSessions:write-attribute(name=owners, value=@OFFLINE_SESSION_CACHE_OWNERS@) - -/subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures:write-attribute(name=owners, value=@LOGIN_FAILURE_CACHE_OWNERS@) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/keycloak-server-subsystem.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/keycloak-server-subsystem.cli deleted file mode 100644 index 7add38129b..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/keycloak-server-subsystem.cli +++ /dev/null @@ -1,28 +0,0 @@ - -echo *** Updating keycloak-server subsystem *** -echo ** Adding login-protocol spi ** -/subsystem=keycloak-server/spi=login-protocol/:add -/subsystem=keycloak-server/spi=login-protocol/provider=saml/:add(enabled=true,properties={knownProtocols => "[\"http=${auth.server.http.port}\",\"https=${auth.server.https.port}\"]"}) - -echo ** Adding theme modules ** -/subsystem=keycloak-server/theme=defaults/:write-attribute(name=modules,value=[org.keycloak.testsuite.integration-arquillian-testsuite-providers]) - -echo ** Adding provider ** -/subsystem=keycloak-server/:write-attribute(name=providers, \ - value=[ classpath:${jboss.home.dir}/providers/*, \ - module:org.keycloak.testsuite.integration-arquillian-testsuite-providers \ - ] \ -) - -echo ** Adding max-detail-length to eventsStore spi ** -/subsystem=keycloak-server/spi=eventsStore/provider=jpa/:write-attribute(name=properties.max-detail-length,value=${keycloak.eventsStore.maxDetailLength:1000}) - -echo ** Adding spi=userProfile with default provider and legacy-user-profile configuration of read-only attributes ** -/subsystem=keycloak-server/spi=userProfile/:add(default-provider="declarative-user-profile") -/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:add(properties={},enabled=true) -/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:map-put(name=properties,key=read-only-attributes,value="[\"deniedFoo\",\"deniedBar*\",\"deniedSome/thing\",\"deniedsome*thing\"]") -/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:map-put(name=properties,key=admin-read-only-attributes,value="[\"deniedSomeAdmin\"]") - -echo ** Do not reuse connections for HttpClientProvider within testsuite ** -/subsystem=keycloak-server/spi=connectionsHttpClient/provider=default/:map-put(name=properties,key=reuse-connections,value=false) - diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/migration/configure-server-jpa-legacy.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/migration/configure-server-jpa-legacy.cli deleted file mode 100644 index 40436e9a54..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/migration/configure-server-jpa-legacy.cli +++ /dev/null @@ -1,21 +0,0 @@ - -echo *** Creating module.xml in modules *** -module add --name=test.jdbc.@DATABASE@ \ - --resources=@DRIVER_TMP_DIR@/@DATABASE@-@DRIVER_VERSION@.jar \ - --dependencies=javax.api,javax.transaction.api,javax.xml.bind.api - -echo *** Updating datasource subsystem *** -echo ** Adding driver definition ** -/subsystem=datasources/jdbc-driver=@DATABASE@:add(driver-name=@DATABASE@,driver-module-name=test.jdbc.@DATABASE@) - -echo ** Updating connection properties ** -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=connection-url,value="@JDBC_URL@") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=driver-name,value="@DATABASE@") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=user-name,value="@USER@") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=password,value="@PASSWORD@") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=min-pool-size,value="10") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=max-pool-size,value="50") -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=pool-prefill,value="true") - -echo *** Adding dialect logger *** -/subsystem=logging/logger=org.hibernate.dialect:add(level=${org.hibernate.dialect.Dialect:ALL}) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/replace-jdbc-url.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/replace-jdbc-url.cli deleted file mode 100644 index 1153d64cbf..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/replace-jdbc-url.cli +++ /dev/null @@ -1,3 +0,0 @@ - -echo ** Updating jdbc url properties ** -/subsystem=datasources/data-source=KeycloakDS/:write-attribute(name=connection-url,value="@JDBC_URL@") diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/set-manual-migration-strategy.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/set-manual-migration-strategy.cli deleted file mode 100644 index 1b3fae685d..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/set-manual-migration-strategy.cli +++ /dev/null @@ -1,5 +0,0 @@ - -echo *** Updating keycloak-server subsystem *** -echo ** Changing migration strategy to manual ** -/subsystem=keycloak-server/spi=connectionsJpa/provider=default/:write-attribute(name=properties.migrationStrategy,value=manual) -/subsystem=keycloak-server/spi=connectionsJpa/provider=default/:write-attribute(name=properties.initializeEmpty,value=false) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/truststore.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/truststore.cli deleted file mode 100644 index d6ead8c8da..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/truststore.cli +++ /dev/null @@ -1,8 +0,0 @@ - -echo ** Adding truststore spi** -/subsystem=keycloak-server/spi=truststore/:add -/subsystem=keycloak-server/spi=truststore/provider=file/:add(enabled=true,properties={ \ - file => "${auth.server.truststore:${jboss.home.dir}/standalone/configuration/keycloak.truststore}", \ - password => "${auth.server.truststore.password:secret}", \ - hostname-verification-policy => "WILDCARD", \ - disabled => "false"}) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/undertow-subsystem-cluster-setup.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/undertow-subsystem-cluster-setup.cli deleted file mode 100644 index 2c22234227..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/undertow-subsystem-cluster-setup.cli +++ /dev/null @@ -1,3 +0,0 @@ - -echo *** Update undertow subsystem *** -/subsystem=undertow/server=default-server/http-listener=default:write-attribute(name=proxy-address-forwarding,value=true) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/update-jpa-schema.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/update-jpa-schema.cli deleted file mode 100644 index d1fe4c5f4f..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/update-jpa-schema.cli +++ /dev/null @@ -1,3 +0,0 @@ - -echo *** Updating schema within keycloak-server subsystem connectionsJpa spi *** -/subsystem=keycloak-server/spi=connectionsJpa/provider=default/:write-attribute(name=properties.schema,value=@SCHEMA@) diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/mgmt-users.properties b/testsuite/integration-arquillian/servers/auth-server/jboss/common/mgmt-users.properties deleted file mode 100644 index b27edafd1d..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/mgmt-users.properties +++ /dev/null @@ -1 +0,0 @@ -admin=c22052286cd5d72239a90fe193737253 diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/eap/pom.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/eap/pom.xml deleted file mode 100644 index e5f30892d3..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/eap/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers-auth-server-jboss - 999-SNAPSHOT - - 4.0.0 - - pom - - integration-arquillian-servers-auth-server-eap - - Auth Server - JBoss - EAP - - - ${product.name}-${product.filename.version} - - eap - ${project.build.directory}/unpacked/${product.unpacked.folder.name} - - - ${product.version} - ${product.unpacked.folder.name} - - - ${product.version} - org.jboss.eap - ${eap.version} - jboss-eap-7.4 - - - - - - maven-enforcer-plugin - - - enforce-auth-server-jboss-profile - - enforce - - - false - - - product.version - - - - - - - - - - - - auth-server-apply-patch - - - auth.server.patch.zips - - - - - - org.codehaus.mojo - exec-maven-plugin - - - install-patch - process-resources - - exec - - - - - ${common.resources}/install-patch.${script.suffix} - ${auth.server.home}/bin - - ${auth.server.java.home} - ${auth.server.home} - ${auth.server.patch.zips} - - - - - - - - - diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/eap/src/.dont-delete b/testsuite/integration-arquillian/servers/auth-server/jboss/eap/src/.dont-delete deleted file mode 100644 index 63f93b0dd0..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/eap/src/.dont-delete +++ /dev/null @@ -1 +0,0 @@ -This file is to mark this Maven project as a valid option for building auth server artifact diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/legacy/assembly.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/legacy/assembly.xml deleted file mode 100644 index b919fa1c95..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/legacy/assembly.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - auth-server-legacy - - - zip - - - false - - - - ${auth.server.home} - auth-server-legacy - - **/*.sh - - - - ${auth.server.home} - auth-server-legacy - - **/*.sh - - 0755 - - - - diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/legacy/pom.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/legacy/pom.xml deleted file mode 100644 index 4aad59964a..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/legacy/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers-auth-server-jboss - 999-SNAPSHOT - - 4.0.0 - - pom - - integration-arquillian-servers-auth-server-legacy - - Auth Server - Legacy - - - ${auth.server.legacy.version} - keycloak-${auth.server.legacy.version} - - - - - - maven-enforcer-plugin - - false - - - - org.apache.maven.plugins - maven-assembly-plugin - - - create-zip - package - - single - - - - assembly.xml - - false - - - - - - - - - - product - - - product - - - - ${product.name}-legacy - - - - - maven-antrun-plugin - - - rename-unpacked-directory - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/legacy/src/.dont-delete b/testsuite/integration-arquillian/servers/auth-server/jboss/legacy/src/.dont-delete deleted file mode 100644 index 63f93b0dd0..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/legacy/src/.dont-delete +++ /dev/null @@ -1 +0,0 @@ -This file is to mark this Maven project as a valid option for building auth server artifact diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml deleted file mode 100644 index c6b3918617..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml +++ /dev/null @@ -1,793 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers-auth-server - 999-SNAPSHOT - - 4.0.0 - - pom - - integration-arquillian-servers-auth-server-jboss - - Auth Server - JBoss - - - ${basedir}/../common - ${project.parent.basedir}/assembly.xml - - - org.keycloak - keycloak-server-dist - ${project.version} - keycloak-${auth.server.dist.version} - - - org.keycloak - keycloak-server-overlay - ${project.version} - - org.wildfly - wildfly-dist - ${wildfly.version} - wildfly-${overlaid.container.version} - - - ${auth.server.dist.groupId} - ${auth.server.dist.artifactId} - ${auth.server.dist.version} - - ${project.build.directory}/unpacked/${auth.server.dist.unpacked.folder.name} - - - false - - - scenario-standalone - - 1 - 1 - 1 - - - ${project.parent.basedir}/../../../tests/base/src/test/resources - - false - - - - - - auth-server-jboss-submodules - - - src - - - - - - maven-deploy-plugin - - true - - - - maven-dependency-plugin - - - unpack-server-or-overlay - generate-resources - - unpack - - - - - ${unpacked.artifact.groupId} - ${unpacked.artifact.artifactId} - ${unpacked.artifact.version} - zip - ${project.build.directory}/unpacked - - - - - - copy-testsuite-providers - process-resources - - copy - - - - - org.keycloak.testsuite - integration-arquillian-testsuite-providers - ${project.version} - jar - false - ${auth.server.home}/modules/org/keycloak/testsuite/integration-arquillian-testsuite-providers/main - - - - - - install-testsuite-providers-module - process-resources - - unpack - - - - - org.keycloak.testsuite - integration-arquillian-testsuite-providers - ${project.version} - jar - ${auth.server.home}/modules - **/module.xml - - - - - - deploy-testsuite-providers-deployment - process-resources - - copy - - - - - org.keycloak.testsuite - integration-arquillian-testsuite-providers-deployment - ${project.version} - jar - false - ${auth.server.home}/standalone/deployments - - - - - - - - maven-enforcer-plugin - - - maven-resources-plugin - - - add-extending-theme - process-resources - - copy-resources - - - ${auth.server.home}/themes - - - ${keycloak.base.test.resource}/theme - - - - - - enable-jboss-mgmt-admin - process-resources - - copy-resources - - - ${auth.server.home}/standalone/configuration - - - ${common.resources} - - mgmt-users.properties - - - - true - - - - copy-keystore - process-resources - - copy-resources - - - ${auth.server.home}/standalone/configuration - - - ${common.resources}/keystore - - keycloak.jks - keycloak.truststore - client.jks - client-ca.jks - test-user-cert-intermediary-ca.jks - ca.crt - client.crt - client.key - *.crl - other_client.jks - test-user-obb.jks - - - - ${common.resources}/pki/root/ca - - certs/clients/test-user-san@localhost.cert.pem - certs/clients/test-user@localhost.key.pem - - - - - - - copy-vault - process-resources - - copy-resources - - - ${auth.server.home}/standalone/configuration/vault - - - ${common.resources}/vault - - master_smtp__key - test_smtp__key - consumer_oidc__idp - master_smtp__password - master_ldap__bindCredential - test_ldap__bindCredential - admin-client-test_ldap__bindCredential - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - ant-generate-default - generate-resources - - run - - - - - - ${auth.server.home} - - - - - - - - - - - ant-apply-prepared-clis - process-resources - - run - - - - - - ${auth.server.home} - - - - - - - - maven-assembly-plugin - - - create-zip - package - - single - - - - ${assembly.xml} - - false - - - - - - - - - - - server-overlay - - - server-overlay - - - - - ${overlaid.container.groupId} - ${overlaid.container.artifactId} - ${overlaid.container.version} - ${project.build.directory}/unpacked/${overlaid.container.unpacked.folder.name} - - - - - - maven-dependency-plugin - - - unpack-overlaid-container - generate-resources - - unpack - - - - - ${auth.server.overlay.groupId} - ${auth.server.overlay.artifactId} - ${auth.server.overlay.version} - zip - true - ${project.build.directory}/unpacked/${overlaid.container.unpacked.folder.name} - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - install-server-overlay - generate-resources - - exec - - - - - ${common.resources}/install-keycloak.${script.suffix} - ${auth.server.home}/bin - - ${auth.server.java.home} - ${auth.server.home} - - - - - - - - - - jpa - - ${project.build.directory}/jdbc-driver - true - - - - - - maven-enforcer-plugin - - - enforce-properties - - enforce - - - - - jdbc.mvn.groupId - ((?!com.h2database).)* - jdbc.mvn.groupId property is not set correctly: ${jdbc.mvn.groupId}. Profile jpa is not supported for default h2 values! - - - jdbc.mvn.artifactId - ((?!h2).)* - jdbc.mvn.artifactId property is not set correctly: ${jdbc.mvn.artifactId}. Profile jpa is not supported for default h2 values! - - - jdbc.mvn.version - ((?!${h2.version}).)* - jdbc.mvn.version property is not set correctly: ${jdbc.mvn.version}. Profile jpa is not supported for default h2 values! - - - keycloak.connectionsJpa.password - ^(?!\s*$).+ - keycloak.connectionsJpa.password property cannot be empty string! - - - true - - - - - - maven-dependency-plugin - - - jdbc-driver - generate-resources - - copy - - - - - ${jdbc.mvn.groupId} - ${jdbc.mvn.artifactId} - ${jdbc.mvn.version} - jar - - - ${jdbc.driver.tmp.dir} - true - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - configure-server-jpa - generate-resources - - run - - - - - - - - ${jdbc.mvn.groupId} - ${jdbc.mvn.artifactId} - ${jdbc.mvn.version} - ${keycloak.connectionsJpa.url} - ${keycloak.connectionsJpa.user} - ${keycloak.connectionsJpa.password} - ${keycloak.connectionsJpa.schema} - - - - - - - - - - - - - migration-manual - - - migration.mode - manual - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - set-manual-migration-strategy - generate-resources - - run - - - - - - - - - - - - - - - - auth-servers-crossdc-jboss - - scenario-crossdc - - jdbc:h2:tcp://localhost:9092/mem:keycloak-dc-shared;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE - - true - - - - - maven-enforcer-plugin - - true - - - - - - - maven-enforcer-plugin - - - enforce-profile-activation - - enforce - - - - - auth.server.jboss - Profile "auth-servers-crossdc-jboss" requires activation of another profile: either "auth-server-wildfly" or "auth-server-eap". - (wildfly|eap) - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - jpa-h2-tcp - generate-resources - - run - - - ${skip.h2.tcp} - - - - - - - - - - - - - - auth-server-cluster - - scenario-cluster - simple - - - jdbc:h2:tcp://${jboss.bind.address:localhost}:9092/mem:keycloak;DB_CLOSE_DELAY=-1 - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - jpa-h2-tcp - generate-resources - - run - - - ${skip.h2.tcp} - - - - - - - - - - - - - - admin - - - - - maven-resources-plugin - - - copy-keycloak-add-user-json - process-resources - - copy-resources - - - ${auth.server.home}/standalone/configuration - - - ${common.resources} - - keycloak-add-user.json - - - - true - - - - - - - - - - - auth-server-legacy - - - auth.server.legacy.version - - - - legacy - - - - - auth-server-wildfly - - wildfly - - - - auth-server-eap - - eap - - - - - db-failover-mariadb - - org.mariadb.jdbc - mariadb-java-client - 2.0.3 - keycloak - keycloak - - replication - localhost:3316,localhost:3326 - keycloak - - jdbc:mariadb:${mariadb.ha.mode}://${mariadb.hosts}/${mariadb.database}${mariadb.options} - - - - - cache-auth - - true - - - - - - jdk15 - - [15,) - - - - - - - maven-dependency-plugin - - - copy-nashorn-module - generate-resources - - copy - - - - - org.openjdk.nashorn - nashorn-core - ${nashorn.version} - jar - - - ${project.build.directory}/nashorn - true - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - deploy-nashorn-module - generate-resources - - run - - - - - - - - - - - - - - - - diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/pom.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/pom.xml deleted file mode 100644 index eebec263bb..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers-auth-server-jboss - 999-SNAPSHOT - - 4.0.0 - - pom - - integration-arquillian-servers-auth-server-wildfly - - Auth Server - JBoss - Wildfly - - - - org.keycloak - keycloak-server-dist - zip - - - - - wildfly - - - - - - maven-enforcer-plugin - - false - - - - - - diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/src/.dont-delete b/testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/src/.dont-delete deleted file mode 100644 index 63f93b0dd0..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/wildfly/src/.dont-delete +++ /dev/null @@ -1 +0,0 @@ -This file is to mark this Maven project as a valid option for building auth server artifact diff --git a/testsuite/integration-arquillian/servers/auth-server/pom.xml b/testsuite/integration-arquillian/servers/auth-server/pom.xml index 05f4a63c75..a7747a86a1 100644 --- a/testsuite/integration-arquillian/servers/auth-server/pom.xml +++ b/testsuite/integration-arquillian/servers/auth-server/pom.xml @@ -36,7 +36,6 @@ services - jboss undertow diff --git a/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml b/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml index 3d2eed8976..d08838bef1 100644 --- a/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml +++ b/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml @@ -14,7 +14,7 @@ ${project.build.directory}/unpacked/keycloak-${project.version} - ${basedir}/../jboss/common + ${basedir}/../common 2 2 2 diff --git a/testsuite/integration-arquillian/servers/auth-server/undertow/pom.xml b/testsuite/integration-arquillian/servers/auth-server/undertow/pom.xml index 4d68e0b700..436d880905 100644 --- a/testsuite/integration-arquillian/servers/auth-server/undertow/pom.xml +++ b/testsuite/integration-arquillian/servers/auth-server/undertow/pom.xml @@ -29,7 +29,7 @@ Auth Server - Undertow - ${basedir}/../jboss/common + ${basedir}/../common diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 45873f872e..ac615e12c4 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -43,7 +43,7 @@ **/crossdc/**/*Test.java 2.4.0.Final 1.19.0 - ${basedir}/../../servers/auth-server/jboss/common + ${basedir}/../../servers/auth-server/common 3.8.1 11 11 diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java index 1782f0a084..97c7832c76 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java @@ -24,7 +24,6 @@ import org.jboss.arquillian.container.spi.client.container.DeploymentException; import org.jboss.arquillian.container.spi.event.StartContainer; import org.jboss.arquillian.container.spi.event.StartSuiteContainers; import org.jboss.arquillian.container.spi.event.StopContainer; -import org.jboss.arquillian.container.spi.event.container.AfterStart; import org.jboss.arquillian.container.spi.event.container.BeforeStop; import org.jboss.arquillian.container.test.api.ContainerController; import org.jboss.arquillian.core.api.Event; @@ -40,7 +39,6 @@ import org.jboss.arquillian.test.spi.event.suite.AfterSuite; import org.jboss.arquillian.test.spi.event.suite.BeforeClass; import org.jboss.arquillian.test.spi.event.suite.BeforeSuite; import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; import org.keycloak.admin.client.Keycloak; import org.keycloak.common.util.StringPropertyReplacer; import org.keycloak.representations.idm.RealmRepresentation; @@ -49,20 +47,12 @@ import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.client.KeycloakTestingClient; -import org.keycloak.testsuite.util.LogChecker; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.SpiProvidersSwitchingUtils; import org.keycloak.testsuite.util.SqlUtils; import org.keycloak.testsuite.util.SystemInfoHelper; import org.keycloak.testsuite.util.VaultUtils; -import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.TextFileChecker; -import org.wildfly.extras.creaper.core.ManagementClient; -import org.wildfly.extras.creaper.core.online.OnlineManagementClient; -import org.wildfly.extras.creaper.core.online.OnlineOptions; -import org.wildfly.extras.creaper.core.online.operations.Address; -import org.wildfly.extras.creaper.core.online.operations.Operations; -import org.wildfly.extras.creaper.core.online.operations.admin.Administration; import java.io.File; import java.io.FileFilter; @@ -86,17 +76,12 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.jboss.arquillian.test.spi.event.suite.After; import org.jboss.arquillian.test.spi.event.suite.Before; -import org.jboss.shrinkwrap.api.importer.ZipImporter; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.junit.Assert; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import static org.keycloak.testsuite.arquillian.ServerTestEnricherUtil.addHttpsListener; -import static org.keycloak.testsuite.arquillian.ServerTestEnricherUtil.reloadOrRestartTimeoutClient; -import static org.keycloak.testsuite.arquillian.ServerTestEnricherUtil.removeHttpsListener; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; @@ -131,8 +116,6 @@ public class AuthServerTestEnricher { public static final String AUTH_SERVER_BACKEND_PROPERTY = "auth.server.backend"; public static final String AUTH_SERVER_BACKEND = System.getProperty(AUTH_SERVER_BACKEND_PROPERTY, AUTH_SERVER_BACKEND_DEFAULT); - public static final String AUTH_SERVER_LEGACY = "auth-server-legacy"; - public static final String AUTH_SERVER_BALANCER_DEFAULT = "auth-server-balancer"; public static final String AUTH_SERVER_BALANCER_PROPERTY = "auth.server.balancer"; public static final String AUTH_SERVER_BALANCER = System.getProperty(AUTH_SERVER_BALANCER_PROPERTY, AUTH_SERVER_BALANCER_DEFAULT); @@ -200,19 +183,6 @@ public class AuthServerTestEnricher { : ":" + contextRoot.getPort()); } - public static OnlineManagementClient getManagementClient() { - try { - return ManagementClient.online(OnlineOptions - .standalone() - .hostAndPort(System.getProperty("auth.server.management.host", "localhost"), Integer.parseInt(System.getProperty("auth.server.management.port", "10090"))) - .auth("admin", "admin") - .build() - ); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - public void distinguishContainersInConsoleOutput(@Observes(precedence = 5) StartContainer event) { log.info("************************" + event.getContainer().getName() + "*****************************************************************************"); @@ -302,15 +272,6 @@ public class AuthServerTestEnricher { suiteContext.addAuthServerBackendsInfo(0, c); }); - if (Boolean.parseBoolean(System.getProperty("auth.server.jboss.legacy"))) { - ContainerInfo legacy = containers.stream() - .filter(c -> c.getQualifier().startsWith(AUTH_SERVER_LEGACY)) - .findAny() - .orElseThrow(() -> new IllegalStateException("Not found legacy container: " + AUTH_SERVER_LEGACY)); - updateWithAuthServerInfo(legacy, 500); - suiteContext.setLegacyAuthServerInfo(legacy); - } - if (suiteContext.getAuthServerBackendsInfo().isEmpty()) { throw new RuntimeException(String.format("No auth server container matching '%s' found in arquillian.xml.", AUTH_SERVER_BACKEND)); } @@ -359,19 +320,6 @@ public class AuthServerTestEnricher { } } - public static void executeCli(String... commands) throws Exception { - OnlineManagementClient client = AuthServerTestEnricher.getManagementClient(); - Administration administration = new Administration(client); - - for (String c : commands) { - client.execute(c).assertSuccess(); - } - - administration.reload(); - - client.close(); - } - private ContainerInfo updateWithAuthServerInfo(ContainerInfo authServerInfo) { return updateWithAuthServerInfo(authServerInfo, 0); } @@ -392,7 +340,6 @@ public class AuthServerTestEnricher { if (suiteContext.isAuthServerMigrationEnabled()) { log.info("\n\n### Starting keycloak " + System.getProperty("migrated.auth.server.version", "- previous") + " ###\n\n"); startContainerEvent.fire(new StartContainer(suiteContext.getMigratedAuthServerInfo().getArquillianContainer())); - initializeTLS(suiteContext.getMigratedAuthServerInfo()); } } @@ -434,9 +381,6 @@ public class AuthServerTestEnricher { // this will mitigate possible issues in manual server update tests // when the auth server started with not updated DB // e.g. Caused by: org.keycloak.ServerStartupError: Database not up-to-date, please migrate database with - if (suiteContext.getServerLogChecker() == null) { - setServerLogChecker(); - } suiteContext.getServerLogChecker() .updateLastCheckedPositionsOfAllFilesToEndOfFile(); } catch (IOException ioe) { @@ -506,27 +450,11 @@ public class AuthServerTestEnricher { } } - private void setServerLogChecker() throws IOException { - String jbossHomePath = suiteContext.getAuthServerInfo().getProperties().get("jbossHome"); - suiteContext.setServerLogChecker(LogChecker.getJBossServerLogsChecker(jbossHomePath)); + public void checkServerLogs(@Observes(precedence = -1) BeforeSuite event) { + suiteContext.setServerLogChecker(new TextFileChecker()); } - public void checkServerLogs(@Observes(precedence = -1) BeforeSuite event) throws IOException, InterruptedException { - if (! suiteContext.getAuthServerInfo().isJBossBased()) { - suiteContext.setServerLogChecker(new TextFileChecker()); // checks nothing - return; - } - if (suiteContext.getServerLogChecker() == null) { - setServerLogChecker(); - } - boolean checkLog = Boolean.parseBoolean(System.getProperty("auth.server.log.check", "true")); - if (checkLog) { - suiteContext.getServerLogChecker() - .checkFiles(true, AuthServerTestEnricher::failOnRecognizedErrorInLog); - } - } - - public void restartAuthServer() throws Exception { + public void restartAuthServer() { stopContainerEvent.fire(new StopContainer(suiteContext.getAuthServerInfo().getArquillianContainer())); startContainerEvent.fire(new StartContainer(suiteContext.getAuthServerInfo().getArquillianContainer())); } @@ -557,27 +485,6 @@ public class AuthServerTestEnricher { } } - public void initializeTLS(@Observes(precedence = 3) BeforeClass event) throws Exception { - // TLS for Undertow is configured in KeycloakOnUndertow since it requires - // SSLContext while initializing HTTPS handlers - if (!suiteContext.isAuthServerCrossDc() && !suiteContext.isAuthServerCluster()) { - initializeTLS(suiteContext.getAuthServerInfo()); - } - } - - public static void initializeTLS(ContainerInfo containerInfo) { - if (ServerURLs.AUTH_SERVER_SSL_REQUIRED && containerInfo.isJBossBased()) { - log.infof("\n\n### Setting up TLS for %s ##\n\n", containerInfo); - try (OnlineManagementClient client = getManagementClient(containerInfo)) { - AuthServerTestEnricher.enableTLS(client); - } catch (Exception e) { - log.warn("Failed to set up TLS for container '" + containerInfo.getQualifier() + "'. This may lead to unexpected behavior unless the test" + - " sets it up manually", e); - } - - } - } - /** KEYCLOAK-15692 Work-around the OpenJSSE TlsMasterSecretGenerator error: * * https://github.com/openjsse/openjsse/issues/11 @@ -769,37 +676,6 @@ public class AuthServerTestEnricher { } } - private static OnlineManagementClient getManagementClient(ContainerInfo containerInfo) { - try { - return ManagementClient.online(OnlineOptions - .standalone() - .hostAndPort("localhost", Integer.parseInt(containerInfo.getProperties().get("managementPort"))) - .build() - ); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - private static void enableTLS(OnlineManagementClient client) throws Exception { - Administration administration = new Administration(client); - Operations operations = new Operations(client); - - if(!operations.exists(Address.subsystem("elytron").and("server-ssl-context", "httpsSSC"))) { - client.execute("/subsystem=elytron/key-store=httpsKS:add(relative-to=jboss.server.config.dir,path=keycloak.jks,credential-reference={clear-text=secret},type=JKS)"); - client.execute("/subsystem=elytron/key-manager=httpsKM:add(key-store=httpsKS,credential-reference={clear-text=secret})"); - client.execute("/subsystem=elytron/key-store=twoWayTS:add(relative-to=jboss.server.config.dir,path=keycloak.truststore,credential-reference={clear-text=secret},type=JKS)"); - client.execute("/subsystem=elytron/trust-manager=twoWayTM:add(key-store=twoWayTS)"); - client.execute("/subsystem=elytron/server-ssl-context=httpsSSC:add(key-manager=httpsKM,protocols=[\"TLSv1.2\"],trust-manager=twoWayTM,want-client-auth=true)"); - - removeHttpsListener(client, administration); - addHttpsListener(client); - reloadOrRestartTimeoutClient(administration); - } else { - log.info("## The Auth Server has already configured TLS. Skipping ##"); - } - } - protected boolean isAuthServerJBossBased() { return containerRegistry.get().getContainers().stream() .map(ContainerInfo::new) diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/CrossDCTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/CrossDCTestEnricher.java index afe65a7a00..28b1d9e0e9 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/CrossDCTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/CrossDCTestEnricher.java @@ -387,7 +387,8 @@ public class CrossDCTestEnricher { if (! containerInfo.isStarted()) { log.infof("--DC: Starting backend auth-server node: %s", containerInfo.getQualifier()); containerController.get().start(containerInfo.getQualifier()); - AuthServerTestEnricher.initializeTLS(containerInfo); + // Cross-DC are not working with Quarkus + //AuthServerTestEnricher.initializeTLS(containerInfo); createRESTClientsForNode(containerInfo); } } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LogChecker.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LogChecker.java deleted file mode 100644 index c58981c039..0000000000 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LogChecker.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.keycloak.testsuite.util; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Path; -import java.util.Arrays; - -/** - * - * @author hmlnarik - */ -public class LogChecker { - - public static String[] getJBossServerLogFiles(String jbossHome) { - boolean domain = System.getProperty("auth.server.config.property.name", "standalone").contains("domain"); - if (domain) { - return new String[] { - jbossHome + "/domain/log/process-controller.log", - jbossHome + "/domain/log/host-controller.log", - jbossHome + "/domain/servers/load-balancer/log/server.log", - jbossHome + "/domain/servers/server-one/log/server.log" - }; - } else { - return new String[] { - jbossHome + "/standalone/log/server.log" - }; - } - } - - public static TextFileChecker getJBossServerLogsChecker(String jbossHome) throws IOException { - String[] pathsToCheck = getJBossServerLogFiles(jbossHome); - Path[] pathsArray = Arrays.stream(pathsToCheck).map(File::new).map(File::toPath).toArray(Path[]::new); - - return new TextFileChecker(pathsArray); - } - -} \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SpiProvidersSwitchingUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SpiProvidersSwitchingUtils.java index 164ea4a7f2..f4980c5dc5 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SpiProvidersSwitchingUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SpiProvidersSwitchingUtils.java @@ -20,7 +20,6 @@ import java.util.concurrent.ConcurrentHashMap; public class SpiProvidersSwitchingUtils { - private static final String SUBSYSTEM_KEYCLOAK_SERVER_SPI = "/subsystem=keycloak-server/spi="; private static final String KEYCLOAKX_ARG_SPI_PREFIX = "--spi-"; private static final Map originalSettingsBackup = new ConcurrentHashMap<>(); protected static final Logger log = Logger.getLogger(SpiProvidersSwitchingUtils.class); @@ -47,50 +46,7 @@ public class SpiProvidersSwitchingUtils { return "keycloak." + spiName + ".provider"; } }, - WILDFLY { - - @Override - public Optional getCurrentDefaultProvider(Container container, String spiName, - SetDefaultProvider annotation) { - String cliCmd = SUBSYSTEM_KEYCLOAK_SERVER_SPI + spiName + ":read-attribute(name=default-provider)"; - return runInCli(cliCmd).filter(ModelNodeResult::isSuccess) - .map(n -> n.get("result").asString()); - } - - @Override - public void setDefaultProvider(Container container, String spiName, String providerId) { - runInCli(SUBSYSTEM_KEYCLOAK_SERVER_SPI + spiName + "/:add(default-provider=\"" + providerId + "\")"); - } - - @Override - public void updateDefaultProvider(Container container, String spiName, String providerId) { - runInCli(SUBSYSTEM_KEYCLOAK_SERVER_SPI + spiName + ":write-attribute(name=default-provider, value=" - + providerId + ")"); - } - - @Override - public void unsetDefaultProvider(Container container, String spiName) { - runInCli(SUBSYSTEM_KEYCLOAK_SERVER_SPI + spiName + ":/:undefine-attribute(name=default-provider)"); - } - - @Override - public void removeProviderConfig(Container container, String spiName) { - runInCli(SUBSYSTEM_KEYCLOAK_SERVER_SPI + spiName + "/:remove"); - } - - public Optional runInCli(String cliCmd) { - try ( - OnlineManagementClient client = AuthServerTestEnricher.getManagementClient(); - ) { - return Optional.ofNullable(client.execute(cliCmd)); - } catch (CliException | IOException e) { - // return empty optional, see below - } - return Optional.empty(); - } - }, QUARKUS { - @Override public void setDefaultProvider(Container container, String spiName, String providerId) { getQuarkusContainer(container).setAdditionalBuildArgs(Collections @@ -156,10 +112,8 @@ public class SpiProvidersSwitchingUtils { public static SpiSwitcher getSpiSwitcherFor(ContainerInfo containerInfo) { if (containerInfo.isUndertow()) { return SpiSwitcher.UNDERTOW; - } else if (containerInfo.isQuarkus()) { - return SpiSwitcher.QUARKUS; } - return SpiSwitcher.WILDFLY; + return SpiSwitcher.QUARKUS; } } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/VaultUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/VaultUtils.java index 11f5d26666..cd5132e751 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/VaultUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/VaultUtils.java @@ -17,51 +17,28 @@ package org.keycloak.testsuite.util; - -import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.arquillian.SuiteContext; import org.keycloak.testsuite.arquillian.annotation.EnableVault; -import org.wildfly.extras.creaper.core.online.CliException; -import org.wildfly.extras.creaper.core.online.OnlineManagementClient; - -import java.io.IOException; -import java.util.concurrent.TimeoutException; - /** * @author mhajas */ public class VaultUtils { - public static void enableVault(SuiteContext suiteContext, EnableVault.PROVIDER_ID provider) throws IOException, CliException, TimeoutException, InterruptedException { + public static void enableVault(SuiteContext suiteContext, EnableVault.PROVIDER_ID provider) { ContainerInfo serverInfo = suiteContext.getAuthServerInfo(); if (serverInfo.isUndertow()) { System.setProperty("keycloak.vault." + provider.getName() + ".provider.enabled", "true"); - } else if (serverInfo.isJBossBased()) { - OnlineManagementClient client = AuthServerTestEnricher.getManagementClient(); - // configure the selected provider and set it as the default vault provider. - client.execute("/subsystem=keycloak-server/spi=vault/:add(default-provider=" + provider.getName() + ")"); - for (String command : provider.getCliInstallationCommands()) { - client.execute(command); - } - client.close(); } } - public static void disableVault(SuiteContext suiteContext, EnableVault.PROVIDER_ID provider) throws IOException, CliException, TimeoutException, InterruptedException { + public static void disableVault(SuiteContext suiteContext, EnableVault.PROVIDER_ID provider) { ContainerInfo serverInfo = suiteContext.getAuthServerInfo(); if (serverInfo.isUndertow()) { System.setProperty("keycloak.vault." + provider.getName() + ".provider.enabled", "false"); - } else if (serverInfo.isJBossBased()) { - OnlineManagementClient client = AuthServerTestEnricher.getManagementClient(); - for (String command : provider.getCliRemovalCommands()) { - client.execute(command); - } - client.execute("/subsystem=keycloak-server/spi=vault/:remove"); - client.close(); } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientSearchTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientSearchTest.java index 8fc3fe3635..c01c6bd6c2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientSearchTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientSearchTest.java @@ -25,10 +25,7 @@ import org.junit.Before; import org.junit.Test; import org.keycloak.models.ClientProvider; import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.arquillian.containers.KeycloakQuarkusServerDeployableContainer; -import org.wildfly.extras.creaper.core.online.OnlineManagementClient; -import org.wildfly.extras.creaper.core.online.operations.admin.Administration; import java.util.Arrays; import java.util.Collections; @@ -144,12 +141,7 @@ public class ClientSearchTest extends AbstractClientTest { controller.stop(suiteContext.getAuthServerInfo().getQualifier()); System.setProperty(SEARCHABLE_ATTRS_PROP, String.join(",", searchableAttributes)); controller.start(suiteContext.getAuthServerInfo().getQualifier()); - } else if (suiteContext.getAuthServerInfo().isJBossBased()) { - searchableAttributes = Arrays.stream(searchableAttributes).map(a -> a.replace("\"", "\\\\\\\"")).toArray(String[]::new); - String s = "\\\"" + String.join("\\\",\\\"", searchableAttributes) + "\\\""; - executeCli("/subsystem=keycloak-server/spi=client:add()", - "/subsystem=keycloak-server/spi=client/provider=jpa/:add(properties={searchableAttributes => \"[" + s + "]\"},enabled=true)"); - } else if(suiteContext.getAuthServerInfo().isQuarkus()) { + } else if (suiteContext.getAuthServerInfo().isQuarkus()) { searchableAttributes = Arrays.stream(searchableAttributes) .map(a -> a.replace(" ", "\\ ").replace("\"", "\\\\\\\"")) .toArray(String[]::new); @@ -172,10 +164,8 @@ public class ClientSearchTest extends AbstractClientTest { controller.stop(suiteContext.getAuthServerInfo().getQualifier()); System.clearProperty(SEARCHABLE_ATTRS_PROP); controller.start(suiteContext.getAuthServerInfo().getQualifier()); - } else if (suiteContext.getAuthServerInfo().isJBossBased()) { - executeCli("/subsystem=keycloak-server/spi=client:remove"); - } else if(suiteContext.getAuthServerInfo().isQuarkus()) { - KeycloakQuarkusServerDeployableContainer container = (KeycloakQuarkusServerDeployableContainer)suiteContext.getAuthServerInfo().getArquillianContainer().getDeployableContainer(); + } else if (suiteContext.getAuthServerInfo().isQuarkus()) { + KeycloakQuarkusServerDeployableContainer container = (KeycloakQuarkusServerDeployableContainer) suiteContext.getAuthServerInfo().getArquillianContainer().getDeployableContainer(); container.setAdditionalBuildArgs(Collections.emptyList()); container.restartServer(); } else { @@ -185,22 +175,6 @@ public class ClientSearchTest extends AbstractClientTest { reconnectAdminClient(); } - private void executeCli(String... commands) throws Exception { - OnlineManagementClient client = AuthServerTestEnricher.getManagementClient(); - Administration administration = new Administration(client); - - log.debug("Running CLI commands:"); - for (String c : commands) { - log.debug(c); - client.execute(c).assertSuccess(); - } - log.debug("Done"); - - administration.reload(); - - client.close(); - } - private boolean isJpaStore() { String providerId = testingClient.server() .fetchString(s -> s.getKeycloakSessionFactory().getProviderFactory(ClientProvider.class).getId()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTruststoreTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTruststoreTest.java index bc82f8beb6..2cb41f66b8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTruststoreTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTruststoreTest.java @@ -35,7 +35,7 @@ public class KcAdmTruststoreTest extends AbstractAdmCliTest { // only run this test if ssl protected keycloak server is available if (!AUTH_SERVER_SSL_REQUIRED) { - System.out.println("TEST SKIPPED - This test requires HTTPS. Run with '-Pauth-server-wildfly -Dauth.server.ssl.required=true'"); + System.out.println("TEST SKIPPED - This test requires HTTPS. Run with '-Pauth-server-quarkus -Dauth.server.ssl.required=true'"); return; } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTruststoreTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTruststoreTest.java index 99f5eaf3d2..f4443a71fc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTruststoreTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTruststoreTest.java @@ -35,7 +35,7 @@ public class KcRegTruststoreTest extends AbstractRegCliTest { // only run the rest of this test if ssl protected keycloak server is available if (!AUTH_SERVER_SSL_REQUIRED) { - System.out.println("TEST SKIPPED - This test requires HTTPS. Run with '-Pauth-server-wildfly -Dauth.server.ssl.required=true'"); + System.out.println("TEST SKIPPED - This test requires HTTPS. Run with '-Pauth-server-quarkus -Dauth.server.ssl.required=true'"); return; } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java index 0bbb98c137..b4335a72d8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java @@ -9,7 +9,6 @@ import org.keycloak.admin.client.Keycloak; import org.keycloak.models.Constants; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.util.ContainerAssume; @@ -118,8 +117,6 @@ public abstract class AbstractClusterTest extends AbstractKeycloakTest { } log.info("Backend node " + node + " is started"); - AuthServerTestEnricher.initializeTLS(node); - if (!backendAdminClients.containsKey(node)) { backendAdminClients.put(node, createAdminClientFor(node)); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/AbstractHostnameTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/AbstractHostnameTest.java index 2aab5541d0..14eb877bde 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/AbstractHostnameTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/AbstractHostnameTest.java @@ -4,11 +4,8 @@ import org.jboss.arquillian.container.test.api.ContainerController; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.logging.Logger; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.arquillian.containers.KeycloakQuarkusServerDeployableContainer; import org.keycloak.testsuite.util.OAuthClient; -import org.wildfly.extras.creaper.core.online.OnlineManagementClient; -import org.wildfly.extras.creaper.core.online.operations.admin.Administration; import java.net.URI; import java.util.ArrayList; @@ -35,10 +32,6 @@ public abstract class AbstractHostnameTest extends AbstractKeycloakTest { "keycloak.hostname.fixed.httpsPort", "keycloak.hostname.fixed.alwaysHttps"); controller.start(suiteContext.getAuthServerInfo().getQualifier()); - } else if (suiteContext.getAuthServerInfo().isJBossBased()) { - executeCli("/subsystem=keycloak-server/spi=hostname:remove", - "/subsystem=keycloak-server/spi=hostname/:add(default-provider=default)", - "/subsystem=keycloak-server/spi=hostname/provider=default/:add(properties={frontendUrl => \"${keycloak.frontendUrl:}\",forceBackendUrlToFrontendUrl => \"false\"},enabled=true)"); } else if (suiteContext.getAuthServerInfo().isQuarkus()) { KeycloakQuarkusServerDeployableContainer container = (KeycloakQuarkusServerDeployableContainer)suiteContext.getAuthServerInfo().getArquillianContainer().getDeployableContainer(); container.resetConfiguration(); @@ -63,13 +56,6 @@ public abstract class AbstractHostnameTest extends AbstractKeycloakTest { } System.setProperty("keycloak.hostname.default.forceBackendUrlToFrontendUrl", String.valueOf(forceBackendUrlToFrontendUrl)); controller.start(suiteContext.getAuthServerInfo().getQualifier()); - } else if (suiteContext.getAuthServerInfo().isJBossBased()) { - executeCli("/subsystem=keycloak-server/spi=hostname:remove", - "/subsystem=keycloak-server/spi=hostname/:add(default-provider=default)", - "/subsystem=keycloak-server/spi=hostname/provider=default/:add(properties={" + - "frontendUrl => \"" + frontendUrl + "\"" + - ",forceBackendUrlToFrontendUrl => \"" + forceBackendUrlToFrontendUrl + "\"" + - (adminUrl != null ? ",adminUrl=\"" + adminUrl + "\"" : "") + "},enabled=true)"); } else if (suiteContext.getAuthServerInfo().isQuarkus()) { controller.stop(suiteContext.getAuthServerInfo().getQualifier()); KeycloakQuarkusServerDeployableContainer container = (KeycloakQuarkusServerDeployableContainer)suiteContext.getAuthServerInfo().getArquillianContainer().getDeployableContainer(); @@ -102,10 +88,6 @@ public abstract class AbstractHostnameTest extends AbstractKeycloakTest { System.setProperty("keycloak.hostname.fixed.httpsPort", String.valueOf(httpsPort)); System.setProperty("keycloak.hostname.fixed.alwaysHttps", String.valueOf(alwaysHttps)); controller.start(suiteContext.getAuthServerInfo().getQualifier()); - } else if (suiteContext.getAuthServerInfo().isJBossBased()) { - executeCli("/subsystem=keycloak-server/spi=hostname:remove", - "/subsystem=keycloak-server/spi=hostname/:add(default-provider=fixed)", - "/subsystem=keycloak-server/spi=hostname/provider=fixed/:add(properties={hostname => \"" + hostname + "\",httpPort => \"" + httpPort + "\",httpsPort => \"" + httpsPort + "\",alwaysHttps => \"" + alwaysHttps + "\"},enabled=true)"); } else { throw new RuntimeException("Don't know how to config"); } @@ -113,22 +95,6 @@ public abstract class AbstractHostnameTest extends AbstractKeycloakTest { reconnectAdminClient(); } - private void executeCli(String... commands) throws Exception { - OnlineManagementClient client = AuthServerTestEnricher.getManagementClient(); - Administration administration = new Administration(client); - - LOGGER.debug("Running CLI commands:"); - for (String c : commands) { - LOGGER.debug(c); - client.execute(c).assertSuccess(); - } - LOGGER.debug("Done"); - - administration.reload(); - - client.close(); - } - private void removeProperties(String... keys) { for (String k : keys) { System.getProperties().remove(k); diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/pom.xml deleted file mode 100644 index c53ccfb54a..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - 4.0.0 - - - org.keycloak.testsuite - integration-arquillian-tests-adapters-jboss-relative - 999-SNAPSHOT - - - integration-arquillian-tests-adapters-relative-eap - - Adapter Tests - JBoss - Relative EAP - - - relative-eap - - - - - - maven-enforcer-plugin - - - - enforce - - - - - auth-server-eap - - - - - - - - - - - - auth-server-eap - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCAdapterTest.java deleted file mode 100644 index fe87f9f825..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCAdapterTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.AbstractJBossOIDCServletsAdapterTest; - -/** - * - * @author tkyjovsk - */ -public class RelativeEAPOIDCAdapterTest extends AbstractJBossOIDCServletsAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCSessionAdapterTest.java deleted file mode 100644 index 444c7587c9..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPOIDCSessionAdapterTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest; - -/** - * - * @author tkyjovsk - */ -public class RelativeEAPOIDCSessionAdapterTest extends AbstractSessionServletAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPSAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPSAMLAdapterTest.java deleted file mode 100644 index 9807577299..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/eap/src/test/java/org/keycloak/testsuite/adapter/RelativeEAPSAMLAdapterTest.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.AbstractSAMLServletsAdapterTest; - -/** - * @author mhajas - */ -public class RelativeEAPSAMLAdapterTest extends AbstractSAMLServletsAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/pom.xml deleted file mode 100644 index 1f456bf125..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - 4.0.0 - - - org.keycloak.testsuite - integration-arquillian-tests-adapters-jboss - 999-SNAPSHOT - - - pom - - integration-arquillian-tests-adapters-jboss-relative - - Adapter Tests - JBoss - Relative - - - ${project.parent.parent.basedir}/common - - true - - false - app-server-${app.server} - ${app.server.artifactId} - - suite - - ${auth.server.port.offset} - ${auth.server.http.port} - ${auth.server.https.port} - ${auth.server.management.port} - - ${auth.server.jboss.startup.timeout} - ${auth.server.memory.settings} - ${auth.server.ssl.required} - - - - - auth-server-wildfly - - wildfly - - - - auth-server-eap - - eap - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/pom.xml deleted file mode 100644 index c8a5609258..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - 4.0.0 - - - org.keycloak.testsuite - integration-arquillian-tests-adapters-jboss-relative - 999-SNAPSHOT - - - integration-arquillian-tests-adapters-relative-wildfly - - Adapter Tests - JBoss - Relative Wildfly - - - relative-wildfly - - - - - - maven-enforcer-plugin - - - - enforce - - - - - auth-server-wildfly - - - - - - - - - - - - auth-server-wildfly - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCAdapterTest.java deleted file mode 100644 index 0e14d93a43..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCAdapterTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.AbstractJBossOIDCServletsAdapterTest; - -/** - * - * @author tkyjovsk - */ -public class RelativeWildflyOIDCAdapterTest extends AbstractJBossOIDCServletsAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCSessionAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCSessionAdapterTest.java deleted file mode 100644 index 060af6102a..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflyOIDCSessionAdapterTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.AbstractSessionServletAdapterTest; - -/** - * - * @author tkyjovsk - */ -public class RelativeWildflyOIDCSessionAdapterTest extends AbstractSessionServletAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflySAMLAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflySAMLAdapterTest.java deleted file mode 100644 index ea3afa6e17..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/RelativeWildflySAMLAdapterTest.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.keycloak.testsuite.adapter; - -import org.keycloak.testsuite.adapter.servlet.AbstractSAMLServletsAdapterTest; - -/** - * @author mhajas - */ -public class RelativeWildflySAMLAdapterTest extends AbstractSAMLServletsAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyBasicAuthExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyBasicAuthExampleAdapterTest.java deleted file mode 100644 index 17dc40c301..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyBasicAuthExampleAdapterTest.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.keycloak.testsuite.adapter.example; - -/** - * - * @author tkyjovsk - */ -public class RelativeWildflyBasicAuthExampleAdapterTest extends AbstractBasicAuthExampleAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyCorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyCorsExampleAdapterTest.java deleted file mode 100644 index af3bdb886d..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyCorsExampleAdapterTest.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.keycloak.testsuite.adapter.example; - -/** - * - * @author fkiss - */ -public class RelativeWildflyCorsExampleAdapterTest extends AbstractCorsExampleAdapterTest { - -} \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyDemoExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyDemoExampleAdapterTest.java deleted file mode 100644 index 0abd086ac8..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflyDemoExampleAdapterTest.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.keycloak.testsuite.adapter.example; - -/** - * - * @author tkyjovsk - */ -public class RelativeWildflyDemoExampleAdapterTest extends AbstractDemoExampleAdapterTest { - -} diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflySAMLExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflySAMLExampleAdapterTest.java deleted file mode 100644 index 56fa580ed8..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/java/org/keycloak/testsuite/adapter/example/RelativeWildflySAMLExampleAdapterTest.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.keycloak.testsuite.adapter.example; - -/** - * - * @author mhajas - */ -public class RelativeWildflySAMLExampleAdapterTest extends AbstractSAMLExampleAdapterTest { - -} \ No newline at end of file diff --git a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/resources/web.xml b/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/resources/web.xml deleted file mode 100644 index 50a159560a..0000000000 --- a/testsuite/integration-arquillian/tests/other/adapters/jboss/relative/wildfly/src/test/resources/web.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - %CONTEXT_PATH% - - diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index 31d6a7f197..c12622ea4d 100755 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -268,26 +268,6 @@ maven-dependency-plugin - - unpack-auth-server-jboss - generate-resources - - unpack - - - - - org.keycloak.testsuite - ${auth.server.jboss.artifactId} - ${project.version} - zip - - - ${containers.home} - true - ${auth.server.jboss.skip.unpack} - - unpack-undertow-server generate-test-resources @@ -806,54 +786,6 @@ - - auth-server-wildfly - - wildfly - true - false - standalone.xml - ${auth.server.home}/standalone/configuration - 1024m - - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - - - org.wildfly.core - wildfly-cli - test - ${wildfly.core.version} - - - - - - auth-server-eap - - eap - true - false - standalone.xml - ${auth.server.home}/standalone/configuration - 1024m - - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - - - org.wildfly.core - wildfly-cli - test - ${wildfly.core.version} - - - - auth-servers-crossdc-undertow @@ -1516,161 +1448,6 @@ - - - - auth-server-cluster - - - - - - true - true - - ${containers.home}/auth-server-${auth.server}-backend1 - ${containers.home}/auth-server-${auth.server}-backend2 - 5008 - 5009 - - ${containers.home}/auth-server-legacy - 5010 - - ${auth.server.backend1.home}/standalone/configuration - - %d{HH:mm:ss,SSS} [%t] %-5p [%c{1.}] %m%n - - - - - maven-enforcer-plugin - - - - enforce - - - - - - auth.server - (wildfly)|(eap) - Profile "auth-server-cluster" requires activation of profile "auth-server-wildfly" or "auth-server-eap". - - - - - - - - - - - maven-antrun-plugin - - - copy-auth-server-backend-nodes - process-resources - - run - - - - - - - - - - - - - - - - maven-surefire-plugin - - - true - ${docker.database.skip} - - false - - ${auth.server.backend1.home} - ${auth.server.backend2.home} - -agentlib:jdwp=transport=dt_socket,server=y,suspend=${auth.server.debug.suspend},address=${auth.server.host}:${auth.server.backend1.debug.port} - -agentlib:jdwp=transport=dt_socket,server=y,suspend=${auth.server.debug.suspend},address=${auth.server.host}:${auth.server.backend2.debug.port} - - - 101 - 102 - - 8181 - 8182 - - 8544 - 8545 - - 10091 - 10092 - - 10100 - 10101 - - ${auth.server.legacy.home} - -agentlib:jdwp=transport=dt_socket,server=y,suspend=${auth.server.debug.suspend},address=${auth.server.host}:${auth.server.legacy.debug.port} - 600 - 10590 - - - - - - - - - - auth-server-legacy - - - auth.server.legacy.version - - - - true - - - - - - maven-dependency-plugin - - - unpack-auth-server-legacy - generate-resources - - unpack - - - - - org.keycloak.testsuite - integration-arquillian-servers-auth-server-legacy - ${project.version} - zip - - - ${containers.home} - true - - - - - - - - - clean-jpa