Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CLOUD-3621 - Correct default bindings / jms-connection factory for usage with external broker #181

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CLOUD-3621 - Correct default bindings / jms-connection factory for usage with external broker #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions jboss/container/wildfly/launch/messaging/added/launch/messaging.sh
View file
Open in desktop
Expand Up @@ -946,7 +946,9 @@ EOF
sed -i "s|##DEFAULT_JMS##||" $CONFIG_FILE
fi
elif [ "${default_jms_config_mode}" = "cli" ]; then
if ([ "$REMOTE_AMQ_BROKER" = "true" ] || ([ -n "${MQ_QUEUES}" ] || [ -n "${HORNETQ_QUEUES}" ] || [ -n "${MQ_TOPICS}" ] || [ -n "${HORNETQ_TOPICS}" ] || [ "x${DISABLE_EMBEDDED_JMS_BROKER}" != "xtrue" ]) && [ "x${DISABLE_EMBEDDED_JMS_BROKER}" != "xalways" ]) && [ -n "${defaultJmsConnectionFactoryJndi}" ]; then
if [ "$REMOTE_AMQ_BROKER" = "true" ] && [ -n "${defaultJmsConnectionFactoryJndi}" ]; then
echo "/subsystem=ee/service=default-bindings:write-attribute(name=jms-connection-factory, value=\"${defaultJmsConnectionFactoryJndi}\")" >> "${CLI_SCRIPT_FILE}"
elif ([ -n "${MQ_QUEUES}" ] || [ -n "${HORNETQ_QUEUES}" ] || [ -n "${MQ_TOPICS}" ] || [ -n "${HORNETQ_TOPICS}" ] || [ "x${DISABLE_EMBEDDED_JMS_BROKER}" != "xtrue" ]) && [ "x${DISABLE_EMBEDDED_JMS_BROKER}" != "xalways" ] && [ -n "${defaultJmsConnectionFactoryJndi}" ]; then
echo "/subsystem=ee/service=default-bindings:write-attribute(name=jms-connection-factory, value=\"${defaultJmsConnectionFactoryJndi}\")" >> "${CLI_SCRIPT_FILE}"
else
echo "/subsystem=ee/service=default-bindings:undefine-attribute(name=jms-connection-factory)" >> "${CLI_SCRIPT_FILE}"
Expand Down Expand Up @@ -1088,7 +1090,7 @@ can_add_embedded(){
local has_remoting_subsystem
local xpath="\"//*[local-name()='subsystem' and starts-with(namespace-uri(), 'urn:jboss:domain:remoting:')]\""
testXpathExpression "${xpath}" "has_remoting_subsystem"


if [ "${has_remoting_subsystem}" -ne 0 ]; then
# Just ignore
return 1
Expand All @@ -1104,4 +1106,4 @@ can_add_embedded(){
fi

return 0
}
}