diff --git a/core/src/main/python/discover.py b/core/src/main/python/discover.py index 718a808c7..26c24f19a 100644 --- a/core/src/main/python/discover.py +++ b/core/src/main/python/discover.py @@ -236,6 +236,8 @@ def __discover(model_context, aliases, credential_injector, helper, extra_tokens __connect_to_domain(model_context, helper) try: _add_domain_name(base_location, aliases, helper) + _establish_production_mode(aliases, helper) + DomainInfoDiscoverer(model_context, model.get_model_domain_info(), base_location, wlst_mode=__wlst_mode, aliases=aliases, credential_injector=credential_injector).discover() TopologyDiscoverer(model_context, model.get_model_topology(), base_location, wlst_mode=__wlst_mode, @@ -277,6 +279,24 @@ def _add_domain_name(location, aliases, helper): raise de +def _establish_production_mode(aliases, helper): + """ + Determine if production mode is enabled for the domain, and set it in the aliases. + :param aliases: aliases instance for discover + :param helper: wlst_helper instance + :raises DiscoverException: if an error occurs during discovery + """ + _method_name = '_establish_production_mode' + try: + helper.cd('/') + production_mode_enabled = helper.get(model_constants.PRODUCTION_MODE_ENABLED) + aliases.set_production_mode(production_mode_enabled) + except PyWLSTException, pe: + de = exception_helper.create_discover_exception('WLSDPLY-06036', pe.getLocalizedMessage()) + __logger.throwing(class_name=_class_name, method_name=_method_name, error=de) + raise de + + def __discover_multi_tenant(model, model_context, base_location, aliases, injector): """ Discover the multi-tenant-related parts of the domain, if they exist. diff --git a/core/src/main/python/wlsdeploy/aliases/alias_constants.py b/core/src/main/python/wlsdeploy/aliases/alias_constants.py index 9a2425c5d..b6c75bdea 100644 --- a/core/src/main/python/wlsdeploy/aliases/alias_constants.py +++ b/core/src/main/python/wlsdeploy/aliases/alias_constants.py @@ -26,6 +26,7 @@ PASSWORD_TOKEN = "--FIX ME--" PATH_TOKEN = 'path_token' PREFERRED_MODEL_TYPE = 'preferred_model_type' +PRODUCTION_DEFAULT = 'production_default' RESTART_REQUIRED = 'restart_required' SET_MBEAN_TYPE = 'set_mbean_type' SET_METHOD = 'set_method' @@ -73,6 +74,10 @@ # used when DEFAULT_VALUE has curly-brace value that resolves to null NULL_VALUE_KEY = '__NULL__' +NULL_VALUE_KEY_FIELDS = [ + DEFAULT_VALUE, + PRODUCTION_DEFAULT +] # attribute wlst_type values BOOLEAN = 'boolean' diff --git a/core/src/main/python/wlsdeploy/aliases/alias_entries.py b/core/src/main/python/wlsdeploy/aliases/alias_entries.py index af5c84800..90acb2978 100644 --- a/core/src/main/python/wlsdeploy/aliases/alias_entries.py +++ b/core/src/main/python/wlsdeploy/aliases/alias_entries.py @@ -28,6 +28,7 @@ from wlsdeploy.aliases.alias_constants import NAME_VALUE from wlsdeploy.aliases.alias_constants import NONE_CHILD_FOLDERS_TYPE from wlsdeploy.aliases.alias_constants import NULL_VALUE_KEY +from wlsdeploy.aliases.alias_constants import NULL_VALUE_KEY_FIELDS from wlsdeploy.aliases.alias_constants import ONLINE_BEAN from wlsdeploy.aliases.alias_constants import PATH_TOKEN from wlsdeploy.aliases.alias_constants import SET_MBEAN_TYPE @@ -1494,7 +1495,7 @@ def __resolve_attribute(self, attr_dict): else: result[key] = self._resolve_curly_braces(attr) # resolve null key in curly brace values, such as "${__NULL__,Online}" - if key == DEFAULT_VALUE and result[key] == NULL_VALUE_KEY: + if key in NULL_VALUE_KEY_FIELDS and result[key] == NULL_VALUE_KEY: result[key] = None for key in [GET_METHOD, SET_METHOD, GET_MBEAN_TYPE, SET_MBEAN_TYPE]: diff --git a/core/src/main/python/wlsdeploy/aliases/aliases.py b/core/src/main/python/wlsdeploy/aliases/aliases.py index a7c9148cf..a2eecea35 100644 --- a/core/src/main/python/wlsdeploy/aliases/aliases.py +++ b/core/src/main/python/wlsdeploy/aliases/aliases.py @@ -31,6 +31,7 @@ from wlsdeploy.aliases.alias_constants import PASSWORD from wlsdeploy.aliases.alias_constants import PASSWORD_TOKEN from wlsdeploy.aliases.alias_constants import PREFERRED_MODEL_TYPE +from wlsdeploy.aliases.alias_constants import PRODUCTION_DEFAULT from wlsdeploy.aliases.alias_constants import PROPERTIES from wlsdeploy.aliases.alias_constants import RESTART_REQUIRED from wlsdeploy.aliases.alias_constants import RO @@ -49,6 +50,7 @@ from wlsdeploy.exception import exception_helper from wlsdeploy.exception.expection_types import ExceptionType from wlsdeploy.logging.platform_logger import PlatformLogger +from wlsdeploy.util import dictionary_utils from wlsdeploy.util import string_utils from wlsdeploy.util import unicode_helper as str_helper @@ -80,6 +82,13 @@ def __init__(self, model_context, wlst_mode=WlstModes.OFFLINE, wls_version=None, self._wls_version = wls_version self._alias_entries = AliasEntries(wlst_mode, self._wls_version) + self._production_mode_enabled = False + + def set_production_mode(self, production_mode_enabled): + _method_name = 'set_production_mode' + if production_mode_enabled: + self._logger.info('WLSDPLY-19047', class_name=self._class_name, method_name=_method_name) + self._production_mode_enabled = production_mode_enabled ########################################################################### # Model folder navigation-related methods # @@ -674,7 +683,7 @@ def get_wlst_access_rod_attribute_names(self, location): except AliasException, ae: self._raise_exception(ae, _method_name, 'WLSDPLY-19046', location.get_current_model_folder(), location.get_folder_path(), ae.getLocalizedMessage()) - + ########################################################################### # Model folder-related methods # ########################################################################### @@ -1044,7 +1053,7 @@ def get_model_attribute_name_and_value(self, location, wlst_attribute_name, wlst delimiter=delimiter) model_attribute_name = attribute_info[MODEL_NAME] - default_value = attribute_info[DEFAULT_VALUE] + default_value = self._get_default_value_for_execution_mode(attribute_info) # # The logic below to compare the str() representation of the converted value and the default value @@ -1259,7 +1268,7 @@ def get_model_attribute_default_value(self, location, model_attribute_name): default_value = None attribute_info = self._alias_entries.get_alias_attribute_entry_by_model_name(location, model_attribute_name) if attribute_info is not None: - default_value = attribute_info[DEFAULT_VALUE] + default_value = self._get_default_value_for_execution_mode(attribute_info) data_type, delimiter = \ alias_utils.compute_read_data_type_and_delimiter_from_attribute_info( attribute_info, default_value) @@ -1271,6 +1280,19 @@ def get_model_attribute_default_value(self, location, model_attribute_name): self._raise_exception(ae, _method_name, 'WLSDPLY-19032', model_attribute_name, location.get_folder_path(), ae.getLocalizedMessage()) + def _get_default_value_for_execution_mode(self, attribute_info): + """ + Get the default value corresponding to the domain execution mode. + For example, return production mode default if domain is in production mode. + :param attribute_info: alias information for an attribute + :return: the correct default value for the execution mode + """ + if self._production_mode_enabled: + default_value = dictionary_utils.get_element(attribute_info, PRODUCTION_DEFAULT) + if default_value is not None: + return default_value + return dictionary_utils.get_element(attribute_info, DEFAULT_VALUE) + def get_ignore_attribute_names(self): """ Return the list of attribute names that are ignored by the aliases and not defined in the alias category diff --git a/core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py index e38fd3b41..0dc2e0138 100644 --- a/core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py +++ b/core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py @@ -517,6 +517,7 @@ def _get_virtual_hosts(self): location.add_name_token(name_token, vhost) result[vhost] = OrderedDict() self._populate_model_parameters(result[vhost], location) + self._discover_subfolders(result[vhost], location) location.remove_name_token(name_token) _logger.exiting(class_name=_class_name, method_name=_method_name, result=model_top_folder_name) @@ -646,7 +647,7 @@ def get_managed_thread_factory_template(self): _logger.exiting(class_name=_class_name, method_name=_method_name, result=model_top_folder_name) return model_top_folder_name, result - + def _get_ws_securities(self): """ Discover the Webservice Security configuration for the domain diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSServer.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSServer.json index 5c8b86bc7..1ca3bc13b 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSServer.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSServer.json @@ -49,15 +49,15 @@ "BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSize${Kb:KB}", "wlst_path": "WP001", "default_value": 8, "wlst_type": "integer", "get_method": "LSA"} ], "DateFormatPattern": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } , {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:SSS a z}", "derived_default": "${:true}" ,"wlst_type": "string", "get_method": "${LSA:GET}" } ], - "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer" } ], - "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ], + "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ], + "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ], "FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/jmsServers/%JMSSERVER%/jms.messages.log}", "derived_default": "${:true}", "wlst_type": "string", "restart_required": "true", "uses_path_tokens": "true" } ], "FileTimeSpan": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer" } ], "FileTimeSpanFactor": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long" } ], "LogFileRotationDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LogFileRotationDir", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true", "get_method": "${LSA:GET}" } ], "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "NumberOfFilesLimited": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], - "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], + "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "production_default": "${__NULL__:false}", "wlst_type": "boolean" } ], "RotationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ] }, diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json index 2c7338c4a..b150bbcff 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json @@ -11,9 +11,9 @@ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ], "DomainLogBroadcastFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcastFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], "DomainLogBroadcastSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcastSeverity", "wlst_path": "WP001", "default_value": "${__NULL__:Notice}", "wlst_type": "string" } ], - "DomainLogBroadcasterBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcasterBufferSize", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer"} ], - "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer"} ], - "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer"} ], + "DomainLogBroadcasterBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcasterBufferSize", "wlst_path": "WP001", "default_value": 1, "production_default": "${__NULL__:10}", "wlst_type": "integer"} ], + "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer"} ], + "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer"} ], "FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/%DOMAIN%.log}", "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" } ], "FileTimeSpan": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer"} ], "FileTimeSpanFactor": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long" } ], @@ -31,13 +31,13 @@ "LoggerSeverityProperties": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverityProperties", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ], "MemoryBufferFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean"} ], "MemoryBufferSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSeverity", "wlst_path": "WP001", "default_value": "${__NULL__:Trace}", "wlst_type": "string" } ], - "MemoryBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "default_value": 10, "wlst_type": "integer"} ], + "MemoryBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "default_value": 10, "production_default": "${__NULL__:500}", "wlst_type": "integer"} ], "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "NumberOfFilesLimited": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean"} ], "PlatformLoggerLevels": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "PlatformLoggerLevels", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ], "RedirectStderrToServerLogEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RedirectStderrToServerLogEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true"} ], "RedirectStdoutToServerLogEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RedirectStdoutToServerLogEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true"} ], - "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean"} ], + "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "production_default": "${__NULL__:false}", "wlst_type": "boolean"} ], "RotationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ], "ServerLoggingBridgeAtRootLoggerEnabled": [ {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "ServerLoggingBridgeAtRootLoggerEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean"} ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Partition.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Partition.json index d4c54086b..5a965a9c0 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Partition.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Partition.json @@ -598,7 +598,7 @@ "ParallelDeployApplicationModules": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ParallelDeployApplicationModules", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ], "ParallelDeployApplications": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ParallelDeployApplications", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], "PartitionId": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Partition${Id:ID}", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "${:RO}"} ], - "PartitionLifeCycleTimeoutVal": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PartitionLifeCycleTimeoutVal", "wlst_path": "WP001", "default_value": 30, "wlst_type": "integer" } ], + "PartitionLifeCycleTimeoutVal": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PartitionLifeCycleTimeoutVal", "wlst_path": "WP001", "default_value": 30, "production_default": "${__NULL__:120}", "wlst_type": "integer" } ], "PartitionWorkManagerRef": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PartitionWorkManagerRef", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "LSA", "set_method": "MBEAN.set_partition_work_manager_mbean", "set_mbean_type": "weblogic.management.configuration.PartitionWorkManagerMBean" } ], "PrimaryIdentityDomain": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PrimaryIdentityDomain", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string" } ], "RCMHistoricalDataBufferLimit": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "RCMHistoricalDataBufferLimit", "wlst_path": "WP001", "default_value": 250, "wlst_type": "integer" } ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SAFAgent.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SAFAgent.json index 8d29856b5..06fc7f382 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SAFAgent.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SAFAgent.json @@ -18,15 +18,15 @@ "BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSize${Kb:KB}", "wlst_path": "WP001", "default_value": 8, "wlst_type": "integer" } ], "DateFormatPattern": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } , {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ], - "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer" } ], - "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ], + "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ], + "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ], "FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/safagents/%SAFAGENT%/jms/jms.messages.log}", "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true", "restart_required": "true" } ], "FileTimeSpan": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer" } ], "FileTimeSpanFactor": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long" } ], "LogFileRotationDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LogFileRotationDir", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ], "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "NumberOfFilesLimited": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], - "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], + "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "production_default": "${__NULL__:false}", "wlst_type": "boolean" } ], "RotationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[10,12.2.1.1)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "bySize", "wlst_type": "string" } , {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ] diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json index 0b09bb12c..3612a19a2 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json @@ -82,15 +82,15 @@ "attributes": { "BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSizeK${b:B}", "wlst_path": "WP001", "default_value": 8, "wlst_type": "integer" } ], "DateFormatPattern": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "GET" } ], - "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer" } ], - "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ], + "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ], + "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ], "FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/datasource.log}", "derived_default": "${:true}", "wlst_type": "string" } ], "FileTimeSpan": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer" } ], "FileTimeSpanFactor": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long" } ], "LogFileRotationDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LogFileRotationDir", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ], "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "NumberOfFilesLimited":[ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ], - "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ], + "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": true, "production_default": "${__NULL__:false}", "wlst_type": "boolean" } ], "RotationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ] }, @@ -148,7 +148,7 @@ "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "QueueLength": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "QueueLength", "wlst_path": "WP001", "default_value": 65536, "wlst_type": "integer" } ], "QueueLengthThresholdPercent": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "QueueLengthThresholdPercent", "wlst_path": "WP001", "default_value": 90, "wlst_type": "integer" } ], - "ThreadCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ThreadCount", "wlst_path": "WP001", "default_value": 15, "wlst_type": "integer" } ], + "ThreadCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ThreadCount", "wlst_path": "WP001", "default_value": 15, "production_default": "${__NULL__:25}", "wlst_type": "integer" } ], "ThreadsIncrease": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ThreadsIncrease", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ], "ThreadsMaximum": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ThreadsMaximum", "wlst_path": "WP001", "default_value": 400, "wlst_type": "integer" } ], "ThreadsMinimum": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ThreadsMinimum", "wlst_path": "WP001", "default_value": 5, "wlst_type": "integer" } ], @@ -273,9 +273,9 @@ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ], "DomainLogBroadcastFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcastFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], "DomainLogBroadcastSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcastSeverity", "wlst_path": "WP001", "default_value": "${__NULL__:Notice}", "wlst_type": "string" } ], - "DomainLogBroadcasterBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcasterBufferSize", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer"} ], - "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer"} ], - "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer"} ], + "DomainLogBroadcasterBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcasterBufferSize", "wlst_path": "WP001", "default_value": 1, "production_default": "${__NULL__:10}", "wlst_type": "integer"} ], + "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer"} ], + "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer"} ], "FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/%SERVER%.log}", "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" } ], "FileTimeSpan": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer"} ], "FileTimeSpanFactor": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long" } ], @@ -293,13 +293,13 @@ "LoggerSeverityProperties": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverityProperties", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ], "MemoryBufferFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], "MemoryBufferSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSeverity", "wlst_path": "WP001", "default_value": "${__NULL__:Trace}", "wlst_type": "string" } ], - "MemoryBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "default_value": 10, "wlst_type": "integer"} ], + "MemoryBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "default_value": 10, "production_default": "${__NULL__:500}", "wlst_type": "integer"} ], "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "NumberOfFilesLimited": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean"} ], "PlatformLoggerLevels": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "PlatformLoggerLevels", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ], "RedirectStderrToServerLogEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RedirectStderrToServerLogEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true"} ], "RedirectStdoutToServerLogEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RedirectStdoutToServerLogEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true"} ], - "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean"} ], + "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "production_default": "${__NULL__:false}", "wlst_type": "boolean"} ], "RotationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ], "ServerLoggingBridgeAtRootLoggerEnabled": [ {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "ServerLoggingBridgeAtRootLoggerEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean"} ], @@ -998,7 +998,7 @@ "PreferredStoreSizeLimit": [ {"version": "[10,)" , "wlst_mode": "both", "wlst_name": "PreferredStoreSizeLimit", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer"} ], "StoreSizeCheckPeriod": [ {"version": "[10,)" , "wlst_mode": "both", "wlst_name": "StoreSizeCheckPeriod", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer"} ], "SynchronousEventPersistenceEnabled": [ {"version": "[10,)" , "wlst_mode": "both", "wlst_name": "SynchronousEventPersistenceEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ], - "WldfBuiltinSystemResourceType": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "W${ldf:LDF}BuiltinSystemResourceType", "wlst_path": "WP001", "default_value": "${__NULL__:None}", "wlst_type": "string" } ], + "WldfBuiltinSystemResourceType": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "W${ldf:LDF}BuiltinSystemResourceType", "wlst_path": "WP001", "default_value": "${__NULL__:None}", "production_default": "${__NULL__:Low}", "wlst_type": "string" } ], "WldfDiagnosticVolume": [ {"version": "[10,)" , "wlst_mode": "both", "wlst_name": "${Wldf:WLDF}DiagnosticVolume", "wlst_path": "WP001", "default_value": "${__NULL__:Low}", "wlst_type": "string" } ] }, "wlst_attributes_path": "WP001", @@ -1245,8 +1245,8 @@ "DateFormatPattern": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } , {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ], "ELFFields": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ELFFields", "wlst_path": "WP001", "default_value": "date time cs-method cs-uri sc-status", "wlst_type": "string", "get_method": "${LSA:GET}" } ], - "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer" } ], - "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ], + "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ], + "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ], "FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/access.log}", "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" } ], "FileTimeSpan": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer" } ], "FileTimeSpanFactor": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long" } ], @@ -1260,7 +1260,7 @@ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" }, {"version": "[10,)", "wlst_mode": "online", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], - "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], + "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "production_default": "${__NULL__:false}", "wlst_type": "boolean" } ], "RotationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ] }, @@ -1649,7 +1649,7 @@ "ScatteredReadsEnabled": [ {"version": "[10.3.4,)", "wlst_mode": "both", "wlst_name": "ScatteredReadsEnabled", "wlst_path": "WP001", "default_value": "false", "derived_default": "${:true}", "wlst_type": "boolean", "restart_required": "true" } ], "SelfTuningThreadPoolSizeMax": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SelfTuningThreadPoolSizeMax", "wlst_path": "WP001", "default_value": 400, "wlst_type": "integer", "get_method": "${LSA:GET}" } ], "SelfTuningThreadPoolSizeMin": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SelfTuningThreadPoolSizeMin", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer", "get_method": "${LSA:GET}" } ], - "ServerLifeCycleTimeoutVal": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerLifeCycleTimeoutVal", "wlst_path": "WP001", "default_value": 30, "wlst_type": "integer" } ], + "ServerLifeCycleTimeoutVal": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerLifeCycleTimeoutVal", "wlst_path": "WP001", "default_value": 30, "production_default": "${__NULL__:120}", "wlst_type": "integer" } ], "ServerTemplate": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerTemplate", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "${:MBEAN.set_server_template_mbean}", "set_mbean_type": "${:weblogic.management.configuration.ServerTemplateMBean}" } ], "ServerVersion": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerVersion", "wlst_path": "WP001", "default_value": "unknown", "wlst_type": "string" } ], "SessionReplicationOnShutdownEnabled": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "SessionReplicationOnShutdownEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json index bcdd033a8..9cc36b662 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json @@ -85,15 +85,15 @@ "attributes": { "BufferSizeKb": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "BufferSizeK${b:B}", "wlst_path": "WP001", "default_value": 8, "wlst_type": "integer" } ], "DateFormatPattern": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ], - "FileCount": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer" } ], - "FileMinSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ], + "FileCount": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ], + "FileMinSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ], "FileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/datasource.log}", "derived_default": "${:true}", "wlst_type": "string" } ], "FileTimeSpan": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer" } ], "FileTimeSpanFactor": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long" } ], "LogFileRotationDir": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LogFileRotationDir", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ], "Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "NumberOfFilesLimited":[ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ], - "RotateLogOnStartup": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ], + "RotateLogOnStartup": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": true, "production_default": "${__NULL__:false}", "wlst_type": "boolean" } ], "RotationTime": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ] }, @@ -151,7 +151,7 @@ "Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "QueueLength": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "QueueLength", "wlst_path": "WP001", "default_value": 65536, "wlst_type": "integer" } ], "QueueLengthThresholdPercent": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "QueueLengthThresholdPercent", "wlst_path": "WP001", "default_value": 90, "wlst_type": "integer" } ], - "ThreadCount": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ThreadCount", "wlst_path": "WP001", "default_value": 15, "wlst_type": "integer" } ], + "ThreadCount": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ThreadCount", "wlst_path": "WP001", "default_value": 15, "production_default": "${__NULL__:25}", "wlst_type": "integer" } ], "ThreadsIncrease": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ThreadsIncrease", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ], "ThreadsMaximum": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ThreadsMaximum", "wlst_path": "WP001", "default_value": 400, "wlst_type": "integer" } ], "ThreadsMinimum": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ThreadsMinimum", "wlst_path": "WP001", "default_value": 5, "wlst_type": "integer" } ], @@ -280,9 +280,9 @@ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ], "DomainLogBroadcastFilter": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcastFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], "DomainLogBroadcastSeverity": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcastSeverity", "wlst_path": "WP001", "default_value": "${__NULL__:Notice}", "wlst_type": "string" } ], - "DomainLogBroadcasterBufferSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcasterBufferSize", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer"} ], - "FileCount": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer"} ], - "FileMinSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": "500", "wlst_type": "integer"} ], + "DomainLogBroadcasterBufferSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcasterBufferSize", "wlst_path": "WP001", "default_value": 1, "production_default": "${__NULL__:10}", "wlst_type": "integer"} ], + "FileCount": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer"} ], + "FileMinSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": "500", "production_default": "${__NULL__:5000}", "wlst_type": "integer"} ], "FileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/%SERVERTEMPLATE%.log}", "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" } ], "FileTimeSpan": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer"} ], "FileTimeSpanFactor": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long" } ], @@ -303,13 +303,13 @@ "MemoryBufferFilter": [ {"version": "[12.1.2,12.1.3)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } , {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], "MemoryBufferSeverity": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSeverity", "wlst_path": "WP001", "default_value": "${__NULL__:Trace}", "wlst_type": "string" } ], - "MemoryBufferSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "default_value": 10, "wlst_type": "integer"} ], + "MemoryBufferSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "default_value": 10, "production_default": "${__NULL__:500}", "wlst_type": "integer"} ], "Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "NumberOfFilesLimited": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean"} ], "PlatformLoggerLevels": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "PlatformLoggerLevels", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ], "RedirectStderrToServerLogEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RedirectStderrToServerLogEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ], "RedirectStdoutToServerLogEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RedirectStdoutToServerLogEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ], - "RotateLogOnStartup": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean"} ], + "RotateLogOnStartup": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "production_default": "${__NULL__:false}", "wlst_type": "boolean"} ], "RotationTime": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ], "ServerLoggingBridgeAtRootLoggerEnabled": [ {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "ServerLoggingBridgeAtRootLoggerEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean"} ], @@ -1008,7 +1008,7 @@ "PreferredStoreSizeLimit": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "PreferredStoreSizeLimit", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ], "StoreSizeCheckPeriod": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "StoreSizeCheckPeriod", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer" } ], "SynchronousEventPersistenceEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SynchronousEventPersistenceEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ], - "WldfBuiltinSystemResourceType": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "W${ldf:LDF}BuiltinSystemResourceType", "wlst_path": "WP001", "default_value": "${__NULL__:None}", "wlst_type": "string" } ], + "WldfBuiltinSystemResourceType": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "W${ldf:LDF}BuiltinSystemResourceType", "wlst_path": "WP001", "default_value": "${__NULL__:None}", "production_default": "${__NULL__:Low}", "wlst_type": "string" } ], "WldfDiagnosticVolume": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "W${ldf:LDF}DiagnosticVolume", "wlst_path": "WP001", "default_value": "${__NULL__:Low}", "wlst_type": "string" } ] }, "wlst_attributes_path": "WP001", @@ -1256,8 +1256,8 @@ "DateFormatPattern": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } , {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ], "ELFFields": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ELFFields", "wlst_path": "WP001", "default_value": "date time cs-method cs-uri sc-status", "wlst_type": "string", "get_method": "${LSA:GET}" } ], - "FileCount": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer" } ], - "FileMinSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ], + "FileCount": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ], + "FileMinSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ], "FileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/access.log}", "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" } ], "FileTimeSpan": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer" } ], "FileTimeSpanFactor": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long", "get_method": "LSA"} ], @@ -1269,12 +1269,12 @@ "Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "NumberOfFilesLimited": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" }, - {"version": "[12.1.2,12.2.1.4.0.210629)", "wlst_mode": "online", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" }, + {"version": "[12.1.2,12.2.1.4.0.210629)", "wlst_mode": "online", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "false", "production_default": "${__NULL__:true}", "wlst_type": "boolean" }, {"version": "[12.2.1.4.0.210629,14)", "wlst_mode": "online", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" }, - {"version": "[14,14.1.1.0.0.210701)", "wlst_mode": "online", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" }, + {"version": "[14,14.1.1.0.0.210701)", "wlst_mode": "online", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "false", "production_default": "${__NULL__:true}", "wlst_type": "boolean" }, {"version": "[14.1.1.0.0.210701,)", "wlst_mode": "online", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], - "RotateLogOnStartup": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], + "RotateLogOnStartup": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "production_default": "${__NULL__:false}", "wlst_type": "boolean" } ], "RotationTime": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ] }, @@ -1673,7 +1673,7 @@ "ScatteredReadsEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ScatteredReadsEnabled", "wlst_path": "WP001", "default_value": "false", "derived_default": "${:true}", "wlst_type": "boolean", "restart_required": "true" } ], "SelfTuningThreadPoolSizeMax": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SelfTuningThreadPoolSizeMax", "wlst_path": "WP001", "default_value": 400, "wlst_type": "integer", "get_method": "${LSA:GET}" } ], "SelfTuningThreadPoolSizeMin": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SelfTuningThreadPoolSizeMin", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer", "get_method": "${LSA:GET}" } ], - "ServerLifeCycleTimeoutVal": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerLifeCycleTimeoutVal", "wlst_path": "WP001", "default_value": 30, "wlst_type": "integer" } ], + "ServerLifeCycleTimeoutVal": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerLifeCycleTimeoutVal", "wlst_path": "WP001", "default_value": 30, "production_default": "${__NULL__:120}", "wlst_type": "integer" } ], "ServerVersion": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerVersion", "wlst_path": "WP001", "default_value": "unknown", "wlst_type": "string" } ], "SessionReplicationOnShutdownEnabled": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "SessionReplicationOnShutdownEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ], "SitConfigPollingInterval": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "SitConfigPollingInterval", "wlst_path": "WP001", "default_value": 5, "wlst_type": "integer" } ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualHost.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualHost.json index c56c8a364..9d089db0c 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualHost.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualHost.json @@ -16,8 +16,8 @@ "DateFormatPattern": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } , {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ], "ELFFields": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ELFFields", "wlst_path": "WP001", "default_value": "date time cs-method cs-uri sc-status", "wlst_type": "string", "get_method": "${LSA:GET}" } ], - "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer" } ], - "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ], + "FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ], + "FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ], "FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/virtualHosts/%VIRTUALHOST%/access.log}", "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" } ], "FileTimeSpan": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer" } ], "FileTimeSpanFactor": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long", "restart_required": "true" } ], @@ -28,12 +28,12 @@ "LoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggingEnabled", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ], "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "NumberOfFilesLimited": [ - {"version": "[10,12.2.1.4.0.210629)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "${true:false}", "wlst_type": "boolean" }, + {"version": "[10,12.2.1.4.0.210629)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "${true:false}", "production_default": "${__NULL__:true}", "wlst_type": "boolean" }, {"version": "[12.2.1.4.0.210629,14.1.1)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" }, - {"version": "[14.1.1,14.1.1.0.0.210701)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "${true:false}", "wlst_type": "boolean" }, + {"version": "[14.1.1,14.1.1.0.0.210701)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "${true:false}", "production_default": "${__NULL__:true}", "wlst_type": "boolean" }, {"version": "[14.1.1.0.0.210701,)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], - "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ], + "RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": true, "production_default": "${__NULL__:false}", "wlst_type": "boolean" } ], "RotationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ] }, diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualTarget.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualTarget.json index 7888b2395..89a382cdb 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualTarget.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualTarget.json @@ -23,8 +23,8 @@ "BufferSizeKb": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "BufferSizeK${b:B}", "wlst_path": "WP001", "default_value": 8, "wlst_type": "integer" } ], "DateFormatPattern": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string" } ], "ELFFields": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ELFFields", "wlst_path": "WP001", "default_value": "date time cs-method cs-uri sc-status", "wlst_type": "string" } ], - "FileCount": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "wlst_type": "integer" } ], - "FileMinSize": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ], + "FileCount": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ], + "FileMinSize": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ], "FileName": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string" } ], "FileTimeSpan": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer" } ], "FileTimeSpanFactor": [ {"version": "[12.2.1,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor","wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long" } ], @@ -35,10 +35,10 @@ "LoggingEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LoggingEnabled", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ], "Notes": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "NumberOfFilesLimited": [ - {"version": "[12.2.1,12.2.1.4.0.210629)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "${true:false}", "wlst_type": "boolean" }, + {"version": "[12.2.1,12.2.1.4.0.210629)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": "${true:false}", "production_default": "${__NULL__:true}", "wlst_type": "boolean" }, {"version": "[12.2.1.4.0.210629,)", "wlst_mode": "both", "wlst_name": "NumberOfFilesLimited", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ], - "RotateLogOnStartup": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ], + "RotateLogOnStartup": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "default_value": "true", "production_default": "${__NULL__:false}", "wlst_type": "boolean" } ], "RotationTime": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "default_value": "00:00", "wlst_type": "string" } ], "RotationType": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "default_value": "${__NULL__:bySize}", "wlst_type": "string" } ] }, diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebAppContainer.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebAppContainer.json index 89b4a29a9..29f029ce9 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebAppContainer.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebAppContainer.json @@ -71,7 +71,7 @@ "RtexprvalueJspParamName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RtexprvalueJspParamName", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ], "ServletAuthenticationFormURL": [ {"version": "[10,12.1.3)", "wlst_mode": "both", "wlst_name": "ServletAuthenticationFormU${rl:RL}", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } , {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "ServletAuthenticationFormURL", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ], - "ServletReloadCheckSecs": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServletReloadCheckSecs", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer" } ], + "ServletReloadCheckSecs": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServletReloadCheckSecs", "wlst_path": "WP001", "default_value": 1, "production_default": "${__NULL__:-1}", "wlst_type": "integer" } ], "ShowArchivedRealPathEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ShowArchivedRealPathEnabled", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ], "WAPEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "WAPEnabled", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ], "WeblogicPluginEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "WeblogicPluginEnabled", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties b/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties index 9c1317b33..0a02a7e8f 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties +++ b/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties @@ -584,6 +584,7 @@ WLSDPLY-06032=Model file name was not included in command arguments and either - WLSDPLY-06033=Archive file name was included in command arguments and either -skip_archive or -remote was selected WLSDPLY-06034=Writing results file {0} WLSDPLY-06035=Unable to write the results file specified by environment variable {0}: {1} +WLSDPLY-06036=Unable to determine if production mode is enabled for the domain: {0} # discoverer.py WLSDPLY-06100=Find attributes at location {0} @@ -1542,6 +1543,7 @@ WLSDPLY-19044=Failed to get the ordering of subfolders at parent location {0} : WLSDPLY-19045=Failed to get the derived default value for attribute {0} at location {1} : {2} WLSDPLY-19046=Failed to get the model attribute list that have ACCESS type ROD ({0}) \ at location ({1}): {2} +WLSDPLY-19047=Discovering domain in production mode # wlsdeploy/tool/util/attribute_setter.py WLSDPLY-19200=No target found with name {0} diff --git a/core/src/test/python/alias_json_file_test.py b/core/src/test/python/alias_json_file_test.py index 2a7577d4e..664865d77 100644 --- a/core/src/test/python/alias_json_file_test.py +++ b/core/src/test/python/alias_json_file_test.py @@ -41,6 +41,7 @@ from wlsdeploy.aliases.alias_constants import NONE from wlsdeploy.aliases.alias_constants import ONLINE_BEAN from wlsdeploy.aliases.alias_constants import PREFERRED_MODEL_TYPE +from wlsdeploy.aliases.alias_constants import PRODUCTION_DEFAULT from wlsdeploy.aliases.alias_constants import RESTART_REQUIRED from wlsdeploy.aliases.alias_constants import SET_MBEAN_TYPE from wlsdeploy.aliases.alias_constants import SET_METHOD @@ -88,7 +89,6 @@ class ListTestCase(unittest.TestCase): CHILD_FOLDERS_TYPE, CONTAINS, DEFAULT_NAME_VALUE, - DERIVED_DEFAULT, FLATTENED_FOLDER_DATA, FOLDER_ORDER, FOLDER_PARAMS, @@ -117,6 +117,7 @@ class ListTestCase(unittest.TestCase): GET_METHOD, MERGE, PREFERRED_MODEL_TYPE, + PRODUCTION_DEFAULT, RESTART_REQUIRED, SET_MBEAN_TYPE, SET_METHOD, @@ -609,6 +610,10 @@ def _verify_attribute_default_value_attribute_value(self, folder_name, attribute def _verify_attribute_derived_default_attribute_value(self, folder_name, attribute_name, alias_attribute_value): return [] + def _verify_attribute_production_default_attribute_value(self, folder_name, attribute_name, alias_attribute_value): + # nothing to verify - production_default can be any type or null + return [] + def _verify_attribute_version_attribute_value(self, folder_name, attribute_name, alias_attribute_value): result = [] if type(alias_attribute_value) is not str: