Skip to content

Commit 9d6e525

Browse files
robertpatrickrobertpatrick
committed
fixing log statements, correcting domainInfo aliases, and updating doc
1 parent c4c828b commit 9d6e525

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

‎core/src/main/python/wlsdeploy/util/cla_utils.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,27 +276,27 @@ def process_args(self, args, tool_type=TOOL_TYPE_DEFAULT, trailing_arg_count=0):
276276
value, idx = self._get_arg_value(args, idx)
277277
self._validate_rcu_database_arg(value)
278278
self._add_arg(key, value)
279-
_logger.deprecation('WLSDPLY-31000')
279+
_logger.deprecation('WLSDPLY-31000', class_name=self._class_name, method_name=method_name)
280280
elif self.is_rcu_dbuser_key(key):
281281
value, idx = self._get_arg_value(args, idx)
282282
self._validate_rcu_dbuser_arg(value)
283283
self._add_arg(key, value)
284-
_logger.deprecation('WLSDPLY-31001')
284+
_logger.deprecation('WLSDPLY-31001', class_name=self._class_name, method_name=method_name)
285285
elif self.is_rcu_prefix_key(key):
286286
value, idx = self._get_arg_value(args, idx)
287287
self._validate_rcu_prefix_arg(value)
288288
self._add_arg(key, value)
289-
_logger.deprecation('WLSDPLY-31002')
289+
_logger.deprecation('WLSDPLY-31002', class_name=self._class_name, method_name=method_name)
290290
elif self.is_rcu_sys_pass_key(key):
291291
value, idx = self._get_arg_value(args, idx)
292292
self._validate_rcu_sys_pass_arg(value)
293293
self._add_arg(key, value)
294-
_logger.deprecation('WLSDPLY-31003')
294+
_logger.deprecation('WLSDPLY-31003', class_name=self._class_name, method_name=method_name)
295295
elif self.is_rcu_schema_pass_key(key):
296296
value, idx = self._get_arg_value(args, idx)
297297
self._validate_rcu_schema_pass_arg(value)
298298
self._add_arg(key, value)
299-
_logger.deprecation('WLSDPLY-31004')
299+
_logger.deprecation('WLSDPLY-31004', class_name=self._class_name, method_name=method_name)
300300
elif self.is_passphrase_switch(key):
301301
value, idx = self._get_arg_value(args, idx)
302302
self._validate_passphrase_arg(value)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
"atp.default.tablespace": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "atp.default.tablespace", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
1010
"atp.temp.tablespace": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "atp.temp.tablespace", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
1111
"databaseType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "databaseType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
12-
"compInfoXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "compInfoXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true"} ],
13-
"javax.net.ssl.keyStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.keyStore", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
12+
"compInfoXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "compInfoXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
13+
"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" } ],
1414
"javax.net.ssl.keyStoreType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.keyStoreType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
1515
"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" } ],
16-
"javax.net.ssl.trustStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStore", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
16+
"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" } ],
1717
"javax.net.ssl.trustStoreType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStoreType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
1818
"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" } ],
19-
"oracle.net.tns_admin": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "oracle.net.tns_admin", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
19+
"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"} ],
2020
"rcu_admin_password": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_admin_password", "wlst_path": "WP001", "default_value": null, "wlst_type": "password" } ],
2121
"rcu_db_conn_string": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_db_conn_string", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
2222
"rcu_prefix": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_prefix", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
@@ -26,7 +26,7 @@
2626
"rcu_temp_tablespace": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_temp_tablespace", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
2727
"tns.alias": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "tns.alias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
2828
"rcu_variables": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_variables", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
29-
"storageXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "storageXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true"} ],
29+
"storageXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "storageXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
3030
"useATP": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "useATP", "wlst_path": "WP001", "default_value": null, "wlst_type": "boolean" } ],
3131
"useSSL": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "useSSL", "wlst_path": "WP001", "default_value": null, "wlst_type": "boolean" } ]
3232
},

‎documentation/3.0/content/userguide/database/connect-db.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ domainInfo:
114114
RCUDbInfo:
115115
databaseType : 'ATP'
116116
rcu_prefix : DEV
117+
rcu_db_conn_string: <required URL string for use with -run_rcu>
117118
rcu_admin_password: <database admin password is required only when you specify -run_rcu flag>
118119
rcu_schema_password : <RCU schema password>
119120
rcu_db_user : admin

0 commit comments

Comments
 (0)