You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by jo...@apache.org on 2013/12/29 20:41:56 UTC
[1/2] git commit: DELTASPIKE-482 Added cdicontainer version to all
arquillian.xml files for use in any test.
Updated Branches:
refs/heads/master c0eca43f7 -> bcc29d014
DELTASPIKE-482 Added cdicontainer version to all arquillian.xml files for use in any test.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/0f390214
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/0f390214
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/0f390214
Branch: refs/heads/master
Commit: 0f3902141ca08612da77955644ca730f1e511133
Parents: c0eca43
Author: John D. Ament <jo...@gmail.com>
Authored: Sun Dec 29 14:33:10 2013 -0500
Committer: John D. Ament <jo...@gmail.com>
Committed: Sun Dec 29 14:33:10 2013 -0500
----------------------------------------------------------------------
.../bean-validation/impl/src/test/resources/arquillian.xml | 4 ++--
deltaspike/modules/data/impl/src/test/resources/arquillian.xml | 4 ++--
deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml | 4 ++--
deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml | 4 ++--
.../modules/partial-bean/impl/src/test/resources/arquillian.xml | 4 ++--
.../modules/scheduler/impl/src/test/resources/arquillian.xml | 4 ++--
.../modules/security/impl/src/test/resources/arquillian.xml | 4 ++--
.../modules/servlet/impl/src/test/resources/arquillian.xml | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0f390214/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
index d2ac604..f167509 100644
--- a/deltaspike/modules/bean-validation/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/bean-validation/impl/src/test/resources/arquillian.xml
@@ -29,7 +29,7 @@
<container qualifier="jbossas-managed-7">
<configuration>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
@@ -38,7 +38,7 @@
<container qualifier="jbossas-build-managed-7">
<configuration>
<property name="jbossHome">${arquillian.jboss_home}</property>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0f390214/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
index e7c24a8..7d86b8d 100644
--- a/deltaspike/modules/data/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/data/impl/src/test/resources/arquillian.xml
@@ -31,7 +31,7 @@
<container qualifier="jbossas-managed-7">
<configuration>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
@@ -40,7 +40,7 @@
<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</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>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0f390214/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
index d2ac604..f167509 100644
--- a/deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml
@@ -29,7 +29,7 @@
<container qualifier="jbossas-managed-7">
<configuration>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
@@ -38,7 +38,7 @@
<container qualifier="jbossas-build-managed-7">
<configuration>
<property name="jbossHome">${arquillian.jboss_home}</property>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0f390214/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
index d2ac604..f167509 100644
--- a/deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml
@@ -29,7 +29,7 @@
<container qualifier="jbossas-managed-7">
<configuration>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
@@ -38,7 +38,7 @@
<container qualifier="jbossas-build-managed-7">
<configuration>
<property name="jbossHome">${arquillian.jboss_home}</property>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0f390214/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
index b0d7dbf..5160915 100644
--- a/deltaspike/modules/partial-bean/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/partial-bean/impl/src/test/resources/arquillian.xml
@@ -27,7 +27,7 @@
<container qualifier="jbossas-managed-7">
<configuration>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
@@ -36,7 +36,7 @@
<container qualifier="jbossas-build-managed-7">
<configuration>
<property name="jbossHome">${arquillian.jboss_home}</property>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0f390214/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
index a385b7f..848cb4c 100644
--- a/deltaspike/modules/scheduler/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/scheduler/impl/src/test/resources/arquillian.xml
@@ -27,7 +27,7 @@
<container qualifier="jbossas-managed-7">
<configuration>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
@@ -36,7 +36,7 @@
<container qualifier="jbossas-build-managed-7">
<configuration>
<property name="jbossHome">${arquillian.jboss_home}</property>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0f390214/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
index 30869ae..3e5e0d2 100644
--- a/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
@@ -27,7 +27,7 @@
<container qualifier="jbossas-managed-7">
<configuration>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
@@ -36,7 +36,7 @@
<container qualifier="jbossas-build-managed-7">
<configuration>
<property name="jbossHome">${arquillian.jboss_home}</property>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0f390214/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
index d2ac604..f167509 100644
--- a/deltaspike/modules/servlet/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/servlet/impl/src/test/resources/arquillian.xml
@@ -29,7 +29,7 @@
<container qualifier="jbossas-managed-7">
<configuration>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
@@ -38,7 +38,7 @@
<container qualifier="jbossas-build-managed-7">
<configuration>
<property name="jbossHome">${arquillian.jboss_home}</property>
- <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m</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>
[2/2] git commit: DELTASPIKE-482 TomEE requires explicit listing of
CDI enricher.
Posted by jo...@apache.org.
DELTASPIKE-482 TomEE requires explicit listing of CDI enricher.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/bcc29d01
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/bcc29d01
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/bcc29d01
Branch: refs/heads/master
Commit: bcc29d014164335388d9797b8278d883546cac0d
Parents: 0f39021
Author: John D. Ament <jo...@gmail.com>
Authored: Sun Dec 29 14:41:18 2013 -0500
Committer: John D. Ament <jo...@gmail.com>
Committed: Sun Dec 29 14:41:18 2013 -0500
----------------------------------------------------------------------
.../test/core/impl/resourceloader/ClasspathWebProfileTest.java | 2 --
deltaspike/parent/code/pom.xml | 6 ++++++
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bcc29d01/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
index 50bead2..1fb20f4 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
@@ -87,7 +87,6 @@ public class ClasspathWebProfileTest
public void testAmbiguousFileLookup(@ExternalResource(storage=ClasspathStorage.class,
location="META-INF/beans.xml") InputStream inputStream)
{
- Assume.assumeTrue(CdiContainerUnderTest.isNotTomEE()); // don't run in TomEE until TOMEE-1101 is fixed.
Assert.assertNull(inputStream); // for some reason, this works, exception no longer thrown.
}
@@ -95,7 +94,6 @@ public class ClasspathWebProfileTest
public void testSuccessfulAmbiguousLookup(@ExternalResource(storage = ClasspathStorage.class,
location="META-INF/beans.xml") List<InputStream> inputStreams)
{
- Assume.assumeTrue(CdiContainerUnderTest.isNotTomEE()); // don't run in TomEE until TOMEE-1101 is fixed.
Assert.assertTrue(inputStreams.size() > 1); //the count is different on as7 compared to the standalone setup
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bcc29d01/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index a2fa4f6..ee8ef4c 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -355,6 +355,12 @@
<type>zip</type>
</dependency>
<dependency>
+ <groupId>org.jboss.arquillian.testenricher</groupId>
+ <artifactId>arquillian-testenricher-cdi</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
</dependency>