Author: rmannibucau
Date: Thu May 29 18:27:45 2014
New Revision: 1598356
URL: http://svn.apache.org/r1598356
Log:
TOMEE-1228 ensuring we deploy jar/ear by default even if a custom tomee.xml is
not provided
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=1598356&r1=1598355&r2=1598356&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
Thu May 29 18:27:45 2014
@@ -1025,7 +1025,10 @@ 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
+ || (file.exists()
+ && (
+ (apps != null && !apps.isEmpty())
+ || (!"pom".equals(packaging) &&
!"war".equals(packaging))))) { // 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" +
