Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/main/java/io/openliberty/tools/ant/ServerTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ public class ServerTask extends AbstractTask {
private Map<String, String> environmentVariables;

private String serverRoot;

private boolean usePosixRules = false;

@Override
protected void initTask() {
Expand Down Expand Up @@ -480,6 +482,7 @@ private void addArchiveOption(List<String> command) {
if (archive.isDirectory()) {
throw new BuildException("The archive attribute must specify a file");
}

if (isWindows) {
String archivePath = archive.toString();
if (archivePath.contains(" ")) {
Expand All @@ -490,6 +493,11 @@ private void addArchiveOption(List<String> command) {
command.add("--archive=" + "\"" + archivePath + "\"");
}
} else {
if(isUsePosixRules()){
command.add("--archive=" + archive.toString());
log("Setting archive option based on latest POSIX rules");
return;
}
command.add("--archive=" + archive.toString().replaceAll(" ", "\\\\ "));
}
}
Expand Down Expand Up @@ -685,4 +693,11 @@ public void setEnvironmentVariables(Map<String, String> environmentVariables) {
this.environmentVariables = environmentVariables;
}

public boolean isUsePosixRules() {
return usePosixRules;
}

public void setUsePosixRules(boolean usePosixRules) {
this.usePosixRules = usePosixRules;
}
}