updated files where the old modcluster.conf was used

Author: PaulLodge

core/src/main/groovy/noe/rhel/server/workspace/WorkspaceHttpdTomcatsBaseOS.groovy

@@ -95,7 +95,7 @@ class WorkspaceHttpdTomcatsBaseOS extends WorkspaceMultipleTomcats{
    * @param httpd Instance of `Httpd` server
    */
   private void copyModClusterConfIfMissing(Httpd httpd) {
-    List<String> confRelativePaths = ["conf.d/mod_cluster.conf"]
+    List<String> confRelativePaths = ["conf.d/${DefaultProperties.MOD_CLUSTER_CONFIG_FILE}"]
     confRelativePaths.each() { String confRelativePath->
       File confPath = new File(httpd.getServerRoot(), confRelativePath)
       File sclConfPath = new File("${DefaultProperties.HTTPD_SCL_ROOT}/etc/httpd/${confRelativePath}")

pom.xml

@@ -5,6 +5,12 @@
     <groupId>org.jboss.qa.noe</groupId>
     <artifactId>noe-core-parent</artifactId>
     <version>0.17.7-SNAPSHOT</version>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.qa.noe</groupId>
+            <artifactId>noe-core</artifactId>
+        </dependency>
+    </dependencies>
     <packaging>pom</packaging>
 
     <name>Noe core: Parent</name>

testsuite/src/test/groovy/noe/HttpdKillTestIT.groovy

@@ -1,6 +1,7 @@
 package noe
 
 import groovy.util.logging.Slf4j
+import noe.common.DefaultProperties
 import noe.common.TestAbstract
 import noe.common.utils.JBFile
 import noe.common.utils.Platform
@@ -35,7 +36,7 @@ class HttpdKillTestIT extends TestAbstract {
       log.debug("Deleting ssl.conf: $sslConfFile.absolutePath")
       JBFile.delete(sslConfFile)
       // we are not testing mod_cluster here, lets remove mod_cluster
-      def mod_clusterConfFile = new File(httpdServer.getConfDeploymentPath(), "mod_cluster.conf")
+      def mod_clusterConfFile = new File(httpdServer.getConfDeploymentPath(), DefaultProperties.MOD_CLUSTER_CONFIG_FILE)
       log.debug("Deleting mod-cluster.conf: $mod_clusterConfFile.absolutePath")
       JBFile.delete(mod_clusterConfFile)
     }