Skip to content

Commit 7504281

Browse files
jfdenisejfdenise
committed
Microprofile default config and FP build
1 parent 4bb47d1 commit 7504281

File tree

12 files changed

+257
-1
lines changed

12 files changed

+257
-1
lines changed

‎jboss/container/eap/galleon/config/mp/artifacts/opt/jboss/container/eap/galleon/definitions/fat-default-server/provisioning.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" ?>
2+
3+
<installation xmlns="urn:jboss:galleon:provisioning:3.0">
4+
<!-- Use the image version, to avoid retrieving metadata.xml for un-released s2i FP-->
5+
<feature-pack location="eap-s2i@maven(org.jboss.universe:s2i-universe)#3.0.0.Final">
6+
<default-configs inherit="false">
7+
<include model="standalone" name="standalone-microprofile-ha.xml"/>
8+
</default-configs>
9+
</feature-pack>
10+
</installation>

‎jboss/container/eap/galleon/config/mp/artifacts/opt/jboss/container/eap/galleon/definitions/slim-default-server/provisioning.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" ?>
2+
3+
<installation xmlns="urn:jboss:galleon:provisioning:3.0">
4+
<!-- Use the image version, to avoid retrieving metadata.xml for un-released s2i FP-->
5+
<feature-pack location="eap-s2i@maven(org.jboss.universe:s2i-universe)#3.0.0.Final">
6+
<default-configs inherit="false">
7+
<include model="standalone" name="standalone-microprofile-ha.xml"/>
8+
</default-configs>
9+
</feature-pack>
10+
<options>
11+
<option name="jboss-maven-dist" value="true"/>
12+
</options>
13+
</installation>

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

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
JBoss, Home of Professional Open Source
4+
Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
5+
contributors by the @authors tag. See the copyright.txt in the
6+
distribution for a full listing of individual contributors.
7+
8+
Licensed under the Apache License, Version 2.0 (the "License");
9+
you may not use this file except in compliance with the License.
10+
You may obtain a copy of the License at
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
<groupId>org.jboss.eap.galleon.s2i</groupId>
22+
<artifactId>eap-s2i-galleon-pack</artifactId>
23+
<version>3.0.0.Final</version>
24+
<packaging>pom</packaging>
25+
<name>EAP Galleon feature-pack for OpenShift</name>
26+
27+
<description>EAP Galleon feature-pack for OpenShift</description>
28+
29+
<licenses>
30+
<license>
31+
<name>Apache License, Version 2.0</name>
32+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
33+
<distribution>repo</distribution>
34+
</license>
35+
</licenses>
36+
37+
<properties>
38+
<version.org.wildfly>${env.WILDFLY_VERSION}</version.org.wildfly>
39+
<version.org.wildfly.galleon-plugins>${env.GALLEON_WILDFLY_VERSION}</version.org.wildfly.galleon-plugins>
40+
</properties>
41+
42+
<dependencies>
43+
<dependency>
44+
<groupId>org.jboss.eap</groupId>
45+
<artifactId>wildfly-galleon-pack</artifactId>
46+
<version>${version.org.wildfly}</version>
47+
<type>zip</type>
48+
</dependency>
49+
</dependencies>
50+
51+
<build>
52+
<plugins>
53+
<plugin>
54+
<groupId>org.wildfly.galleon-plugins</groupId>
55+
<artifactId>wildfly-galleon-maven-plugin</artifactId>
56+
<version>${version.org.wildfly.galleon-plugins}</version>
57+
<executions>
58+
<execution>
59+
<id>eap-openshift-feature-pack-build</id>
60+
<goals>
61+
<goal>build-user-feature-pack</goal>
62+
</goals>
63+
<phase>compile</phase>
64+
<configuration>
65+
</configuration>
66+
</execution>
67+
</executions>
68+
</plugin>
69+
</plugins>
70+
</build>
71+
</project>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" ?>
2+
3+
<config xmlns="urn:jboss:galleon:config:1.0" model="standalone">
4+
<props>
5+
<prop name="--server-config" value="standalone-openshift.xml"/>
6+
</props>
7+
<packages>
8+
<package name="eap.s2i.common"/>
9+
<package name="org.jboss.as.patching.cli"/>
10+
<!-- packages that append content to standalone.conf -->
11+
<package name="wildfly.s2i.jolokia"/>
12+
<package name="wildfly.s2i.java"/>
13+
<package name="eap.s2i.hawkular"/>
14+
<package name="eap.s2i.prometheus"/>
15+
<package name="wildfly.s2i.mvn"/>
16+
<package name="docs.licenses.merge"/>
17+
<!-- that is a workaround waiting for WF to upgrade to Galleon-plugins 4.2.5+ -->
18+
<package name="layers.conf" optional="true"/>
19+
<!-- Although we don't have ejb present in the default configuration, although we don't have a layer for ejb,
20+
we could end in a situation where a custom configuration bring ejb, so the statefulset.sh script that this package
21+
brings should be provisioned in all cases. In 7.3.x this script is only provisioned with the default config.-->
22+
<package name="wildfly.s2i.ejb.tx.recovery" optional="true"/>
23+
</packages>
24+
<layers>
25+
<!-- required by operator to be monitored -->
26+
<include name="operator-required"/>
27+
<!-- required for termination and script execution -->
28+
<include name="core-tools"/>
29+
</layers>
30+
</config>

