summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMatthew Piggott2011-01-21 12:33:10 (EST)
committer vladt2011-01-21 14:14:57 (EST)
commita6b89fcde0b2efc03d3bafc4f8c733dd08d6ac33 (patch)
tree9500b1f52875d0c7ee086bfd4d80b65bc70421ec
parent98d1f94dc3681c6cbc82ead5be0298f2e53af938 (diff)
downloadm2e-core-a6b89fcde0b2efc03d3bafc4f8c733dd08d6ac33.zip
m2e-core-a6b89fcde0b2efc03d3bafc4f8c733dd08d6ac33.tar.gz
m2e-core-a6b89fcde0b2efc03d3bafc4f8c733dd08d6ac33.tar.bz2
MNGECLIPSE-2746 - Moved setting marker attributes into LifecycleMappingProblemInfo
-rw-r--r--org.eclipse.m2e.cliresolver30/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--org.eclipse.m2e.discovery/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/WorkspaceHelpers.java6
3 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.m2e.cliresolver30/.settings/org.eclipse.core.resources.prefs b/org.eclipse.m2e.cliresolver30/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index fc41399..0000000
--- a/org.eclipse.m2e.cliresolver30/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Dec 20 22:59:10 EST 2010
-eclipse.preferences.version=1
-encoding//target/classes/META-INF/plexus/components.xml=UTF-8
diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
index 772d439..ff601ef 100644
--- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@ Require-Bundle: org.eclipse.equinox.p2.ui.discovery,
org.eclipse.core.resources,
org.eclipse.ui.ide
Export-Package: org.eclipse.m2e.internal.discovery,
+ org.eclipse.m2e.internal.discovery.markers,
org.eclipse.m2e.internal.discovery.wizards
Import-Package: org.apache.maven.artifact.repository.metadata,
org.apache.maven.model,
diff --git a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/WorkspaceHelpers.java b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/WorkspaceHelpers.java
index 8b4823f..61acb41 100644
--- a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/WorkspaceHelpers.java
+++ b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/WorkspaceHelpers.java
@@ -237,6 +237,7 @@ public class WorkspaceHelpers {
List<IMarker> errorMarkers = WorkspaceHelpers.findErrorMarkers(project);
Assert.assertNotNull(errorMarkers);
Assert.assertEquals(WorkspaceHelpers.toString(errorMarkers), 1, errorMarkers.size());
+ assertLifecycleIdErrorMarkerAttributes(errorMarkers.get(0), lifecycleId);
}
public static void assertConfiguratorErrorMarkerAttributes(IProject project, String configuratorId)
@@ -252,6 +253,7 @@ public class WorkspaceHelpers {
List<IMarker> errorMarkers = WorkspaceHelpers.findErrorMarkers(project);
Assert.assertNotNull(errorMarkers);
Assert.assertEquals(WorkspaceHelpers.toString(errorMarkers), 1, errorMarkers.size());
+ assertLifecyclePackagingErrorMarkerAttributes(errorMarkers.get(0), packagingType);
}
public static void assertLifecycleIdErrorMarkerAttributes(IMarker marker, String lifecycleId) {
@@ -262,10 +264,10 @@ public class WorkspaceHelpers {
}
public static void assertConfiguratorErrorMarkerAttributes(IMarker marker, String configuratorId) {
- Assert.assertEquals("Marker's ConfiguratorID", configuratorId,
- marker.getAttribute(IMavenConstants.MARKER_ATTR_CONFIGURATOR_ID, null));
Assert.assertEquals("Marker's editor hint", IMavenConstants.EDITOR_HINT_MISSING_CONFIGURATOR,
marker.getAttribute(IMavenConstants.MARKER_ATTR_EDITOR_HINT, null));
+ Assert.assertEquals("Marker's ConfiguratorID", configuratorId,
+ marker.getAttribute(IMavenConstants.MARKER_ATTR_CONFIGURATOR_ID, null));
}
public static void assertLifecyclePackagingErrorMarkerAttributes(IMarker marker, String packagingType) {