Skip to content

Commit f6dff0e

Browse files
jfdeniseluck3y
authored andcommitted
Remove sso
1 parent b685196 commit f6dff0e

File tree

14 files changed

+94
-3
lines changed

14 files changed

+94
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<include name="amq6-rar"/>
1010
</layers>
1111

12-
<!-- sso packages -->
13-
<feature-group name="sso"/>
12+
<!-- No sso packages for JDK17 techpreview -->
13+
<!-- <feature-group name="sso"/> -->
1414

1515
<!-- JDK 17 -->
1616
<exclude feature-id="core-service.management.security-realm:security-realm=ApplicationRealm"/>

jboss/container/eap/galleon/config/ee-elytron/configure.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ chmod -R ug+rwX $SCRIPT_DIR
1111
pushd ${ARTIFACTS_DIR}
1212
cp -pr * /
1313
popd
14+
15+
# Remove sso content for JDK17 tech preview image. To be removed when supported.
16+
rm "${GALLEON_FP_PATH}/src/main/resources/feature_groups/sso.xml"
17+
rm -r "${GALLEON_FP_PATH}/src/main/resources/layers/standalone/sso"

jboss/container/eap/launch/module.yaml renamed to jboss/container/eap/launch/common/module.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
schema_version: 1
2-
name: jboss.container.eap.launch
2+
name: jboss.container.eap.launch.common
33
version: '1.0'
44
description: Module that enables CLI configuration for standalone-openshift.xml file
55
execute:
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#!/bin/sh
2+
3+
# Centralised configuration file to set variables that affect the launch scripts in wildfly-cekit-modules.
4+
5+
# Scripts that modify the configuration. Either via xml marker replacement or via CLI commands.
6+
# wildfly-cekit-modules will look for each of the listed files and run them if they exist.
7+
CONFIG_SCRIPT_CANDIDATES=(
8+
$JBOSS_HOME/bin/launch/backward-compatibility.sh
9+
$JBOSS_HOME/bin/launch/configure_extensions.sh
10+
$JBOSS_HOME/bin/launch/passwd.sh
11+
$JBOSS_HOME/bin/launch/messaging.sh
12+
$JBOSS_HOME/bin/launch/datasource.sh
13+
$JBOSS_HOME/bin/launch/resource-adapter.sh
14+
$JBOSS_HOME/bin/launch/admin.sh
15+
# Keep this order, jgroups.sh before ha.sh. jgroups.sh is the script which initializes the protocol list store
16+
# used to share changes in the protocol list when a protocol is added either by ha.sh or by jgroups.sh.
17+
# This protocol store is just a set of files under temporal directory. We need them to be able to share changes
18+
# done by the ha.sh and jgroups.sh routines which are executed in subshells
19+
$JBOSS_HOME/bin/launch/jgroups.sh
20+
$JBOSS_HOME/bin/launch/ha.sh
21+
$JBOSS_HOME/bin/launch/https.sh
22+
$JBOSS_HOME/bin/launch/elytron.sh
23+
$JBOSS_HOME/bin/launch/json_logging.sh
24+
$JBOSS_HOME/bin/launch/configure_logger_category.sh
25+
$JBOSS_HOME/bin/launch/security-domains.sh
26+
$JBOSS_HOME/bin/launch/jboss_modules_system_pkgs.sh
27+
$JBOSS_HOME/bin/launch/deploymentScanner.sh
28+
$JBOSS_HOME/bin/launch/ports.sh
29+
$JBOSS_HOME/bin/launch/access_log_valve.sh
30+
$JBOSS_HOME/bin/launch/filters.sh
31+
$JBOSS_HOME/bin/launch/statefulset.sh
32+
/opt/run-java/proxy-options
33+
)
34+
# The server configuration file to use. If not set, wildfly-cekit-modules defaults to standalone.xml.
35+
# For EAP we want standalone-openshift.xml
36+
WILDFLY_SERVER_CONFIGURATION=standalone-openshift.xml
37+
# The configuration adjustment mode. For EAP we want both xml marker replacement and CLI commands.
38+
# Notice that the value of this variable must be aligned with the value configured in assemble
39+
export CONFIG_ADJUSTMENT_MODE="xml_cli"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
set -e
3+
4+
SCRIPT_DIR=$(dirname $0)
5+
ADDED_DIR=${SCRIPT_DIR}/added
6+
7+
mkdir -p ${JBOSS_HOME}/bin/launch
8+
#Overwrite openshift-launch.sh
9+
10+
cp -p ${ADDED_DIR}/launch/* ${JBOSS_HOME}/bin/launch
11+
12+
#Ensure permissions
13+
chmod -R g+rwX ${JBOSS_HOME}/bin/launch/

0 commit comments

Comments
 (0)