‎jboss/container/eap/galleon/config/mp/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone-microprofile-ha.xml/config.xml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" ?>
2+
3+
<config xmlns="urn:jboss:galleon:config:1.0" name="standalone-microprofile-ha.xml" model="standalone">
4+
5+
<!-- sso packages -->
6+
<feature-group name="sso"/>
7+
8+
<exclude feature-id="core-service.management.security-realm.server-identity.ssl:security-realm=ApplicationRealm"/>
9+
10+
<exclude feature-id="subsystem.logging.pattern-formatter:pattern-formatter=PATTERN"/>
11+
<exclude feature-id="subsystem.logging.periodic-rotating-file-handler:periodic-rotating-file-handler=FILE"/>
12+
13+
14+
<exclude feature-id="subsystem.datasources.data-source:data-source=ExampleDS"/>
15+
<feature spec="subsystem.ee.service.default-bindings">
16+
<unset param="datasource"/>
17+
</feature>
18+
<exclude spec="subsystem.microprofile-opentracing-smallrye"/>
19+
20+
<!-- jgroups -->
21+
<exclude spec="subsystem.jgroups.channel"/>
22+
<feature spec="subsystem.jgroups.channel">
23+
<param name="channel" value="ee"/>
24+
<param name="stack" value="tcp"/>
25+
<unset param="cluster"/>
26+
</feature>
27+
<feature spec="subsystem.jgroups.stack.protocol.FD_SOCK">
28+
<param name="stack" value="udp"/>
29+
<unset param="socket-binding"/>
30+
</feature>
31+
<feature spec="subsystem.jgroups.stack.protocol.FD_SOCK">
32+
<param name="stack" value="tcp"/>
33+
<unset param="socket-binding"/>
34+
</feature>
35+
<exclude feature-id="subsystem.jgroups.stack.protocol:stack=udp,protocol=PING"/>
36+
<exclude feature-id="subsystem.jgroups.stack.protocol.MPING:stack=tcp"/>
37+
38+
<!-- we need to reconstruct to remove jgroups and ajp -->
39+
<exclude spec="socket-binding-group.socket-binding"/>
40+
<feature spec="socket-binding-group">
41+
<param name="socket-binding-group" value="standard-sockets" />
42+
<param name="port-offset" value="0"/>
43+
<param name="default-interface" value="public"/>
44+
<feature-group name="standalone-sockets">
45+
<exclude feature-id="socket-binding-group.socket-binding:name=standard-sockets,socket-binding=ajp"/>
46+
<!-- we don't want it in mp -->
47+
<exclude feature-id="socket-binding-group.remote-destination-outbound-socket-binding:name=standard-sockets,remote-destination-outbound-socket-binding=mail-smtp"/>
48+
</feature-group>
49+
<feature-group name="jgroups-sockets">
50+
<exclude feature-id="socket-binding-group.socket-binding:name=standard-sockets,socket-binding=jgroups-udp-fd"/>
51+
<exclude feature-id="socket-binding-group.socket-binding:name=standard-sockets,socket-binding=jgroups-tcp-fd"/>
52+
</feature-group>
53+
</feature>
54+
55+
<!-- inifinispan web hibernate cache-container changes -->
56+
<feature-group name="os-infinispan-web-repl-cache"/>
57+
<feature-group name="os-infinispan-hibernate"/>
58+
59+
60+
<exclude feature-id="subsystem.undertow.server.https-listener:server=default-server,https-listener=https"/>
61+
62+
</config>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
layers=openshift

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" ?>
2+
3+
<package-spec xmlns="urn:jboss:galleon:package:2.0" name="layers.conf">
4+
</package-spec>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" ?>
2+
3+
<tasks xmlns="urn:wildfly:wildfly-feature-pack-tasks:2.0">
4+
<!-- that is a workaround waiting for WF to upgrade to Galleon-plugins 4.2.5+ -->
5+
<mkdir name="modules/system/layers/openshift"/>
6+
</tasks>
7+

