Commit a5438d6

authored

removing remnants of unused -prev-model-file argument (#1335)

1 parent 2440213 commit a5438d6Copy full SHA for a5438d6

File tree

4 files changed

-27

lines changed

core/src/main/python
- deploy.py
- update.py
- wlsdeploy/util
  - cla_utils.py
  - model_context.py

4 files changed

-27

lines changed

`‎core/src/main/python/deploy.py‎`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`The entry point for the deployApps tool.`
`6`	`6`	`"""`
`7`		`-import exceptions`
`8`	`7`	`import os`
`9`	`8`	`import sys`
`10`	`9`
`@@ -50,7 +49,6 @@`
`50`	`49`	`# Used by shell script to locate WLST`
`51`	`50`	`CommandLineArgUtil.DOMAIN_TYPE_SWITCH,`
`52`	`51`	`CommandLineArgUtil.ARCHIVE_FILE_SWITCH,`
`53`		`- CommandLineArgUtil.PREVIOUS_MODEL_FILE_SWITCH,`
`54`	`52`	`CommandLineArgUtil.VARIABLE_FILE_SWITCH,`
`55`	`53`	`CommandLineArgUtil.ADMIN_URL_SWITCH,`
`56`	`54`	`CommandLineArgUtil.ADMIN_USER_SWITCH,`

`‎core/src/main/python/update.py‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@`
`52`	`52`	`# Used by shell script to locate WLST`
`53`	`53`	`CommandLineArgUtil.DOMAIN_TYPE_SWITCH,`
`54`	`54`	`CommandLineArgUtil.ARCHIVE_FILE_SWITCH,`
`55`		`- CommandLineArgUtil.PREVIOUS_MODEL_FILE_SWITCH,`
`56`	`55`	`CommandLineArgUtil.VARIABLE_FILE_SWITCH,`
`57`	`56`	`CommandLineArgUtil.ADMIN_URL_SWITCH,`
`58`	`57`	`CommandLineArgUtil.ADMIN_USER_SWITCH,`

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

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ class CommandLineArgUtil(object):`
`62`	`62`	`OPSS_WALLET_PASSPHRASE = '-opss_wallet_passphrase'`
`63`	`63`	`OPSS_WALLET_FILE_PASSPHRASE = '-opss_wallet_passphrase_file'`
`64`	`64`	`OPSS_WALLET_ENV_PASSPHRASE = '-opss_wallet_passphrase_env'`
`65`		`- PREVIOUS_MODEL_FILE_SWITCH = '-prev_model_file'`
`66`	`65`	`VARIABLE_FILE_SWITCH = '-variable_file'`
`67`	`66`	`RCU_DB_SWITCH = '-rcu_db'`
`68`	`67`	`RCU_DB_USER_SWITCH = '-rcu_db_user'`
`@@ -262,10 +261,6 @@ def process_args(self, args, tool_type=TOOL_TYPE_DEFAULT, trailing_arg_count=0):`
`262`	`261`	`value, idx = self._get_arg_value(args, idx)`
`263`	`262`	`full_path = self._validate_model_file_arg(value)`
`264`	`263`	`self._add_arg(key, full_path, True)`
`265`		`- elif self.is_previous_model_file_key(key):`
`266`		`- value, idx = self._get_arg_value(args, idx)`
`267`		`- full_path = self._validate_previous_model_file_arg(value)`
`268`		`- self._add_arg(key, full_path, True)`
`269`	`264`	`elif self.is_validate_method_key(key):`
`270`	`265`	`value, idx = self._get_arg_value(args, idx)`
`271`	`266`	`context = self._validate_validate_method_arg(value)`
`@@ -762,12 +757,6 @@ def _validate_model_file_arg(self, value):`
`762`	`757`
`763`	`758`	`return ",".join(result_model_files)`
`764`	`759`
`765`		`- def get_previous_model_file_key(self):`
`766`		`- return self.PREVIOUS_MODEL_FILE_SWITCH`
`767`		`-`
`768`		`- def is_previous_model_file_key(self, key):`
`769`		`- return self.PREVIOUS_MODEL_FILE_SWITCH == key`
`770`		`-`
`771`	`760`	`def _validate_previous_model_file_arg(self, value):`
`772`	`761`	`method_name = '_validate_previous_model_file_arg'`
`773`	`762`

`‎core/src/main/python/wlsdeploy/util/model_context.py‎`

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ def __init__(self, program_name, arg_map):`
`69`	`69`	`self._archive_file_name = None`
`70`	`70`	`self._archive_file = None`
`71`	`71`	`self._model_file = None`
`72`		`- self._previous_model_file = None`
`73`	`72`	`self._variable_file_name = None`
`74`	`73`	`self._run_rcu = False`
`75`	`74`	`self._rcu_database = None`
`@@ -162,9 +161,6 @@ def __copy_from_args(self, arg_map):`
`162`	`161`	`if CommandLineArgUtil.WAIT_FOR_EDIT_LOCK_SWITCH in arg_map:`
`163`	`162`	`self._wait_for_edit_lock = arg_map[CommandLineArgUtil.WAIT_FOR_EDIT_LOCK_SWITCH]`
`164`	`163`
`165`		`- if CommandLineArgUtil.PREVIOUS_MODEL_FILE_SWITCH in arg_map:`
`166`		`- self._previous_model_file = arg_map[CommandLineArgUtil.PREVIOUS_MODEL_FILE_SWITCH]`
`167`		`-`
`168`	`164`	`if CommandLineArgUtil.ATTRIBUTES_ONLY_SWITCH in arg_map:`
`169`	`165`	`self._attributes_only = arg_map[CommandLineArgUtil.ATTRIBUTES_ONLY_SWITCH]`
`170`	`166`
`@@ -293,8 +289,6 @@ def __copy__(self):`
`293`	`289`	`arg_map[CommandLineArgUtil.ARCHIVE_FILE_SWITCH] = self._archive_file_name`
`294`	`290`	`if self._model_file is not None:`
`295`	`291`	`arg_map[CommandLineArgUtil.MODEL_FILE_SWITCH] = self._model_file`
`296`		`- if self._previous_model_file is not None:`
`297`		`- arg_map[CommandLineArgUtil.PREVIOUS_MODEL_FILE_SWITCH] = self._previous_model_file`
`298`	`292`	`if self._attributes_only is not None:`
`299`	`293`	`arg_map[CommandLineArgUtil.ATTRIBUTES_ONLY_SWITCH] = self._attributes_only`
`300`	`294`	`if self._folders_only is not None:`
`@@ -568,13 +562,6 @@ def get_model_file(self):`
`568`	`562`	`"""`
`569`	`563`	`return self._model_file`
`570`	`564`
`571`		`- def get_previous_model_file(self):`
`572`		`- """`
`573`		`- Get the previous model file.`
`574`		`- :return: the previous model file`
`575`		`- """`
`576`		`- return self._previous_model_file`
`577`		`-`
`578`	`565`	`def get_folders_only_control_option(self):`
`579`	`566`	`"""`
`580`	`567`	`Get the -folders_only command-line switch for model help tool.`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a5438d6

File tree

4 files changed

4 files changed

`‎core/src/main/python/deploy.py‎`

`‎core/src/main/python/update.py‎`

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

`‎core/src/main/python/wlsdeploy/util/model_context.py‎`

0 commit comments