Skip to content

Commit 6295dc4

Browse files
authored
Use INFO message for version-invalid attributes in model; remove duplicate deploy message (#1386)
1 parent 66fcea1 commit 6295dc4

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

core/src/main/python/wlsdeploy/tool/deploy/deployer.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
2+
Copyright (c) 2017, 2023, Oracle and/or its affiliates.
33
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
"""
55
import os
@@ -317,15 +317,12 @@ def set_special_attribute(self, location, key, value, wlst_merge_value, set_meth
317317
def _check_location(self, location):
318318
"""
319319
Verify that the specified location in valid for the current WLS version.
320-
A warning is logged if the location is not valid.
320+
Validation has already logged a WARNING or INFO message if the location was not valid.
321321
:param location: the location to be checked
322322
:return: True if the location is valid, False otherwise
323323
"""
324324
_method_name = '_check_location'
325325
if self.aliases.get_wlst_mbean_type(location) is None:
326-
the_type = self.get_location_type(location)
327-
self.logger.warning('WLSDPLY-09203', the_type, self.wls_helper.get_weblogic_version(),
328-
class_name=self._class_name, method_name=_method_name)
329326
return False
330327
return True
331328

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) 2022, Oracle and/or its affiliates.
2+
Copyright (c) 2022, 2023, Oracle and/or its affiliates.
33
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
"""
55

@@ -30,7 +30,7 @@ def __init__(self, key):
3030
self._allow_unresolved_file_tokens = False
3131
self._allow_unresolved_secret_tokens = False
3232
self._allow_unresolved_variable_tokens = False
33-
self._allow_version_invalid_attributes = False
33+
self._allow_version_invalid_attributes = True # Jira WDT-724
3434

3535
if key == LAX_METHOD:
3636
# almost no checks on archive, tokens, etc.

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,6 @@ WLSDPLY-09200=Error setting attribute {0} for {1} {2}: {3}
11681168
WLSDPLY-09201=Failed to get existing WLST value for model attribute {0} at location {1} because the \
11691169
attribute map did not contain the key {2}
11701170
WLSDPLY-09202=Set method {0} not implemented for attribute {1} in location {2}
1171-
WLSDPLY-09203=The model element {0} is not valid for WLS version {1}, so it will be omitted from deployment
11721171
WLSDPLY-09204=Model attribute {0} at model location {1} with value {2} references a location inside \
11731172
the archive file {3} that does not exist
11741173
WLSDPLY-09205=Unable to locate the indicated {3} {0} at location {1} : {2}

0 commit comments

Comments
 (0)