@@ -174,6 +174,8 @@ def _add_shared_libray_plan_to_archive(self, library_name, library_dict):
174174 _logger .exiting (class_name = _class_name , method_name = _method_name )
175175
176176 def get_shlib_plan (self , plan_path , library_dict , library_source_name , archive_file ):
177+ _method_name = 'get_shlib_plan'
178+ 177179 plan_file_name = plan_path
178180 if not self ._model_context .is_remote ():
179181 plan_path = self ._convert_path (plan_path )
@@ -194,11 +196,11 @@ def get_shlib_plan(self, plan_path, library_dict, library_source_name, archive_f
194196 library_source_name ,
195197 plan_file_name ))
196198 except IllegalArgumentException , iae :
197- _logger .warning ('WLSDPLY-06385' , library_name , plan_file_name ,
199+ _logger .warning ('WLSDPLY-06385' , library_source_name , plan_file_name ,
198200 iae .getLocalizedMessage (), class_name = _class_name ,
199201 method_name = _method_name )
200202 except WLSDeployArchiveIOException , wioe :
201- de = exception_helper .create_discover_exception ('WLSDPLY-06387' , library_name ,
203+ de = exception_helper .create_discover_exception ('WLSDPLY-06387' , library_source_name ,
202204 plan_file_name ,
203205 wioe .getLocalizedMessage ())
204206 _logger .throwing (class_name = _class_name , method_name = _method_name , error = de )
@@ -524,10 +526,7 @@ def _get_plan_path(self, plan_path, archive_file, app_source_name, application_n
524526 del application_dict [model_constants .PLAN_DIR ]
525527 plan_file_name = self ._resolve_deployment_plan_path (plan_dir , plan_path )
526528 if self ._model_context .is_remote ():
527- if plan_file_name .endswith ('plan' ):
528- new_plan_name = WLSDeployArchive .getApplicationPlanDirArchivePath (plan_file_name )
529- else :
530- new_plan_name = WLSDeployArchive .getApplicationPlanArchivePath (plan_file_name )
529+ new_plan_name = WLSDeployArchive .getApplicationPlanArchivePath (plan_file_name )
531530 self .add_to_remote_map (plan_path , new_plan_name ,
532531 WLSDeployArchive .ArchiveEntryType .APPLICATION_PLAN .name ())
533532 elif not self ._model_context .skip_archive ():
0 commit comments