Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2011-04-05 15:57:49 -0400
committerIgor Fedorenko2011-04-05 16:03:40 -0400
commit5cfff20bc109ee73ba4dc399662eab5df5797943 (patch)
tree7416f7ec0672d96b99bbd5e66108f3ca45b29c31
parent61b982390eaa5c8035c2ecc70ca5a4b095c76822 (diff)
downloadm2e-core-5cfff20bc109ee73ba4dc399662eab5df5797943.tar.gz
m2e-core-5cfff20bc109ee73ba4dc399662eab5df5797943.tar.xz
m2e-core-5cfff20bc109ee73ba4dc399662eab5df5797943.zip
Introduced IPluginExecutionMetadata interface
Replaced references to generated PluginExecutionMetadata class with IPluginExecutionMetadata interface in all public non-internal classes. Marked IPluginExecutionMetadata as @noimplement/@noextend to make it clear that m2e does not expect external implementations. IPluginExecutionMetadata is almost empty at this point, but we'll be able to introduce new methods as we need then without breaking existing clients. Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--org.eclipse.m2e.core/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.m2e.core/mdo/lifecycle-mapping-metadata-model.xml7
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java37
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingResult.java8
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/LifecycleMappingConfiguration.java13
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/MojoExecutionMappingConfiguration.java7
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/LifecycleMappingConfiguration.java17
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/MavenProjectFacade.java8
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/lifecyclemapping/model/IPluginExecutionMetadata.java21
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/lifecyclemapping/model/PluginExecutionAction.java (renamed from org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/model/PluginExecutionAction.java)2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IMavenProjectFacade.java4
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractCustomizableLifecycleMapping.java19
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java14
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/ILifecycleMappingConfiguration.java4
-rw-r--r--org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java9
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/MavenMarkerResolutionGenerator.java2
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomQuickAssistProcessor.java2
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingOperation.java2
-rw-r--r--org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingProposal.java2
-rw-r--r--org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java6
20 files changed, 109 insertions, 78 deletions
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index 965c8fe4..ead95b8a 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -39,7 +39,7 @@ Export-Package: org.eclipse.m2e.core,
org.eclipse.m2e.core.internal.index;x-friends:="org.eclipse.m2e.core.tests,org.eclipse.m2e.editor,org.eclipse.m2e.editor.xml",
org.eclipse.m2e.core.internal.lifecyclemapping;x-friends:="org.eclipse.m2e.tests,org.eclipse.m2e.editor.xml",
org.eclipse.m2e.core.internal.lifecyclemapping.discovery;x-internal:=true,
- org.eclipse.m2e.core.internal.lifecyclemapping.model;x-friends:="org.eclipse.m2e.tests,org.eclipse.m2e.editor.xml",
+ org.eclipse.m2e.core.internal.lifecyclemapping.model,
org.eclipse.m2e.core.internal.lifecyclemapping.model.io.xpp3;x-internal:=true,
org.eclipse.m2e.core.internal.markers;x-internal:=true,
org.eclipse.m2e.core.internal.preferences;x-friends:="org.eclipse.m2e.core.tests",
@@ -47,6 +47,7 @@ Export-Package: org.eclipse.m2e.core,
org.eclipse.m2e.core.internal.project.registry;x-friends:="org.eclipse.m2e.core.tests",
org.eclipse.m2e.core.internal.repository;x-friends:="org.eclipse.m2e.core.tests",
org.eclipse.m2e.core.jobs,
+ org.eclipse.m2e.core.lifecyclemapping.model,
org.eclipse.m2e.core.project,
org.eclipse.m2e.core.project.configurator,
org.eclipse.m2e.core.repository
diff --git a/org.eclipse.m2e.core/mdo/lifecycle-mapping-metadata-model.xml b/org.eclipse.m2e.core/mdo/lifecycle-mapping-metadata-model.xml
index 7230712a..7d324faf 100644
--- a/org.eclipse.m2e.core/mdo/lifecycle-mapping-metadata-model.xml
+++ b/org.eclipse.m2e.core/mdo/lifecycle-mapping-metadata-model.xml
@@ -196,6 +196,9 @@
<class xml.tagName="pluginExecution" xml.standaloneRead="true">
<name>PluginExecutionMetadata</name>
+ <interfaces>
+ <interface>org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata</interface>
+ </interfaces>
<fields>
<field required="true" xml.tagName="pluginExecutionFilter">
<name>filter</name>
@@ -212,9 +215,9 @@
<codeSegments>
<codeSegment>
<code><![CDATA[
- public PluginExecutionAction getAction() {
+ public org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction getAction() {
org.codehaus.plexus.util.xml.Xpp3Dom actionDom = ((org.codehaus.plexus.util.xml.Xpp3Dom) getActionDom()).getChild(0);
- return PluginExecutionAction.valueOf(actionDom.getName());
+ return org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction.valueOf(actionDom.getName());
}
public org.codehaus.plexus.util.xml.Xpp3Dom getConfiguration() {
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
index 959de8f5..bd563373 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
@@ -69,13 +69,14 @@ import org.eclipse.m2e.core.internal.Messages;
import org.eclipse.m2e.core.internal.embedder.MavenImpl;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadata;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadataSource;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.io.xpp3.LifecycleMappingMetadataSourceXpp3Reader;
import org.eclipse.m2e.core.internal.markers.MavenProblemInfo;
import org.eclipse.m2e.core.internal.markers.SourceLocation;
import org.eclipse.m2e.core.internal.markers.SourceLocationHelper;
import org.eclipse.m2e.core.internal.project.registry.MavenProjectFacade;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.m2e.core.project.configurator.AbstractLifecycleMapping;
import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
@@ -183,7 +184,7 @@ public class LifecycleMappingFactory {
result.setLifecycleMappingMetadata(lifecycleMappingMetadata);
- Map<MojoExecutionKey, List<PluginExecutionMetadata>> executionMapping = new LinkedHashMap<MojoExecutionKey, List<PluginExecutionMetadata>>();
+ Map<MojoExecutionKey, List<IPluginExecutionMetadata>> executionMapping = new LinkedHashMap<MojoExecutionKey, List<IPluginExecutionMetadata>>();
result.setMojoExecutionMapping(executionMapping);
return;
@@ -273,7 +274,7 @@ public class LifecycleMappingFactory {
// PHASE 2. Bind project configurators to mojo executions.
//
- Map<MojoExecutionKey, List<PluginExecutionMetadata>> executionMapping = new LinkedHashMap<MojoExecutionKey, List<PluginExecutionMetadata>>();
+ Map<MojoExecutionKey, List<IPluginExecutionMetadata>> executionMapping = new LinkedHashMap<MojoExecutionKey, List<IPluginExecutionMetadata>>();
if(mojoExecutions != null) {
for(MojoExecution execution : mojoExecutions) {
@@ -317,7 +318,7 @@ public class LifecycleMappingFactory {
primaryMetadata = null;
}
- List<PluginExecutionMetadata> executionMetadatas = new ArrayList<PluginExecutionMetadata>();
+ List<IPluginExecutionMetadata> executionMetadatas = new ArrayList<IPluginExecutionMetadata>();
if(primaryMetadata != null) {
executionMetadatas.add(primaryMetadata);
@@ -410,17 +411,17 @@ public class LifecycleMappingFactory {
}
public static void instantiateProjectConfigurators(MavenProject mavenProject, LifecycleMappingResult result,
- Map<MojoExecutionKey, List<PluginExecutionMetadata>> executionMapping) {
- if(executionMapping == null) {
+ Map<MojoExecutionKey, List<IPluginExecutionMetadata>> map) {
+ if(map == null) {
Map<String, AbstractProjectConfigurator> configurators = Collections.emptyMap();
result.setProjectConfigurators(configurators);
return;
}
Map<String, AbstractProjectConfigurator> configurators = new LinkedHashMap<String, AbstractProjectConfigurator>();
- for(Map.Entry<MojoExecutionKey, List<PluginExecutionMetadata>> entry : executionMapping.entrySet()) {
+ for(Map.Entry<MojoExecutionKey, List<IPluginExecutionMetadata>> entry : map.entrySet()) {
MojoExecutionKey executionKey = entry.getKey();
- List<PluginExecutionMetadata> executionMetadatas = entry.getValue();
+ List<IPluginExecutionMetadata> executionMetadatas = entry.getValue();
if(executionMetadatas == null || executionMetadatas.isEmpty()) {
if(isInterestingPhase(executionKey.getLifecyclePhase())) {
@@ -430,7 +431,7 @@ public class LifecycleMappingFactory {
continue;
}
- for(PluginExecutionMetadata metadata : executionMetadatas) {
+ for(IPluginExecutionMetadata metadata : executionMetadatas) {
String message = LifecycleMappingFactory.getActionMessage(metadata);
switch(metadata.getAction()) {
case error: {
@@ -527,12 +528,12 @@ public class LifecycleMappingFactory {
return DefaultMavenExecutionRequest.copy(templateRequest); // TODO ain't nice
}
- public static AbstractProjectConfigurator createProjectConfigurator(PluginExecutionMetadata pluginExecutionMetadata) {
- PluginExecutionAction pluginExecutionAction = pluginExecutionMetadata.getAction();
+ public static AbstractProjectConfigurator createProjectConfigurator(IPluginExecutionMetadata metadata) {
+ PluginExecutionAction pluginExecutionAction = metadata.getAction();
if(pluginExecutionAction != PluginExecutionAction.configurator) {
throw new IllegalArgumentException();
}
- String configuratorId = getProjectConfiguratorId(pluginExecutionMetadata);
+ String configuratorId = getProjectConfiguratorId(metadata);
AbstractProjectConfigurator projectConfigurator = createProjectConfigurator(configuratorId);
if(projectConfigurator == null) {
String message = NLS.bind(Messages.ProjectConfiguratorNotAvailable, configuratorId);
@@ -541,16 +542,16 @@ public class LifecycleMappingFactory {
return projectConfigurator;
}
- public static String getProjectConfiguratorId(PluginExecutionMetadata pluginExecutionMetadata) {
- Xpp3Dom child = pluginExecutionMetadata.getConfiguration().getChild(ATTR_ID);
+ public static String getProjectConfiguratorId(IPluginExecutionMetadata metadata) {
+ Xpp3Dom child = ((PluginExecutionMetadata) metadata).getConfiguration().getChild(ATTR_ID);
if(child == null || child.getValue().trim().length() == 0) {
throw new LifecycleMappingConfigurationException("A configurator id must be specified");
}
return child.getValue();
}
- public static String getActionMessage(PluginExecutionMetadata pluginExecutionMetadata) {
- Xpp3Dom child = pluginExecutionMetadata.getConfiguration().getChild(ELEMENT_MESSAGE);
+ public static String getActionMessage(IPluginExecutionMetadata metadata) {
+ Xpp3Dom child = ((PluginExecutionMetadata) metadata).getConfiguration().getChild(ELEMENT_MESSAGE);
if(child == null || child.getValue().trim().length() == 0) {
return null;
}
@@ -594,9 +595,9 @@ public class LifecycleMappingFactory {
}
public static MojoExecutionBuildParticipant createMojoExecutionBuildParicipant(IMavenProjectFacade projectFacade,
- MojoExecution mojoExecution, PluginExecutionMetadata pluginExecutionMetadata) {
+ MojoExecution mojoExecution, IPluginExecutionMetadata executionMetadata) {
boolean runOnIncremental = true;
- Xpp3Dom child = pluginExecutionMetadata.getConfiguration().getChild(ELEMENT_RUN_ON_INCREMENTAL);
+ Xpp3Dom child = ((PluginExecutionMetadata) executionMetadata).getConfiguration().getChild(ELEMENT_RUN_ON_INCREMENTAL);
if(child != null) {
runOnIncremental = Boolean.parseBoolean(child.getValue());
}
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingResult.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingResult.java
index 60e184ef..55c83b80 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingResult.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingResult.java
@@ -16,8 +16,8 @@ import java.util.List;
import java.util.Map;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadata;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
import org.eclipse.m2e.core.internal.markers.MavenProblemInfo;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
import org.eclipse.m2e.core.project.configurator.AbstractLifecycleMapping;
import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
import org.eclipse.m2e.core.project.configurator.MojoExecutionKey;
@@ -26,7 +26,7 @@ import org.eclipse.m2e.core.project.configurator.MojoExecutionKey;
public class LifecycleMappingResult {
private LifecycleMappingMetadata lifecycleMappingMetadata;
- private Map<MojoExecutionKey, List<PluginExecutionMetadata>> mojoExecutionMapping;
+ private Map<MojoExecutionKey, List<IPluginExecutionMetadata>> mojoExecutionMapping;
private List<MavenProblemInfo> problems = new ArrayList<MavenProblemInfo>();
@@ -42,7 +42,7 @@ public class LifecycleMappingResult {
return this.lifecycleMappingMetadata;
}
- public Map<MojoExecutionKey, List<PluginExecutionMetadata>> getMojoExecutionMapping() {
+ public Map<MojoExecutionKey, List<IPluginExecutionMetadata>> getMojoExecutionMapping() {
return mojoExecutionMapping;
}
@@ -58,7 +58,7 @@ public class LifecycleMappingResult {
this.lifecycleMappingMetadata = lifecycleMappingMetadata;
}
- public void setMojoExecutionMapping(Map<MojoExecutionKey, List<PluginExecutionMetadata>> mojoExecutionMapping) {
+ public void setMojoExecutionMapping(Map<MojoExecutionKey, List<IPluginExecutionMetadata>> mojoExecutionMapping) {
this.mojoExecutionMapping = mojoExecutionMapping;
}
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/LifecycleMappingConfiguration.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/LifecycleMappingConfiguration.java
index 84097954..2e1f8d37 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/LifecycleMappingConfiguration.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/LifecycleMappingConfiguration.java
@@ -48,6 +48,7 @@ import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMeta
import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadataSource;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
import org.eclipse.m2e.core.project.MavenProjectInfo;
import org.eclipse.m2e.core.project.ProjectImportConfiguration;
import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
@@ -348,11 +349,11 @@ public class LifecycleMappingConfiguration {
.getLifecycleMappingRequirement());
}
- for(Map.Entry<MojoExecutionKey, List<PluginExecutionMetadata>> entry : lifecycleResult
+ for(Map.Entry<MojoExecutionKey, List<IPluginExecutionMetadata>> entry : lifecycleResult
.getMojoExecutionMapping().entrySet()) {
MojoExecutionKey key = entry.getKey();
- List<PluginExecutionMetadata> mapppings = entry.getValue();
- PluginExecutionMetadata primaryMapping = null;
+ List<IPluginExecutionMetadata> mapppings = entry.getValue();
+ IPluginExecutionMetadata primaryMapping = null;
if(mapppings != null && !mapppings.isEmpty()) {
primaryMapping = mapppings.get(0);
}
@@ -397,11 +398,11 @@ public class LifecycleMappingConfiguration {
return result;
}
- private static boolean isProjectSource(PluginExecutionMetadata mapping) {
- if (mapping == null) {
+ private static boolean isProjectSource(IPluginExecutionMetadata primaryMapping) {
+ if (primaryMapping == null) {
return false;
}
- return isProjectSource(mapping.getSource());
+ return isProjectSource(((PluginExecutionMetadata) primaryMapping).getSource());
}
private static boolean isProjectSource(LifecycleMappingMetadata mappingMetadata) {
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/MojoExecutionMappingConfiguration.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/MojoExecutionMappingConfiguration.java
index 143ad68a..a7a4e890 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/MojoExecutionMappingConfiguration.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/MojoExecutionMappingConfiguration.java
@@ -9,8 +9,9 @@
package org.eclipse.m2e.core.internal.lifecyclemapping.discovery;
import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.core.project.configurator.MojoExecutionKey;
@@ -94,9 +95,9 @@ public class MojoExecutionMappingConfiguration implements ILifecycleMappingEleme
private final ILifecycleMappingRequirement requirement;
- public MojoExecutionMappingConfiguration(MojoExecutionKey execution, PluginExecutionMetadata mapping) {
+ public MojoExecutionMappingConfiguration(MojoExecutionKey execution, IPluginExecutionMetadata mapping) {
this.execution = execution;
- this.mapping = mapping;
+ this.mapping = (PluginExecutionMetadata) mapping;
if(mapping == null) {
requirement = new MojoExecutionMappingRequirement(execution);
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/LifecycleMappingConfiguration.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/LifecycleMappingConfiguration.java
index eeb14862..abc5da39 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/LifecycleMappingConfiguration.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/LifecycleMappingConfiguration.java
@@ -35,8 +35,9 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.apache.maven.plugin.MojoExecution;
import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.m2e.core.project.configurator.ILifecycleMappingConfiguration;
import org.eclipse.m2e.core.project.configurator.MojoExecutionKey;
@@ -50,12 +51,12 @@ public class LifecycleMappingConfiguration implements ILifecycleMappingConfigura
private final String lifecycleMappingId;
- private final Map<MojoExecutionKey, List<PluginExecutionMetadata>> mojoExecutionMapping;
+ private final Map<MojoExecutionKey, List<IPluginExecutionMetadata>> mojoExecutionMapping;
private final Map<MojoExecutionKey, Xpp3Dom> mojoExecutionConfiguration;
public LifecycleMappingConfiguration(String lifecycleMappingId,
- Map<MojoExecutionKey, List<PluginExecutionMetadata>> mojoExecutionMapping,
+ Map<MojoExecutionKey, List<IPluginExecutionMetadata>> mojoExecutionMapping,
Map<MojoExecutionKey, Xpp3Dom> mojoExecutionConfiguration) {
this.lifecycleMappingId = lifecycleMappingId;
this.mojoExecutionMapping = mojoExecutionMapping;
@@ -66,7 +67,7 @@ public class LifecycleMappingConfiguration implements ILifecycleMappingConfigura
return lifecycleMappingId;
}
- public Map<MojoExecutionKey, List<PluginExecutionMetadata>> getMojoExecutionMapping() {
+ public Map<MojoExecutionKey, List<IPluginExecutionMetadata>> getMojoExecutionMapping() {
return mojoExecutionMapping;
}
@@ -100,7 +101,7 @@ public class LifecycleMappingConfiguration implements ILifecycleMappingConfigura
public static LifecycleMappingConfiguration newLifecycleMappingConfiguration(IMavenProjectFacade facade,
IProgressMonitor monitor) throws CoreException {
String lifecycleMappingId = facade.getLifecycleMappingId();
- Map<MojoExecutionKey, List<PluginExecutionMetadata>> mojoExecutionMapping = facade.getMojoExecutionMapping();
+ Map<MojoExecutionKey, List<IPluginExecutionMetadata>> mojoExecutionMapping = facade.getMojoExecutionMapping();
if(lifecycleMappingId == null || mojoExecutionMapping == null) {
return null;
@@ -108,10 +109,10 @@ public class LifecycleMappingConfiguration implements ILifecycleMappingConfigura
Map<MojoExecutionKey, Xpp3Dom> mojoExecutionConfiguration = new LinkedHashMap<MojoExecutionKey, Xpp3Dom>();
- for(Map.Entry<MojoExecutionKey, List<PluginExecutionMetadata>> entry : mojoExecutionMapping.entrySet()) {
- List<PluginExecutionMetadata> metadatas = entry.getValue();
+ for(Map.Entry<MojoExecutionKey, List<IPluginExecutionMetadata>> entry : mojoExecutionMapping.entrySet()) {
+ List<IPluginExecutionMetadata> metadatas = entry.getValue();
if(metadatas != null) {
- for(PluginExecutionMetadata metadata : metadatas) {
+ for(IPluginExecutionMetadata metadata : metadatas) {
if(metadata.getAction() == PluginExecutionAction.configurator) {
MojoExecution execution = facade.getMojoExecution(entry.getKey(), monitor);
mojoExecutionConfiguration.put(entry.getKey(), execution.getConfiguration());
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/MavenProjectFacade.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/MavenProjectFacade.java
index a4ac6f75..69195983 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/MavenProjectFacade.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/MavenProjectFacade.java
@@ -43,7 +43,7 @@ import org.eclipse.m2e.core.embedder.ArtifactRepositoryRef;
import org.eclipse.m2e.core.embedder.IMaven;
import org.eclipse.m2e.core.embedder.IMavenConfiguration;
import org.eclipse.m2e.core.internal.Messages;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.m2e.core.project.MavenProjectUtils;
import org.eclipse.m2e.core.project.MavenUpdateRequest;
@@ -96,7 +96,7 @@ public class MavenProjectFacade implements IMavenProjectFacade, Serializable {
// lifecycle mapping
private String lifecycleMappingId;
- private Map<MojoExecutionKey, List<PluginExecutionMetadata>> mojoExecutionMapping;
+ private Map<MojoExecutionKey, List<IPluginExecutionMetadata>> mojoExecutionMapping;
public MavenProjectFacade(ProjectRegistryManager manager, IFile pom, MavenProject mavenProject,
Map<String, List<MojoExecution>> executionPlans, ResolverConfiguration resolverConfiguration) {
@@ -340,7 +340,7 @@ public class MavenProjectFacade implements IMavenProjectFacade, Serializable {
return lifecycleMappingId;
}
- public Map<MojoExecutionKey, List<PluginExecutionMetadata>> getMojoExecutionMapping() {
+ public Map<MojoExecutionKey, List<IPluginExecutionMetadata>> getMojoExecutionMapping() {
return mojoExecutionMapping;
}
@@ -402,7 +402,7 @@ public class MavenProjectFacade implements IMavenProjectFacade, Serializable {
this.lifecycleMappingId = lifecycleMappingId;
}
- public void setMojoExecutionMapping(Map<MojoExecutionKey, List<PluginExecutionMetadata>> mojoExecutionMapping) {
+ public void setMojoExecutionMapping(Map<MojoExecutionKey, List<IPluginExecutionMetadata>> mojoExecutionMapping) {
this.mojoExecutionMapping = mojoExecutionMapping;
}
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/lifecyclemapping/model/IPluginExecutionMetadata.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/lifecyclemapping/model/IPluginExecutionMetadata.java
new file mode 100644
index 00000000..e7f11180
--- /dev/null
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/lifecyclemapping/model/IPluginExecutionMetadata.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Sonatype, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Sonatype, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.m2e.core.lifecyclemapping.model;
+
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
+ */
+public interface IPluginExecutionMetadata {
+
+ PluginExecutionAction getAction();
+
+}
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/model/PluginExecutionAction.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/lifecyclemapping/model/PluginExecutionAction.java
index 530b8206..3485a8c6 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/model/PluginExecutionAction.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/lifecyclemapping/model/PluginExecutionAction.java
@@ -8,7 +8,7 @@
* Contributors:
* Sonatype, Inc. - initial API and implementation
*******************************************************************************/
-package org.eclipse.m2e.core.internal.lifecyclemapping.model;
+package org.eclipse.m2e.core.lifecyclemapping.model;
public enum PluginExecutionAction {
ignore, //
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IMavenProjectFacade.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IMavenProjectFacade.java
index b6313713..0d510e0f 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IMavenProjectFacade.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IMavenProjectFacade.java
@@ -28,7 +28,7 @@ import org.apache.maven.project.MavenProject;
import org.eclipse.m2e.core.embedder.ArtifactKey;
import org.eclipse.m2e.core.embedder.ArtifactRef;
import org.eclipse.m2e.core.embedder.ArtifactRepositoryRef;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
import org.eclipse.m2e.core.project.configurator.MojoExecutionKey;
/**
@@ -153,5 +153,5 @@ public interface IMavenProjectFacade {
public String getLifecycleMappingId();
- public Map<MojoExecutionKey, List<PluginExecutionMetadata>> getMojoExecutionMapping();
+ public Map<MojoExecutionKey, List<IPluginExecutionMetadata>> getMojoExecutionMapping();
}
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractCustomizableLifecycleMapping.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractCustomizableLifecycleMapping.java
index 72092dec..07b031a4 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractCustomizableLifecycleMapping.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractCustomizableLifecycleMapping.java
@@ -29,6 +29,7 @@ import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
import org.eclipse.m2e.core.internal.project.registry.MavenProjectFacade;
import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
@@ -45,7 +46,7 @@ public abstract class AbstractCustomizableLifecycleMapping extends AbstractLifec
log.debug("Build participants for {}", projectFacade.getMavenProject());
Map<MojoExecutionKey, List<AbstractBuildParticipant>> result = new LinkedHashMap<MojoExecutionKey, List<AbstractBuildParticipant>>();
- Map<MojoExecutionKey, List<PluginExecutionMetadata>> mapping = projectFacade.getMojoExecutionMapping();
+ Map<MojoExecutionKey, List<IPluginExecutionMetadata>> mapping = projectFacade.getMojoExecutionMapping();
Map<String, AbstractProjectConfigurator> configurators = getProjectConfigurators(projectFacade);
List<MojoExecution> mojoExecutions = ((MavenProjectFacade) projectFacade).getExecutionPlan(
@@ -55,10 +56,10 @@ public abstract class AbstractCustomizableLifecycleMapping extends AbstractLifec
for(MojoExecution mojoExecution : mojoExecutions) {
MojoExecutionKey mojoExecutionKey = new MojoExecutionKey(mojoExecution);
log.debug("Mojo execution key: {}", mojoExecutionKey);
- List<PluginExecutionMetadata> executionMetadatas = mapping.get(mojoExecutionKey);
+ List<IPluginExecutionMetadata> executionMetadatas = mapping.get(mojoExecutionKey);
List<AbstractBuildParticipant> executionMappings = new ArrayList<AbstractBuildParticipant>();
if(executionMetadatas != null) {
- for(PluginExecutionMetadata executionMetadata : executionMetadatas) {
+ for(IPluginExecutionMetadata executionMetadata : executionMetadatas) {
log.debug("\tAction: {}", executionMetadata.getAction());
switch(executionMetadata.getAction()) {
case execute:
@@ -113,12 +114,12 @@ public abstract class AbstractCustomizableLifecycleMapping extends AbstractLifec
return true;
}
- Map<MojoExecutionKey, List<PluginExecutionMetadata>> oldMappings = oldConfiguration.getMojoExecutionMapping();
+ Map<MojoExecutionKey, List<IPluginExecutionMetadata>> oldMappings = oldConfiguration.getMojoExecutionMapping();
- for(Map.Entry<MojoExecutionKey, List<PluginExecutionMetadata>> entry : newFacade.getMojoExecutionMapping()
+ for(Map.Entry<MojoExecutionKey, List<IPluginExecutionMetadata>> entry : newFacade.getMojoExecutionMapping()
.entrySet()) {
- List<PluginExecutionMetadata> metadatas = entry.getValue();
- List<PluginExecutionMetadata> oldMetadatas = oldMappings.get(entry.getKey());
+ List<IPluginExecutionMetadata> metadatas = entry.getValue();
+ List<IPluginExecutionMetadata> oldMetadatas = oldMappings.get(entry.getKey());
if(metadatas == null || metadatas.isEmpty()) {
if(oldMetadatas != null && !oldMetadatas.isEmpty()) {
return true; // different
@@ -132,8 +133,8 @@ public abstract class AbstractCustomizableLifecycleMapping extends AbstractLifec
return true;
}
for(int i = 0; i < metadatas.size(); i++ ) {
- PluginExecutionMetadata metadata = metadatas.get(i);
- PluginExecutionMetadata oldMetadata = oldMetadatas.get(i);
+ IPluginExecutionMetadata metadata = metadatas.get(i);
+ IPluginExecutionMetadata oldMetadata = oldMetadatas.get(i);
if(metadata == null) {
if(oldMetadata != null) {
return true;
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java
index f0c63d31..58128422 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java
@@ -42,9 +42,9 @@ import org.eclipse.m2e.core.embedder.IMaven;
import org.eclipse.m2e.core.embedder.IMavenConfiguration;
import org.eclipse.m2e.core.internal.Messages;
import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
import org.eclipse.m2e.core.internal.markers.IMavenMarkerManager;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.core.project.IMavenProjectChangedListener;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.m2e.core.project.MavenProjectChangedEvent;
@@ -185,7 +185,7 @@ public abstract class AbstractProjectConfigurator implements IExecutableExtensio
}
public AbstractBuildParticipant getBuildParticipant(IMavenProjectFacade projectFacade, MojoExecution execution,
- PluginExecutionMetadata executionMetadata) {
+ IPluginExecutionMetadata executionMetadata) {
return null;
}
@@ -245,11 +245,11 @@ public abstract class AbstractProjectConfigurator implements IExecutableExtensio
*/
public static Map<String, Set<MojoExecutionKey>> getConfiguratorExecutions(IMavenProjectFacade projectFacade) {
Map<String, Set<MojoExecutionKey>> configuratorExecutions = new HashMap<String, Set<MojoExecutionKey>>();
- Map<MojoExecutionKey, List<PluginExecutionMetadata>> executionMapping = projectFacade.getMojoExecutionMapping();
- for(Map.Entry<MojoExecutionKey, List<PluginExecutionMetadata>> entry : executionMapping.entrySet()) {
- List<PluginExecutionMetadata> metadatas = entry.getValue();
+ Map<MojoExecutionKey, List<IPluginExecutionMetadata>> executionMapping = projectFacade.getMojoExecutionMapping();
+ for(Map.Entry<MojoExecutionKey, List<IPluginExecutionMetadata>> entry : executionMapping.entrySet()) {
+ List<IPluginExecutionMetadata> metadatas = entry.getValue();
if(metadatas != null) {
- for(PluginExecutionMetadata metadata : metadatas) {
+ for(IPluginExecutionMetadata metadata : metadatas) {
if(metadata.getAction() == PluginExecutionAction.configurator) {
String configuratorId = LifecycleMappingFactory.getProjectConfiguratorId(metadata);
if(configuratorId != null) {
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/ILifecycleMappingConfiguration.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/ILifecycleMappingConfiguration.java
index 7317f250..e6d75699 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/ILifecycleMappingConfiguration.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/ILifecycleMappingConfiguration.java
@@ -15,7 +15,7 @@ import java.util.Map;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
/**
* ILifecycleMappingConfiguration
@@ -35,7 +35,7 @@ public interface ILifecycleMappingConfiguration {
/**
* @return
*/
- Map<MojoExecutionKey, List<PluginExecutionMetadata>> getMojoExecutionMapping();
+ Map<MojoExecutionKey, List<IPluginExecutionMetadata>> getMojoExecutionMapping();
/**
* @param key
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java
index 47055288..70259539 100644
--- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java
+++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java
@@ -53,8 +53,9 @@ import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.MojoExecutionMap
import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.PackagingTypeMappingConfiguration;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadata;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadataSource;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
+import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.core.project.configurator.MojoExecutionKey;
import org.eclipse.m2e.core.ui.internal.wizards.IImportWizardPageFactory;
import org.eclipse.m2e.internal.discovery.operation.MavenDiscoveryInstallOperation;
@@ -200,11 +201,11 @@ public class MavenDiscoveryService implements IImportWizardPageFactory, IMavenDi
}
}
- for(Map.Entry<MojoExecutionKey, List<PluginExecutionMetadata>> entry : mappingResult.getMojoExecutionMapping()
+ for(Map.Entry<MojoExecutionKey, List<IPluginExecutionMetadata>> entry : mappingResult.getMojoExecutionMapping()
.entrySet()) {
if(entry.getValue() != null) {
- for(PluginExecutionMetadata executionMapping : entry.getValue()) {
- IMavenDiscoveryProposal proposal = getProposal(executionMapping.getSource());
+ for(IPluginExecutionMetadata executionMapping : entry.getValue()) {
+ IMavenDiscoveryProposal proposal = getProposal(((PluginExecutionMetadata)executionMapping).getSource());
if(proposal != null) {
// assumes installation of mapping proposal installs all required project configurators
put(proposals, new MojoExecutionMappingConfiguration.MojoExecutionMappingRequirement(entry.getKey()),
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/MavenMarkerResolutionGenerator.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/MavenMarkerResolutionGenerator.java
index da754dda..c6a31500 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/MavenMarkerResolutionGenerator.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/MavenMarkerResolutionGenerator.java
@@ -17,7 +17,7 @@ import org.eclipse.ui.IMarkerResolutionGenerator;
import org.eclipse.ui.IMarkerResolutionGenerator2;
import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction;
+import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.editor.xml.internal.lifecycle.LifecycleMappingProposal;
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomQuickAssistProcessor.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomQuickAssistProcessor.java
index 4105683d..751c384b 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomQuickAssistProcessor.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomQuickAssistProcessor.java
@@ -56,7 +56,7 @@ import org.eclipse.wst.sse.core.utils.StringUtils;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction;
+import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.editor.xml.internal.Messages;
import org.eclipse.m2e.editor.xml.internal.NodeOperation;
import org.eclipse.m2e.editor.xml.internal.XmlUtils;
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingOperation.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingOperation.java
index 3b536a3e..08be2bfd 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingOperation.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingOperation.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction;
+import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction;
import org.eclipse.m2e.core.ui.internal.editing.PomEdits.Operation;
import org.eclipse.m2e.core.ui.internal.editing.PomHelper;
diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingProposal.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingProposal.java
index e1f234c0..7ab80136 100644
--- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingProposal.java
+++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/internal/lifecycle/LifecycleMappingProposal.java
@@ -34,7 +34,7 @@ import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.texteditor.MarkerAnnotation;
import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction;
+import org.eclipse.m2e.core.lifecyclemapping.model.PluginExecutionAction;
import static org.eclipse.m2e.core.ui.internal.editing.PomEdits.*;
import org.eclipse.m2e.editor.xml.internal.Messages;
diff --git a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java
index 52e36916..25a830e1 100644
--- a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java
+++ b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java
@@ -36,9 +36,9 @@ import org.apache.maven.project.MavenProject;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadataSource;
-import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata;
import org.eclipse.m2e.core.internal.project.registry.MavenProjectFacade;
import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager;
+import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.m2e.core.project.IProjectConfigurationManager;
import org.eclipse.m2e.core.project.MavenProjectManager;
@@ -114,9 +114,9 @@ public abstract class AbstractLifecycleMappingTest extends AbstractMavenProjectT
protected List<MojoExecutionKey> getNotCoveredMojoExecutions(IMavenProjectFacade facade) {
List<MojoExecutionKey> result = new ArrayList<MojoExecutionKey>();
- Map<MojoExecutionKey, List<PluginExecutionMetadata>> executionMapping = facade.getMojoExecutionMapping();
+ Map<MojoExecutionKey, List<IPluginExecutionMetadata>> executionMapping = facade.getMojoExecutionMapping();
- for(Map.Entry<MojoExecutionKey, List<PluginExecutionMetadata>> entry : executionMapping.entrySet()) {
+ for(Map.Entry<MojoExecutionKey, List<IPluginExecutionMetadata>> entry : executionMapping.entrySet()) {
if(entry.getValue() == null || entry.getValue().isEmpty()) {
if (LifecycleMappingFactory.isInterestingPhase(entry.getKey().getLifecyclePhase())) {
result.add(entry.getKey());

Back to the top