tomee git commit: skipArchiveRootFolder option for tomee maven plugin build goal

[rmannibucau]

Repository: tomee
Updated Branches:
  refs/heads/master 73fe8c45c -> 5286814da


skipArchiveRootFolder option for tomee maven plugin build goal


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

Branch: refs/heads/master
Commit: 5286814da9271e384fb6c4a6b76a625ff934b406
Parents: 73fe8c4
Author: Romain Manni-Bucau <rmannibu...@apache.org>
Authored: Fri Jun 19 16:24:03 2015 +0200
Committer: Romain Manni-Bucau <rmannibu...@apache.org>
Committed: Fri Jun 19 16:24:03 2015 +0200

----------------------------------------------------------------------
 .../org/apache/openejb/maven/plugin/BuildTomEEMojo.java     | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/5286814d/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
----------------------------------------------------------------------
diff --git 
a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
 
b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
index ce4f8f1..bb5c6a6 100644
--- 
a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
+++ 
b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
@@ -64,6 +64,12 @@ public class BuildTomEEMojo extends AbstractTomEEMojo {
     protected String classifier = null;
 
     /**
+     * Behaves as TomEE 1 Maven plugin ie zip structure will get bin/ conf/ 
lib/ ... directly in zip root.
+     */
+    @Parameter(property = "tomee-plugin.no-root", defaultValue = "false")
+    protected boolean skipArchiveRootFolder;
+
+    /**
      * config looks like:
      * &gt;formats&lt;
      *     
&gt;zip>${project.build.directory}/${project.build.finalName}.zip&gt;/zip&lt;
@@ -87,6 +93,9 @@ public class BuildTomEEMojo extends AbstractTomEEMojo {
         if (!prefix.endsWith(File.separator)) {
             prefix += File.separator;
         }
+        if (skipArchiveRootFolder) {
+            prefix += catalinaBase.getName() + File.separator;
+        }
 
         if (zip || formats.containsKey("zip")) {
             getLog().info("Zipping Custom TomEE Distribution");