diff --git a/examples/pom.xml b/examples/pom.xml index 46b1723710..22cc29d867 100755 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -61,7 +61,6 @@ js-console multi-tenant basic-auth - fuse kerberos themes saml 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 6244ba2937..3fd01bb7cb 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 8d7890e22a..b23ee2b027 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 cc8b0cfeba..b6174cd7c6 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 cc8b0cfeba..b6174cd7c6 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/examples/fuse/README.md b/testsuite/integration-arquillian/test-apps/fuse/README.md similarity index 100% rename from examples/fuse/README.md rename to testsuite/integration-arquillian/test-apps/fuse/README.md diff --git a/examples/fuse/camel-fuse7-undertow/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/pom.xml similarity index 94% rename from examples/fuse/camel-fuse7-undertow/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/pom.xml index 1e6208391b..c23f8bb641 100755 --- a/examples/fuse/camel-fuse7-undertow/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/pom.xml @@ -19,14 +19,13 @@ - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT 4.0.0 - org.keycloak.example.demo - camel-endpoint-example-fuse7-undertow + fuse-example-camel-endpoint-fuse7-undertow bundle Camel endpoint example - Secured in Karaf/Fuse 7.0 on Undertow diff --git a/examples/fuse/camel-fuse7-undertow/src/main/java/org/keycloak/example/CamelHelloProcessor.java b/testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/src/main/java/org/keycloak/example/CamelHelloProcessor.java similarity index 100% rename from examples/fuse/camel-fuse7-undertow/src/main/java/org/keycloak/example/CamelHelloProcessor.java rename to testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/src/main/java/org/keycloak/example/CamelHelloProcessor.java diff --git a/examples/fuse/camel-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from examples/fuse/camel-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/examples/fuse/camel-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json b/testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json similarity index 100% rename from examples/fuse/camel-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json rename to testsuite/integration-arquillian/test-apps/fuse/camel-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json diff --git a/examples/fuse/camel/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/camel/pom.xml similarity index 93% rename from examples/fuse/camel/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/camel/pom.xml index 5abb2d5755..5a0b9ecd84 100755 --- a/examples/fuse/camel/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/camel/pom.xml @@ -19,14 +19,14 @@ - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT 4.0.0 - org.keycloak.example.demo - camel-endpoint-example + org.keycloak.testsuite + fuse-example-camel-endpoint bundle Camel endpoint example - Secured in Karaf/Fuse diff --git a/examples/fuse/camel/src/main/java/org/keycloak/example/CamelHelloProcessor.java b/testsuite/integration-arquillian/test-apps/fuse/camel/src/main/java/org/keycloak/example/CamelHelloProcessor.java similarity index 100% rename from examples/fuse/camel/src/main/java/org/keycloak/example/CamelHelloProcessor.java rename to testsuite/integration-arquillian/test-apps/fuse/camel/src/main/java/org/keycloak/example/CamelHelloProcessor.java diff --git a/examples/fuse/camel/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/testsuite/integration-arquillian/test-apps/fuse/camel/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from examples/fuse/camel/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to testsuite/integration-arquillian/test-apps/fuse/camel/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/examples/fuse/customer-app-fuse/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/pom.xml similarity index 96% rename from examples/fuse/customer-app-fuse/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/pom.xml index 7816001800..adecb44982 100755 --- a/examples/fuse/customer-app-fuse/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/pom.xml @@ -19,14 +19,14 @@ - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT 4.0.0 - org.keycloak.example.demo - customer-portal-fuse-example + org.keycloak.testsuite + fuse-example-customer-portal war Customer Portal - Secured in Karaf/Fuse diff --git a/examples/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CamelClient.java b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CamelClient.java similarity index 100% rename from examples/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CamelClient.java rename to testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CamelClient.java diff --git a/examples/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CxfRsClient.java b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CxfRsClient.java similarity index 100% rename from examples/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CxfRsClient.java rename to testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CxfRsClient.java diff --git a/examples/fuse/customer-app-fuse/src/main/webapp/WEB-INF/jetty-web.xml b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/WEB-INF/jetty-web.xml similarity index 100% rename from examples/fuse/customer-app-fuse/src/main/webapp/WEB-INF/jetty-web.xml rename to testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/WEB-INF/jetty-web.xml diff --git a/examples/fuse/customer-app-fuse/src/main/webapp/WEB-INF/keycloak.json b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/WEB-INF/keycloak.json similarity index 100% rename from examples/fuse/customer-app-fuse/src/main/webapp/WEB-INF/keycloak.json rename to testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/WEB-INF/keycloak.json diff --git a/examples/fuse/customer-app-fuse/src/main/webapp/WEB-INF/web.xml b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from examples/fuse/customer-app-fuse/src/main/webapp/WEB-INF/web.xml rename to testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/WEB-INF/web.xml diff --git a/examples/fuse/customer-app-fuse/src/main/webapp/customers/camel.jsp b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/customers/camel.jsp similarity index 100% rename from examples/fuse/customer-app-fuse/src/main/webapp/customers/camel.jsp rename to testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/customers/camel.jsp diff --git a/examples/fuse/customer-app-fuse/src/main/webapp/customers/cxf-rs.jsp b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/customers/cxf-rs.jsp similarity index 100% rename from examples/fuse/customer-app-fuse/src/main/webapp/customers/cxf-rs.jsp rename to testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/customers/cxf-rs.jsp diff --git a/examples/fuse/customer-app-fuse/src/main/webapp/index.html b/testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/index.html similarity index 100% rename from examples/fuse/customer-app-fuse/src/main/webapp/index.html rename to testsuite/integration-arquillian/test-apps/fuse/customer-app-fuse/src/main/webapp/index.html diff --git a/examples/fuse/cxf-jaxrs-fuse7-undertow/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/pom.xml similarity index 94% rename from examples/fuse/cxf-jaxrs-fuse7-undertow/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/pom.xml index 5203b4d5ac..e4fb635397 100755 --- a/examples/fuse/cxf-jaxrs-fuse7-undertow/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/pom.xml @@ -19,14 +19,13 @@ - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT 4.0.0 - org.keycloak.example.demo - cxf-jaxrs-example-fuse7-undertow + fuse-example-cxf-jaxrs-fuse7-undertow bundle CXF JAXRS Example - Secured in Karaf/Fuse 7.0 on Undertow diff --git a/examples/fuse/cxf-jaxrs-fuse7-undertow/src/main/java/org/keycloak/example/rs/CxfCustomerService.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/src/main/java/org/keycloak/example/rs/CxfCustomerService.java similarity index 100% rename from examples/fuse/cxf-jaxrs-fuse7-undertow/src/main/java/org/keycloak/example/rs/CxfCustomerService.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/src/main/java/org/keycloak/example/rs/CxfCustomerService.java diff --git a/examples/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/META-INF/cxf/bus-extensions.txt b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/META-INF/cxf/bus-extensions.txt similarity index 100% rename from examples/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/META-INF/cxf/bus-extensions.txt rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/META-INF/cxf/bus-extensions.txt diff --git a/examples/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from examples/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/examples/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json similarity index 100% rename from examples/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json diff --git a/examples/fuse/cxf-jaxrs/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/pom.xml similarity index 94% rename from examples/fuse/cxf-jaxrs/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/pom.xml index 68b20848b8..75449324c3 100755 --- a/examples/fuse/cxf-jaxrs/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/pom.xml @@ -19,14 +19,13 @@ - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT 4.0.0 - org.keycloak.example.demo - cxf-jaxrs-example + fuse-example-cxf-jaxrs bundle CXF JAXRS Example - Secured in Karaf/Fuse diff --git a/examples/fuse/cxf-jaxrs/src/main/java/org/keycloak/example/rs/CxfCustomerService.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/src/main/java/org/keycloak/example/rs/CxfCustomerService.java similarity index 100% rename from examples/fuse/cxf-jaxrs/src/main/java/org/keycloak/example/rs/CxfCustomerService.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/src/main/java/org/keycloak/example/rs/CxfCustomerService.java diff --git a/examples/fuse/cxf-jaxrs/src/main/resources/META-INF/cxf/bus-extensions.txt b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/src/main/resources/META-INF/cxf/bus-extensions.txt similarity index 100% rename from examples/fuse/cxf-jaxrs/src/main/resources/META-INF/cxf/bus-extensions.txt rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/src/main/resources/META-INF/cxf/bus-extensions.txt diff --git a/examples/fuse/cxf-jaxrs/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from examples/fuse/cxf-jaxrs/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/examples/fuse/cxf-jaxrs/src/main/resources/WEB-INF/jetty-web.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/src/main/resources/WEB-INF/jetty-web.xml similarity index 100% rename from examples/fuse/cxf-jaxrs/src/main/resources/WEB-INF/jetty-web.xml rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/src/main/resources/WEB-INF/jetty-web.xml diff --git a/examples/fuse/cxf-jaxrs/src/main/resources/WEB-INF/keycloak.json b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/src/main/resources/WEB-INF/keycloak.json similarity index 100% rename from examples/fuse/cxf-jaxrs/src/main/resources/WEB-INF/keycloak.json rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxrs/src/main/resources/WEB-INF/keycloak.json diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/pom.xml similarity index 85% rename from examples/fuse/cxf-jaxws-fuse7-undertow/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/pom.xml index 3be832a346..fe90ba20ba 100755 --- a/examples/fuse/cxf-jaxws-fuse7-undertow/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/pom.xml @@ -19,17 +19,15 @@ - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT 4.0.0 - org.keycloak.example.demo - cxf-jaxws-example-fuse7-undertow + fuse-example-cxf-jaxws-fuse7-undertow bundle CXF JAXWS Example - Secured in Karaf/Fuse 7.0 on Undertow - @@ -69,6 +67,16 @@ jaxb-api 2.2 + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + @@ -89,7 +97,6 @@ - diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/Product.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/Product.java similarity index 100% rename from examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/Product.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/Product.java diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/ProductImpl.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/ProductImpl.java similarity index 100% rename from examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/ProductImpl.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/ProductImpl.java diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/UnknownProductFault.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/UnknownProductFault.java similarity index 100% rename from examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/UnknownProductFault.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/UnknownProductFault.java diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/GetProduct.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/GetProduct.java similarity index 100% rename from examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/GetProduct.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/GetProduct.java diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/GetProductResponse.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/GetProductResponse.java similarity index 100% rename from examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/GetProductResponse.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/GetProductResponse.java diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/ObjectFactory.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/ObjectFactory.java similarity index 100% rename from examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/ObjectFactory.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/ObjectFactory.java diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/UnknownProductFault.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/UnknownProductFault.java similarity index 100% rename from examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/UnknownProductFault.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/UnknownProductFault.java diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/package-info.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/package-info.java similarity index 100% rename from examples/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/package-info.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/java/org/keycloak/example/ws/types/package-info.java diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from examples/fuse/cxf-jaxws-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/examples/fuse/cxf-jaxws-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json similarity index 100% rename from examples/fuse/cxf-jaxws-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json diff --git a/examples/fuse/cxf-jaxws/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/pom.xml similarity index 90% rename from examples/fuse/cxf-jaxws/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/pom.xml index 5c80c39b9b..55a4eac323 100755 --- a/examples/fuse/cxf-jaxws/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/pom.xml @@ -19,17 +19,15 @@ - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT 4.0.0 - org.keycloak.example.demo - cxf-jaxws-example + fuse-example-cxf-jaxws bundle CXF JAXWS Example - Secured in Karaf/Fuse - @@ -84,11 +82,6 @@ cxf-rt-transports-http ${cxf.version} - - org.apache.cxf - cxf-rt-transports-http-jetty - ${cxf.version} - diff --git a/examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/Product.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/Product.java similarity index 100% rename from examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/Product.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/Product.java diff --git a/examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/ProductImpl.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/ProductImpl.java similarity index 100% rename from examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/ProductImpl.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/ProductImpl.java diff --git a/examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/UnknownProductFault.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/UnknownProductFault.java similarity index 100% rename from examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/UnknownProductFault.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/UnknownProductFault.java diff --git a/examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/GetProduct.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/GetProduct.java similarity index 100% rename from examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/GetProduct.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/GetProduct.java diff --git a/examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/GetProductResponse.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/GetProductResponse.java similarity index 100% rename from examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/GetProductResponse.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/GetProductResponse.java diff --git a/examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/ObjectFactory.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/ObjectFactory.java similarity index 100% rename from examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/ObjectFactory.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/ObjectFactory.java diff --git a/examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/UnknownProductFault.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/UnknownProductFault.java similarity index 100% rename from examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/UnknownProductFault.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/UnknownProductFault.java diff --git a/examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/package-info.java b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/package-info.java similarity index 100% rename from examples/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/package-info.java rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/java/org/keycloak/example/ws/types/package-info.java diff --git a/examples/fuse/cxf-jaxws/src/main/resources/META-INF/spring/beans.xml b/testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/resources/META-INF/spring/beans.xml similarity index 100% rename from examples/fuse/cxf-jaxws/src/main/resources/META-INF/spring/beans.xml rename to testsuite/integration-arquillian/test-apps/fuse/cxf-jaxws/src/main/resources/META-INF/spring/beans.xml diff --git a/examples/fuse/demorealm.json b/testsuite/integration-arquillian/test-apps/fuse/demorealm.json similarity index 100% rename from examples/fuse/demorealm.json rename to testsuite/integration-arquillian/test-apps/fuse/demorealm.json diff --git a/examples/fuse/external-config/external-config-keycloak.json b/testsuite/integration-arquillian/test-apps/fuse/external-config/external-config-keycloak.json similarity index 100% rename from examples/fuse/external-config/external-config-keycloak.json rename to testsuite/integration-arquillian/test-apps/fuse/external-config/external-config-keycloak.json diff --git a/examples/fuse/external-config/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/external-config/pom.xml similarity index 96% rename from examples/fuse/external-config/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/external-config/pom.xml index cd3e79c396..c20c34d8b1 100755 --- a/examples/fuse/external-config/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/external-config/pom.xml @@ -19,15 +19,15 @@ 4.0.0 - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT Keycloak Examples - External Config - external-config + fuse-example-external-config war - org.keycloak.example.demo + org.keycloak.testsuite Keycloak External Config Example diff --git a/examples/fuse/external-config/src/main/java/org/keycloak/examples/ProtectedServlet.java b/testsuite/integration-arquillian/test-apps/fuse/external-config/src/main/java/org/keycloak/examples/ProtectedServlet.java similarity index 100% rename from examples/fuse/external-config/src/main/java/org/keycloak/examples/ProtectedServlet.java rename to testsuite/integration-arquillian/test-apps/fuse/external-config/src/main/java/org/keycloak/examples/ProtectedServlet.java diff --git a/examples/fuse/external-config/src/main/webapp/WEB-INF/jetty-web.xml b/testsuite/integration-arquillian/test-apps/fuse/external-config/src/main/webapp/WEB-INF/jetty-web.xml similarity index 100% rename from examples/fuse/external-config/src/main/webapp/WEB-INF/jetty-web.xml rename to testsuite/integration-arquillian/test-apps/fuse/external-config/src/main/webapp/WEB-INF/jetty-web.xml diff --git a/examples/fuse/external-config/src/main/webapp/WEB-INF/web.xml b/testsuite/integration-arquillian/test-apps/fuse/external-config/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from examples/fuse/external-config/src/main/webapp/WEB-INF/web.xml rename to testsuite/integration-arquillian/test-apps/fuse/external-config/src/main/webapp/WEB-INF/web.xml diff --git a/examples/fuse/external-config/src/main/webapp/index.html b/testsuite/integration-arquillian/test-apps/fuse/external-config/src/main/webapp/index.html similarity index 100% rename from examples/fuse/external-config/src/main/webapp/index.html rename to testsuite/integration-arquillian/test-apps/fuse/external-config/src/main/webapp/index.html diff --git a/examples/fuse/features/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/features/pom.xml similarity index 92% rename from examples/fuse/features/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/features/pom.xml index edf7fc1306..75cef3c0d5 100755 --- a/examples/fuse/features/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/features/pom.xml @@ -19,14 +19,14 @@ - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT 4.0.0 - org.keycloak.example.demo - keycloak-fuse-example-features + org.keycloak.testsuite + fuse-example-keycloak-features Keycloak Fuse Example - Features diff --git a/examples/fuse/features/src/main/resources/features.xml b/testsuite/integration-arquillian/test-apps/fuse/features/src/main/resources/features.xml similarity index 61% rename from examples/fuse/features/src/main/resources/features.xml rename to testsuite/integration-arquillian/test-apps/fuse/features/src/main/resources/features.xml index f7d291d0a5..5ab566c4c2 100644 --- a/examples/fuse/features/src/main/resources/features.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/features/src/main/resources/features.xml @@ -30,12 +30,12 @@ mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version} mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version} - mvn:org.keycloak.example.demo/camel-endpoint-example-fuse7-undertow/${project.version} - mvn:org.keycloak.example.demo/cxf-jaxrs-example-fuse7-undertow/${project.version} - mvn:org.keycloak.example.demo/cxf-jaxws-example-fuse7-undertow/${project.version} - mvn:org.keycloak.example.demo/customer-portal-fuse-example/${project.version}/war - mvn:org.keycloak.example.demo/external-config/${project.version}/war - mvn:org.keycloak.example.demo/product-portal-fuse-example-fuse7-undertow/${project.version} + mvn:org.keycloak.testsuite/fuse-example-camel-endpoint-fuse7-undertow/${project.version} + mvn:org.keycloak.testsuite/fuse-example-cxf-jaxrs-fuse7-undertow/${project.version} + mvn:org.keycloak.testsuite/fuse-example-cxf-jaxws-fuse7-undertow/${project.version} + mvn:org.keycloak.testsuite/fuse-example-customer-portal/${project.version}/war + mvn:org.keycloak.testsuite/fuse-example-external-config/${project.version}/war + mvn:org.keycloak.testsuite/fuse-example-product-portal-fuse7-undertow/${project.version} @@ -48,12 +48,12 @@ keycloak-jetty9-adapter mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version} mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version} - mvn:org.keycloak.example.demo/product-portal-fuse-example/${project.version} - mvn:org.keycloak.example.demo/customer-portal-fuse-example/${project.version}/war - mvn:org.keycloak.example.demo/external-config/${project.version}/war - mvn:org.keycloak.example.demo/camel-endpoint-example/${project.version} - mvn:org.keycloak.example.demo/cxf-jaxws-example/${project.version} - mvn:org.keycloak.example.demo/cxf-jaxrs-example/${project.version} + mvn:org.keycloak.testsuite/fuse-example-product-portal/${project.version} + mvn:org.keycloak.testsuite/fuse-example-customer-portal/${project.version}/war + mvn:org.keycloak.testsuite/fuse-example-external-config/${project.version}/war + mvn:org.keycloak.testsuite/fuse-example-camel-endpoint/${project.version} + mvn:org.keycloak.testsuite/fuse-example-cxf-jaxws/${project.version} + mvn:org.keycloak.testsuite/fuse-example-cxf-jaxrs/${project.version} @@ -67,11 +67,11 @@ keycloak-jetty8-adapter mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version} mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version} - mvn:org.keycloak.example.demo/product-portal-fuse-example/${project.version} - mvn:org.keycloak.example.demo/customer-portal-fuse-example/${project.version}/war - mvn:org.keycloak.example.demo/camel-endpoint-example/${project.version} - mvn:org.keycloak.example.demo/cxf-jaxws-example/${project.version} - mvn:org.keycloak.example.demo/cxf-jaxrs-example/${project.version} + mvn:org.keycloak.testsuite/fuse-example-product-portal/${project.version} + mvn:org.keycloak.testsuite/fuse-example-customer-portal/${project.version}/war + mvn:org.keycloak.testsuite/fuse-example-camel-endpoint/${project.version} + mvn:org.keycloak.testsuite/fuse-example-cxf-jaxws/${project.version} + mvn:org.keycloak.testsuite/fuse-example-cxf-jaxrs/${project.version} diff --git a/examples/fuse/fuse-admin/README.md b/testsuite/integration-arquillian/test-apps/fuse/fuse-admin/README.md similarity index 100% rename from examples/fuse/fuse-admin/README.md rename to testsuite/integration-arquillian/test-apps/fuse/fuse-admin/README.md diff --git a/examples/fuse/fuse-admin/keycloak-direct-access.json b/testsuite/integration-arquillian/test-apps/fuse/fuse-admin/keycloak-direct-access.json similarity index 100% rename from examples/fuse/fuse-admin/keycloak-direct-access.json rename to testsuite/integration-arquillian/test-apps/fuse/fuse-admin/keycloak-direct-access.json diff --git a/examples/fuse/fuse-admin/keycloak-hawtio-client.json b/testsuite/integration-arquillian/test-apps/fuse/fuse-admin/keycloak-hawtio-client.json similarity index 100% rename from examples/fuse/fuse-admin/keycloak-hawtio-client.json rename to testsuite/integration-arquillian/test-apps/fuse/fuse-admin/keycloak-hawtio-client.json diff --git a/examples/fuse/fuse-admin/keycloak-hawtio.json b/testsuite/integration-arquillian/test-apps/fuse/fuse-admin/keycloak-hawtio.json similarity index 100% rename from examples/fuse/fuse-admin/keycloak-hawtio.json rename to testsuite/integration-arquillian/test-apps/fuse/fuse-admin/keycloak-hawtio.json diff --git a/examples/fuse/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/pom.xml similarity index 83% rename from examples/fuse/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/pom.xml index d8e55481cf..64b3e00a5f 100755 --- a/examples/fuse/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/pom.xml @@ -18,28 +18,29 @@ - keycloak-examples-parent - org.keycloak + integration-arquillian-test-apps + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT - Fuse Examples + Fuse Test Applications 4.0.0 - keycloak-examples-fuse-parent + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite pom - 2.21.0 + 2.21.2 customer-app-fuse - product-app-fuse - product-app-fuse7-undertow cxf-jaxrs cxf-jaxrs-fuse7-undertow cxf-jaxws cxf-jaxws-fuse7-undertow + product-app-fuse + product-app-fuse7-undertow camel camel-fuse7-undertow features diff --git a/examples/fuse/product-app-fuse/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/pom.xml similarity index 90% rename from examples/fuse/product-app-fuse/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/pom.xml index 64eb82450f..a21ad469e3 100755 --- a/examples/fuse/product-app-fuse/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/pom.xml @@ -19,18 +19,15 @@ - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT 4.0.0 - org.keycloak.example.demo - product-portal-fuse-example + fuse-example-product-portal bundle - Product Portal - Secured in Karaf/Fuse - @@ -62,8 +59,9 @@ - org.keycloak.example.demo - cxf-jaxws-example + org.keycloak.testsuite + fuse-example-cxf-jaxws + ${project.version} diff --git a/examples/fuse/product-app-fuse/src/main/java/org/keycloak/example/ProductPortalServlet.java b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/src/main/java/org/keycloak/example/ProductPortalServlet.java similarity index 100% rename from examples/fuse/product-app-fuse/src/main/java/org/keycloak/example/ProductPortalServlet.java rename to testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/src/main/java/org/keycloak/example/ProductPortalServlet.java diff --git a/examples/fuse/product-app-fuse/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from examples/fuse/product-app-fuse/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/examples/fuse/product-app-fuse/src/main/resources/WEB-INF/jetty-web.xml b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/src/main/resources/WEB-INF/jetty-web.xml similarity index 100% rename from examples/fuse/product-app-fuse/src/main/resources/WEB-INF/jetty-web.xml rename to testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/src/main/resources/WEB-INF/jetty-web.xml diff --git a/examples/fuse/product-app-fuse/src/main/resources/WEB-INF/keycloak.json b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/src/main/resources/WEB-INF/keycloak.json similarity index 100% rename from examples/fuse/product-app-fuse/src/main/resources/WEB-INF/keycloak.json rename to testsuite/integration-arquillian/test-apps/fuse/product-app-fuse/src/main/resources/WEB-INF/keycloak.json diff --git a/examples/fuse/product-app-fuse7-undertow/pom.xml b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/pom.xml similarity index 89% rename from examples/fuse/product-app-fuse7-undertow/pom.xml rename to testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/pom.xml index aead67acb6..82f693ef3c 100755 --- a/examples/fuse/product-app-fuse7-undertow/pom.xml +++ b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/pom.xml @@ -19,18 +19,15 @@ - keycloak-examples-fuse-parent - org.keycloak + integration-arquillian-test-apps-fuse-parent + org.keycloak.testsuite 4.3.0.Final-SNAPSHOT 4.0.0 - org.keycloak.example.demo - product-portal-fuse-example-fuse7-undertow + fuse-example-product-portal-fuse7-undertow bundle - Product Portal - Secured in Karaf/Fuse 7.0 on Undertow - @@ -65,8 +62,9 @@ - org.keycloak.example.demo - cxf-jaxws-example + org.keycloak.testsuite + fuse-example-cxf-jaxws-fuse7-undertow + ${project.version} diff --git a/examples/fuse/product-app-fuse7-undertow/src/main/java/org/keycloak/example/ProductPortalServlet.java b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/src/main/java/org/keycloak/example/ProductPortalServlet.java similarity index 100% rename from examples/fuse/product-app-fuse7-undertow/src/main/java/org/keycloak/example/ProductPortalServlet.java rename to testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/src/main/java/org/keycloak/example/ProductPortalServlet.java diff --git a/examples/fuse/product-app-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from examples/fuse/product-app-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml rename to testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/examples/fuse/product-app-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json b/testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json similarity index 100% rename from examples/fuse/product-app-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json rename to testsuite/integration-arquillian/test-apps/fuse/product-app-fuse7-undertow/src/main/resources/WEB-INF/keycloak.json diff --git a/testsuite/integration-arquillian/test-apps/pom.xml b/testsuite/integration-arquillian/test-apps/pom.xml index a6cc7e5e55..8a4fdc0c67 100644 --- a/testsuite/integration-arquillian/test-apps/pom.xml +++ b/testsuite/integration-arquillian/test-apps/pom.xml @@ -23,6 +23,7 @@ servlets app-profile-jee cors + fuse 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 a9cd806112..37c7fa90c0 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 @@ + + + + + + + + diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index fd61eafb34..b0ead5410e 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -535,6 +535,13 @@ ${project.version} runtime + + org.keycloak.testsuite + integration-arquillian-test-apps-fuse-parent + ${project.version} + runtime + pom + org.jboss.arquillian.container arquillian-container-karaf-managed @@ -589,6 +596,13 @@ ${project.version} runtime + + org.keycloak.testsuite + integration-arquillian-test-apps-fuse-parent + ${project.version} + runtime + pom + org.jboss.arquillian.container arquillian-container-karaf-managed @@ -647,6 +661,13 @@ org.jboss.arquillian.container arquillian-container-karaf-managed + + org.keycloak.testsuite + integration-arquillian-test-apps-fuse-parent + ${project.version} + runtime + pom + 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 a9c762ef95..b59665f1f3 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 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 3625d31a62..3a6e3faf7b 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 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();