438593 : Missing dependent project in Web project's deployment assembly
setting
Change-Id: I0f9747097affd69c5f76c5483903ddca4d3f7a97
Signed-off-by: wecai <wecai@ebay.com>
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UnsupportedDependencyTypeProjectConfigurator.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UnsupportedDependencyTypeProjectConfigurator.java
index ce77373..7305a16 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UnsupportedDependencyTypeProjectConfigurator.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/UnsupportedDependencyTypeProjectConfigurator.java
@@ -55,13 +55,24 @@
@Override
public void configure(ProjectConfigurationRequest request, IProgressMonitor monitor) throws CoreException {
- //Nothing to configure
+ IMavenProjectFacade facade = request.getMavenProjectFacade();
+ checkUnsupportedWorkspaceDependency(monitor, facade);
}
@Override
public void mavenProjectChanged(MavenProjectChangedEvent event, IProgressMonitor monitor) throws CoreException {
IMavenProjectFacade facade = event.getMavenProject();
- if(facade == null) {
+ checkUnsupportedWorkspaceDependency(monitor, facade);
+ }
+
+/**
+ * @param monitor
+ * @param facade
+ * @throws CoreException
+ */
+private void checkUnsupportedWorkspaceDependency(IProgressMonitor monitor,
+ IMavenProjectFacade facade) throws CoreException {
+ if(facade == null) {
return;
}
@@ -92,7 +103,7 @@
}
}
}
- }
+}
private void clearWarnings(IResource resource) throws CoreException {
markerManager.deleteMarkers(resource, WTP_MARKER_UNSUPPORTED_DEPENDENCY_PROBLEM);
diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebProjectConfiguratorDelegate.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebProjectConfiguratorDelegate.java
index f5b4c95..df0586e 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebProjectConfiguratorDelegate.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/WebProjectConfiguratorDelegate.java
@@ -209,6 +209,7 @@
}
+ setModuleDependencies(project, mavenProject, monitor);
WTPProjectsUtil.removeWTPClasspathContainer(project);
}
