You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/06/19 09:14:30 UTC
[tomee] branch master updated: Fix TomEE composer to support win 32
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 72405f8 Fix TomEE composer to support win 32
new aa0c44a Merge pull request #482 from doychin/fix-jwt-itest-for-win32
72405f8 is described below
commit 72405f8eadc467ee57e5a65ee34ba38c91c55dbb
Author: Doychin Bondzhev <do...@dsoft-bg.com>
AuthorDate: Sun Jun 9 21:04:49 2019 +0300
Fix TomEE composer to support win 32
Signed-off-by: Doychin Bondzhev <do...@dsoft-bg.com>
---
.../java/org/apache/tomee/server/composer/TomEE.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/TomEE.java b/itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/TomEE.java
index 69b2b92..6196ad1 100644
--- a/itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/TomEE.java
+++ b/itests/tomee-server-composer/src/main/java/org/apache/tomee/server/composer/TomEE.java
@@ -197,12 +197,17 @@ public class TomEE {
extracted = System.nanoTime() - start;
}
- { // make scripts executable
- Stream.of(new File(home, "bin").listFiles())
- .filter(file1 -> file1.getName().endsWith(".sh"))
- .forEach(file2 -> file2.setExecutable(true));
+ String os = System.getProperty("os.name").toLowerCase();
+ String extension = ".sh";
+ if (!os.contains("win")) {
+ { // make scripts executable
+ Stream.of(new File(home, "bin").listFiles())
+ .filter(file1 -> file1.getName().endsWith(".sh"))
+ .forEach(file2 -> file2.setExecutable(true));
+ }
+ } else {
+ extension = ".bat";
}
-
applyModifications(home);
final int http;
@@ -220,7 +225,7 @@ public class TomEE {
applyHomeConsumers(home);
- final File catalinaSh = Files.file(home, "bin", "catalina.sh");
+ final File catalinaSh = Files.file(home, "bin", "catalina" + extension);
final ProcessBuilder builder = new ProcessBuilder()
.directory(home)