From 099de9e6e3f081bc62e345302368d9563a42e5c5 Mon Sep 17 00:00:00 2001 From: Vlasta Ramik Date: Thu, 25 Aug 2016 12:20:18 +0200 Subject: [PATCH] KEYCLOAK-3459 Adapt testsuite according to server configuration inside standalone.xml instead of keycloak-server.json --- .../auth-server/jboss/build-truststore.xml | 52 ----------- .../servers/auth-server/jboss/build.xml | 42 --------- .../common/keycloak-server-subsystem.xsl | 65 ++++++++++++++ .../servers/auth-server/jboss/pom.xml | 88 ++++--------------- 4 files changed, 84 insertions(+), 163 deletions(-) delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/build-truststore.xml delete mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/build.xml create mode 100644 testsuite/integration-arquillian/servers/auth-server/jboss/common/keycloak-server-subsystem.xsl diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/build-truststore.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/build-truststore.xml deleted file mode 100644 index 073f860a32..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/build-truststore.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/build.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/build.xml deleted file mode 100644 index 1e4ab786e5..0000000000 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/build.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/keycloak-server-subsystem.xsl b/testsuite/integration-arquillian/servers/auth-server/jboss/common/keycloak-server-subsystem.xsl new file mode 100644 index 0000000000..f32c036600 --- /dev/null +++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/keycloak-server-subsystem.xsl @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + module:org.keycloak.testsuite.integration-arquillian-testsuite-providers + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml index 4fab304829..eae0512470 100644 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml @@ -142,74 +142,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - inject-into-keycloak-server-json - process-resources - - run - - - - - - - - - - - inject-truststore-into-keycloak-server-json - process-resources - - run - - - - - - - - - - - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - org.apache.ant - ant-apache-bsf - 1.9.3 - - - org.apache.bsf - bsf-api - 3.1 - - - rhino - js - 1.7R2 - - - org.keycloak - keycloak-core - ${project.version} - - - maven-enforcer-plugin @@ -247,6 +179,25 @@ + + inject-provider-and-truststore + process-resources + + transform + + + + + ${auth.server.home}/standalone/configuration + + standalone.xml + + ${common.resources}/keycloak-server-subsystem.xsl + ${auth.server.home}/standalone/configuration + + + + @@ -318,7 +269,6 @@ - server-overlay