From 24b7d080af6ea554e346aa4ab770f00450696e4d Mon Sep 17 00:00:00 2001 From: vramik Date: Wed, 12 Sep 2018 11:56:07 +0200 Subject: [PATCH] KEYCLOAK-8268 unify fuse70 and fuse71 modules into fuse7x module --- .../Fuse70AppServerArquillianExtension.java | 36 -------- ...boss.arquillian.core.spi.LoadableExtension | 1 - ...llian.container.AppServerContainerProvider | 1 - .../servers/app-server/karaf/fuse71/pom.xml | 86 ----------------- .../container/Fuse71AppServerProvider.java | 92 ------------------- ...boss.arquillian.core.spi.LoadableExtension | 1 - ...llian.container.AppServerContainerProvider | 1 - .../src/main/resources/install-features.cli | 7 -- .../src/main/resources/keycloak-bearer.json | 9 -- .../resources/keycloak-direct-access.json | 9 -- .../resources/keycloak-hawtio-client.json | 7 -- .../src/main/resources/keycloak-hawtio.json | 9 -- .../src/main/resources/update-config-auth.cli | 9 -- .../src/main/resources/update-config.cli | 15 --- .../src/main/resources/users.properties | 1 - .../fuse71/src/saml-adapter-not-supported | 1 - .../karaf/{fuse70 => fuse7x}/pom.xml | 12 +-- .../Fuse7xAppServerArquillianExtension.java} | 2 +- .../container/Fuse7xAppServerProvider.java} | 6 +- ...boss.arquillian.core.spi.LoadableExtension | 1 + ...llian.container.AppServerContainerProvider | 1 + .../cxf-customerservice-keycloak.json | 0 .../src/main/resources/install-features.cli | 0 .../src/main/resources/keycloak-bearer.json | 0 .../resources/keycloak-direct-access.json | 0 .../resources/keycloak-hawtio-client.json | 0 .../src/main/resources/keycloak-hawtio.json | 0 .../src/main/resources/update-config-auth.cli | 0 .../src/main/resources/update-config.cli | 0 .../src/main/resources/users.properties | 0 .../src/saml-adapter-not-supported | 0 .../servers/app-server/karaf/pom.xml | 18 +--- .../integration-arquillian/tests/base/pom.xml | 69 +------------- .../containers/ContainerConstants.java | 4 +- .../example/fuse/FuseAdminAdapterTest.java | 3 +- .../example/fuse/FuseExampleAdapterTest.java | 3 +- 36 files changed, 23 insertions(+), 381 deletions(-) delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse70AppServerArquillianExtension.java delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse71AppServerProvider.java delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/install-features.cli delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-bearer.json delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-direct-access.json delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-hawtio-client.json delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-hawtio.json delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/update-config-auth.cli delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/update-config.cli delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/users.properties delete mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/saml-adapter-not-supported rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/pom.xml (90%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse71/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse71AppServerArquillianExtension.java => fuse7x/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse7xAppServerArquillianExtension.java} (94%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse70AppServerProvider.java => fuse7x/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse7xAppServerProvider.java} (95%) create mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension create mode 100644 testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/src/main/resources/cxf-customerservice-keycloak.json (100%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/src/main/resources/install-features.cli (100%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/src/main/resources/keycloak-bearer.json (100%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/src/main/resources/keycloak-direct-access.json (100%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/src/main/resources/keycloak-hawtio-client.json (100%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/src/main/resources/keycloak-hawtio.json (100%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/src/main/resources/update-config-auth.cli (100%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/src/main/resources/update-config.cli (100%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/src/main/resources/users.properties (100%) rename testsuite/integration-arquillian/servers/app-server/karaf/{fuse70 => fuse7x}/src/saml-adapter-not-supported (100%) diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse70AppServerArquillianExtension.java b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse70AppServerArquillianExtension.java deleted file mode 100644 index a5c27c4cea..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse70AppServerArquillianExtension.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2018 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.arquillian.fuse; - -import org.jboss.arquillian.container.spi.client.container.DeployableContainer; -import org.jboss.arquillian.core.spi.LoadableExtension; -import org.keycloak.testsuite.utils.arquillian.fuse.CustomFuseContainer; - -/** - * - * @author Vlasta Ramik - */ -public class Fuse70AppServerArquillianExtension implements LoadableExtension { - - @Override - public void register(ExtensionBuilder builder) { - - builder.service(DeployableContainer.class, CustomFuseContainer.class); - - } - -} diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index 2b8cf1704b..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.fuse.Fuse70AppServerArquillianExtension diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider deleted file mode 100644 index 01068c3035..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.fuse.container.Fuse70AppServerProvider diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/pom.xml deleted file mode 100644 index 9cc28122bd..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-karaf - 4.5.0.Final-SNAPSHOT - - 4.0.0 - - integration-arquillian-servers-app-server-fuse71 - jar - App Server - Fuse 7.1 - - - fuse71 - org.jboss.fuse - fuse-karaf - ${fuse71.version} - fuse-karaf-${fuse71.version} - -u admin -p admin - - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-spi - ${project.version} - - - org.keycloak.testsuite - integration-arquillian-util - ${project.version} - - - org.jboss.arquillian.container - arquillian-container-osgi - - - com.google.guava - guava - - - - - - - - - maven-enforcer-plugin - - - - enforce - - - - - fuse71.version - - - - - - - - - - diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse71AppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse71AppServerProvider.java deleted file mode 100644 index 0c084b37aa..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse71AppServerProvider.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2018 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.arquillian.fuse.container; - -import java.util.ArrayList; -import java.util.List; -import org.jboss.arquillian.core.spi.Validate; -import org.jboss.shrinkwrap.descriptor.spi.node.Node; -import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider; -import org.keycloak.testsuite.utils.arquillian.fuse.CustomFuseContainer; - -/** - * @author Vlasta Ramik - */ -public class Fuse71AppServerProvider implements AppServerContainerProvider { - - private Node configuration; - private static final String containerName = "fuse71"; - - private final String appServerHome; - private final String appServerJavaHome; - private final String managementUser; - private final String managementPassword; - - public Fuse71AppServerProvider() { - appServerHome = System.getProperty("app.server.home"); - appServerJavaHome = System.getProperty("app.server.java.home"); - managementUser = System.getProperty("app.server.management.user"); - managementPassword = System.getProperty("app.server.management.password"); - - Validate.notNullOrEmpty(appServerHome, "app.server.home is not set."); - Validate.notNullOrEmpty(appServerJavaHome, "app.server.java.home is not set."); - Validate.notNullOrEmpty(managementUser, "app.server.management.user is not set."); - Validate.notNullOrEmpty(managementPassword, "app.server.management.password is not set."); - } - - @Override - public String getName() { - return containerName; - } - - @Override - public List getContainers() { - List containers = new ArrayList<>(); - - containers.add(standaloneContainer()); - - return containers; - } - - private void createChild(String name, String text) { - configuration.createChild("property").attribute("name", name).text(text); - } - - private Node standaloneContainer() { - Node container = new Node("container"); - container.attribute("mode", "manual"); - container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName); - - configuration = container.createChild("configuration"); - createChild("enabled", "true"); - createChild("adapterImplClass", CustomFuseContainer.class.getName()); - createChild("autostartBundle", "false"); - createChild("karafHome", appServerHome); - createChild("javaHome", appServerJavaHome); - createChild("javaVmArguments", - System.getProperty("app.server.karaf.jvm.debug.args", "") + " " + - System.getProperty("adapter.test.props", " ") - ); - - createChild("jmxServiceURL", "service:jmx:rmi://127.0.0.1:44444/jndi/rmi://127.0.0.1:1099/karaf-root"); - createChild("jmxUsername", managementUser); - createChild("jmxPassword", managementPassword); - - return container; - } -} diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index ac525766c9..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.fuse.Fuse71AppServerArquillianExtension diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider deleted file mode 100644 index a5eec3df91..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.fuse.container.Fuse71AppServerProvider diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/install-features.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/install-features.cli deleted file mode 100644 index b6174cd7c6..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/install-features.cli +++ /dev/null @@ -1,7 +0,0 @@ -feature:repo-add mvn:org.keycloak/keycloak-osgi-features/${project.version}/xml/features -feature:repo-add mvn:org.keycloak.testsuite/fuse-example-keycloak-features/${project.version}/xml/features - -feature:install pax-http-undertow - -feature:install keycloak-jaas keycloak-pax-http-undertow -feature:install keycloak-fuse-7.0-example diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-bearer.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-bearer.json deleted file mode 100644 index b7f6b9ea90..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-bearer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "realm" : "demo", - "resource" : "jaas", - "bearer-only" : true, - "auth-server-url" : "http://localhost:8080/auth", - "ssl-required" : "external", - "use-resource-role-mappings": false, - "principal-attribute": "preferred_username" -} diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-direct-access.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-direct-access.json deleted file mode 100644 index bc741a9c81..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-direct-access.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "realm" : "demo", - "resource" : "ssh-jmx-admin-client", - "auth-server-url" : "http://localhost:8080/auth", - "ssl-required" : "external", - "credentials": { - "secret": "password" - } -} diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-hawtio-client.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-hawtio-client.json deleted file mode 100644 index 97fb5c9747..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-hawtio-client.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "realm" : "demo", - "clientId" : "hawtio-client", - "url" : "http://localhost:8080/auth", - "ssl-required" : "external", - "public-client" : true -} diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-hawtio.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-hawtio.json deleted file mode 100644 index bc741a9c81..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-hawtio.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "realm" : "demo", - "resource" : "ssh-jmx-admin-client", - "auth-server-url" : "http://localhost:8080/auth", - "ssl-required" : "external", - "credentials": { - "secret": "password" - } -} diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/update-config-auth.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/update-config-auth.cli deleted file mode 100644 index 7e38734522..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/update-config-auth.cli +++ /dev/null @@ -1,9 +0,0 @@ -config:edit org.apache.karaf.shell -config:property-set sshRealm keycloak -config:update - -system:property -p hawtio.keycloakEnabled true -system:property -p hawtio.realm keycloak -system:property -p hawtio.keycloakClientConfig file://\${karaf.base}/etc/keycloak-hawtio-client.json -system:property -p hawtio.keycloakServerConfig file://\${karaf.base}/etc/keycloak-bearer.json -system:property -p hawtio.rolePrincipalClasses org.keycloak.adapters.jaas.RolePrincipal,org.apache.karaf.jaas.boot.principal.RolePrincipal diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/update-config.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/update-config.cli deleted file mode 100644 index b1e19c0f6d..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/update-config.cli +++ /dev/null @@ -1,15 +0,0 @@ -config:edit org.ops4j.pax.url.mvn -config:property-set org.ops4j.pax.url.mvn.localRepository ${maven.repo.local} -config:property-set org.ops4j.pax.url.mvn.settings ${maven.local.settings} -config:property-append org.ops4j.pax.url.mvn.repositories ${repositories} -config:update - -config:edit org.ops4j.pax.web -config:property-set org.ops4j.pax.web.config.file '${karaf.etc}/undertow.xml' -config:update - -config:edit jmx.acl.org.apache.karaf.security.jmx -config:property-append list* viewer -config:property-append set* jmxAdmin -config:property-append * jmxAdmin,admin -config:update diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/users.properties b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/users.properties deleted file mode 100644 index 97e935c74e..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/users.properties +++ /dev/null @@ -1 +0,0 @@ -admin=admin,admin,manager,viewer,ssh,systembundles diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/saml-adapter-not-supported b/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/saml-adapter-not-supported deleted file mode 100644 index 8b13789179..0000000000 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/saml-adapter-not-supported +++ /dev/null @@ -1 +0,0 @@ - diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/pom.xml similarity index 90% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/pom.xml rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/pom.xml index 0b302792a5..bebaebc772 100644 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/pom.xml @@ -25,16 +25,16 @@ 4.0.0 - integration-arquillian-servers-app-server-fuse70 + integration-arquillian-servers-app-server-fuse7x jar - App Server - Fuse 7.0 + App Server - Fuse 7.x - fuse70 + fuse7x org.jboss.fuse fuse-karaf - ${fuse70.version} - fuse-karaf-${fuse70.version} + ${fuse7x.version} + fuse-karaf-${fuse7x.version} -u admin -p admin @@ -73,7 +73,7 @@ - fuse70.version + fuse7x.version diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse71AppServerArquillianExtension.java b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse7xAppServerArquillianExtension.java similarity index 94% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse71AppServerArquillianExtension.java rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse7xAppServerArquillianExtension.java index 9e52a0e983..7b2a6fa71a 100644 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse71AppServerArquillianExtension.java +++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse7xAppServerArquillianExtension.java @@ -24,7 +24,7 @@ import org.keycloak.testsuite.utils.arquillian.fuse.CustomFuseContainer; * * @author Vlasta Ramik */ -public class Fuse71AppServerArquillianExtension implements LoadableExtension { +public class Fuse7xAppServerArquillianExtension implements LoadableExtension { @Override public void register(ExtensionBuilder builder) { diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse70AppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse7xAppServerProvider.java similarity index 95% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse70AppServerProvider.java rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse7xAppServerProvider.java index fda6070a47..d7652b11f1 100644 --- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse70AppServerProvider.java +++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse7xAppServerProvider.java @@ -27,17 +27,17 @@ import org.keycloak.testsuite.utils.arquillian.fuse.CustomFuseContainer; /** * @author Vlasta Ramik */ -public class Fuse70AppServerProvider implements AppServerContainerProvider { +public class Fuse7xAppServerProvider implements AppServerContainerProvider { private Node configuration; - private static final String containerName = "fuse70"; + private static final String containerName = "fuse7x"; private final String appServerHome; private final String appServerJavaHome; private final String managementUser; private final String managementPassword; - public Fuse70AppServerProvider() { + public Fuse7xAppServerProvider() { appServerHome = System.getProperty("app.server.home"); appServerJavaHome = System.getProperty("app.server.java.home"); managementUser = System.getProperty("app.server.management.user"); diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension new file mode 100644 index 0000000000..68b1252ddb --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension @@ -0,0 +1 @@ +org.keycloak.testsuite.arquillian.fuse.Fuse7xAppServerArquillianExtension diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider new file mode 100644 index 0000000000..97783aed9b --- /dev/null +++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider @@ -0,0 +1 @@ +org.keycloak.testsuite.arquillian.fuse.container.Fuse7xAppServerProvider diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/cxf-customerservice-keycloak.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/cxf-customerservice-keycloak.json similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/cxf-customerservice-keycloak.json rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/cxf-customerservice-keycloak.json diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/install-features.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/install-features.cli similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/install-features.cli rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/install-features.cli diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-bearer.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/keycloak-bearer.json similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-bearer.json rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/keycloak-bearer.json diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-direct-access.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/keycloak-direct-access.json similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-direct-access.json rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/keycloak-direct-access.json diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-hawtio-client.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/keycloak-hawtio-client.json similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-hawtio-client.json rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/keycloak-hawtio-client.json diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-hawtio.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/keycloak-hawtio.json similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-hawtio.json rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/keycloak-hawtio.json diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/update-config-auth.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/update-config-auth.cli similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/update-config-auth.cli rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/update-config-auth.cli diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/update-config.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/update-config.cli similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/update-config.cli rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/update-config.cli diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/users.properties b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/users.properties similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/users.properties rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/main/resources/users.properties diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/saml-adapter-not-supported b/testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/saml-adapter-not-supported similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/saml-adapter-not-supported rename to testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/src/saml-adapter-not-supported diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml index 556dccda86..4f6cf13f98 100644 --- a/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml @@ -267,27 +267,15 @@ - app-server-fuse70 + app-server-fuse7x app.server - fuse70 + fuse7x - fuse70 - - - - app-server-fuse71 - - - app.server - fuse71 - - - - fuse71 + fuse7x diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index 594067a4d5..09d5233127 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -576,15 +576,15 @@ - app-server-fuse70 + app-server-fuse7x app.server - fuse70 + fuse7x - fuse70 + fuse7x false @@ -601,7 +601,7 @@ org.keycloak.testsuite - integration-arquillian-servers-app-server-fuse70 + integration-arquillian-servers-app-server-fuse7x ${project.version} runtime @@ -636,67 +636,6 @@ - - app-server-fuse71 - - - app.server - fuse71 - - - - fuse71 - false - - - 0 - 8080 - 9990 - - 8181 - - admin - admin - -agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.debug.suspend},address=localhost:${app.server.debug.port} - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-fuse71 - ${project.version} - runtime - - - org.jboss.arquillian.container - arquillian-container-karaf-managed - - - org.keycloak.testsuite - integration-arquillian-test-apps-fuse-parent - ${project.version} - runtime - pom - - - - - - org.commonjava.maven.plugins - directory-maven-plugin - - - maven-surefire-plugin - - - ${app.server.management.user} - ${app.server.management.password} - ${app.server.karaf.jvm.debug.args} - - - - - - auth-servers-crossdc-undertow diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java index 6f5279e3b8..875a4ea4a8 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java @@ -36,6 +36,6 @@ public interface ContainerConstants { public static final String APP_SERVER_EAP6_CLUSTER = APP_SERVER_EAP6 + "-ha-node-1;" + APP_SERVER_EAP6 + "-ha-node-2"; public static final String APP_SERVER_FUSE63 = APP_SERVER_PREFIX + "fuse63"; - public static final String APP_SERVER_FUSE70 = APP_SERVER_PREFIX + "fuse70"; - public static final String APP_SERVER_FUSE71 = APP_SERVER_PREFIX + "fuse71"; + public static final String APP_SERVER_FUSE7X = APP_SERVER_PREFIX + "fuse7x"; + } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/FuseAdminAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/FuseAdminAdapterTest.java index b59665f1f3..6b51415a8e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/FuseAdminAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/FuseAdminAdapterTest.java @@ -75,8 +75,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; @AppServerContainer(ContainerConstants.APP_SERVER_FUSE63) -@AppServerContainer(ContainerConstants.APP_SERVER_FUSE70) -@AppServerContainer(ContainerConstants.APP_SERVER_FUSE71) +@AppServerContainer(ContainerConstants.APP_SERVER_FUSE7X) public class FuseAdminAdapterTest extends AbstractExampleAdapterTest { @Drone diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/FuseExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/FuseExampleAdapterTest.java index 3a6e3faf7b..95b19c52ce 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/FuseExampleAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/FuseExampleAdapterTest.java @@ -46,8 +46,7 @@ import org.hamcrest.Matchers; * @author tkyjovsk */ @AppServerContainer(ContainerConstants.APP_SERVER_FUSE63) -@AppServerContainer(ContainerConstants.APP_SERVER_FUSE70) -@AppServerContainer(ContainerConstants.APP_SERVER_FUSE71) +@AppServerContainer(ContainerConstants.APP_SERVER_FUSE7X) public class FuseExampleAdapterTest extends AbstractExampleAdapterTest { @Page