437441 : add warning when build output preference is overridden
Change-Id: I4d62062edea7cf6d0fc4643b4558a437c23de43b
Signed-off-by: Fred Bricon <fbricon@gmail.com>
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarProjectConfiguratorDelegate.java
index 1d244d6..f1ca081 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarProjectConfiguratorDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/EarProjectConfiguratorDelegate.java
@@ -20,6 +20,7 @@
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
@@ -124,12 +125,16 @@
//MECLIPSEWTP-56 : application.xml should not be generated in the source directory
boolean useBuildDirectory = MavenWtpPlugin.getDefault().getMavenWtpPreferencesManager().getPreferences(project).isApplicationXmGeneratedInBuildDirectory();
- useBuildDirectory = useBuildDirectory || config.isFilteringDeploymentDescriptorsEnabled();
+ boolean useResourcefiltering = config.isFilteringDeploymentDescriptorsEnabled();
List<IPath> sourcePaths = new ArrayList<IPath>();
sourcePaths.add(contentDirPath);
- if (useBuildDirectory) {
+ if (!useBuildDirectory && useResourcefiltering) {
+ mavenMarkerManager.addMarker(project, MavenWtpConstants.WTP_MARKER_CONFIGURATION_ERROR_ID,
+ Messages.markers_mavenarchiver_output_settings_ignored_warning, -1, IMarker.SEVERITY_WARNING);
+ }
+ if (useBuildDirectory || useResourcefiltering) {
IPath m2eclipseWtpFolderPath = new Path("/").append(ProjectUtils.getM2eclipseWtpFolder(mavenProject, project)); //$NON-NLS-1$
ProjectUtils.hideM2eclipseWtpFolder(mavenProject, project);
IPath generatedResourcesPath = m2eclipseWtpFolderPath.append(Path.SEPARATOR+MavenWtpConstants.EAR_RESOURCES_FOLDER);
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/messages.properties b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/messages.properties
index 7b62ed8..8c8fc3b 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/messages.properties
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/messages.properties
@@ -49,7 +49,7 @@
Error_Reading_Project_Facet=Can not read project '{0}' facets
markers_unsupported_dependencies_warning=Dependency to project {0} with type {1} is not fully supported. Classpath and/or deployment issues might arise. Try Maven->Disable Workspace Resolution
markers_inclusion_patterns_problem=Using both <{0}> and <packagingIncludes> can not be translated reliably to the equivalent WTP inclusion patterns. Prefer using <packagingIncludes>.
-markers_mavenarchiver_output_settings_ignored_warning=Current Maven Archiver output settings are ignored as web resource filtering is currently used
+markers_mavenarchiver_output_settings_ignored_warning=Current Maven Archiver output settings are ignored as resource filtering is currently used
MavenDeploymentDescriptorManagement_Error_Deleting_Temp_Folder=Could not delete temp file: {0}
MavenSessionHelper_Error_Component_Lookup=Could not lookup required component
RarPluginConfiguration_Project_Must_Have_rar_Packaging=Maven project must have rar packaging
