diff --git a/core/src/main/python/wlsdeploy/tool/modelhelp/model_sample_printer.py b/core/src/main/python/wlsdeploy/tool/modelhelp/model_sample_printer.py index 9395d7fd7d..0a4c2dc9b6 100644 --- a/core/src/main/python/wlsdeploy/tool/modelhelp/model_sample_printer.py +++ b/core/src/main/python/wlsdeploy/tool/modelhelp/model_sample_printer.py @@ -164,6 +164,12 @@ def _print_subfolder_keys_sample(self, model_location, subfolder_keys, control_o for key in subfolder_keys: model_location.append_location(key) + + # folder may not be valid for WLS version + if self._alias_helper.get_wlst_mbean_type(model_location) is None: + model_location.pop_location() + continue + name_token = self._alias_helper.get_name_token(model_location) if name_token is not None: model_location.add_name_token(name_token, '%s-0' % key) 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 c94ad9c407..efa5b5c5af 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 @@ -1,8 +1,8 @@ { - "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.", + "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. All rights reserved.", "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl", "wlst_type": "Partition${:s}", - "version": "[12.2.1,)", + "version": "[12.2.1,14.1.1)", "child_folders_type": "multiple", "short_name": "Part", "folders": { diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/PartitionWorkManager.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/PartitionWorkManager.json index fe130d247b..d35395d3a6 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/PartitionWorkManager.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/PartitionWorkManager.json @@ -1,8 +1,8 @@ { - "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.", + "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. All rights reserved.", "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl", "wlst_type": "PartitionWorkManager${:s}", - "version": "[12.2.1,)", + "version": "[12.2.1,14.1.1)", "child_folders_type": "multiple", "short_name": "PartWM", "folders": {}, diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceGroup.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceGroup.json index 53ed43f340..886621852a 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceGroup.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceGroup.json @@ -1,8 +1,8 @@ { - "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.", + "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. All rights reserved.", "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl", "wlst_type": "ResourceGroup${:s}", - "version": "[12.2.1,)", + "version": "[12.2.1,14.1.1)", "child_folders_type": "multiple", "short_name": "RG", "folders": {}, diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceGroupTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceGroupTemplate.json index f282cdd8d8..8054bef1ce 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceGroupTemplate.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceGroupTemplate.json @@ -1,8 +1,8 @@ { - "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.", + "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. All rights reserved.", "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl", "wlst_type": "ResourceGroupTemplate${:s}", - "version": "[12.2.1,)", + "version": "[12.2.1,14.1.1)", "child_folders_type": "multiple", "short_name": "RGTemplate", "folders": {}, 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 77d55ac0a5..e8e7bfe64c 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 @@ -1,8 +1,8 @@ { - "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.", + "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. All rights reserved.", "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl", "wlst_type": "VirtualTarget${:s}", - "version": "[12.2.1,)", + "version": "[12.2.1,14.1.1)", "child_folders_type": "multiple", "short_name": "VTarg", "folders": { 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 f3f333d632..fe0b6de8d0 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 @@ -906,7 +906,7 @@ WLSDPLY-08206=Invalid version range {0}: {1} WLSDPLY-08207=Attribute {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic \ version {3} and higher WLSDPLY-08208=Attribute {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic \ - versions between {3} and {4} + versions between {3} and {4} WLSDPLY-08209=Attribute {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic \ version {3} WLSDPLY-08210=Attribute {0} in folder {1} is not supported in WebLogic version {2} or any other WebLogic version \ @@ -914,7 +914,7 @@ WLSDPLY-08210=Attribute {0} in folder {1} is not supported in WebLogic version { WLSDPLY-08211=Folder {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic \ version {3} and higher WLSDPLY-08212=Folder {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic \ - versions between {3} and {4} + versions between {3} and {4} WLSDPLY-08213=Folder {0} in folder {1} is not supported in WebLogic version {2} but is supported in WebLogic version {3} WLSDPLY-08214=Folder {0} in folder {1} is not supported in WebLogic version {2} or any other WebLogic version \ in WLST {3} mode