Skip to content
Permalink
Browse files

WFLY-11752 testsuite/integration/elytron uses directly a jboss.dist d…

…ir when set instead of its copy in the target dir
  • Loading branch information
OndrejKotek authored and bstansberry committed Feb 20, 2019
1 parent 2763925 commit a82a4fc2b1e093865835a42fd5e5776130c7727c
Showing with 139 additions and 90 deletions.
  1. +139 −90 testsuite/integration/elytron/pom.xml
@@ -46,9 +46,11 @@
<name>WildFly Test Suite: Integration - Elytron</name>

<properties>
<jbossas.ts.integ.dir>${basedir}/..</jbossas.ts.integ.dir>
<jbossas.ts.dir>${jbossas.ts.integ.dir}/..</jbossas.ts.dir>
<jbossas.project.dir>${jbossas.ts.dir}/..</jbossas.project.dir>

<wildfly.instance.name>wildfly</wildfly.instance.name>
<jboss.dist>${basedir}/target/${wildfly.instance.name}</jboss.dist>
<wildfly.dir>${jboss.dist}</wildfly.dir>

<enforcer.skip>true</enforcer.skip>
</properties>
@@ -125,7 +127,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-batch-jberet</artifactId>
<scope>test</scope>
</dependency>
</dependency>
</dependencies>

<build>
@@ -138,93 +140,6 @@
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
<executions>
<execution>
<id>server-provisioning</id>
<goals>
<goal>provision</goal>
</goals>
<phase>generate-test-resources</phase>
<configuration>
<install-dir>${project.build.directory}/${wildfly.instance.name}</install-dir>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<offline>true</offline>
<feature-packs>
<feature-pack>
<transitive>true</transitive>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<version>${version.org.wildfly.core}</version>
</feature-pack>
<feature-pack>
<transitive>true</transitive>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-servlet-galleon-pack</artifactId>
<version>${project.version}</version>
</feature-pack>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${project.version}</version>
<excluded-packages>
<name>product.conf</name>
<name>docs</name>
<name>docs.licenses.merge</name>
</excluded-packages>
<inherit-configs>false</inherit-configs>
<included-configs>
<config>
<model>standalone</model>
<name>standalone.xml</name>
</config>
<config>
<model>standalone</model>
<name>standalone-full.xml</name>
</config>
</included-configs>
</feature-pack>
</feature-packs>
<plugin-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${version.resources.plugin}</version>
<executions combine.self="override">
<execution>
<id>ts.config-as.copy-mgmt-users</id>
<phase>none</phase>
</execution>
<execution>
<id>ts.copy-wildfly</id>
<phase>none</phase>
</execution>
<execution>
<id>ts.copy-elytron.config</id>
<phase>process-test-resources</phase>
<inherited>false</inherited>
<configuration combine.self="override">
<outputDirectory>${wildfly.dir}/standalone/configuration</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>src/test/config</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<!-- Use keytool plugin to create JCEKS keystore for Elytron Credential Store related testing -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -286,6 +201,140 @@
</plugins>
</build>
<profiles>
<profile>
<id>server-jboss-dist-profile</id>
<activation>
<property>
<name>jboss.dist</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions combine.children="append">
<!-- Copy the AS modules into current_submodule/target/wildfly/modules. -->
<!-- JASPI tests create new modules. -->
<execution>
<id>copy-wildfly-modules</id>
<inherited>true</inherited>
<phase>generate-test-resources</phase>
<goals><goal>copy-resources</goal></goals>
<configuration>
<outputDirectory>${basedir}/target/wildfly/modules</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>${jboss.dist}/modules</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>server-provisioning-profile</id>
<activation>
<property>
<name>!jboss.dist</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
<executions>
<execution>
<id>server-provisioning</id>
<goals>
<goal>provision</goal>
</goals>
<phase>generate-test-resources</phase>
<configuration>
<install-dir>${project.build.directory}/${wildfly.instance.name}</install-dir>
<record-state>false</record-state>
<log-time>${galleon.log.time}</log-time>
<offline>true</offline>
<feature-packs>
<feature-pack>
<transitive>true</transitive>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-galleon-pack</artifactId>
<version>${version.org.wildfly.core}</version>
</feature-pack>
<feature-pack>
<transitive>true</transitive>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-servlet-galleon-pack</artifactId>
<version>${project.version}</version>
</feature-pack>
<feature-pack>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${project.version}</version>
<excluded-packages>
<name>product.conf</name>
<name>docs</name>
<name>docs.licenses.merge</name>
</excluded-packages>
<inherit-configs>false</inherit-configs>
<included-configs>
<config>
<model>standalone</model>
<name>standalone.xml</name>
</config>
<config>
<model>standalone</model>
<name>standalone-full.xml</name>
</config>
</included-configs>
</feature-pack>
</feature-packs>
<plugin-options>
<jboss-maven-dist/>
<jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
</plugin-options>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${version.resources.plugin}</version>
<executions combine.self="override">
<execution>
<id>ts.config-as.copy-mgmt-users</id>
<phase>none</phase>
</execution>
<execution>
<id>ts.copy-wildfly</id>
<phase>none</phase>
</execution>
<execution>
<id>ts.copy-elytron.config</id>
<phase>process-test-resources</phase>
<inherited>false</inherited>
<configuration combine.self="override">
<outputDirectory>${wildfly.dir}/standalone/configuration</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>src/test/config</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>adjust-server-config</id>
<activation>

0 comments on commit a82a4fc

Please sign in to comment.
You can’t perform that action at this time.