Details
diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/win/run-jboss-cli.bat b/testsuite/integration-arquillian/servers/app-server/jboss/common/win/run-jboss-cli.bat
index fd4a87f..6cfbeb4 100644
--- a/testsuite/integration-arquillian/servers/app-server/jboss/common/win/run-jboss-cli.bat
+++ b/testsuite/integration-arquillian/servers/app-server/jboss/common/win/run-jboss-cli.bat
@@ -1,16 +1,22 @@
+@echo off
+
set "NOPAUSE=true"
set cli_file=%2
set working_dir=%3
cd %working_dir%
+echo working_dir: %cd%
if "%4"=="-Dserver.config" (
set server_config=%5
) else (
set server_config=standalone.xml
)
+echo server.config=%server_config%
+echo cli_file=%cli_file%
if "%4"=="-Djboss.server.config.dir" (
+ echo jboss.server.config.dir=%5
jboss-cli.bat --file=%cli_file% -Dserver.config=%server_config% -Djboss.server.config.dir=%5
) else (
jboss-cli.bat --file=%cli_file% -Dserver.config=%server_config%
diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml
index 529a271..bc56691 100644
--- a/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/jboss/eap6/pom.xml
@@ -68,90 +68,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-auth-server-jboss-profile</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>eap6.version</property>
- </requireProperty>
- <requireProperty>
- <property>fuse63.version</property>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>backup-configs-fuse</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${app.server.jboss.home}/standalone-default</outputDirectory>
- <resources>
- <resource>
- <directory>${app.server.jboss.home}/standalone</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-hawtio-jsons</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${app.server.jboss.home}/standalone-fuse/configuration</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources/config/fuse</directory>
- <includes>
- <include>keycloak-hawtio.json</include>
- <include>keycloak-hawtio-client.json</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-fuse-installer</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${fuse.installer.groupId}</groupId>
- <artifactId>${fuse.installer.artifactId}</artifactId>
- <version>${fuse.installer.version}</version>
- <type>jar</type>
- <outputDirectory>${app.server.jboss.home}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
@@ -189,22 +105,6 @@
</configuration>
</execution>
<execution>
- <id>install-fuse</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>${basedir}/src/main/resources/config/fuse/install-fuse.${script.suffix}</executable>
- <workingDirectory>${app.server.jboss.home}/standalone-fuse</workingDirectory>
- <environmentVariables>
- <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
- <JBOSS_HOME>${app.server.jboss.home}</JBOSS_HOME>
- <FUSE_INSTALLER_NAME>${fuse.installer.artifactId}-${fuse.installer.version}.jar</FUSE_INSTALLER_NAME>
- </environmentVariables>
- </configuration>
- </execution>
- <execution>
<id>add-secured-deployments-eap6</id>
<phase>generate-test-sources</phase>
<goals>
@@ -222,65 +122,182 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-hawtio-to-standalone-fuse</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>${app.server.jboss.home}/standalone-fuse/configuration</dir>
- <includes>
- <include>standalone.xml</include>
- </includes>
- <stylesheet>${basedir}/src/main/resources/config/fuse/add-hawtio.xsl</stylesheet>
- <outputDir>${app.server.jboss.home}/standalone-fuse/configuration</outputDir>
- </transformationSet>
- </transformationSets>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>move-configs-fuse</id>
- <phase>process-test-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <echo message="Rename ./standalone to ./standalone-fuse" />
- <move file="${app.server.jboss.home}/standalone"
- tofile="${app.server.jboss.home}/standalone-fuse" />
- </target>
- </configuration>
- </execution>
- <execution>
- <id>restore-configs-after-fuse-installation</id>
- <phase>process-test-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <echo message="Rename ./standalone-default to ./standalone" />
- <move file="${app.server.jboss.home}/standalone-default"
- tofile="${app.server.jboss.home}/standalone" />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>fuse-installer</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ </os>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-fuse63-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>fuse63.version</property>
+ </requireProperty>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>backup-configs-fuse</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${app.server.jboss.home}/standalone-default</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${app.server.jboss.home}/standalone</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-hawtio-jsons</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${app.server.jboss.home}/standalone-fuse/configuration</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources/config/fuse</directory>
+ <includes>
+ <include>keycloak-hawtio.json</include>
+ <include>keycloak-hawtio-client.json</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-fuse-installer</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${fuse.installer.groupId}</groupId>
+ <artifactId>${fuse.installer.artifactId}</artifactId>
+ <version>${fuse.installer.version}</version>
+ <type>jar</type>
+ <outputDirectory>${app.server.jboss.home}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-fuse</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>${basedir}/src/main/resources/config/fuse/install-fuse.${script.suffix}</executable>
+ <workingDirectory>${app.server.jboss.home}/standalone-fuse</workingDirectory>
+ <environmentVariables>
+ <JAVA_HOME>${app.server.java.home}</JAVA_HOME>
+ <JBOSS_HOME>${app.server.jboss.home}</JBOSS_HOME>
+ <FUSE_INSTALLER_NAME>${fuse.installer.artifactId}-${fuse.installer.version}.jar</FUSE_INSTALLER_NAME>
+ </environmentVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-hawtio-to-standalone-fuse</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>${app.server.jboss.home}/standalone-fuse/configuration</dir>
+ <includes>
+ <include>standalone.xml</include>
+ </includes>
+ <stylesheet>${basedir}/src/main/resources/config/fuse/add-hawtio.xsl</stylesheet>
+ <outputDir>${app.server.jboss.home}/standalone-fuse/configuration</outputDir>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>move-configs-fuse</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo message="Rename ./standalone to ./standalone-fuse" />
+ <move file="${app.server.jboss.home}/standalone"
+ tofile="${app.server.jboss.home}/standalone-fuse" />
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>restore-configs-after-fuse-installation</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo message="Rename ./standalone-default to ./standalone" />
+ <move file="${app.server.jboss.home}/standalone-default"
+ tofile="${app.server.jboss.home}/standalone" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/EAP6Fuse6HawtioAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/EAP6Fuse6HawtioAdapterTest.java
index 1ebadfc..5ae7fdd 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/EAP6Fuse6HawtioAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/EAP6Fuse6HawtioAdapterTest.java
@@ -28,7 +28,9 @@ import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.graphene.page.Page;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.junit.After;
+import org.junit.Assume;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.keycloak.representations.idm.RealmRepresentation;
@@ -71,6 +73,11 @@ public class EAP6Fuse6HawtioAdapterTest extends AbstractExampleAdapterTest imple
testRealms.add(loadRealm("/adapter-test/hawtio-realm/demorealm.json"));
}
+ @BeforeClass
+ public static void enabled() {
+ Assume.assumeFalse(System.getProperty("os.name").startsWith("Windows"));
+ }
+
@Before
public void addJSDriver() {
DroneUtils.addWebDriver(jsDriver);
