12:04 a.m.
Author: asoldano
Date: 2014-12-03 18:04:58 -0500 (Wed, 03 Dec 2014)
New Revision: 19122
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml
stack/cxf/branches/arquillian/modules/testsuite/pom.xml
stack/cxf/branches/arquillian/pom.xml
Log:
Restoring 'fast' profile
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-03 22:25:58
UTC (rev 19121)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-03 23:04:58
UTC (rev 19122)
@@ -257,6 +257,61 @@
</build>
</profile>
+ <!-- When the 'fast' profile is on, the testsuite runs in parallel mode;
Arquillan messes up with containers in such a scenario, unless they're started
upfront.
+ So we start all the containers specified in the arquillan.xml configuration
-->
+ <profile>
+ <id>fast</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jboss</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <configuration>
+ <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m
-XX:MaxPermSize=256m</jvmArgs>
+ <serverConfig>jbws-testsuite-default.xml</serverConfig>
+ <jbossHome>${jboss.home}</jbossHome>
+ <port>9990</port>
+ </configuration>
+ </execution>
+ <execution>
+ <id>ssl-mutual-auth</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <configuration>
+ <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m
-XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000</jvmArgs>
+
<serverConfig>jbws-testsuite-ssl-mutual-auth.xml</serverConfig>
+ <jbossHome>${jboss.home}</jbossHome>
+ <port>19990</port>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-config-tests</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <configuration>
+ <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m
-XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000</jvmArgs>
+
<serverConfig>jbws-testsuite-default-config-tests.xml</serverConfig>
+ <jbossHome>${jboss.home}</jbossHome>
+ <port>29990</port>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2014-12-03
22:25:58 UTC (rev 19121)
+++
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2014-12-03
23:04:58 UTC (rev 19122)
@@ -17,7 +17,7 @@
<container qualifier="ssl-mutual-auth" mode="manual">
<configuration>
<property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server
-XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m
-Djboss.socket.binding.port-offset=10000</property>
+ <property name="javaVmArguments">-server
-XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m
-Djboss.socket.binding.port-offset=10000</property>
<property
name="serverConfig">jbws-testsuite-ssl-mutual-auth.xml</property>
<property
name="allowConnectingToRunningServer">true</property>
<property
name="managementPort">${as.managementPort:19990}</property>
@@ -29,7 +29,7 @@
<container qualifier="default-config-tests" mode="manual">
<configuration>
<property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server
-XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m
-Djboss.socket.binding.port-offset=20000</property>
+ <property name="javaVmArguments">-server
-XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m
-Djboss.socket.binding.port-offset=20000</property>
<property
name="serverConfig">jbws-testsuite-default-config-tests.xml</property>
<property
name="allowConnectingToRunningServer">true</property>
<property
name="managementPort">${as.managementPort:29990}</property>
Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-03 22:25:58 UTC (rev
19121)
+++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-03 23:04:58 UTC (rev
19122)
@@ -631,7 +631,6 @@
<profile>
<id>wildfly800</id>
<properties>
- <jboss.version>${wildfly800.version}</jboss.version>
<jbossws.integration.target>wildfly800</jbossws.integration.target>
<remote.port>8080</remote.port>
<remote.protocol>http-remoting</remote.protocol>
@@ -641,6 +640,25 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly800-tests-integration</artifactId>
</dependency>
+ <!-- Arquillian container integration -->
+ <dependency>
+ <groupId>org.wildfly.arquillian</groupId>
+ <artifactId>wildfly-arquillian-container-managed</artifactId>
+ <version>1.0.0.Alpha2</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.slf4j</groupId>
+ <artifactId>slf4j-jboss-logmanager</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.protocol</groupId>
+ <artifactId>arquillian-protocol-servlet</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- LittleProxy depencency declared in this profile as other profiles require
different exclusions -->
<dependency>
<groupId>org.littleshoot</groupId>
@@ -713,7 +731,6 @@
<profile>
<id>wildfly810</id>
<properties>
- <jboss.version>${wildfly810.version}</jboss.version>
<jbossws.integration.target>wildfly810</jbossws.integration.target>
<remote.port>8080</remote.port>
<remote.protocol>http-remoting</remote.protocol>
@@ -723,6 +740,25 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly810-tests-integration</artifactId>
</dependency>
+ <!-- Arquillian container integration -->
+ <dependency>
+ <groupId>org.wildfly.arquillian</groupId>
+ <artifactId>wildfly-arquillian-container-managed</artifactId>
+ <version>1.0.0.Alpha2</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.slf4j</groupId>
+ <artifactId>slf4j-jboss-logmanager</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.protocol</groupId>
+ <artifactId>arquillian-protocol-servlet</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- LittleProxy depencency declared in this profile as other profiles require
different exclusions -->
<dependency>
<groupId>org.littleshoot</groupId>
@@ -795,7 +831,6 @@
<profile>
<id>wildfly900</id>
<properties>
- <jboss.version>${wildfly900.version}</jboss.version>
<jbossws.integration.target>wildfly900</jbossws.integration.target>
<remote.port>8080</remote.port>
<remote.protocol>http-remoting</remote.protocol>
Modified: stack/cxf/branches/arquillian/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/pom.xml 2014-12-03 22:25:58 UTC (rev 19121)
+++ stack/cxf/branches/arquillian/pom.xml 2014-12-03 23:04:58 UTC (rev 19122)
@@ -1283,6 +1283,16 @@
<version>2.2</version>
</plugin>
<plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.wildfly.plugins</groupId>
+ <artifactId>wildfly-maven-plugin</artifactId>
+ <version>1.0.2.Final</version>
+ </plugin>
+ <plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<version>2.1.2</version>
@@ -1355,6 +1365,7 @@
<properties>
<jbossws.integration.target>wildfly800</jbossws.integration.target>
<jboss.home>${wildfly800.home}</jboss.home>
+ <jboss.version>${wildfly800.version}</jboss.version>
</properties>
</profile>
@@ -1367,6 +1378,7 @@
<properties>
<jbossws.integration.target>wildfly810</jbossws.integration.target>
<jboss.home>${wildfly810.home}</jboss.home>
+ <jboss.version>${wildfly810.version}</jboss.version>
</properties>
</profile>
@@ -1379,6 +1391,7 @@
<properties>
<jbossws.integration.target>wildfly900</jbossws.integration.target>
<jboss.home>${wildfly900.home}</jboss.home>
+ <jboss.version>${wildfly900.version}</jboss.version>
</properties>
</profile>