Merge branch 'jira-wdt-972-server-start' into 'main'

Add option to disable merging of server and system component start arguments

See merge request weblogic-cloud/weblogic-deploy-tooling!1854

Author: robertpatrick

core/src/main/python/wlsdeploy/tool/util/attribute_setter.py

@@ -83,6 +83,7 @@
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.util.wlst_helper import WlstHelper
+from wlsdeploy.util import model_config
 from wlsdeploy.util import model_helper
 from wlsdeploy.util import path_helper
 import wlsdeploy.util.unicode_helper as str_helper
@@ -662,15 +663,22 @@ def set_plugin_deployment_mbean(self, location, key, value, wlst_value):
 
     def set_jvm_args(self, location, key, value, wlst_value):
         """
-        Set the server start args string. The new arguments are merged and re-sorted with existing arguments.
+        Set the server start args string. The new arguments are merged and re-sorted with existing arguments,
+        unless merge is turned off in tool.properties or using command-line -D.
         :param location: the location
         :param key: the attribute name
         :param value: the string value
         :param wlst_value: the existing value of the attribute from WLST
         :raises BundleAwareException of the specified type: if an error occurs
         """
+        merge = model_config.get_model_config().get_merge_server_start_arguments()
+
         if value is None or len(value) == 0:
             result = value
+        elif not merge:
+            result = value
+            if isinstance(value, list):
+                result = ' '.join(value)
         elif wlst_value is None or len(wlst_value) == 0:
             new_args = JVMArguments(self.__logger, value)
             result = new_args.get_arguments_string()

core/src/main/python/wlsdeploy/util/model_config.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 
@@ -36,6 +36,8 @@
 DISCOVER_RCU_DS_GENERATE_RCUDB_INFO_DEFAULT='true'
 ENABLE_CREATE_DOMAIN_PASSWORD_VALIDATION_PROP = 'enable.create.domain.password.validation'
 ENABLE_CREATE_DOMAIN_PASSWORD_VALIDATION_DEFAULT = 'true'
+MERGE_SERVER_START_ARGUMENTS = 'merge.server.start.arguments'
+MERGE_SERVER_START_ARGUMENTS_DEFAULT = 'true'
 REDEPLOY_TIMEOUT_PROP = 'redeploy.timeout'
 REDEPLOY_TIMEOUT_DEFAULT = '180000'
 SET_SERVER_GRPS_TIMEOUT_PROP = 'set.server.groups.timeout'
@@ -213,6 +215,13 @@ def get_discover_rcu_ds_generate_rcudb_info(self):
         """
         return self._get_from_dict(DISCOVER_RCU_DS_GENERATE_RCUDB_INFO_PROP, DISCOVER_RCU_DS_GENERATE_RCUDB_INFO_DEFAULT)
 
+    def get_merge_server_start_arguments(self):
+        """
+        Return whether to merge server start arguments.
+        :return: whether to merge server start arguments
+        """
+        return self._get_from_dict_as_boolean(MERGE_SERVER_START_ARGUMENTS, MERGE_SERVER_START_ARGUMENTS_DEFAULT)
+
     def use_ssh_compression(self):
         """
         Return whether to use SSH compression.

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SystemComponent.json

@@ -12,7 +12,7 @@
             "default_name_value": "${NO_NAME_0:%SYSTEMCOMPONENT%}",
             "folders": {},
             "attributes": {
-                "Arguments":     [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "Arguments",     "wlst_path": "WP001", "default_value": null,    "wlst_type": "string", "set_method": "MBEAN.set_jvm_args" } ],
+                "Arguments":     [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "Arguments",     "wlst_path": "WP001", "default_value": null,    "wlst_type": "delimited_string[space]", "set_method": "MBEAN.set_jvm_args" } ],
                 "BeaHome":       [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "BeaHome",       "wlst_path": "WP001", "default_value": null,    "wlst_type": "string", "uses_path_tokens": "true" } ],
                 "ClassPath":     [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "ClassPath",     "wlst_path": "WP001", "default_value": null,    "wlst_type": "delimited_string[path_separator]", "preferred_model_type": "delimited_string", "uses_path_tokens": "true" } ],
                 "JavaHome":      [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "JavaHome",      "wlst_path": "WP001", "default_value": null,    "wlst_type": "string", "uses_path_tokens": "true" } ],

installer/src/main/lib/tool.properties

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 connect.timeout=120000
@@ -78,6 +78,12 @@ store.discovered.passwords.in.clear.text=false
 # ones passed on the command-line.
 #
 store.discover.admin_credentials=true
+#
+# When deploying JVM arguments for server start or system component start,
+# should the arguments be merged with existing arguments,
+# or used without merging.
+#
+merge.server.start.arguments=true
 
 #
 # the property model.encryption.secret specifies the name of