Merge pull request #183 from jfdenise/CD19

Fix for CLOUD-3508, galleon module refactoring to handle WF galleon feature-packs

Author: luck3y

jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/pom.xml

@@ -37,11 +37,12 @@
     <properties>
         <version.org.wildfly>${env.WILDFLY_VERSION}</version.org.wildfly>
         <version.org.wildfly.galleon-plugins>${env.GALLEON_WILDFLY_VERSION}</version.org.wildfly.galleon-plugins>
+        <full.maven.groupId>${env.EAP_FULL_GROUPID}</full.maven.groupId>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.jboss.eap</groupId>
+            <groupId>${full.maven.groupId}</groupId>
             <artifactId>wildfly-galleon-pack</artifactId>
             <version>${version.org.wildfly}</version>
             <type>zip</type>

jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/model.xml

@@ -13,7 +13,9 @@
         <package name="eap.s2i.hawkular"/>
         <package name="eap.s2i.prometheus"/>
         <package name="wildfly.s2i.mvn"/>
-        <package name="docs.licenses.merge"/>        
+        <package name="docs.licenses.merge"/>
+        <!-- that is a workaround waiting for WF to upgrade to Galleon-plugins 4.2.5+ -->
+        <package name="layers.conf" optional="true"/>        
     </packages>
     <layers>
         <!-- required by operator to be monitored -->

jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/layers/standalone/core-security-realms/layer-spec.xml renamed to jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/layers/standalone/application-security-realm/layer-spec.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
-<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="core-security-realms">
+<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="application-security-realm">
     <exclude feature-id="core-service.management.security-realm.server-identity.ssl:security-realm=ApplicationRealm"/>
 </layer-spec>

jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/packages/layers.conf/content/modules/layers.conf

@@ -0,0 +1 @@
+layers=openshift

jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/packages/layers.conf/package.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+
+<package-spec xmlns="urn:jboss:galleon:package:2.0" name="layers.conf">
+</package-spec>

jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/packages/layers.conf/pm/wildfly/tasks.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" ?>
+
+<tasks xmlns="urn:wildfly:wildfly-feature-pack-tasks:2.0">
+    <!-- that is a workaround waiting for WF to upgrade to Galleon-plugins 4.2.5+ -->
+    <mkdir name="modules/system/layers/openshift"/>
+</tasks>
+