KEYCLOAK-8268 unify fuse70 and fuse71 modules into fuse7x module

testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse70AppServerArquillianExtension.java

@@ -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 <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
- */
-public class Fuse70AppServerArquillianExtension implements LoadableExtension {
-
-    @Override
-    public void register(ExtensionBuilder builder) {
-
-        builder.service(DeployableContainer.class, CustomFuseContainer.class);
-
-    }
-
-}

testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension

@@ -1 +0,0 @@
-org.keycloak.testsuite.arquillian.fuse.Fuse70AppServerArquillianExtension

testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider

@@ -1 +0,0 @@
-org.keycloak.testsuite.arquillian.fuse.container.Fuse70AppServerProvider

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/pom.xml

@@ -1,86 +0,0 @@
-<?xml version="1.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.
--->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <parent>
-        <groupId>org.keycloak.testsuite</groupId>
-        <artifactId>integration-arquillian-servers-app-server-karaf</artifactId>
-        <version>4.5.0.Final-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>integration-arquillian-servers-app-server-fuse71</artifactId>
-    <packaging>jar</packaging>
-    <name>App Server - Fuse 7.1</name>
-
-    <properties>
-        <app.server.karaf>fuse71</app.server.karaf>
-        <app.server.karaf.groupId>org.jboss.fuse</app.server.karaf.groupId>
-        <app.server.karaf.artifactId>fuse-karaf</app.server.karaf.artifactId>
-        <app.server.karaf.version>${fuse71.version}</app.server.karaf.version>
-        <app.server.karaf.unpacked.folder.name>fuse-karaf-${fuse71.version}</app.server.karaf.unpacked.folder.name>
-        <app.server.karaf.client.auth>-u admin -p admin</app.server.karaf.client.auth>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.keycloak.testsuite</groupId>
-            <artifactId>integration-arquillian-servers-app-server-spi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak.testsuite</groupId>
-            <artifactId>integration-arquillian-util</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-container-osgi</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireProperty>
-                                    <property>fuse71.version</property>
-                                </requireProperty>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse71AppServerProvider.java

@@ -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 <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
- */
-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<Node> getContainers() {
-        List<Node> 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;
-    }
-}

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension

@@ -1 +0,0 @@
-org.keycloak.testsuite.arquillian.fuse.Fuse71AppServerArquillianExtension

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider

@@ -1 +0,0 @@
-org.keycloak.testsuite.arquillian.fuse.container.Fuse71AppServerProvider

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/install-features.cli

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

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-bearer.json

@@ -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"
-}

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-direct-access.json

@@ -1,9 +0,0 @@
-{
-  "realm" : "demo",
-  "resource" : "ssh-jmx-admin-client",
-  "auth-server-url" : "http://localhost:8080/auth",
-  "ssl-required" : "external",
-  "credentials": {
-    "secret": "password"
-  }
-}

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-hawtio-client.json

@@ -1,7 +0,0 @@
-{
-  "realm" : "demo",
-  "clientId" : "hawtio-client",
-  "url" : "http://localhost:8080/auth",
-  "ssl-required" : "external",
-  "public-client" : true
-}

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/keycloak-hawtio.json

@@ -1,9 +0,0 @@
-{
-  "realm" : "demo",
-  "resource" : "ssh-jmx-admin-client",
-  "auth-server-url" : "http://localhost:8080/auth",
-  "ssl-required" : "external",
-  "credentials": {
-    "secret": "password"
-  }
-}

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/update-config-auth.cli

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

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/update-config.cli

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

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/main/resources/users.properties

@@ -1 +0,0 @@
-admin=admin,admin,manager,viewer,ssh,systembundles

testsuite/integration-arquillian/servers/app-server/karaf/fuse71/src/saml-adapter-not-supported

@@ -1 +0,0 @@
-

testsuite/integration-arquillian/servers/app-server/karaf/fuse7x/pom.xml

@@ -25,16 +25,16 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>integration-arquillian-servers-app-server-fuse70</artifactId>
+    <artifactId>integration-arquillian-servers-app-server-fuse7x</artifactId>
     <packaging>jar</packaging>
-    <name>App Server - Fuse 7.0</name>
+    <name>App Server - Fuse 7.x</name>
 
     <properties>
-        <app.server.karaf>fuse70</app.server.karaf>
+        <app.server.karaf>fuse7x</app.server.karaf>
         <app.server.karaf.groupId>org.jboss.fuse</app.server.karaf.groupId>
         <app.server.karaf.artifactId>fuse-karaf</app.server.karaf.artifactId>
-        <app.server.karaf.version>${fuse70.version}</app.server.karaf.version>
+        <app.server.karaf.version>${fuse7x.version}</app.server.karaf.version>
-        <app.server.karaf.unpacked.folder.name>fuse-karaf-${fuse70.version}</app.server.karaf.unpacked.folder.name>
+        <app.server.karaf.unpacked.folder.name>fuse-karaf-${fuse7x.version}</app.server.karaf.unpacked.folder.name>
         <app.server.karaf.client.auth>-u admin -p admin</app.server.karaf.client.auth>
     </properties>
 
