Merge pull request arquillian#354 from WolfgangHG/arquillian_glassfish_212

Testsuite: arquillian glassfish container has new groupId, Update to 2.1.2

Author: rhusar

build/ftest-base/pom.xml

@@ -14,7 +14,7 @@
   <properties>
     <version.shrinkwrap>1.2.6</version.shrinkwrap>
     <version.shrinkwrap.descriptors>2.0.0</version.shrinkwrap.descriptors>
-    <version.arquillian.glassfish>1.8</version.arquillian.glassfish>
+    <version.arquillian.glassfish>2.1.2</version.arquillian.glassfish>
 
     <!-- Arquillian Configuration -->
     <arquillian.debug>false</arquillian.debug>
@@ -23,6 +23,8 @@
     <arquillian.container.home />
     <arquillian.container.distribution />
     <arquillian.container.configuration />
+    <!-- Relative path to a file that should be made "executable" when the container is started by the arquillian container. -->
+    <arquillian.container.linux.executepermission.file />
     <arquillian.container.uninstall>true</arquillian.container.uninstall>
     <arquillian.container.vmargs>-Xmx768m -Darquillian.debug=${arquillian.debug}
     </arquillian.container.vmargs>
@@ -230,6 +232,10 @@
         <arquillian.container.home>${project.build.directory}/glassfish7</arquillian.container.home>
         <arquillian.container.distribution>org.glassfish.main.distributions:glassfish:zip:${version.glassfish}
         </arquillian.container.distribution>
+        <!-- Relative path to a file that should be made "executable" when the container is started by the arquillian container.
+             Here it is the "asadmin" script (https://github.com/OmniFish-EE/arquillian-container-glassfish/pull/9) -->
+        <arquillian.container.linux.executepermission.file>glassfish7/glassfish/bin/asadmin
+        </arquillian.container.linux.executepermission.file>
       </properties>
 
       <dependencies>
@@ -239,7 +245,7 @@
             so use a fork at https://github.com/OmniFish-EE/arquillian-container-glassfish <dependency>
         -->
         <dependency>
-          <groupId>org.omnifaces.arquillian</groupId>
+          <groupId>ee.omnifish.arquillian</groupId>
           <artifactId>arquillian-glassfish-server-managed</artifactId>
           <version>${version.arquillian.glassfish}</version>
           <scope>test</scope>
@@ -278,7 +284,7 @@
       </properties>
       <dependencies>
         <dependency>
-          <groupId>org.omnifaces.arquillian</groupId>
+          <groupId>ee.omnifish.arquillian</groupId>
           <artifactId>arquillian-glassfish-server-remote</artifactId>
           <version>${version.arquillian.glassfish}</version>
           <scope>test</scope>

build/resources/src/main/java/org/arquillian/warp/ftest/configuration/IntegrationTestConfiguration.java

@@ -27,6 +27,7 @@ public class IntegrationTestConfiguration implements DroneConfiguration<Integrat
     private String containerHome;
     private String containerDistribution;
     private String containerConfiguration;
+    private String containerLinuxExecutePermissionFile;
     private Boolean containerUninstall;
     private Boolean debug;
 
@@ -53,6 +54,16 @@ public String getContainerHome() {
         return containerHome;
     }
 
+    /**
+     * If the arquillian container adapter calls a launcher script for starting the container, this file must have the "execute" permisson on linux environments.
+     * This property must contain the relative path (subdir of "containerConfiguration").
+     *
+     * @return Relative path to the file that should be marked as "executable" if the test environment is not Windows.
+     */
+    public String getContainerLinuxExecutePermissionFile() {
+        return containerLinuxExecutePermissionFile;
+    }
+
     /**
      * Set the flag that the container was installed from distribution
      */

build/resources/src/main/java/org/arquillian/warp/ftest/installation/ContainerInstaller.java

@@ -80,6 +80,25 @@ public void unpackContainerDistribution(@Observes InstallContainer event) {
         log.info(String.format("The container distribution '%s' was installed into '%s'", distribution,
             unpackDestination.getAbsolutePath()));
 
+        // If we are running on a linux environment, maybe a launcher script that is required by the arquillian container plugin must be executable.
+        String launcherScript = configuration.get().getContainerLinuxExecutePermissionFile();
+        if (launcherScript != null && launcherScript.trim().length() > 0) {
+            // Do this only on non-Windows-OS.
+            if (!System.getProperty("os.name").toLowerCase().startsWith("windows")) {
+                File fileAsadmin = new File(unpackDestination.getAbsolutePath(), launcherScript);
+                if (fileAsadmin.exists()) {
+                    log.info(String.format("Preparing container: setting execute permisson for '%s'.", fileAsadmin.getAbsoluteFile()));
+                    fileAsadmin.setExecutable(true);
+                }
+                else {
+                    log.warning(String.format("Wrong configuration: Could not find file '%s'.", fileAsadmin.getAbsoluteFile()));
+                }
+            }
+            else {
+              log.info("Preparing container: No linux environment, skipping step.");
+            }
+        }
+
         if (!containerHome.exists()) {
             throw new IllegalStateException(String.format(
                 "The container distribution was unpacked but the containerHome (%s) still doesn't exist", containerHome));

build/resources/src/main/resources/arquillian.xml

@@ -66,6 +66,9 @@
     <property name="containerConfiguration">${arquillian.container.configuration}</property>
     <!-- true if the container should be uninstalled after test when it was installed from distribution -->
     <property name="containerUninstall">${arquillian.container.uninstall}</property>
+    <!-- If the arquillian container adapter calls a launcher script for starting the container, this file must have the "execute" permisson on linux environments.
+         Configure the path relative to the subdir of "arquillian.container.configuration". -->
+    <property name="containerLinuxExecutePermissionFile">${arquillian.container.linux.executepermission.file}</property>
   </extension>
 
 </arquillian>