Return-Path: 
 <deltaspike-commits-return-183-apmail-incubator-deltaspike-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-deltaspike-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-deltaspike-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E250D9CCB
	for <apmail-incubator-deltaspike-commits-archive@minotaur.apache.org>;
 Wed,  1 Feb 2012 16:31:45 +0000 (UTC)
Received: (qmail 13395 invoked by uid 500); 1 Feb 2012 16:31:45 -0000
Delivered-To: apmail-incubator-deltaspike-commits-archive@incubator.apache.org
Received: (qmail 13345 invoked by uid 500); 1 Feb 2012 16:31:45 -0000
Mailing-List: contact deltaspike-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:deltaspike-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:deltaspike-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:deltaspike-commits@incubator.apache.org>
List-Id: <deltaspike-commits.incubator.apache.org>
Reply-To: deltaspike-dev@incubator.apache.org
Delivered-To: mailing list deltaspike-commits@incubator.apache.org
Received: (qmail 13324 invoked by uid 99); 1 Feb 2012 16:31:45 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 16:31:45 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 16:31:44 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id AD68E31B122; Wed,  1 Feb 2012 16:31:23 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: chkal@apache.org
To: deltaspike-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [2/4] git commit: Add arquillian.xml to the classpath during
 execution of the core integration tests
Message-Id: <20120201163123.AD68E31B122@tyr.zones.apache.org>
Date: Wed,  1 Feb 2012 16:31:23 +0000 (UTC)

Add arquillian.xml to the classpath during execution of the core integration tests


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

Branch: refs/heads/master
Commit: ee227d6854380d3e3ec7dabdd8dd32269f63ffa9
Parents: 2314c59
Author: Christian Kaltepoth <christian@kaltepoth.de>
Authored: Sun Jan 29 16:48:41 2012 +0100
Committer: Christian Kaltepoth <chkal@apache.org>
Committed: Wed Feb 1 17:02:15 2012 +0100

----------------------------------------------------------------------
 deltaspike/core/integration-test/pom.xml |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ee227d68/deltaspike/core/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/integration-test/pom.xml b/deltaspike/core/integration-test/pom.xml
index de753fe..2de0254 100644
--- a/deltaspike/core/integration-test/pom.xml
+++ b/deltaspike/core/integration-test/pom.xml
@@ -154,6 +154,30 @@
                 </executions>
             </plugin>
 
+            <!--
+                The core tests require arquillian.xml to run successfully. We cannot simply
+                include "src/test/resources" on the classpath for the test execution because
+                the other files in there clash with the ones packaged in core's test jar.
+            -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-arquillian-xml</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${basedir}/src/test/resources/arquillian.xml"
+                                    todir="${project.build.directory}/coretests/" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>