Skip to content

Commit b5285b8

Browse files
authored
Issue #797 - Allow non-archive libraries in online deploy; fix invalid method (#798)
1 parent 586541d commit b5285b8

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

core/src/main/python/wlsdeploy/tool/deploy/applications_deployer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,8 @@ def __deploy_model_libraries(self, model_libs, lib_location):
934934
for uses_path_tokens_attribute_name in uses_path_tokens_attribute_names:
935935
if uses_path_tokens_attribute_name in lib_dict:
936936
path = lib_dict[uses_path_tokens_attribute_name]
937-
self.__extract_source_path_from_archive(path, LIBRARY, lib_name)
937+
if deployer_utils.is_path_into_archive(path):
938+
self.__extract_source_path_from_archive(path, LIBRARY, lib_name)
938939

939940
location.add_name_token(token_name, lib_name)
940941
resource_group_template_name, resource_group_name, partition_name = \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ def replace_tokens(self, resource_type, resource_name, attribute_name, resource_
782782
return
783783
uri = URI(attribute_value)
784784
uri_scheme = uri.getScheme()
785-
if uri_scheme is not None and uri_scheme.startsWith('file'):
785+
if uri_scheme is not None and str(uri_scheme).startswith('file'):
786786
attribute_value = uri.getPath()
787787
if attribute_value.startswith(self.ORACLE_HOME_TOKEN):
788788
message = "Replacing {0} in {1} {2} {3} with {4}"

0 commit comments

Comments
 (0)