commit afeebe6a01490d1fbcbf16a13cbb46b01c125ba3
author Fred Bricon <fbricon@gmail.com> Sun Jul 12 10:13:25 2015 -0400
committer Fred Bricon <fbricon@gmail.com> Sun Jul 12 10:13:46 2015 -0400
tree 97798348d5b3eb3c83dba71484c4f8a1da06e818
parent 247b0036104145e757b295e9a61a11843000461a

471622 : use failOnMissingWebXml value from Maven properties

Change-Id: Ic48e33c0f7a2196c87bdc8f02e7666873306f283
Signed-off-by: Fred Bricon <fbricon@gmail.com>

org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java

diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java
index 355ab2a..9e5504b 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WarPluginConfiguration.java
@@ -70,6 +70,8 @@
 
   private static final String WEB_3_1_TEXT = "3.1"; //$NON-NLS-1$
   
+  private static final String FAIL_ON_MISSING_WEB_XML = "failOnMissingWebXml";
+  
   //Keep backward compat with WTP < Kepler
   private static final IProjectFacetVersion WEB_31 = WebFacetUtils.WEB_FACET.hasVersion(WEB_3_1_TEXT)?
                                                               WebFacetUtils.WEB_FACET.getVersion(WEB_3_1_TEXT)
@@ -408,9 +410,16 @@
   public boolean isFailOnMissingWebXml() {
     Xpp3Dom config = getConfiguration();
     boolean failOnMissingWebXml = true;
+    String fail = null;
     if (config != null) {
-    	failOnMissingWebXml = DomUtils.getBooleanChildValue(config, "failOnMissingWebXml", true); //$NON-NLS-1$
-    };
+      fail = DomUtils.getChildValue(config, FAIL_ON_MISSING_WEB_XML); //$NON-NLS-1$
+    }
+    if (fail == null) {
+      fail = mavenProject.getProperties().getProperty(FAIL_ON_MISSING_WEB_XML); //$NON-NLS-1$
+    }
+    if (fail != null) {
+      failOnMissingWebXml = Boolean.parseBoolean(fail);
+    }
     return failOnMissingWebXml;
   }
 }