deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ch...@apache.org
Subject git commit: DELTASPIKE-496 Merge arquillian.xml files into a single one
Date Thu, 09 Jan 2014 16:38:33 GMT
Updated Branches:
  refs/heads/master 277bd24ca -> f36d0e63e


DELTASPIKE-496 Merge arquillian.xml files into a single one


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/f36d0e63
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/f36d0e63
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/f36d0e63

Branch: refs/heads/master
Commit: f36d0e63eb7231756857ad15eae8ff4a0152b412
Parents: 277bd24
Author: Christian Kaltepoth <chkal@apache.org>
Authored: Thu Jan 9 17:24:52 2014 +0100
Committer: Christian Kaltepoth <chkal@apache.org>
Committed: Thu Jan 9 17:25:48 2014 +0100

----------------------------------------------------------------------
 .../core/impl/src/test/resources/arquillian.xml | 87 -----------------
 .../impl/src/test/resources/arquillian.xml      | 85 -----------------
 .../data/impl/src/test/resources/arquillian.xml | 94 -------------------
 .../jpa/impl/src/test/resources/arquillian.xml  | 85 -----------------
 .../jsf/impl/src/test/resources/arquillian.xml  | 85 -----------------
 .../impl/src/test/resources/arquillian.xml      | 82 ----------------
 .../impl/src/test/resources/arquillian.xml      | 83 -----------------
 .../impl/src/test/resources/arquillian.xml      | 83 -----------------
 .../impl/src/test/resources/arquillian.xml      | 85 -----------------
 .../src/main/resources/arquillian.xml           | 98 ++++++++++++++++++++
 10 files changed, 98 insertions(+), 769 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f36d0e63/deltaspike/core/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/resources/arquillian.xml b/deltaspike/core/impl/src/test/resources/arquillian.xml
