Skip to content

Commit 850fd66

Browse files
Change to process relative path on all files added to archive
1 parent 1961f9b commit 850fd66

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,8 +1268,6 @@ private static void validateExistingFile(File file, String argName, String fileN
12681268
IllegalArgumentException iae = new IllegalArgumentException(message);
12691269
LOGGER.throwing(CLASS, METHOD, iae);
12701270
throw iae;
1271-
} else if (!file.isAbsolute()) {
1272-
12731271
} else if (!file.exists()) {
12741272
String message = ExceptionHelper.getMessage("WLSDPLY-01421", fileName, file);
12751273
IllegalArgumentException iae = new IllegalArgumentException(message);

core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,10 +573,10 @@ def _add_library(self, server_name, classpath_name):
573573
_logger.info('WLSDPLY-06618', classpath_name, server_name, class_name=_class_name, method_name=_method_name)
574574
return_name = self._model_context.tokenize_path(classpath_name)
575575
else:
576-
file_name_path = self._convert_path(classpath_name)
577-
_logger.finer('WLSDPLY-06619', file_name_path, server_name, class_name=_class_name,
576+
_logger.finer('WLSDPLY-06619', classpath_name, server_name, class_name=_class_name,
578577
method_name=_method_name)
579578
archive_file = self._model_context.get_archive_file()
579+
file_name_path = self._convert_path(classpath_name)
580580
new_source_name = None
581581
try:
582582
new_source_name = archive_file.addClasspathLibrary(File(file_name_path))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"copyright": "Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.",
2+
"copyright": "Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.",
33
"license": "The Universal Permissive License (UPL), Version 1.0",
44
"wlst_type": "WLDFSystemResource${:s}",
55
"child_folders_type": "multiple",
@@ -159,7 +159,7 @@
159159
"folders": {},
160160
"attributes": {
161161
"AcceptedResponseType": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "AcceptedResponseType", "wlst_path": "WP001", "value": {"default": "${None:application/json}" }, "wlst_type": "string" } ],
162-
"CustomNotificationProperties": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CustomNotificationProperties", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "LSA" } ],
162+
"CustomNotificationProperties": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CustomNotificationProperties", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ],
163163
"Enabled": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
164164
"EndpointUrl": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "Endpoint${Url:URL}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
165165
"HttpAuthenticationMode": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "HttpAuthenticationMode", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],

0 commit comments

Comments
 (0)