From 7cd6831493ca68c383714d1da865628a765050f3 Mon Sep 17 00:00:00 2001
From: Lukas Fryc <lfryc@redhat.com>
Date: Fri, 10 Jan 2014 19:47:48 +0100
Subject: [PATCH] RF-13248: correct welcomeFile for WF/JBAS compatibility

---
 .../FundamentalTestConfiguration.java             | 15 ++++++++++++++-
 .../java/org/richfaces/deployment/Deployment.java |  1 -
 .../src/main/resources/arquillian.xml             |  2 ++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/build/build-resources/src/main/java/org/richfaces/arquillian/configuration/FundamentalTestConfiguration.java b/build/build-resources/src/main/java/org/richfaces/arquillian/configuration/FundamentalTestConfiguration.java
index 085db9deb0..34f00f57cf 100644
--- a/build/build-resources/src/main/java/org/richfaces/arquillian/configuration/FundamentalTestConfiguration.java
+++ b/build/build-resources/src/main/java/org/richfaces/arquillian/configuration/FundamentalTestConfiguration.java
@@ -13,6 +13,7 @@ public class FundamentalTestConfiguration implements DroneConfiguration<Fundamen
     private String currentBuildRichfacesVersion = "5.0.0-SNAPSHOT";
     private String jsfProvider;
     private String jsfImplementation;
+    private String container;
     private String containerHome;
     private String containerDistribution;
     private String containerConfiguration;
@@ -64,6 +65,14 @@ public JsfProvider getJsfProvider() {
         return JsfProvider.valueOf(jsfProvider.toUpperCase());
     }
 
+    /**
+     * Get the name of the container profile as specified by -Dintegration={container} execution
+     * @return
+     */
+    public String getContainer() {
+        return container;
+    }
+
     /**
      * Get the Maven dependency (GAV) for the container distribution artifact
      */
@@ -111,8 +120,12 @@ public String getMavenSettings() {
      * Validates the configuration
      */
     public void validate() {
+        if (container == null) {
+            throw new IllegalArgumentException("The ${integration} configuration needs to be specified");
+        }
+
         if (servletContainerSetup == null) {
-            throw new IllegalArgumentException("The servletContainerSetup configuration needs to be specified");
+            throw new IllegalArgumentException("The ${servletContainerSetup} configuration needs to be specified");
         }
     }
 
diff --git a/build/build-resources/src/main/java/org/richfaces/deployment/Deployment.java b/build/build-resources/src/main/java/org/richfaces/deployment/Deployment.java
index 1ada69f0eb..8aa2a36177 100644
--- a/build/build-resources/src/main/java/org/richfaces/deployment/Deployment.java
+++ b/build/build-resources/src/main/java/org/richfaces/deployment/Deployment.java
@@ -91,7 +91,6 @@ protected Deployment(Class<?> testClass) {
                 .addNamespace("xmlns:web", "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd")
                 .getOrCreateWelcomeFileList()
                     .welcomeFile("faces/index.xhtml")
-                    .welcomeFile("index.jsf")
                 .up()
                 .getOrCreateContextParam()
                     .paramName("javax.faces.PROJECT_STAGE")
diff --git a/build/build-resources/src/main/resources/arquillian.xml b/build/build-resources/src/main/resources/arquillian.xml
index 683bcb445a..e3c97fbd98 100644
--- a/build/build-resources/src/main/resources/arquillian.xml
+++ b/build/build-resources/src/main/resources/arquillian.xml
@@ -103,6 +103,8 @@
         <!-- GAV of the JSF implementation used for testing in servlet containers -->
         <property name="jsfImplementation">${arquillian.richfaces.jsfImplementation}</property>
         <!-- the home of the container -->
+        <property name="container">${integration}</property>
+        <!-- the home of the container -->
         <property name="containerHome">${arquillian.container.home}</property>
         <!-- the GAV of container distribution artifact -->
         <property name="containerDistribution">${arquillian.container.distribution}</property>