Updated Branches: refs/heads/master 6c0169550 -> ce875fde3
DELTASPIKE-496 Use 'Servlet 3.0' protocol for AS7 and Wildfly integration tests Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/ce875fde Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/ce875fde Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/ce875fde Branch: refs/heads/master Commit: ce875fde3fe5421c6d12bd43019fedaee8af5923 Parents: 6c01695 Author: Christian Kaltepoth <[email protected]> Authored: Fri Feb 7 17:04:40 2014 +0100 Committer: Christian Kaltepoth <[email protected]> Committed: Fri Feb 7 17:07:14 2014 +0100 ---------------------------------------------------------------------- deltaspike/parent/code/pom.xml | 6 ++ .../src/main/resources/arquillian-jboss.xml | 72 ++++++++++++++++++++ .../src/main/resources/arquillian.xml | 39 ----------- 3 files changed, 78 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ce875fde/deltaspike/parent/code/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml index e8b2937..ecf8821 100644 --- a/deltaspike/parent/code/pom.xml +++ b/deltaspike/parent/code/pom.xml @@ -468,6 +468,7 @@ <configuration> <systemProperties> <arquillian.launch>jbossas-managed-7</arquillian.launch> + <arquillian.xml>arquillian-jboss.xml</arquillian.xml> <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage> <cdicontainer.version>${cdicontainer.version}</cdicontainer.version> </systemProperties> @@ -537,6 +538,7 @@ <configuration> <systemProperties> <arquillian.launch>jbossas-build-managed-7</arquillian.launch> + <arquillian.xml>arquillian-jboss.xml</arquillian.xml> <arquillian.jboss_home> ${container.unpack.directory}/jboss-as-${jboss.as.version} </arquillian.jboss_home> @@ -629,6 +631,7 @@ <configuration> <systemProperties> <arquillian.launch>jbossas-remote-7</arquillian.launch> + <arquillian.xml>arquillian-jboss.xml</arquillian.xml> <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage> <cdicontainer.version>${cdicontainer.version}</cdicontainer.version> </systemProperties> @@ -697,6 +700,7 @@ <configuration> <systemProperties> <arquillian.launch>jbossas-managed-7</arquillian.launch> + <arquillian.xml>arquillian-jboss.xml</arquillian.xml> <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage> <cdicontainer.version>${cdicontainer.version}</cdicontainer.version> </systemProperties> @@ -766,6 +770,7 @@ <configuration> <systemProperties> <arquillian.launch>wildfly-build-managed</arquillian.launch> + <arquillian.xml>arquillian-jboss.xml</arquillian.xml> <arquillian.jboss_home> ${container.unpack.directory}/wildfly-${wildfly.version} </arquillian.jboss_home> @@ -857,6 +862,7 @@ <configuration> <systemProperties> <arquillian.launch>jbossas-remote-7</arquillian.launch> + <arquillian.xml>arquillian-jboss.xml</arquillian.xml> <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage> <cdicontainer.version>${cdicontainer.version}</cdicontainer.version> </systemProperties> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ce875fde/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml ---------------------------------------------------------------------- diff --git a/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml b/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml new file mode 100644 index 0000000..668cdea --- /dev/null +++ b/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml @@ -0,0 +1,72 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<arquillian xmlns="http://jboss.org/schema/arquillian"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd";> + + <!--Uncomment to have test archives exported to the file system for inspection --> + <!-- + <engine> + <property name="deploymentExportPath">target/</property> + </engine> + --> + + <!-- We need to specify this because the default protocol for AS7 and Wildfly doesn't work very well --> + <defaultProtocol type="Servlet 3.0" /> + + <container qualifier="jbossas-managed-7"> + <configuration> + <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m -Dcdicontainer.version=${cdicontainer.version}</property> + <property name="outputToConsole">false</property> + <property name="allowConnectingToRunningServer">true</property> + <property name="cdicontainer.version">${cdicontainer.version}</property> + </configuration> + </container> + + <container qualifier="jbossas-build-managed-7"> + <configuration> + <property name="jbossHome">${arquillian.jboss_home}</property> + <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m -Djboss.socket.binding.port-offset=40000 -Dcdicontainer.version=${cdicontainer.version}</property> + <property name="outputToConsole">false</property> + <property name="allowConnectingToRunningServer">true</property> + <property name="managementPort">49999</property> + </configuration> + </container> + + <container qualifier="wildfly-build-managed"> + <configuration> + <property name="jbossHome">${arquillian.jboss_home}</property> + <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m -Djboss.socket.binding.port-offset=50000 -Dcdicontainer.version=${cdicontainer.version}</property> + <property name="outputToConsole">false</property> + <property name="managementPort">59990</property> + </configuration> + </container> + + <container qualifier="jbossas-remote-7"> + <!-- + for remote debugging enable "remote socket debugging" - uncomment: + set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" + in + standalone.conf (standalone.conf.bat) + and connect to + port 8787 + --> + </container> + +</arquillian> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ce875fde/deltaspike/test-utils/src/main/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/deltaspike/test-utils/src/main/resources/arquillian.xml b/deltaspike/test-utils/src/main/resources/arquillian.xml index 15e2e55..50cc228 100644 --- a/deltaspike/test-utils/src/main/resources/arquillian.xml +++ b/deltaspike/test-utils/src/main/resources/arquillian.xml @@ -27,45 +27,6 @@ </engine> --> - <container qualifier="jbossas-managed-7"> - <configuration> - <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m -Dcdicontainer.version=${cdicontainer.version}</property> - <property name="outputToConsole">false</property> - <property name="allowConnectingToRunningServer">true</property> - <property name="cdicontainer.version">${cdicontainer.version}</property> - </configuration> - </container> - - <container qualifier="jbossas-build-managed-7"> - <configuration> - <property name="jbossHome">${arquillian.jboss_home}</property> - <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m -Djboss.socket.binding.port-offset=40000 -Dcdicontainer.version=${cdicontainer.version}</property> - <property name="outputToConsole">false</property> - <property name="allowConnectingToRunningServer">true</property> - <property name="managementPort">49999</property> - </configuration> - </container> - - <container qualifier="wildfly-build-managed"> - <configuration> - <property name="jbossHome">${arquillian.jboss_home}</property> - <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m -Djboss.socket.binding.port-offset=50000 -Dcdicontainer.version=${cdicontainer.version}</property> - <property name="outputToConsole">false</property> - <property name="managementPort">59990</property> - </configuration> - </container> - - <container qualifier="jbossas-remote-7"> - <!-- - for remote debugging enable "remote socket debugging" - uncomment: - set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" - in - standalone.conf (standalone.conf.bat) - and connect to - port 8787 - --> - </container> - <!-- don't remove the qualifier - it's needed for the arquillian.launch property --> <container qualifier="glassfish-remote-3.1"> </container>
