Details
diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml
index cb8fe91..ba7ec2d 100644
--- a/testsuite/integration-arquillian/servers/eap7/pom.xml
+++ b/testsuite/integration-arquillian/servers/eap7/pom.xml
@@ -86,148 +86,6 @@
</build>
</profile>
-<!-- <profile>
- <id>adapter-libs-provided</id>
- <activation>
- <property>
- <name>!adapter.libs.bundled</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-wildfly-adapter-dist</artifactId>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-saml-wildfly-adapter-dist</artifactId>
- <type>zip</type>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-adapter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-wildfly-adapter-dist</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <outputDirectory>${keycloak.server.home}</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-saml-wildfly-adapter-dist</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <outputDirectory>${keycloak.server.home}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>configure-adapter-subsystem</id>
- <phase>process-resources</phase>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${keycloak.server.home}/standalone/configuration</dir>
- <includes>
- <include>standalone.xml</include>
- </includes>
- <stylesheet>src/main/xslt/standalone.xsl</stylesheet>
- <outputDir>${keycloak.server.home}/standalone/configuration</outputDir>
- </transformationSet>
- </transformationSets>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>ssl</id>
- <activation>
- <property>
- <name>auth.server.ssl.required</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>configure-adapter-subsystem-security</id>
- <phase>process-resources</phase>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${keycloak.server.home}/standalone/configuration</dir>
- <includes>
- <include>standalone.xml</include>
- </includes>
- <stylesheet>src/main/xslt/security.xsl</stylesheet>
- <outputDir>${keycloak.server.home}/standalone/configuration</outputDir>
- </transformationSet>
- </transformationSets>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- <executions>
- <execution>
- <id>copy-keystore</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${keycloak.server.home}/standalone/configuration</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/keystore</directory>
- <includes>
- <include>keycloak.jks</include>
- <include>keycloak.truststore</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>jpa</id>
<properties>
@@ -300,7 +158,7 @@
<artifactId>xml-maven-plugin</artifactId>
<executions>
<execution>
- <id>configure-wildfly-datasource</id>
+ <id>configure-datasource</id>
<phase>process-resources</phase>
<goals>
<goal>transform</goal>
@@ -366,6 +224,6 @@
</plugin>
</plugins>
</build>
- </profile> -->
+ </profile>
</profiles>
</project>
diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl
index 66e80fe..b33991d 100644
--- a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl
+++ b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/datasource.xsl
@@ -1,11 +1,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xalan="http://xml.apache.org/xalan"
- xmlns:j="urn:jboss:domain:4.0"
- xmlns:ds="urn:jboss:domain:datasources:4.0"
- xmlns:k="urn:jboss:domain:keycloak:1.1"
- xmlns:sec="urn:jboss:domain:security:1.2"
version="2.0"
- exclude-result-prefixes="xalan j ds k sec">
+ exclude-result-prefixes="xalan">
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" standalone="no"/>
<xsl:strip-space elements="*"/>
diff --git a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl
index 88ac56b..b6484fa 100644
--- a/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl
+++ b/testsuite/integration-arquillian/servers/eap7/src/main/xslt/module.xsl
@@ -1,8 +1,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xalan="http://xml.apache.org/xalan"
- xmlns:m="urn:jboss:module:1.3"
version="2.0"
- exclude-result-prefixes="xalan m">
+ exclude-result-prefixes="xalan">
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" />
@@ -11,7 +10,7 @@
<xsl:param name="version" select="''"/>
<xsl:variable name="newModuleDefinition">
- <module xmlns="urn:jboss:module:1.3" name="com.{$database}">
+ <module xmlns="urn:jboss:module:1.1" name="com.{$database}">
<resources>
<resource-root path="{$database}-{$version}.jar"/>
</resources>