@@ -73,7 +73,7 @@
                         <configuration>
                             <rules>
                                 <requireProperty>
-                                    <property>fuse70.version</property>
+                                    <property>fuse7x.version</property>
                                 </requireProperty>
                             </rules>
                         </configuration>

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 <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
  */
-public class Fuse71AppServerArquillianExtension implements LoadableExtension {
+public class Fuse7xAppServerArquillianExtension implements LoadableExtension {
 
     @Override
     public void register(ExtensionBuilder builder) {

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 <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
  */
-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");

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

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

testsuite/integration-arquillian/servers/app-server/karaf/pom.xml

@@ -267,27 +267,15 @@
             </modules>
         </profile>
         <profile>
-            <id>app-server-fuse70</id>
+            <id>app-server-fuse7x</id>
             <activation>
                 <property>
                     <name>app.server</name>
-                    <value>fuse70</value>
+                    <value>fuse7x</value>
                 </property>
             </activation>
             <modules>
-                <module>fuse70</module>
+                <module>fuse7x</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>app-server-fuse71</id>
-            <activation>
-                <property>
-                    <name>app.server</name>
-                    <value>fuse71</value>
-                </property>
-            </activation>
-            <modules>
-                <module>fuse71</module>
             </modules>
         </profile>
     </profiles>

testsuite/integration-arquillian/tests/base/pom.xml

@@ -576,15 +576,15 @@
             </build>
         </profile>
         <profile>
-            <id>app-server-fuse70</id>
+            <id>app-server-fuse7x</id>
             <activation>
                 <property>
                     <name>app.server</name>
-                    <value>fuse70</value>
+                    <value>fuse7x</value>
                 </property>
             </activation>
             <properties>
-                <app.server>fuse70</app.server> <!--in case the profile is called directly-->
+                <app.server>fuse7x</app.server> <!--in case the profile is called directly-->
                 <app.server.skip.unpack>false</app.server.skip.unpack>
 
                 <!--fuse examples expect auth server on 8080-->
@@ -601,7 +601,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.keycloak.testsuite</groupId>
-                    <artifactId>integration-arquillian-servers-app-server-fuse70</artifactId>
+                    <artifactId>integration-arquillian-servers-app-server-fuse7x</artifactId>
                     <version>${project.version}</version>
                     <scope>runtime</scope>
                 </dependency>
@@ -636,67 +636,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>app-server-fuse71</id>
-            <activation>
-                <property>
-                    <name>app.server</name>
-                    <value>fuse71</value>
-                </property>
-            </activation>
-            <properties>
-                <app.server>fuse71</app.server> <!--in case the profile is called directly-->
-                <app.server.skip.unpack>false</app.server.skip.unpack>
-
-                <!--fuse examples expect auth server on 8080-->
-                <auth.server.port.offset>0</auth.server.port.offset>
-                <auth.server.http.port>8080</auth.server.http.port>
-                <auth.server.management.port>9990</auth.server.management.port>
-                <!--fuse examples expect default karaf http port 8181-->
-                <app.server.http.port>8181</app.server.http.port>
-
-                <app.server.management.user>admin</app.server.management.user>
-                <app.server.management.password>admin</app.server.management.password>
-                <app.server.karaf.jvm.debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.debug.suspend},address=localhost:${app.server.debug.port}</app.server.karaf.jvm.debug.args>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.keycloak.testsuite</groupId>
-                    <artifactId>integration-arquillian-servers-app-server-fuse71</artifactId>
-                    <version>${project.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.jboss.arquillian.container</groupId>
-                    <artifactId>arquillian-container-karaf-managed</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>org.keycloak.testsuite</groupId>
-                    <artifactId>integration-arquillian-test-apps-fuse-parent</artifactId>
-                    <version>${project.version}</version>
-                    <scope>runtime</scope>
-                    <type>pom</type>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.commonjava.maven.plugins</groupId>
-                        <artifactId>directory-maven-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <app.server.management.user>${app.server.management.user}</app.server.management.user>
-                                <app.server.management.password>${app.server.management.password}</app.server.management.password>
-                                <app.server.karaf.jvm.debug.args>${app.server.karaf.jvm.debug.args}</app.server.karaf.jvm.debug.args>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>auth-servers-crossdc-undertow</id>
             <properties>

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_FUSE7X = APP_SERVER_PREFIX + "fuse7x";
-    public static final String APP_SERVER_FUSE71 = APP_SERVER_PREFIX + "fuse71";
+
 }

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_FUSE7X)
-@AppServerContainer(ContainerConstants.APP_SERVER_FUSE71)
 public class FuseAdminAdapterTest extends AbstractExampleAdapterTest {
 
     @Drone

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_FUSE7X)
-@AppServerContainer(ContainerConstants.APP_SERVER_FUSE71)
 public class FuseExampleAdapterTest extends AbstractExampleAdapterTest {
 
     @Page