keycloak-memoizeit

diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index a2a35d0..e012591 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <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">
+
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.keycloak</groupId>
         <artifactId>keycloak-testsuite-pom</artifactId>
         <version>1.9.0.CR1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     
     <groupId>org.keycloak.testsuite</groupId>
     <artifactId>integration-arquillian</artifactId>
     <packaging>pom</packaging>
-    <name>Keycloak Integration TestSuite with Arquillian</name>
+
+    <name>Keycloak Arquillian Integration TestSuite</name>
     
     <modules>
         <module>servers</module>

diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index 97e0565..0ca785b 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -9,7 +9,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>integration-arquillian-tests-base</artifactId>
-    <name>Base Test Suite</name>
+
+    <name>Base TestSuite</name>
+    
+    <description></description>
 
     <properties>
         <exclude.console>-</exclude.console>
@@ -17,8 +20,9 @@
         <exclude.client>-</exclude.client>
         <exclude.migration>-</exclude.migration>
     </properties>
-	<dependencies>
-	    <dependency>
+    
+    <dependencies>
+        <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-util-embedded-ldap</artifactId>
             <exclusions>
@@ -28,7 +32,8 @@
                 </exclusion>
             </exclusions>
         </dependency>
-	</dependencies>
+    </dependencies>
+    
     <build>
         <plugins>
             <plugin>
@@ -43,6 +48,7 @@
                     </execution>
                 </executions>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -55,18 +61,38 @@
                     </excludes>
                 </configuration>
             </plugin>
+        
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-admin-user-json-file</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${jboss.server.config.dir}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/test/resources</directory>
+                                    <includes>
+                                        <include>keycloak-add-user.json</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
         </plugins>
+
     </build>
     
     <profiles>    
         <profile>
-            <id>no-console</id>
-            <properties>
-                <!-- Exclude all admin console tests. -->
-                <exclude.console>**/console/**/*Test.java</exclude.console>           
-            </properties>
-        </profile>
-        <profile>
             <id>no-account</id>
             <properties>
                 <!-- Exclude all account management tests. -->
@@ -76,14 +102,13 @@
         <profile>
             <id>no-client</id>
             <properties>
-                <!-- Exclude all account management tests. -->
-                <exclude.account>**/client/**/*Test.java</exclude.account>
+                <!-- Exclude all client tests. -->
+                <exclude.client>**/client/**/*Test.java</exclude.client>
             </properties>
         </profile>
         <profile>
             <id>adapters-only</id>
             <properties>
-                <exclude.console>**/console/**/*Test.java</exclude.console>           
                 <exclude.account>**/account/**/*Test.java</exclude.account>
                 <exclude.client>**/client/**/*Test.java</exclude.client>
                 <exclude.migration>**/migration/**/*Test.java</exclude.migration>

diff --git a/testsuite/integration-arquillian/tests/other/console/pom.xml b/testsuite/integration-arquillian/tests/other/console/pom.xml
new file mode 100644
index 0000000..b099b16
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/console/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.keycloak.testsuite</groupId>
+        <artifactId>integration-arquillian-tests-other</artifactId>
+        <version>1.9.0.CR1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>integration-arquillian-tests-console</artifactId>
+
+    <name>Admin Console UI Tests</name>
+    
+</project>

diff --git a/testsuite/integration-arquillian/tests/other/pom.xml b/testsuite/integration-arquillian/tests/other/pom.xml
new file mode 100644
index 0000000..847d8f1
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/pom.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.keycloak.testsuite</groupId>
+        <artifactId>integration-arquillian-tests</artifactId>
+        <version>1.9.0.CR1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>integration-arquillian-tests-other</artifactId>
+
+    <packaging>pom</packaging>
+
+    <name>Other Tests Modules</name>
+    
+    <description>Test modules that depend on the Base TestSuite.
+        This POM contains common configuration for submodules.</description>
+
+    <modules>
+        <module>adapters</module>
+        <module>console</module>
+    </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>unpack-test-resources</id>
+                            <phase>generate-resources</phase>
+                            <goals>
+                                <goal>unpack</goal>
+                            </goals>
+                            <configuration>
+                                <artifactItems>
+                                    <artifactItem>
+                                        <groupId>org.keycloak.testsuite</groupId>
+                                        <artifactId>integration-arquillian-tests-base</artifactId>
+                                        <version>${project.version}</version>
+                                        <type>test-jar</type>
+                                        <includes>arquillian.xml,keycloak-add-user.json</includes>
+                                    </artifactItem>
+                                </artifactItems>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin> 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>copy-admin-user-json-file</id>
+                            <phase>process-test-resources</phase>
+                            <goals>
+                                <goal>copy-resources</goal>
+                            </goals>
+                            <configuration>
+                                <outputDirectory>${jboss.server.config.dir}</outputDirectory>
+                                <resources>
+                                    <resource>
+                                        <directory>${project.build.directory}/dependency</directory>
+                                        <includes>
+                                            <include>keycloak-add-user.json</include>
+                                        </includes>
+                                        <filtering>true</filtering>
+                                    </resource>
+                                </resources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <systemPropertyVariables>
+                            <arquillian.xml>${project.build.directory}/dependency/arquillian.xml</arquillian.xml>
+                        </systemPropertyVariables>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>dependency-on-base-testsuite</id>
+            <activation>
+                <!-- activated for all submodules with /src -->
+                <file>
+                    <exists>src</exists>
+                </file>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.keycloak.testsuite</groupId>
+                    <artifactId>integration-arquillian-tests-base</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.keycloak.testsuite</groupId>
+                    <artifactId>integration-arquillian-tests-base</artifactId>
+                    <version>${project.version}</version>
+                    <type>test-jar</type>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+</project>

diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index d520de6..25f7b0d 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0"?>
 <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">
+
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.keycloak.testsuite</groupId>
         <artifactId>integration-arquillian</artifactId>
         <version>1.9.0.CR1-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>integration-arquillian-tests</artifactId>
     <packaging>pom</packaging>
+
+    <artifactId>integration-arquillian-tests</artifactId>
+
     <name>Tests</name>
     
+    <description></description>
+    
     <modules>
         <module>base</module>
-        <module>adapters</module>
-        <module>console</module>
+        <module>other</module>
     </modules>
     
     <properties>
@@ -41,7 +46,7 @@
         <arquillian-wildfly-container.version>8.2.0.Final</arquillian-wildfly-container.version>
         <version.shrinkwrap.resolvers>2.1.1</version.shrinkwrap.resolvers>
         <skip.unpack.server>true</skip.unpack.server>
-        <skip.unpack.previous>true</skip.unpack.previous>
+        <skip.unpack.migrated.server>true</skip.unpack.migrated.server>
         <skip.install.adapters>true</skip.install.adapters>
         
         <jboss.server.config.dir>${project.build.directory}/undertow-configuration</jboss.server.config.dir>
@@ -115,13 +120,13 @@
                     <artifactId>maven-dependency-plugin</artifactId>
                     <executions>
                         <execution>
-                            <id>unpack-previous</id>
+                            <id>unpack-migrated-server</id>
                             <phase>generate-test-resources</phase>
                             <goals>
                                 <goal>unpack</goal>
                             </goals>
                             <configuration>
-                                <skip>${skip.unpack.previous}</skip>
+                                <skip>${skip.unpack.migrated.server}</skip>
                                 <artifactItems>
                                     <artifactItem>
                                         <groupId>org.keycloak.testsuite</groupId>
@@ -135,7 +140,7 @@
                             </configuration>
                         </execution>
                         <execution>
-                            <id>unpack</id>
+                            <id>unpack-server</id>
                             <phase>generate-test-resources</phase>
                             <goals>
                                 <goal>unpack</goal>
@@ -188,7 +193,7 @@
     <profiles>
         
         <profile>
-            <id>common-for-tests</id>
+            <id>common-test-dependencies</id>
             <activation>
                 <file>
                     <exists>src</exists>
@@ -409,6 +414,10 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>               
                     </plugin> 
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>xml-maven-plugin</artifactId>
+                    </plugin>
                 </plugins>
             </build>            
         </profile>
@@ -525,30 +534,6 @@
                                 </systemPropertyVariables>
                             </configuration>
                         </plugin>
-                        <plugin>
-                            <artifactId>maven-resources-plugin</artifactId>
-                            <executions>
-                                <execution>
-                                    <id>copy-admin-user-json-file</id>
-                                    <phase>process-resources</phase>
-                                    <goals>
-                                        <goal>copy-resources</goal>
-                                    </goals>
-                                    <configuration>
-                                        <outputDirectory>${jboss.server.config.dir}</outputDirectory>
-                                        <resources>
-                                            <resource>
-                                                <directory>src/test/resources</directory>
-                                                <includes>
-                                                    <include>keycloak-add-user.json</include>
-                                                </includes>
-                                                <filtering>true</filtering>
-                                            </resource>
-                                        </resources>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
                     </plugins>
                 </pluginManagement>
             </build>
@@ -559,7 +544,7 @@
         <profile>
             <id>migration-kc16</id>
             <properties>
-                <skip.unpack.previous>false</skip.unpack.previous>
+                <skip.unpack.migrated.server>false</skip.unpack.migrated.server>
                 <server.version>1.6.1.Final</server.version>
                 <migrated.server.artifactId>integration-arquillian-server-wildfly-kc16</migrated.server.artifactId>
             </properties>
@@ -587,7 +572,7 @@
         <profile>
             <id>migration-kc15</id>
             <properties>
-                <skip.unpack.previous>false</skip.unpack.previous>
+                <skip.unpack.migrated.server>false</skip.unpack.migrated.server>
                 <server.version>1.5.1.Final</server.version>
                 <migrated.server.artifactId>integration-arquillian-server-wildfly-kc15</migrated.server.artifactId>
             </properties>
@@ -615,7 +600,7 @@
         <profile>
             <id>migration-kc14</id>
             <properties>
-                <skip.unpack.previous>false</skip.unpack.previous>
+                <skip.unpack.migrated.server>false</skip.unpack.migrated.server>
                 <server.version>1.4.0.Final</server.version>
                 <migrated.server.artifactId>integration-arquillian-server-wildfly-kc14</migrated.server.artifactId>
             </properties>
@@ -641,7 +626,7 @@
         <profile>
             <id>migration-kc13</id>
             <properties>
-                <skip.unpack.previous>false</skip.unpack.previous>
+                <skip.unpack.migrated.server>false</skip.unpack.migrated.server>
                 <server.version>1.3.1.Final</server.version>
                 <migrated.server.artifactId>integration-arquillian-server-wildfly-kc13</migrated.server.artifactId>
             </properties>
@@ -667,7 +652,7 @@
         <profile>
             <id>migration-kc12</id>
             <properties>
-                <skip.unpack.previous>false</skip.unpack.previous>
+                <skip.unpack.migrated.server>false</skip.unpack.migrated.server>
                 <server.version>1.2.0.Final</server.version>
                 <migrated.server.artifactId>integration-arquillian-server-wildfly-kc12</migrated.server.artifactId>
             </properties>