[PAYARA-3662] fixing glassfish-web.xml contextroot overwrite #3831
Conversation
| @@ -14,7 +14,6 @@ | |||
| * limitations under the License. | |||
There was a problem hiding this comment.
Changes to this file can be ignored
There was a problem hiding this comment.
@cubastanley With reproducer, context root from glassfish-web.xml is still ignored.
| if (war.getName().startsWith("ROOT.")) { | ||
| deployer.deploy(war, "--availabilityenabled=true", "--force=true", "--contextroot=/", "--loadOnly", "true"); | ||
| } else { | ||
| deployer.deploy(war, "--availabilityenabled=true", "--force=true", "--loadOnly", "true", "--contextroot", deployContext); | ||
| if(deployContext == null) { |
There was a problem hiding this comment.
deployContext is never null since it is set earlier from the war name.
There was a problem hiding this comment.
@smillidge regarding this, what's the purpose of the deployContext variable? It seems in these cases it would be more beneficial to just use contextRoot directly?
|
Difficult to find out what exactly changed due to the many code reformats |
| @@ -1587,7 +1595,11 @@ private void deployAll() throws GlassFishException { | |||
| if (entry.getName().startsWith("ROOT.")) { | |||
| deployer.deploy(entry, "--availabilityenabled=true", "--force=true", "--contextroot=/", "--loadOnly", "true"); | |||
| } else { | |||
| deployer.deploy(entry, "--availabilityenabled=true", "--force=true", "--loadOnly", "true", "--contextroot",deployContext); | |||
| if(deployContext == null) { | |||
There was a problem hiding this comment.
Should be a space between if and (
| if (war.getName().startsWith("ROOT.")) { | ||
| deployer.deploy(war, "--availabilityenabled=true", "--force=true", "--contextroot=/", "--loadOnly", "true"); | ||
| } else { | ||
| deployer.deploy(war, "--availabilityenabled=true", "--force=true", "--loadOnly", "true", "--contextroot", deployContext); | ||
| if(deployContext == null) { |
There was a problem hiding this comment.
Should be a space between if and (
| for (File entry : deploymentDirEntries) { | ||
|
|
||
| boolean hasDefinedContextRoot = (contextRoot != null && contextRoot.isEmpty() == false); |
There was a problem hiding this comment.
contextRoot.isEmpty() == false -> !contextRoot.isEmpty()
| if (war.exists() && war.canRead()) { | ||
| for (File war : deployments) { | ||
|
|
||
| boolean hasDefinedContextRoot = (contextRoot != null && contextRoot.isEmpty() == false); |
There was a problem hiding this comment.
contextRoot.isEmpty() == false -> !contextRoot.isEmpty()
Pandrex247
changed the title
|
Jenkins test please |
Signed-off-by: Maxim Nesen <[email protected]>
[PAYARA-3662] fixing glassfish-web.xml contextroot overwrite
Unfortunately git has tracked the changes in formatting that ended up coming into existence, the only physical changes I've made to the code are I the deployAll() method from line 1530 onwards