You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/03/08 22:43:53 UTC
git commit: DELTASPIKE-57 container setup for tomee
Updated Branches:
refs/heads/master 85d62de28 -> 8a73bd205
DELTASPIKE-57 container setup for tomee
thx to Romain Manni-Bucau
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/8a73bd20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/8a73bd20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/8a73bd20
Branch: refs/heads/master
Commit: 8a73bd205e90a774d851103eb08c8e9d0d001424
Parents: 85d62de
Author: gpetracek <gp...@apache.org>
Authored: Thu Mar 8 20:41:04 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Thu Mar 8 22:41:59 2012 +0100
----------------------------------------------------------------------
.../src/test/resources/arquillian.xml | 11 +++++
deltaspike/parent/it/pom.xml | 36 +++++++++++++++
deltaspike/parent/pom.xml | 9 ++++
3 files changed, 56 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a73bd20/deltaspike/core/integration-test/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/src/test/resources/arquillian.xml b/deltaspike/core/integration-test/src/test/resources/arquillian.xml
index 953f57a..34ee300 100644
--- a/deltaspike/core/integration-test/src/test/resources/arquillian.xml
+++ b/deltaspike/core/integration-test/src/test/resources/arquillian.xml
@@ -49,4 +49,15 @@
</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>
+ </configuration>
+ </container>
</arquillian>
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a73bd20/deltaspike/parent/it/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/it/pom.xml b/deltaspike/parent/it/pom.xml
index eb0d079..79b2df6 100644
--- a/deltaspike/parent/it/pom.xml
+++ b/deltaspike/parent/it/pom.xml
@@ -356,6 +356,42 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <!-- arquillian-tomee-remote isn't a real remote connector for a running server-instance -->
+ <id>tomee-managed</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven.surefire.plugin.version}</version>
+ <configuration>
+ <systemProperties>
+ <arquillian.launch>tomee</arquillian.launch>
+ </systemProperties>
+
+ <!-- we just use groups to mark that a test should be executed only
+ with specific environments. even though a java-ee6 application server has to be able to run
+ all tests in theory, we have to exclude some tests because there are e.g. packaging issues or
+ there are currently issues with arquillian. if a test isn't restricted to an environment,
+ no category is used for the test-class. -->
+ <excludedGroups>
+ org.apache.deltaspike.test.category.SeCategory
+ </excludedGroups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a73bd20/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 25b0d29..e33caae 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -84,6 +84,7 @@
<!-- testing stuff -->
<junit.version>4.10</junit.version>
<arquillian.version>1.0.0.CR7</arquillian.version>
+ <tomee.version>1.0.0-beta-3-SNAPSHOT</tomee.version>
<!-- JSF-2.0 implementations-->
<myfaces2.version>2.0.5</myfaces2.version>
@@ -374,6 +375,14 @@
<version>1.2</version>
<scope>provided</scope>
</dependency>
+
+ <!-- TomEE dependencies -->
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>