‎jboss/container/eap/galleon/config/mp/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/wildfly-user-feature-pack-build.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!--
2+
~ JBoss, Home of Professional Open Source.
3+
~ Copyright 2014, Red Hat, Inc., and individual contributors
4+
~ as indicated by the @author tags. See the copyright.txt file in the
5+
~ distribution for a full listing of individual contributors.
6+
~
7+
~ This is free software; you can redistribute it and/or modify it
8+
~ under the terms of the GNU Lesser General Public License as
9+
~ published by the Free Software Foundation; either version 2.1 of
10+
~ the License, or (at your option) any later version.
11+
~
12+
~ This software is distributed in the hope that it will be useful,
13+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
~ Lesser General Public License for more details.
16+
~
17+
~ You should have received a copy of the GNU Lesser General Public
18+
~ License along with this software; if not, write to the Free
19+
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
20+
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
21+
-->
22+
23+
<build xmlns="urn:wildfly:feature-pack-build:3.2" producer="org.jboss.eap.galleon.s2i:eap-s2i-galleon-pack">
24+
25+
<transitive>
26+
<dependency group-id="org.jboss.eap" artifact-id="wildfly-ee-galleon-pack">
27+
<name>org.wildfly:wildfly-ee-galleon-pack</name>
28+
</dependency>
29+
</transitive>
30+
<dependencies>
31+
<dependency group-id="org.jboss.eap" artifact-id="wildfly-galleon-pack">
32+
<name>org.wildfly:wildfly-galleon-pack</name>
33+
<packages inherit="true"/>
34+
<default-configs inherit="true"/>
35+
<!-- ##PATCHES## -->
36+
</dependency>
37+
</dependencies>
38+
</build>

‎jboss/container/eap/galleon/config/mp/configure.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
# Configure module
3+
set -e
4+
5+
SCRIPT_DIR=$(dirname $0)
6+
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
7+
8+
chown -R jboss:root $SCRIPT_DIR
9+
chmod -R ug+rwX $SCRIPT_DIR
10+
11+
pushd ${ARTIFACTS_DIR}
12+
cp -pr * /
13+
popd

‎jboss/container/eap/galleon/config/mp/module.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
schema_version: 1
2+
name: jboss.container.eap.galleon.config.mp
3+
version: '1.0'
4+
description: Install Galleon descriptions and EAP s2i feature-pack for mp config
5+
6+
execute:
7+
- script: configure.sh

‎jboss/container/eap/galleon/module.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Install Galleon descriptions and EAP s2i feature-pack. Configure ga
55

66
envs:
77
- name: S2I_FP_VERSION
8-
value: "21.0.0.Final"
8+
value: "3.0.0.Final"
99
- name: GALLEON_DEFINITIONS
1010
value: /opt/jboss/container/eap/galleon/definitions
1111
- name: GALLEON_MAVEN_REPO_HOOK_SCRIPT

0 commit comments

Comments
 (0)