For Var processing changes in ci.common testing #919
+115
−57
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…b modules in multi module Signed-off-by: Arun Venmany <[email protected]>
Signed-off-by: Arun Venmany <[email protected]>
…detected in build.gradle Signed-off-by: Arun Venmany <[email protected]>
… test issues are resolving Signed-off-by: Arun Venmany <[email protected]>
Signed-off-by: Arun Venmany <[email protected]>
Signed-off-by: Arun Venmany <[email protected]>
Signed-off-by: Arun Venmany <[email protected]>
Signed-off-by: Arun Venmany <[email protected]>
Signed-off-by: Arun Venmany <[email protected]>
Signed-off-by: Arun Venmany <[email protected]>
Signed-off-by: Arun Venmany <[email protected]>
…maven integration tests Signed-off-by: Arun Venmany <[email protected]>
cherylking
requested changes
Nov 8, 2024
| if (scd == null || !scd.getServerXML().getCanonicalPath().equals(serverXML.getCanonicalPath())) { | ||
| scd = new ServerConfigDocument(log, serverXML, configDir, bootstrapFile, bootstrapProp, serverEnvFile, giveConfigDirPrecedence, libertyDirPropertyFiles) | ||
| protected ServerConfigDocument getServerConfigDocument(CommonLogger log, Map<String, File> libertyDirPropertyFiles) throws IOException { | ||
| if (scd == null) { |
There was a problem hiding this comment.
So this seems problematic. Before we were checking to see if the path for the server.xml file changed and if so we recreated the ServerConfigDocument. Now we cannot tell if it changed. Makes me wonder if we should always create a new ServerConfigDocument, but that is a lot of processing that happens.
| @@ -86,8 +86,7 @@ class StartTask extends AbstractServerTask { | |||
| if (serverConfigFile != null && serverConfigFile.exists()) { | |||
| try { | |||
| Map<String,String> props = combinedBootstrapProperties == null ? convertPropertiesToMap(server.bootstrapProperties) : combinedBootstrapProperties; | |||
| getServerConfigDocument(new CommonLogger(project), serverConfigFile, server.configDirectory, server.bootstrapPropertiesFile, props, server.serverEnvFile, | |||
| false, getLibertyDirectoryPropertyFiles(null)); | |||
| scd = getServerConfigDocument(new CommonLogger(project), getLibertyDirectoryPropertyFiles(null)); | |||
There was a problem hiding this comment.
I don't think the line before this needs to be done anymore. The bootstrap.properties file in the server dir will be used and should have all the combined properties already.
| @@ -79,8 +79,7 @@ class UndeployTask extends AbstractServerTask { | |||
| File serverXML = new File(getServerDir(project).getCanonicalPath(), "server.xml") | |||
|
|
|||
| try { | |||
| getServerConfigDocument(new CommonLogger(project), serverXML, server.configDirectory, | |||
| server.bootstrapPropertiesFile, combinedBootstrapProperties, server.serverEnvFile, false, getLibertyDirectoryPropertyFiles(null)) | |||
| scd= getServerConfigDocument(new CommonLogger(project), getLibertyDirectoryPropertyFiles(null)) | |||
There was a problem hiding this comment.
I don't think you need to get serverXML at line 79 any more.
| @@ -682,8 +682,7 @@ class DeployTask extends AbstractServerTask { | |||
| File serverXML = new File(getServerDir(project).getCanonicalPath(), "server.xml") | |||
|
|
|||
| try { | |||
| scd = getServerConfigDocument(new CommonLogger(project), serverXML, server.configDirectory, | |||
| server.bootstrapPropertiesFile, combinedBootstrapProperties, server.serverEnvFile, false, getLibertyDirectoryPropertyFiles(null)) | |||
| scd = getServerConfigDocument(new CommonLogger(project), getLibertyDirectoryPropertyFiles(null)) | |||
There was a problem hiding this comment.
You don't need to get serverXML anymore at line 682.
| @@ -520,8 +519,7 @@ abstract class AbstractServerTask extends AbstractLibertyTask { | |||
| if (serverConfigFile != null && serverConfigFile.exists()) { | |||
| try { | |||
| Map<String,String> props = combinedBootstrapProperties == null ? convertPropertiesToMap(server.bootstrapProperties) : combinedBootstrapProperties; | |||
| getServerConfigDocument(new CommonLogger(project), serverConfigFile, server.configDirectory, server.bootstrapPropertiesFile, props, server.serverEnvFile, | |||
| false, getLibertyDirectoryPropertyFiles(null)); | |||
| scd = getServerConfigDocument(new CommonLogger(project), getLibertyDirectoryPropertyFiles(null)); | |||
There was a problem hiding this comment.
Don't need to get props anymore at line 521.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.