Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PAYARA-2555 Micro Arquillian Container Doesn't Allow Spaces In Arguments #2481

Merged
merged 6 commits into from
Feb 28, 2018
Merged

PAYARA-2555 Micro Arquillian Container Doesn't Allow Spaces In Arguments #2481

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3daf8ba
Added code to escape spaces in paths.
MattGill98 Feb 28, 2018
b4486de
Corrected escape code for Windows based paths.
MattGill98 Feb 28, 2018
71d6a7e
Merge branch 'Payara-5' into PAYARA-2555-Micro-Arquillian-Container-D…
arjantijms Feb 28, 2018
148a8d0
Added code to iteratively escape spaces in paths.
MattGill98 Feb 28, 2018
07e5dc0
Merge branch 'PAYARA-2555-Micro-Arquillian-Container-Doesnt-Allow-Spa…
MattGill98 Feb 28, 2018
215200e
Merge branch 'Payara-5' into PAYARA-2555-Micro-Arquillian-Container-D…
Pandrex247 Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...va/fish/payara/arquillian/container/payara/managed/PayaraMicroContainerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,14 @@ public void validate() throws ConfigurationException {
"Unable to find Payara Micro Jar version. Please check the file is a valid Payara Micro Jar.", e);
}
notNull(getMicroVersion(), "Unable to find Payara Micro Jar version. Please check the file is a valid Payara Micro Jar.");

// Escape spaces in paths for the cmd options
if (cmdOptions != null) {
cmdOptions = cmdOptions.replaceAll("([\\/\\\\]\\w+) ", "$1\\\\ ");
}
if (extraMicroOptions != null) {
extraMicroOptions = extraMicroOptions.replaceAll("([\\/\\\\]\\w+) ", "$1\\\\ ");
}
}

private static String getConfigurableVariable(String systemPropertyName, String environmentVariableName, String defaultValue) {
Expand Down
12 changes: 8 additions & 4 deletions .../java/fish/payara/arquillian/container/payara/managed/PayaraMicroDeployableContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,20 @@ public ProtocolMetaData deploy(Archive<?> archive) throws DeploymentException {
// Add the extra cmd options to the Payara Micro instance
if (configuration.getCmdOptions() != null) {
int index = 1;
for (String option : configuration.getCmdOptions().split(" ")) {
cmd.add(index, option);
// Split on non-escaped spaces
for (String option : configuration.getCmdOptions().split("(?<!\\\\) ")) {
// Unescape any path spaces before adding the string
cmd.add(index, option.replace("\\ ", " "));
index++;
}
}

// Add the extra micro options to the Payara Micro instance
if (configuration.getExtraMicroOptions() != null) {
for (String option : configuration.getExtraMicroOptions().split(" ")) {
cmd.add(option);
// Split on non-escaped spaces
for (String option : configuration.getExtraMicroOptions().split("(?<!\\\\) ")) {
// Unescape any path spaces before adding the string
cmd.add(option.replace("\\ ", " "));
}
}

Expand Down