From 9d6e52579d68b2b2e40cde908b693ea2dcc9f627 Mon Sep 17 00:00:00 2001 From: Robert Patrick Date: Thu, 10 Aug 2023 14:08:22 -0500 Subject: [PATCH] fixing log statements, correcting domainInfo aliases, and updating doc --- core/src/main/python/wlsdeploy/util/cla_utils.py | 10 +++++----- .../deploy/aliases/category_modules/RCUDbInfo.json | 10 +++++----- .../3.0/content/userguide/database/connect-db.md | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/core/src/main/python/wlsdeploy/util/cla_utils.py b/core/src/main/python/wlsdeploy/util/cla_utils.py index 5ae58acd61..b007ae59dc 100644 --- a/core/src/main/python/wlsdeploy/util/cla_utils.py +++ b/core/src/main/python/wlsdeploy/util/cla_utils.py @@ -276,27 +276,27 @@ def process_args(self, args, tool_type=TOOL_TYPE_DEFAULT, trailing_arg_count=0): value, idx = self._get_arg_value(args, idx) self._validate_rcu_database_arg(value) self._add_arg(key, value) - _logger.deprecation('WLSDPLY-31000') + _logger.deprecation('WLSDPLY-31000', class_name=self._class_name, method_name=method_name) elif self.is_rcu_dbuser_key(key): value, idx = self._get_arg_value(args, idx) self._validate_rcu_dbuser_arg(value) self._add_arg(key, value) - _logger.deprecation('WLSDPLY-31001') + _logger.deprecation('WLSDPLY-31001', class_name=self._class_name, method_name=method_name) elif self.is_rcu_prefix_key(key): value, idx = self._get_arg_value(args, idx) self._validate_rcu_prefix_arg(value) self._add_arg(key, value) - _logger.deprecation('WLSDPLY-31002') + _logger.deprecation('WLSDPLY-31002', class_name=self._class_name, method_name=method_name) elif self.is_rcu_sys_pass_key(key): value, idx = self._get_arg_value(args, idx) self._validate_rcu_sys_pass_arg(value) self._add_arg(key, value) - _logger.deprecation('WLSDPLY-31003') + _logger.deprecation('WLSDPLY-31003', class_name=self._class_name, method_name=method_name) elif self.is_rcu_schema_pass_key(key): value, idx = self._get_arg_value(args, idx) self._validate_rcu_schema_pass_arg(value) self._add_arg(key, value) - _logger.deprecation('WLSDPLY-31004') + _logger.deprecation('WLSDPLY-31004', class_name=self._class_name, method_name=method_name) elif self.is_passphrase_switch(key): value, idx = self._get_arg_value(args, idx) self._validate_passphrase_arg(value) diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RCUDbInfo.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RCUDbInfo.json index e367d344a3..b91b04f6b8 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RCUDbInfo.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RCUDbInfo.json @@ -9,14 +9,14 @@ "atp.default.tablespace": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "atp.default.tablespace", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "atp.temp.tablespace": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "atp.temp.tablespace", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "databaseType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "databaseType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], - "compInfoXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "compInfoXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true"} ], - "javax.net.ssl.keyStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.keyStore", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], + "compInfoXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "compInfoXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ], + "javax.net.ssl.keyStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.keyStore", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ], "javax.net.ssl.keyStoreType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.keyStoreType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "javax.net.ssl.keyStorePassword": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.keyStorePassword", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "secret_suffix": "sslkeystore" } ], - "javax.net.ssl.trustStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStore", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], + "javax.net.ssl.trustStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStore", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ], "javax.net.ssl.trustStoreType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStoreType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "javax.net.ssl.trustStorePassword": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStorePassword", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "secret_suffix": "ssltruststore" } ], - "oracle.net.tns_admin": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "oracle.net.tns_admin", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], + "oracle.net.tns_admin": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "oracle.net.tns_admin", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true"} ], "rcu_admin_password": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_admin_password", "wlst_path": "WP001", "default_value": null, "wlst_type": "password" } ], "rcu_db_conn_string": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_db_conn_string", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "rcu_prefix": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_prefix", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], @@ -26,7 +26,7 @@ "rcu_temp_tablespace": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_temp_tablespace", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "tns.alias": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "tns.alias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "rcu_variables": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_variables", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], - "storageXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "storageXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true"} ], + "storageXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "storageXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ], "useATP": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "useATP", "wlst_path": "WP001", "default_value": null, "wlst_type": "boolean" } ], "useSSL": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "useSSL", "wlst_path": "WP001", "default_value": null, "wlst_type": "boolean" } ] }, diff --git a/documentation/3.0/content/userguide/database/connect-db.md b/documentation/3.0/content/userguide/database/connect-db.md index 58415b2110..7cfc50c9b7 100644 --- a/documentation/3.0/content/userguide/database/connect-db.md +++ b/documentation/3.0/content/userguide/database/connect-db.md @@ -114,6 +114,7 @@ domainInfo: RCUDbInfo: databaseType : 'ATP' rcu_prefix : DEV + rcu_db_conn_string: rcu_admin_password: rcu_schema_password : rcu_db_user : admin