keycloak-aplcache

diff --git a/examples/pom.xml b/examples/pom.xml
index 46b1723..22cc29d 100755
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -61,7 +61,6 @@
         <module>js-console</module>
         <module>multi-tenant</module>
         <module>basic-auth</module>
-        <module>fuse</module>
         <module>kerberos</module>
         <module>themes</module>
         <module>saml</module>

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/install-features.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/install-features.cli
index 6244ba2..3fd01bb 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/install-features.cli
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/install-features.cli
@@ -1,3 +1,3 @@
 features:addurl mvn:org.keycloak/keycloak-osgi-features/${project.version}/xml/features
-features:addurl mvn:org.keycloak.example.demo/keycloak-fuse-example-features/${project.version}/xml/features
+features:addurl mvn:org.keycloak.testsuite/fuse-example-keycloak-features/${project.version}/xml/features
 features:install keycloak-fuse-6.2-example
\ No newline at end of file

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/install-features.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/install-features.cli
index 8d7890e..b23ee2b 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/install-features.cli
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/install-features.cli
@@ -1,3 +1,3 @@
 features:addurl mvn:org.keycloak/keycloak-osgi-features/${project.version}/xml/features
-features:addurl mvn:org.keycloak.example.demo/keycloak-fuse-example-features/${project.version}/xml/features
+features:addurl mvn:org.keycloak.testsuite/fuse-example-keycloak-features/${project.version}/xml/features
 features:install keycloak-fuse-6.3-example
\ No newline at end of file

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/fuse70/src/main/resources/install-features.cli
index cc8b0cf..b6174cd 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/install-features.cli
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/install-features.cli
@@ -1,5 +1,5 @@
 feature:repo-add mvn:org.keycloak/keycloak-osgi-features/${project.version}/xml/features
-feature:repo-add mvn:org.keycloak.example.demo/keycloak-fuse-example-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
 

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
index cc8b0cf..b6174cd 100644
--- 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
@@ -1,5 +1,5 @@
 feature:repo-add mvn:org.keycloak/keycloak-osgi-features/${project.version}/xml/features
-feature:repo-add mvn:org.keycloak.example.demo/keycloak-fuse-example-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
 

diff --git a/testsuite/integration-arquillian/test-apps/pom.xml b/testsuite/integration-arquillian/test-apps/pom.xml
index a6cc7e5..8a4fdc0 100644
--- a/testsuite/integration-arquillian/test-apps/pom.xml
+++ b/testsuite/integration-arquillian/test-apps/pom.xml
@@ -23,6 +23,7 @@
         <module>servlets</module>
         <module>app-profile-jee</module>
         <module>cors</module>
+        <module>fuse</module>
     </modules>
 
     <build>

diff --git a/testsuite/integration-arquillian/test-apps/test-apps-dist/build.xml b/testsuite/integration-arquillian/test-apps/test-apps-dist/build.xml
index a9cd806..37c7fa9 100755
--- a/testsuite/integration-arquillian/test-apps/test-apps-dist/build.xml
+++ b/testsuite/integration-arquillian/test-apps/test-apps-dist/build.xml
@@ -59,5 +59,13 @@
                 <exclude name="**/subsystem-config.xml"/>
             </fileset>
         </copy>
+        <copy todir="target/test-apps/fuse" overwrite="true">
+            <fileset dir="../fuse">
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
+                <exclude name="**/*.unconfigured"/>
+                <exclude name="**/subsystem-config.xml"/>
+            </fileset>
+        </copy>
     </target>
 </project>

diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index fd61eaf..b0ead54 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -536,6 +536,13 @@
                     <scope>runtime</scope>
                 </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>
+                <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-container-karaf-managed</artifactId>
                 </dependency>
@@ -590,6 +597,13 @@
                     <scope>runtime</scope>
                 </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>
+                <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-container-karaf-managed</artifactId>
                 </dependency>
@@ -647,6 +661,13 @@
                     <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>

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 a9c762e..b59665f 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
@@ -101,7 +101,7 @@ public class FuseAdminAdapterTest extends AbstractExampleAdapterTest {
 
     @Override
     public void addAdapterTestRealms(List<RealmRepresentation> testRealms) {
-        RealmRepresentation fuseRealm = loadRealm(new File(EXAMPLES_HOME_DIR + "/fuse/demorealm.json"));
+        RealmRepresentation fuseRealm = loadRealm(new File(TEST_APPS_HOME_DIR + "/fuse/demorealm.json"));
         testRealms.add(fuseRealm);
     }
 

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 3625d31..3a6e3fa 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
@@ -20,7 +20,6 @@ package org.keycloak.testsuite.adapter.example.fuse;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 import static org.keycloak.testsuite.auth.page.AuthRealm.DEMO;
 import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm;
 import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith;
@@ -40,6 +39,7 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
 import org.keycloak.testsuite.arquillian.containers.ContainerConstants;
 import org.keycloak.testsuite.auth.page.account.Account;
 import org.keycloak.testsuite.util.WaitUtils;
+import org.hamcrest.Matchers;
 
 /**
  *
@@ -65,7 +65,7 @@ public class FuseExampleAdapterTest extends AbstractExampleAdapterTest {
 
     @Override
     public void addAdapterTestRealms(List<RealmRepresentation> testRealms) {
-        RealmRepresentation fuseRealm = loadRealm(new File(EXAMPLES_HOME_DIR + "/fuse/demorealm.json"));
+        RealmRepresentation fuseRealm = loadRealm(new File(TEST_APPS_HOME_DIR + "/fuse/demorealm.json"));
         testRealms.add(fuseRealm);
     }
 
@@ -91,10 +91,11 @@ public class FuseExampleAdapterTest extends AbstractExampleAdapterTest {
         assertCurrentUrlStartsWith(customerListing);
 
         String src = driver.getPageSource();
-        assertTrue(src.contains("Username: bburke@redhat.com")
-                && src.contains("Bill Burke")
-                && src.contains("Stian Thorgersen")
-        );
+        assertThat(src, Matchers.allOf(
+          containsString("Username: bburke@redhat.com"),
+          containsString("Bill Burke"),
+          containsString("Stian Thorgersen")
+        ));
 
         // account mgmt
         customerListing.clickAccountManagement();
@@ -152,9 +153,9 @@ public class FuseExampleAdapterTest extends AbstractExampleAdapterTest {
         testRealmLoginPage.form().login("bburke@redhat.com", "password");
         assertCurrentUrlStartsWith(productPortal);
 
-        assertTrue(productPortal.getProduct1UnsecuredText().contains("401: Unauthorized"));
-        assertTrue(productPortal.getProduct1SecuredText().contains("Product received: id=1"));
-        assertTrue(productPortal.getProduct2SecuredText().contains("Product received: id=2"));
+        assertThat(productPortal.getProduct1UnsecuredText(), containsString("401: Unauthorized"));
+        assertThat(productPortal.getProduct1SecuredText(), containsString("Product received: id=1"));
+        assertThat(productPortal.getProduct2SecuredText(), containsString("Product received: id=2"));
 
         productPortal.clickLogOutLink();
         WaitUtils.waitForPageToLoad();