svn commit: r1593629 - /tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

[rmannibucau]

Author: rmannibucau
Date: Fri May  9 22:05:16 2014
New Revision: 1593629

URL: http://svn.apache.org/r1593629
Log:
trying to not force apps to be configured in tomee.xml is not needed

Modified:
    
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Modified: 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1593629&r1=1593628&r2=1593629&view=diff
==============================================================================
--- 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 (original)
+++ 
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 Fri May  9 22:05:16 2014
@@ -279,7 +279,7 @@ public abstract class AbstractTomEEMojo 
                 existingWebapps = Collections.emptyList();
             }
 
-            unzip(resolve(), catalinaBase);
+            unzip(resolve());
             if (removeDefaultWebapps) { // do it first to let add other war
                 removeDefaultWebapps(removeTomeeWebapp, existingWebapps);
             }
@@ -955,7 +955,7 @@ public abstract class AbstractTomEEMojo 
         }
     }
 
-    private void unzip(final File mvnTomEE, final File catalinaBase) {
+    private void unzip(final File mvnTomEE) {
         ZipFile in = null;
         try {
             in = new ZipFile(mvnTomEE);
@@ -1016,19 +1016,7 @@ public abstract class AbstractTomEEMojo 
                 }
             }
 
-            if (file.exists()) {
-                final FileWriter writer = new FileWriter(file);
-                final String rootTag = container.toLowerCase(Locale.ENGLISH);
-                writer.write("<?xml version=\"1.0\"?>\n" +
-                        "<" + rootTag + ">\n" +
-                        "  <Deployments dir=\"apps\" />\n" +
-                        "</" + rootTag + ">\n");
-                writer.close();
-            }
-            final File appsFolder = new File(catalinaBase, "apps");
-            if (!appsFolder.exists() && !appsFolder.mkdirs()) {
-                throw new RuntimeException("Failed to create: " + appsFolder);
-            }
+            ensureAppsFolderExistAndIsConfiguredByDefault(file);
 
             getLog().info(container + " was unzipped in '" + 
catalinaBase.getAbsolutePath() + "'");
         } catch (Exception e) {
@@ -1044,5 +1032,23 @@ public abstract class AbstractTomEEMojo 
         }
     }
 
+    private void ensureAppsFolderExistAndIsConfiguredByDefault(final File 
file) throws IOException {
+        if ("openejb".equals(container.toLowerCase(Locale.ENGLISH))
+                || (file.exists() && apps != null && !apps.isEmpty())) { // 
webapps doesn't need apps folder in tomee
+            final FileWriter writer = new FileWriter(file);
+            final String rootTag = container.toLowerCase(Locale.ENGLISH);
+            writer.write("<?xml version=\"1.0\"?>\n" +
+                    "<" + rootTag + ">\n" +
+                    "  <Deployments dir=\"apps\" />\n" +
+                    "</" + rootTag + ">\n");
+            writer.close();
+
+            final File appsFolder = new File(catalinaBase, "apps");
+            if (!appsFolder.exists() && !appsFolder.mkdirs()) {
+                throw new RuntimeException("Failed to create: " + appsFolder);
+            }
+        }
+    }
+
     public abstract String getCmd();
 }