Wdt 1112 appfileoverrides #1149
Conversation
core/src/main/python/wlsdeploy/tool/deploy/applications_deployer.py
Outdated
Show resolved
Hide resolved
core/src/main/python/wlsdeploy/tool/discover/deployments_discoverer.py
Outdated
Show resolved
Hide resolved
| return app_folder | ||
|
|
||
| def _create_application_directory(self, application_name, application_dict): | ||
| _method_name = 'createAppFolder' |
There was a problem hiding this comment.
method name is _create_application_directory
core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java
Outdated
Show resolved
Hide resolved
core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java
Outdated
Show resolved
Hide resolved
core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java
Outdated
Show resolved
Hide resolved
| @@ -671,11 +716,13 @@ public void extractApplication(String applicationPath, File domainHome) throws W | |||
| validateExistingDirectory(domainHome, "domainHome", getArchiveFileName(), METHOD); | |||
|
|
|||
| String appPath = applicationPath; | |||
| if (!applicationPath.startsWith(ARCHIVE_APPS_TARGET_DIR)) { | |||
| if (!applicationPath.startsWith(ARCHIVE_APPS_FOLD_TARGET_DIR) && | |||
| !applicationPath.startsWith(ARCHIVE_APPS_TARGET_DIR)) { | |||
There was a problem hiding this comment.
Not sure this level of intention is consistent with the rest of the code.
| element = elements.item(0) | ||
| element.setNodeValue(plan_dir) | ||
| element.setTextContent(plan_dir) | ||
| # document.appendChild(element) |
There was a problem hiding this comment.
Please remove the commented code
| @@ -62,7 +62,7 @@ public class WLSDeployArchive { | |||
| * Top-level archive subdirectory where the applications are stored and the subdirectory to which | |||
| * they will be extracted. This is for structured applications found under /app | |||
| */ | |||
| public static final String ARCHIVE_APPS_FOLD_TARGET_DIR = WLSDPLY_ARCHIVE_BINARY_DIR + "/application_folder"; | |||
| public static final String ARCHIVE_APPS_FOLD_TARGET_DIR = WLSDPLY_ARCHIVE_BINARY_DIR + "/applicationsFolder"; | |||
There was a problem hiding this comment.
I hate to be a pain but please change this name to applicationFolders to more accurately reflect the purpose/content. That is, this is a location for structured application folders not a single folder for applications.
There was a problem hiding this comment.
If you don't like that, we could change to structuredApplications instead...
There was a problem hiding this comment.
I think structuredApplications is clearer for the user. Sounds more intuitive as to why we separated the two application types.
|
Kudos, SonarCloud Quality Gate passed! |
Fixes #1112
Handle application folder directories that contain app and plan directories.
Write directory to plan.xml config-root
make sure directory output is correct for option -remote