deleted file mode 100644
index 093e899..0000000
--- a/deltaspike/core/impl/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-    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>
-    -->
-
-    <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 -Dcdicontainer.version=${cdicontainer.version}</property>
-            <property name="outputToConsole">false</property>
-            <property name="allowConnectingToRunningServer">true</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>
-
-    <container qualifier="wls-remote-12c">
-        <configuration>
-            <property name="adminUrl">t3://localhost:7001</property>
-            <property name="adminUserName">weblogic1</property>
-            <property name="adminPassword">weblogic1</property>
-            <property name="target">AdminServer</property>
-            <property name="wlsHome">${WLS_HOME}</property>
-        </configuration>
-    </container>
-
-    <container qualifier="tomee">
-        <configuration>
-            <!-- tomee gets copied to this directory during the build -->
-            <property name="dir">target/tomee</property>
-
-            <!-- value '-1' to allow arquillian-tomee-remote to use dynamic settings -->
-            <property name="httpPort">-1</property>
-            <property name="ajpPort">-1</property>
-            <property name="stopPort">-1</property>
-            <property name="appWorkingDir">target/arquillian-test-working-dir</property>
-            <property name="catalina_opts">-Dcdicontainer.version=tomee-${tomee.version}</property>
-            <property name="simpleLog">true</property>
-        </configuration>
-    </container>
-</arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f36d0e63/deltaspike/modules/bean-validation/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/bean-validation/impl/src/test/resources/arquillian.xml b/deltaspike/modules/bean-validation/impl/src/test/resources/arquillian.xml
deleted file mode 100644
index f167509..0000000
--- a/deltaspike/modules/bean-validation/impl/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-    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>
-    -->
-
-    <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>
-        </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 -Dcdicontainer.version=${cdicontainer.version}</property>
-            <property name="outputToConsole">false</property>
-            <property name="allowConnectingToRunningServer">true</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>
-
-    <container qualifier="wls-remote-12c">
-        <configuration>
-            <property name="adminUrl">t3://localhost:7001</property>
-            <property name="adminUserName">weblogic1</property>
-            <property name="adminPassword">weblogic1</property>
-            <property name="target">AdminServer</property>
-            <property name="wlsHome">${WLS_HOME}</property>
-        </configuration>
-    </container>
-
-    <container qualifier="tomee">
-        <configuration>
-            <!-- tomee gets copied to this directory during the build -->
-            <property name="dir">target/tomee</property>
-
-            <!-- value '-1' to allow arquillian-tomee-remote to use dynamic settings -->
-            <property name="httpPort">-1</property>
-            <property name="ajpPort">-1</property>
-            <property name="stopPort">-1</property>
-            <property name="appWorkingDir">target/arquillian-test-working-dir</property>
-            <property name="simpleLog">true</property>
-        </configuration>
-    </container>
-</arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f36d0e63/deltaspike/modules/data/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/src/test/resources/arquillian.xml b/deltaspike/modules/data/impl/src/test/resources/arquillian.xml
deleted file mode 100644
index 7d86b8d..0000000
--- a/deltaspike/modules/data/impl/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-    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>
-    -->
-    
-    <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>
-        </configuration>
-    </container>
-
-    <container qualifier="jbossas-build-managed-7">
-        <configuration>
-            <property name="jbossHome">target/jboss-as-7.1.1.Final</property>
-            <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>
-        </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>
-
-    <container qualifier="wls-remote-12c">
-        <configuration>
-            <property name="adminUrl">t3://localhost:7001</property>
-            <property name="adminUserName">weblogic1</property>
-            <property name="adminPassword">weblogic1</property>
-            <property name="target">AdminServer</property>
-            <property name="wlsHome">${WLS_HOME}</property>
-        </configuration>
-    </container>
-
-    <container qualifier="tomee">
-        <configuration>
-            <!-- tomee gets copied to this directory during the build -->
-            <property name="dir">target/tomee</property>
-
-            <!-- value '-1' to allow arquillian-tomee-remote to use dynamic settings -->
-            <property name="httpPort">-1</property>
-            <property name="ajpPort">-1</property>
-            <property name="stopPort">-1</property>
-            <property name="appWorkingDir">target/arquillian-test-working-dir</property>
-            <property name="simpleLog">true</property>
-            <property name="properties">
-                testDatabase = new://Resource?type=DataSource
-                testDatabase.JdbcDriver = org.hsqldb.jdbcDriver
-                testDatabase.JdbcUrl = jdbc:hsqldb:mem:testdb
-                testDatabase.JtaManaged = true
-            </property>
-        </configuration>
-    </container>
-
-</arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f36d0e63/deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml b/deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml
deleted file mode 100644
index f167509..0000000
--- a/deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-    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>
-    -->
-
-    <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>
-        </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 -Dcdicontainer.version=${cdicontainer.version}</property>
-            <property name="outputToConsole">false</property>
-            <property name="allowConnectingToRunningServer">true</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>
-
-    <container qualifier="wls-remote-12c">
-        <configuration>
-            <property name="adminUrl">t3://localhost:7001</property>
-            <property name="adminUserName">weblogic1</property>
-            <property name="adminPassword">weblogic1</property>
-            <property name="target">AdminServer</property>
-            <property name="wlsHome">${WLS_HOME}</property>
-        </configuration>
-    </container>
-
-    <container qualifier="tomee">
-        <configuration>
-            <!-- tomee gets copied to this directory during the build -->
-            <property name="dir">target/tomee</property>
-
-            <!-- value '-1' to allow arquillian-tomee-remote to use dynamic settings -->
-            <property name="httpPort">-1</property>
-            <property name="ajpPort">-1</property>
-            <property name="stopPort">-1</property>
-            <property name="appWorkingDir">target/arquillian-test-working-dir</property>
-            <property name="simpleLog">true</property>
-        </configuration>
-    </container>
-</arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f36d0e63/deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml b/deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml
deleted file mode 100644
index f167509..0000000
--- a/deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-    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>
-    -->
-
-    <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>
-        </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 -Dcdicontainer.version=${cdicontainer.version}</property>
-            <property name="outputToConsole">false</property>
-            <property name="allowConnectingToRunningServer">true</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>
-
-    <container qualifier="wls-remote-12c">
-        <configuration>
-            <property name="adminUrl">t3://localhost:7001</property>
-            <property name="adminUserName">weblogic1</property>
-            <property name="adminPassword">weblogic1</property>
-            <property name="target">AdminServer</property>
-            <property name="wlsHome">${WLS_HOME}</property>
-        </configuration>
-    </container>
-
-    <container qualifier="tomee">
-        <configuration>
-            <!-- tomee gets copied to this directory during the build -->
-            <property name="dir">target/tomee</property>
-
-            <!-- value '-1' to allow arquillian-tomee-remote to use dynamic settings -->
-            <property name="httpPort">-1</property>
-            <property name="ajpPort">-1</property>
-            <property name="stopPort">-1</property>
-            <property name="appWorkingDir">target/arquillian-test-working-dir</property>
-            <property name="simpleLog">true</property>
-        </configuration>
-    </container>
-</arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f36d0e63/deltaspike/modules/partial-bean/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/impl/src/test/resources/arquillian.xml b/deltaspike/modules/partial-bean/impl/src/test/resources/arquillian.xml
deleted file mode 100644
index 5160915..0000000
--- a/deltaspike/modules/partial-bean/impl/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-    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-->
-
-    <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>
-        </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 -Dcdicontainer.version=${cdicontainer.version}</property>
-            <property name="outputToConsole">false</property>
-            <property name="allowConnectingToRunningServer">true</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>
-
-    <container qualifier="wls-remote-12c">
-        <configuration>
-            <property name="adminUrl">t3://localhost:7001</property>
-            <property name="adminUserName">weblogic1</property>
-            <property name="adminPassword">weblogic1</property>
-            <property name="target">AdminServer</property>
-            <property name="wlsHome">${WLS_HOME}</property>
-        </configuration>
-    </container>
-
-    <container qualifier="tomee">
-        <configuration>
-            <!-- tomee gets copied to this directory during the build -->
-            <property name="dir">target/tomee</property>
-
-            <!-- value '-1' to allow arquillian-tomee-remote to use dynamic settings -->
-            <property name="httpPort">-1</property>
-            <property name="ajpPort">-1</property>
-            <property name="stopPort">-1</property>
-            <property name="appWorkingDir">target/arquillian-test-working-dir</property>
-        </configuration>
-    </container>
-</arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f36d0e63/deltaspike/modules/scheduler/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/resources/arquillian.xml b/deltaspike/modules/scheduler/impl/src/test/resources/arquillian.xml
deleted file mode 100644
index 848cb4c..0000000
--- a/deltaspike/modules/scheduler/impl/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
-    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-->
-
-    <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>
-        </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 -Dcdicontainer.version=${cdicontainer.version}</property>
-            <property name="outputToConsole">false</property>
-            <property name="allowConnectingToRunningServer">true</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>
-
-    <container qualifier="wls-remote-12c">
-        <configuration>
-            <property name="adminUrl">t3://localhost:7001</property>
-            <property name="adminUserName">weblogic1</property>
-            <property name="adminPassword">weblogic1</property>
-            <property name="target">AdminServer</property>
-            <property name="wlsHome">${WLS_HOME}</property>
-        </configuration>
-    </container>
-
-    <container qualifier="tomee">
-        <configuration>
-            <!-- tomee gets copied to this directory during the build -->
-            <property name="dir">target/tomee</property>
-
-            <!-- value '-1' to allow arquillian-tomee-remote to use dynamic settings -->
-            <property name="httpPort">-1</property>
-            <property name="ajpPort">-1</property>
-            <property name="stopPort">-1</property>
-            <property name="appWorkingDir">target/arquillian-test-working-dir</property>
-            <property name="simpleLog">true</property>
-        </configuration>
-    </container>
-</arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f36d0e63/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/resources/arquillian.xml b/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
deleted file mode 100644
index 3e5e0d2..0000000
--- a/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
-    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>
-
-    <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>
-        </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 -Dcdicontainer.version=${cdicontainer.version}</property>
-            <property name="outputToConsole">false</property>
-            <property name="allowConnectingToRunningServer">true</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>
-
-    <container qualifier="wls-remote-12c">
-        <configuration>
-            <property name="adminUrl">t3://localhost:7001</property>
-            <property name="adminUserName">weblogic1</property>
-            <property name="adminPassword">weblogic1</property>
-            <property name="target">AdminServer</property>
-            <property name="wlsHome">${WLS_HOME}</property>
-        </configuration>
-    </container>
-
-    <container qualifier="tomee">
-        <configuration>
-            <!-- tomee gets copied to this directory during the build -->
-            <property name="dir">target/tomee</property>
-
-            <!-- value '-1' to allow arquillian-tomee-remote to use dynamic settings -->
-            <property name="httpPort">-1</property>
-            <property name="ajpPort">-1</property>
-            <property name="stopPort">-1</property>
-            <property name="appWorkingDir">target/arquillian-test-working-dir</property>
-            <property name="simpleLog">true</property>
-        </configuration>
-    </container>
-</arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f36d0e63/deltaspike/modules/servlet/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/servlet/impl/src/test/resources/arquillian.xml b/deltaspike/modules/servlet/impl/src/test/resources/arquillian.xml
deleted file mode 100644
index f167509..0000000
--- a/deltaspike/modules/servlet/impl/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-    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>
-    -->
-
-    <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>
-        </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 -Dcdicontainer.version=${cdicontainer.version}</property>
-            <property name="outputToConsole">false</property>
-            <property name="allowConnectingToRunningServer">true</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>
-
-    <container qualifier="wls-remote-12c">
-        <configuration>
-            <property name="adminUrl">t3://localhost:7001</property>
-            <property name="adminUserName">weblogic1</property>
-            <property name="adminPassword">weblogic1</property>
-            <property name="target">AdminServer</property>
-            <property name="wlsHome">${WLS_HOME}</property>
-        </configuration>
-    </container>
-
-    <container qualifier="tomee">
-        <configuration>
-            <!-- tomee gets copied to this directory during the build -->
-            <property name="dir">target/tomee</property>
-
-            <!-- value '-1' to allow arquillian-tomee-remote to use dynamic settings -->
-            <property name="httpPort">-1</property>
-            <property name="ajpPort">-1</property>
-            <property name="stopPort">-1</property>
-            <property name="appWorkingDir">target/arquillian-test-working-dir</property>
-            <property name="simpleLog">true</property>
-        </configuration>
-    </container>
-</arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f36d0e63/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
new file mode 100644
index 0000000..bad06cb
--- /dev/null
+++ b/deltaspike/test-utils/src/main/resources/arquillian.xml
@@ -0,0 +1,98 @@
+<!--
+    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>
+    -->
+
+    <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 -Dcdicontainer.version=${cdicontainer.version}</property>
+            <property name="outputToConsole">false</property>
+            <property name="allowConnectingToRunningServer">true</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>
+
+    <container qualifier="wls-remote-12c">
+        <configuration>
+            <property name="adminUrl">t3://localhost:7001</property>
+            <property name="adminUserName">weblogic1</property>
+            <property name="adminPassword">weblogic1</property>
+            <property name="target">AdminServer</property>
+            <property name="wlsHome">${WLS_HOME}</property>
+        </configuration>
+    </container>
+
+    <container qualifier="tomee">
+        <configuration>
+            <!-- tomee gets copied to this directory during the build -->
+            <property name="dir">target/tomee</property>
+
+            <!-- value '-1' to allow arquillian-tomee-remote to use dynamic settings -->
+            <property name="httpPort">-1</property>
+            <property name="ajpPort">-1</property>
+            <property name="stopPort">-1</property>
+            <property name="appWorkingDir">target/arquillian-test-working-dir</property>
+            <property name="catalina_opts">-Dcdicontainer.version=tomee-${tomee.version}</property>
+            <property name="simpleLog">true</property>
+            
+            <!-- In-Memory database for the data module -->
+            <property name="properties">
+                testDatabase = new://Resource?type=DataSource
+                testDatabase.JdbcDriver = org.hsqldb.jdbcDriver
+                testDatabase.JdbcUrl = jdbc:hsqldb:mem:testdb
+                testDatabase.JtaManaged = true
+            </property>
+
+        </configuration>
+    </container>
+</arquillian>


Mime
View raw message