Author: asoldano Date: 2014-12-23 17:14:09 -0500 (Tue, 23 Dec 2014) New Revision: 19233 Modified: stack/cxf/branches/arquillian/README stack/cxf/branches/arquillian/modules/dist/pom.xml 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 Log: A bunch of build improvements and related instructions in README Modified: stack/cxf/branches/arquillian/README =================================================================== --- stack/cxf/branches/arquillian/README 2014-12-23 17:42:45 UTC (rev 19232) +++ stack/cxf/branches/arquillian/README 2014-12-23 22:14:09 UTC (rev 19233) @@ -7,8 +7,13 @@ -The -Dserver.home=/foo/bar option can be used to run the testsuite against a given local server instance; the server does not need to be already running, as the build will create various standalone server configurations and start multiple instances. -The -Dexclude-udp-tests=true option can be used to skip UDP tests; that might be needed when running on a network that does not allow UDP broadcast. +The '-Dserver.home=/foo/bar' option can be used to run the testsuite against a given local server instance; the server must not be already running, as the build will create various standalone server configurations and start multiple instances. +The '-Dexclude-udp-tests' option can be used to skip UDP tests; that might be needed when running on a network that does not allow UDP broadcast. +The '-Dnodeploy' option can be used to avoid upgrading the ws stack on the target server container. +The '-Dnoprepare' option can be used to avoid integration tests preparation phase, which includes tuning of the server configurations, wsconsume/wsprovide invocations, etc. +The '-Ddebug' option can be used to turn on surefire debugging of integration tests only. +The '-Djboss.bind.address=x.y.w.z' option can be used to have the started containers bound to the specified network interface address. +The '-Darquillian.deploymentExportPath=target/foo' option can be used to have Arquillian write the actual test deployments to disk. The 'fast' profile can also be used to run tests concurrently. Modified: stack/cxf/branches/arquillian/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/dist/pom.xml 2014-12-23 17:42:45 UTC (rev 19232) +++ stack/cxf/branches/arquillian/modules/dist/pom.xml 2014-12-23 22:14:09 UTC (rev 19233) @@ -107,48 +107,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <phase>prepare-package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>assembly</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>validate-jboss-home</id> - <phase>validate</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <echo /> - <echo message="profile=${jbossws.integration.target}" /> - <echo message="jboss.home=${jboss.home}" /> - <echo /> - </target> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <inherited>false</inherited> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> @@ -343,15 +301,38 @@ <id>deploy</id> <activation> <property> - <name>!no-deploy</name> + <name>!nodeploy</name> </property> </activation> <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distribution-package</id> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>assembly</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>bdeploy</id> <phase>prepare-package</phase> <goals> <goal>run</goal> @@ -371,5 +352,44 @@ </build> </profile> + <!-- + Name: echo + Descr: A profile for printing few env property values; this is moved to the end of the pom here + to avoid it affecting the plugin execution order due to a bug in Maven with multiple + plugins of the same type in different phases. + --> + <profile> + <id>echo</id> + <activation> + <property> + <name>!echo</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>validate-jboss-home</id> + <phase>validate</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <echo /> + <echo message="profile=${jbossws.integration.target}" /> + <echo message="jboss.home=${jboss.home}" /> + <echo /> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-23 17:42:45 UTC (rev 19232) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-23 22:14:09 UTC (rev 19233) @@ -277,6 +277,8 @@ <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m ${additionalJvmArgs}</jvmArgs> <serverConfig>jbws-testsuite-default.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> + <!-- TODO: add serverArgs section to use a custom bind address (requires wildfly-maven-plugin 1.1.0 +) + https://github.com/wildfly/wildfly-maven-plugin/commit/160b1a29f4e26fff9f... --> <port>9990</port> </configuration> </execution> @@ -290,6 +292,8 @@ <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000 ${additionalJvmArgs}</jvmArgs> <serverConfig>jbws-testsuite-ssl-mutual-auth.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> + <!-- TODO: add serverArgs section to use a custom bind address (requires wildfly-maven-plugin 1.1.0 +) + https://github.com/wildfly/wildfly-maven-plugin/commit/160b1a29f4e26fff9f... --> <port>19990</port> </configuration> </execution> @@ -303,6 +307,8 @@ <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 ${additionalJvmArgs}</jvmArgs> <serverConfig>jbws-testsuite-default-config-tests.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> + <!-- TODO: add serverArgs section to use a custom bind address (requires wildfly-maven-plugin 1.1.0 +) + https://github.com/wildfly/wildfly-maven-plugin/commit/160b1a29f4e26fff9f... --> <port>29990</port> </configuration> </execution> 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-23 17:42:45 UTC (rev 19232) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2014-12-23 22:14:09 UTC (rev 19233) @@ -9,6 +9,8 @@ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m ${additionalJvmArgs}</property> <property name="serverConfig">jbws-testsuite-default.xml</property> <property name="allowConnectingToRunningServer">true</property> + <property name="managementAddress">${jboss.bind.address:localhost}</property> + <property name="jbossArguments">${jbossArguments}</property> <property name="managementPort">${as.managementPort:9990}</property> <!-- AS7-4070 --> <property name="waitForPorts">${as.debug.port:8787} ${as.managementPort:9990}</property> @@ -21,6 +23,8 @@ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000 ${additionalJvmArgs}</property> <property name="serverConfig">jbws-testsuite-ssl-mutual-auth.xml</property> <property name="allowConnectingToRunningServer">true</property> + <property name="managementAddress">${jboss.bind.address:localhost}</property> + <property name="jbossArguments">${jbossArguments}</property> <property name="managementPort">${as.managementPort:19990}</property> <!-- AS7-4070 --> <property name="waitForPorts">${as.debug.port:18787} ${as.managementPort:19990}</property> @@ -33,6 +37,8 @@ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 ${additionalJvmArgs}</property> <property name="serverConfig">jbws-testsuite-default-config-tests.xml</property> <property name="allowConnectingToRunningServer">true</property> + <property name="managementAddress">${jboss.bind.address:localhost}</property> + <property name="jbossArguments">${jbossArguments}</property> <property name="managementPort">${as.managementPort:29990}</property> <!-- AS7-4070 --> <property name="waitForPorts">${as.debug.port:28787} ${as.managementPort:29990}</property> Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-23 17:42:45 UTC (rev 19232) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-23 22:14:09 UTC (rev 19233) @@ -625,6 +625,18 @@ </properties> </profile> + <profile> + <id>jbossArguments</id> + <activation> + <property> + <name>!noJBossArguments</name> + </property> + </activation> + <properties> + <jbossArguments>-b ${jboss.bind.address:127.0.0.1} -bunsecure=${jboss.bind.address:127.0.0.1} -bmanagement=${jboss.bind.address:127.0.0.1}</jbossArguments> + </properties> + </profile> + <!-- Name: hudson Descr: Ignore test failures on hudson