commit bf0e717f172875de21c5a7bd4d77ecf3d4d5c5eb
author Brian de Alwis <bsd@mt.ca> Fri Mar 31 16:16:20 2017 -0400
committer Fred Bricon <fbricon@gmail.com> Wed May 17 16:14:33 2017 -0400
tree 781a0897461bf8f1a842e02277ffc5df6ec79321
parent dbc5d2d034a468e662bead4057caf68b08088ebd

Bug 514577 - m2e-wtp web.xml filtering may need to look at user properties

Change-Id: I1a319dc90831e670de1a881ad9b7b3d590b80630
Signed-off-by: Brian de Alwis <bsd@mt.ca>

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 d143d04..0a51d7f 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
@@ -86,6 +86,9 @@
   
   private MavenProject mavenProject;
 
+  /** {@code true} if {@code maven-war-plugin} version is ≥ 3.0.0 */
+  private boolean isVersion3OrGreater = false;
+
   public WarPluginConfiguration(MavenProject mavenProject, IProject project) {
     this.project = project;
     this.mavenProject = mavenProject;
@@ -94,6 +97,7 @@
     	try {
         	VersionRange war_3_0_0 = VersionRange.createFromVersionSpec("[3.0.0,)"); //$NON-NLS-1$
         	if(war_3_0_0.containsVersion(new DefaultArtifactVersion(plugin.getVersion()))) {
+        		isVersion3OrGreater = true;
         		defaultFailOnMissingWebXml = false;
         	}
         } catch(Exception ex) {
@@ -390,10 +394,26 @@
   }
   
   @Override
-protected String getFilteringAttribute() {
+  protected String getFilteringAttribute() {
     return "filteringDeploymentDescriptors"; //$NON-NLS-1$
   }
-  
+
+  public boolean isFilteringDeploymentDescriptorsEnabled() {
+    Xpp3Dom config = getConfiguration();
+    boolean filteringDeploymentDescriptors = false;
+    String filter = null;
+    if (config != null) {
+      filter = DomUtils.getChildValue(config, getFilteringAttribute());
+    }
+    if (filter == null && !isVersion3OrGreater) {
+      filter = mavenProject.getProperties().getProperty("maven.war." + getFilteringAttribute()); //$NON-NLS-1$
+    }
+    if (filter != null) {
+      filteringDeploymentDescriptors = Boolean.parseBoolean(filter);
+    }
+    return filteringDeploymentDescriptors;
+  }
+
   public String getWarName() {
     Xpp3Dom config = getConfiguration();
     String warName = null;