You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2018/12/10 12:01:21 UTC
[sling-scriptingbundle-maven-plugin] 16/17: made script file
handling OS-independent - attempt 3
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-scriptingbundle-maven-plugin.git
commit 2a5dc673a4262d32534fced5d027ec82796f6528
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Aug 14 17:20:16 2018 +0200
made script file handling OS-independent - attempt 3
---
.../sling/scripting/maven/plugin/ScriptingMavenPlugin.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/scripting/maven/plugin/ScriptingMavenPlugin.java b/src/main/java/org/apache/sling/scripting/maven/plugin/ScriptingMavenPlugin.java
index b99bfc3..25842ab 100644
--- a/src/main/java/org/apache/sling/scripting/maven/plugin/ScriptingMavenPlugin.java
+++ b/src/main/java/org/apache/sling/scripting/maven/plugin/ScriptingMavenPlugin.java
@@ -59,6 +59,8 @@ public class ScriptingMavenPlugin extends AbstractMojo
private static final Set<String> METHODS = new HashSet<>(Arrays.asList(new String[]{"TRACE", "OPTIONS", "GET", "HEAD", "POST", "PUT",
"DELETE", "PATCH"}));
+ private static final Set<String> FILE_SEPARATORS = new HashSet<>(Arrays.asList("\\", "/"));
+
public void execute() throws MojoExecutionException
{
File sdFile = new File(scriptsDirectory);
@@ -177,8 +179,15 @@ public class ScriptingMavenPlugin extends AbstractMojo
}
static Script getScripts(String script) {
+ String fileSeparator = null;
+ for (String sep : FILE_SEPARATORS) {
+ if (script.contains(sep)) {
+ fileSeparator = sep;
+ break;
+ }
+ }
Script result = new Script();
- String[] parts = script.split(Pattern.quote(File.separator));
+ String[] parts = script.split(Pattern.quote(fileSeparator));
result.rt = parts[0];
result.version = parts.length > 2 ? new Version(parts[1]).toString() : null;