You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/10/19 11:26:04 UTC
tomee git commit: TOMEE-1638 fixing subdirectory in java script mode
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 20df62308 -> 99fdfc220
TOMEE-1638 fixing subdirectory in java script mode
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/99fdfc22
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/99fdfc22
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/99fdfc22
Branch: refs/heads/tomee-1.7.x
Commit: 99fdfc220e4a6d7e6b3913ba110d0a2b801ecb89
Parents: 20df623
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Mon Oct 19 11:25:54 2015 +0200
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Mon Oct 19 11:25:54 2015 +0200
----------------------------------------------------------------------
.../openejb/maven/plugin/runner/ExecRunner.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/99fdfc22/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java
index db675d7..e9b40e3 100644
--- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java
+++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/runner/ExecRunner.java
@@ -77,8 +77,21 @@ public class ExecRunner {
}
final File[] extracted = distribOutput.listFiles();
- if (extracted != null && extracted.length == 1) {
- distribOutput = extracted[0];
+ if (extracted != null) {
+ File newRoot = null;
+ for (final File e : extracted) {
+ if (e.isDirectory()) {
+ if (newRoot == null) {
+ newRoot = e;
+ } else {
+ newRoot = null;
+ break;
+ }
+ }
+ }
+ if (newRoot != null) {
+ distribOutput = newRoot;
+ }
}
final File[] scripts = new File(distribOutput, "bin").listFiles();
if (scripts != null) { // dont use filefilter to avoid dependency issue