Skip to content

Commit bea0490

Browse files
fix location of check for names we do not definie in aliases
1 parent dd21b7c commit bea0490

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

core/src/main/python/wlsdeploy/aliases/alias_entries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ def get_alias_attribute_entry_by_wlst_name(self, location, wlst_attribute_name):
738738
else:
739739
_logger.warning('WLSDPLY-08110', wlst_attribute_name, location.get_folder_path(), WLST_PATH)
740740
else:
741-
if wlst_attribute_name not in ('Id', 'Tag', 'Name'):
741+
if wlst_attribute_name not in ('Id', 'Tag', 'Tags', 'Type', 'Name'):
742742
ex = exception_helper.create_alias_exception('WLSDPLY-08111', location.get_folder_path(),
743743
wlst_attribute_name)
744744
_logger.throwing(ex, class_name=_class_name, method_name=_method_name)

core/src/main/python/wlsdeploy/aliases/aliases.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -854,12 +854,6 @@ def get_model_attribute_name_and_value(self, location, wlst_attribute_name, wlst
854854
model_attribute_value = converted_value
855855
if USES_PATH_TOKENS in attribute_info:
856856
model_attribute_value = self._model_context.tokenize_path(model_attribute_value)
857-
858-
if wlst_attribute_name not in ('Id', 'Tag', 'Tags', 'Type', 'Name') and model_attribute_name is None:
859-
ex = exception_helper.create_alias_exception('WLSDPLY-08406', wlst_attribute_name,
860-
location.get_folder_path())
861-
self._logger.throwing(ex, class_name=self._class_name, method_name=_method_name)
862-
raise ex
863857
self._logger.exiting(class_name=self._class_name, method_name=_method_name,
864858
result={model_attribute_name: model_attribute_value})
865859
return model_attribute_name, model_attribute_value

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"PlatformLoggerLevels": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "PlatformLoggerLevels", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
3737
"RedirectStderrToServerLogEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RedirectStderrToServerLogEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"} ],
3838
"RedirectStdoutToServerLogEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RedirectStdoutToServerLogEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"} ],
39-
"RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "value": {"default": "${true:false}"}, "wlst_type": "boolean"} ],
39+
"RotateLogOnStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotateLogOnStartup", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
4040
"RotationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationTime", "wlst_path": "WP001", "value": {"default": "00:00" }, "wlst_type": "string" } ],
4141
"RotationType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RotationType", "wlst_path": "WP001", "value": {"default": "${None:bySize}"}, "wlst_type": "string" } ],
4242
"ServerLoggingBridgeAtRootLoggerEnabled": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "ServerLoggingBridgeAtRootLoggerEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],

0 commit comments

Comments
 (0)