keycloak-memoizeit

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 0000000..68b1252
--- /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 0000000..97783ae
--- /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/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
index 556dccd..4f6cf13 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 @@
             </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>
-            </modules>
-        </profile>
-        <profile>
-            <id>app-server-fuse71</id>
-            <activation>
-                <property>
-                    <name>app.server</name>
-                    <value>fuse71</value>
-                </property>
-            </activation>
-            <modules>
-                <module>fuse71</module>
+                <module>fuse7x</module>
             </modules>
         </profile>
     </profiles>

diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index 594067a..09d5233 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/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>
@@ -637,67 +637,6 @@
             </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>
                 <skip.clean.second.cache>false</skip.clean.second.cache>

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 6f5279e..875a4ea 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 b59665f..6b51415 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 3a6e3fa..95b19c5 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