[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    tomee git commit: taking into account root folder for exec script
From:       rmannibucau () apache ! org
Date:       2015-06-22 13:14:32
Message-ID: ef412ab37f9b4f209cc66e9c37b4b062 () git ! apache ! org
[Download RAW message or body]

Repository: tomee
Updated Branches:
  refs/heads/master 2f5632c6e -> 82e4348ab


taking into account root folder for exec script


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/82e4348a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/82e4348a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/82e4348a

Branch: refs/heads/master
Commit: 82e4348ab0f035af2fb5215b796b26c529951d9e
Parents: 2f5632c
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Mon Jun 22 15:14:05 2015 +0200
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Mon Jun 22 15:14:05 2015 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/openejb/maven/plugin/ExecMojo.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/82e4348a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java
                
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java \
b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java
 index 29a67c3..af40a75 100644
--- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java
                
+++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ExecMojo.java
 @@ -54,6 +54,8 @@ import static org.apache.openejb.loader.Files.mkdirs;
 
 @Mojo(name = "exec", requiresDependencyResolution = \
ResolutionScope.RUNTIME_PLUS_SYSTEM)  public class ExecMojo extends BuildTomEEMojo {
+    private static final String DEFAULT_SCRIPT = "bin/catalina[.sh|.bat]";
+
     @Parameter(property = "tomee-plugin.exec-file", defaultValue = \
"${project.build.directory}/${project.build.finalName}-exec.jar")  protected File \
execFile;  
@@ -66,7 +68,7 @@ public class ExecMojo extends BuildTomEEMojo {
     @Parameter(property = "tomee-plugin.runtime-working-dir", defaultValue = \
".distribution")  private String runtimeWorkingDir;
 
-    @Parameter(property = "tomee-plugin.script", defaultValue = \
"bin/catalina[.sh|.bat]") +    @Parameter(property = "tomee-plugin.script", \
defaultValue = DEFAULT_SCRIPT)  private String script;
 
     @Override
@@ -99,7 +101,7 @@ public class ExecMojo extends BuildTomEEMojo {
         final Properties config = new Properties();
         config.put("distribution", distributionName);
         config.put("workingDir", runtimeWorkingDir);
-        config.put("command", script);
+        config.put("command", DEFAULT_SCRIPT.equals(script) ? (skipArchiveRootFolder \
? "" : catalinaBase.getName() + "/") + DEFAULT_SCRIPT : script);  final List<String> \
jvmArgs = generateJVMArgs();  
         final String catalinaOpts = toString(jvmArgs);


[prev in list] [next in list] [prev in thread] [next in thread]