diff options
48 files changed, 107 insertions, 106 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java index 04cf5b22..48eb5f25 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/M2EUIPluginActivator.java @@ -17,7 +17,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.core.IMavenConstants; -import org.eclipse.m2e.core.internal.lifecycle.discovery.IMavenDisovery; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDisovery; import org.eclipse.m2e.core.ui.internal.console.MavenConsoleImpl; import org.eclipse.m2e.core.ui.internal.search.util.IndexSearchEngine; import org.eclipse.m2e.core.ui.internal.search.util.SearchEngine; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/LifecycleMappingConfiguration.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/LifecycleMappingConfiguration.java index 738c3025..7835a3be 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/LifecycleMappingConfiguration.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/LifecycleMappingConfiguration.java @@ -31,16 +31,16 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.IMaven; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingConfigurationException; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingResult; -import org.eclipse.m2e.core.internal.lifecycle.discovery.ILifecycleMappingElementKey; -import org.eclipse.m2e.core.internal.lifecycle.discovery.IMavenDiscoveryProposal; -import org.eclipse.m2e.core.internal.lifecycle.discovery.MojoExecutionMappingConfiguration; -import org.eclipse.m2e.core.internal.lifecycle.discovery.PackagingTypeMappingConfiguration; -import org.eclipse.m2e.core.internal.lifecycle.discovery.ProjectLifecycleMappingConfiguration; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionAction; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingConfigurationException; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingResult; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.ILifecycleMappingElementKey; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDiscoveryProposal; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.MojoExecutionMappingConfiguration; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.PackagingTypeMappingConfiguration; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.ProjectLifecycleMappingConfiguration; +import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction; +import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata; import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager; import org.eclipse.m2e.core.project.MavenProjectInfo; import org.eclipse.m2e.core.project.ProjectImportConfiguration; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/MojoExecutionMappingLabelProvider.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/MojoExecutionMappingLabelProvider.java index c519e4da..c6cdfec8 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/MojoExecutionMappingLabelProvider.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/MojoExecutionMappingLabelProvider.java @@ -8,9 +8,9 @@ package org.eclipse.m2e.core.ui.internal.lifecyclemapping; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; -import org.eclipse.m2e.core.internal.lifecycle.discovery.MojoExecutionMappingConfiguration; -import org.eclipse.m2e.core.internal.lifecycle.discovery.MojoExecutionMappingConfiguration.MojoExecutionMappingInfo; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.MojoExecutionMappingConfiguration; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.MojoExecutionMappingConfiguration.MojoExecutionMappingInfo; import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/PackagingTypeMappingLabelProvider.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/PackagingTypeMappingLabelProvider.java index c9da70fb..74713488 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/PackagingTypeMappingLabelProvider.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/lifecyclemapping/PackagingTypeMappingLabelProvider.java @@ -8,7 +8,7 @@ package org.eclipse.m2e.core.ui.internal.lifecyclemapping; -import org.eclipse.m2e.core.internal.lifecycle.discovery.PackagingTypeMappingConfiguration; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.PackagingTypeMappingConfiguration; /** diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/AbstractMavenProjectWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/AbstractMavenProjectWizard.java index a95008ff..af46a517 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/AbstractMavenProjectWizard.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/AbstractMavenProjectWizard.java @@ -16,7 +16,7 @@ import java.util.List; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.m2e.core.internal.lifecycle.discovery.IMavenDisovery; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDisovery; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; import org.eclipse.m2e.core.ui.internal.actions.SelectionUtil; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java index 344a7afc..b9dbf394 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java @@ -35,12 +35,12 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewerColumn; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.m2e.core.internal.lifecycle.discovery.ILifecycleMappingElementKey; -import org.eclipse.m2e.core.internal.lifecycle.discovery.IMavenDiscoveryProposal; -import org.eclipse.m2e.core.internal.lifecycle.discovery.IMavenDisovery; -import org.eclipse.m2e.core.internal.lifecycle.discovery.MojoExecutionMappingConfiguration; -import org.eclipse.m2e.core.internal.lifecycle.discovery.PackagingTypeMappingConfiguration; -import org.eclipse.m2e.core.internal.lifecycle.discovery.ProjectLifecycleMappingConfiguration; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.ILifecycleMappingElementKey; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDiscoveryProposal; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDisovery; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.MojoExecutionMappingConfiguration; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.PackagingTypeMappingConfiguration; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.ProjectLifecycleMappingConfiguration; import org.eclipse.m2e.core.project.MavenProjectInfo; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.ui.internal.lifecyclemapping.ILifecycleMappingLabelProvider; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java index 373d4db4..a34be815 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java @@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.internal.lifecycle.discovery.IMavenDiscoveryProposal; -import org.eclipse.m2e.core.internal.lifecycle.discovery.IMavenDisovery; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDiscoveryProposal; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDisovery; import org.eclipse.m2e.core.project.IMavenProjectImportResult; import org.eclipse.m2e.core.project.MavenProjectInfo; import org.eclipse.m2e.core.project.ProjectImportConfiguration; diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index b6a035cc..bedd84a6 100644 --- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -36,10 +36,10 @@ Export-Package: org.eclipse.m2e.core, org.eclipse.m2e.core.internal.content;x-internal:=true, org.eclipse.m2e.core.internal.embedder;x-friends:="org.eclipse.m2e.core.tests", org.eclipse.m2e.core.internal.index;x-friends:="org.eclipse.m2e.core.tests", - org.eclipse.m2e.core.internal.lifecycle;x-friends:="org.eclipse.m2e.tests,org.eclipse.m2e.editor.xml", - org.eclipse.m2e.core.internal.lifecycle.discovery;x-internal:=true, - org.eclipse.m2e.core.internal.lifecycle.model;x-friends:="org.eclipse.m2e.tests,org.eclipse.m2e.editor.xml", - org.eclipse.m2e.core.internal.lifecycle.model.io.xpp3;x-friends:="org.eclipse.m2e.tests", + 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.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", org.eclipse.m2e.core.internal.project;x-friends:="org.eclipse.m2e.core.tests", 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 5629f4f6..a6ab7694 100644 --- a/org.eclipse.m2e.core/mdo/lifecycle-mapping-metadata-model.xml +++ b/org.eclipse.m2e.core/mdo/lifecycle-mapping-metadata-model.xml @@ -9,7 +9,7 @@ <defaults> <default> <key>package</key> - <value>org.eclipse.m2e.core.internal.lifecycle.model</value> + <value>org.eclipse.m2e.core.internal.lifecyclemapping.model</value> </default> </defaults> diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/ActionMessageProblemInfo.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/ActionMessageProblemInfo.java index 258aac5c..2fdacc52 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/ActionMessageProblemInfo.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/ActionMessageProblemInfo.java @@ -8,7 +8,7 @@ * Contributors: * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import org.eclipse.m2e.core.internal.markers.SourceLocation; import org.eclipse.m2e.core.internal.markers.MavenProblemInfo; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/DuplicateMappingException.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/DuplicateMappingException.java index 367b1320..5b00a0c3 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/DuplicateMappingException.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/DuplicateMappingException.java @@ -8,7 +8,7 @@ * Contributors: * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; public class DuplicateMappingException extends RuntimeException { private static final long serialVersionUID = 6916144930019743563L; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/InvalidLifecycleMapping.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/InvalidLifecycleMapping.java index f2f86e8a..10e02cfd 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/InvalidLifecycleMapping.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/InvalidLifecycleMapping.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import java.util.Collections; import java.util.List; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/LifecycleMappingConfigurationException.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingConfigurationException.java index dfd53910..d80feb23 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/LifecycleMappingConfigurationException.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingConfigurationException.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import org.eclipse.m2e.core.internal.markers.SourceLocation; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/LifecycleMappingFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java index 1cc44c73..673eafbe 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/LifecycleMappingFactory.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import java.io.File; import java.io.FileInputStream; @@ -65,11 +65,11 @@ import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.internal.Messages; import org.eclipse.m2e.core.internal.embedder.MavenImpl; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadata; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadataSource; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionAction; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; -import org.eclipse.m2e.core.internal.lifecycle.model.io.xpp3.LifecycleMappingMetadataSourceXpp3Reader; +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; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/LifecycleMappingResult.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingResult.java index 95e9d1ea..60e184ef 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/LifecycleMappingResult.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingResult.java @@ -9,14 +9,14 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadata; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; +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.project.configurator.AbstractLifecycleMapping; import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/MappingMetadataSource.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/MappingMetadataSource.java index b1f34fbf..d503b250 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/MappingMetadataSource.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/MappingMetadataSource.java @@ -9,14 +9,14 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import java.util.List; import org.apache.maven.plugin.MojoExecution; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadata; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; +import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadata; +import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata; /** diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/MissingConfiguratorProblemInfo.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/MissingConfiguratorProblemInfo.java index 2e045cb3..1a599ac0 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/MissingConfiguratorProblemInfo.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/MissingConfiguratorProblemInfo.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/MissingLifecycleExtensionPoint.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/MissingLifecycleExtensionPoint.java index 50e55154..cb3b1cb2 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/MissingLifecycleExtensionPoint.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/MissingLifecycleExtensionPoint.java @@ -8,7 +8,7 @@ * Contributors: * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/MissingLifecyclePackaging.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/MissingLifecyclePackaging.java index a7497902..b450de7b 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/MissingLifecyclePackaging.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/MissingLifecyclePackaging.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/NotCoveredMojoExecution.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/NotCoveredMojoExecution.java index 772ee52b..1e63807b 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/NotCoveredMojoExecution.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/NotCoveredMojoExecution.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/SimpleMappingMetadataSource.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/SimpleMappingMetadataSource.java index b9e90e97..296b333d 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/SimpleMappingMetadataSource.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/SimpleMappingMetadataSource.java @@ -9,16 +9,16 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle; +package org.eclipse.m2e.core.internal.lifecyclemapping; import java.util.ArrayList; import java.util.List; import org.apache.maven.plugin.MojoExecution; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadata; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadataSource; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; +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.PluginExecutionMetadata; import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/ILifecycleMappingElementKey.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/ILifecycleMappingElementKey.java index f76bd64e..9c2fa642 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/ILifecycleMappingElementKey.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/ILifecycleMappingElementKey.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle.discovery; +package org.eclipse.m2e.core.internal.lifecyclemapping.discovery; /** * Identifies Maven project elements that can have lifecycle mapping configuration. Currently, these are project diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/IMavenDiscoveryProposal.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/IMavenDiscoveryProposal.java index a1e160b5..cad16f65 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/IMavenDiscoveryProposal.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/IMavenDiscoveryProposal.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle.discovery; +package org.eclipse.m2e.core.internal.lifecyclemapping.discovery; /** diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/IMavenDisovery.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/IMavenDisovery.java index 1be2ffdf..3d648ebe 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/IMavenDisovery.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/IMavenDisovery.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle.discovery; +package org.eclipse.m2e.core.internal.lifecyclemapping.discovery; import java.util.List; import java.util.Map; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/MojoExecutionMappingConfiguration.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/MojoExecutionMappingConfiguration.java index b6b1bba7..227b4847 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/MojoExecutionMappingConfiguration.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/MojoExecutionMappingConfiguration.java @@ -6,14 +6,14 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle.discovery; +package org.eclipse.m2e.core.internal.lifecyclemapping.discovery; import java.util.ArrayList; import java.util.List; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionAction; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; +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.project.configurator.AbstractProjectConfigurator; import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/PackagingTypeMappingConfiguration.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/PackagingTypeMappingConfiguration.java index 9f04af07..115abbf6 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/PackagingTypeMappingConfiguration.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/PackagingTypeMappingConfiguration.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle.discovery; +package org.eclipse.m2e.core.internal.lifecyclemapping.discovery; import org.eclipse.m2e.core.project.configurator.ILifecycleMapping; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/ProjectLifecycleMappingConfiguration.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/ProjectLifecycleMappingConfiguration.java index 7c19113b..f37dac2e 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/discovery/ProjectLifecycleMappingConfiguration.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/discovery/ProjectLifecycleMappingConfiguration.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle.discovery; +package org.eclipse.m2e.core.internal.lifecyclemapping.discovery; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/model/PluginExecutionAction.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/model/PluginExecutionAction.java index 4bc0a490..530b8206 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/model/PluginExecutionAction.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/model/PluginExecutionAction.java @@ -8,7 +8,7 @@ * Contributors: * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.lifecycle.model; +package org.eclipse.m2e.core.internal.lifecyclemapping.model; public enum PluginExecutionAction { ignore, // diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/markers/MavenProblemInfo.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/markers/MavenProblemInfo.java index ad4a3d82..550312e3 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/markers/MavenProblemInfo.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/markers/MavenProblemInfo.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.CoreException; import org.apache.maven.project.MavenProject; import org.eclipse.m2e.core.core.IMavenConstants; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingConfigurationException; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingConfigurationException; public class MavenProblemInfo { 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 ad9bf1c0..eeb14862 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,8 @@ 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.lifecycle.model.PluginExecutionAction; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; +import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionAction; +import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.configurator.ILifecycleMappingConfiguration; import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java index f8e73bf5..d5ed30b4 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java @@ -72,7 +72,7 @@ import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.embedder.MavenModelManager; import org.eclipse.m2e.core.internal.Messages; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; import org.eclipse.m2e.core.internal.markers.IMavenMarkerManager; import org.eclipse.m2e.core.internal.project.registry.MavenProjectFacade; import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager; 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 95cd4a2b..a4ac6f75 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.lifecycle.model.PluginExecutionMetadata; +import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.MavenProjectUtils; import org.eclipse.m2e.core.project.MavenUpdateRequest; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java index 10c79940..754f8d74 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java @@ -70,8 +70,8 @@ import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.internal.ExtensionReader; import org.eclipse.m2e.core.internal.Messages; import org.eclipse.m2e.core.internal.embedder.MavenImpl; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingResult; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingResult; import org.eclipse.m2e.core.internal.markers.IMavenMarkerManager; import org.eclipse.m2e.core.internal.markers.MarkerUtils; import org.eclipse.m2e.core.internal.project.DependencyResolutionContext; 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 64f1a062..b6313713 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.lifecycle.model.PluginExecutionMetadata; +import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata; import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; /** diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/MavenProjectManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/MavenProjectManager.java index 1d2a6d20..f7e45a9d 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/MavenProjectManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/MavenProjectManager.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.apache.maven.artifact.repository.MavenArtifactRepository; import org.apache.maven.execution.MavenExecutionRequest; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; import org.eclipse.m2e.core.internal.project.registry.MavenProjectFacade; import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager; import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryRefreshJob; 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 0dda8660..11227645 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 @@ -24,9 +24,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.apache.maven.plugin.MojoExecution; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingConfigurationException; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingConfigurationException; +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.project.IMavenProjectFacade; 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 f140e382..f0c63d31 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 @@ -41,9 +41,9 @@ import org.eclipse.m2e.core.core.IMavenConstants; 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.lifecycle.LifecycleMappingFactory; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionAction; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; +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.project.IMavenProjectChangedListener; import org.eclipse.m2e.core.project.IMavenProjectFacade; 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 395548aa..7317f250 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.lifecycle.model.PluginExecutionMetadata; +import org.eclipse.m2e.core.internal.lifecyclemapping.model.PluginExecutionMetadata; /** * ILifecycleMappingConfiguration diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/InstallCatalogItemMavenDiscoveryProposal.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/InstallCatalogItemMavenDiscoveryProposal.java index 9e6c3797..c50eeb0c 100644 --- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/InstallCatalogItemMavenDiscoveryProposal.java +++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/InstallCatalogItemMavenDiscoveryProposal.java @@ -9,7 +9,7 @@ package org.eclipse.m2e.internal.discovery; import org.eclipse.equinox.internal.p2.discovery.model.CatalogItem; -import org.eclipse.m2e.core.internal.lifecycle.discovery.IMavenDiscoveryProposal; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDiscoveryProposal; /** diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java index 3fb0aca7..9d420b96 100644 --- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java +++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscovery.java @@ -26,8 +26,8 @@ import org.eclipse.equinox.internal.p2.discovery.compatibility.RemoteBundleDisco import org.eclipse.equinox.internal.p2.discovery.model.CatalogItem; import org.eclipse.equinox.internal.p2.discovery.model.Tag; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadataSource; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; +import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadataSource; import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; import org.eclipse.m2e.internal.discovery.wizards.MavenCatalogConfiguration; import org.eclipse.m2e.internal.discovery.wizards.MavenCatalogViewer; 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 a5a34a47..04d506ab 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 @@ -28,17 +28,17 @@ import org.eclipse.equinox.internal.p2.discovery.Catalog; import org.eclipse.equinox.internal.p2.discovery.model.CatalogItem; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.IMaven; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingResult; -import org.eclipse.m2e.core.internal.lifecycle.MappingMetadataSource; -import org.eclipse.m2e.core.internal.lifecycle.discovery.ILifecycleMappingElementKey; -import org.eclipse.m2e.core.internal.lifecycle.discovery.IMavenDiscoveryProposal; -import org.eclipse.m2e.core.internal.lifecycle.discovery.IMavenDisovery; -import org.eclipse.m2e.core.internal.lifecycle.discovery.MojoExecutionMappingConfiguration; -import org.eclipse.m2e.core.internal.lifecycle.discovery.PackagingTypeMappingConfiguration; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadata; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadataSource; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingResult; +import org.eclipse.m2e.core.internal.lifecyclemapping.MappingMetadataSource; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.ILifecycleMappingElementKey; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDiscoveryProposal; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.IMavenDisovery; +import org.eclipse.m2e.core.internal.lifecyclemapping.discovery.MojoExecutionMappingConfiguration; +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.PluginExecutionMetadata; import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; import org.eclipse.m2e.internal.discovery.operation.MavenDiscoveryInstallOperation; import org.osgi.framework.Bundle; diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenCatalogViewer.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenCatalogViewer.java index 4257a6c7..125182f5 100644 --- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenCatalogViewer.java +++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenCatalogViewer.java @@ -21,9 +21,9 @@ import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogConfiguration import org.eclipse.equinox.internal.p2.ui.discovery.wizards.CatalogViewer; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.window.IShellProvider; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadata; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadataSource; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; +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.PluginExecutionMetadata; import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; import org.eclipse.m2e.internal.discovery.MavenDiscovery; import org.slf4j.Logger; 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 6fa1a568..da754dda 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.lifecycle.model.PluginExecutionAction; +import org.eclipse.m2e.core.internal.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 d632e7e8..7db71144 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.lifecycle.model.PluginExecutionAction; +import org.eclipse.m2e.core.internal.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 3441d068..3b536a3e 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 @@ -26,8 +26,8 @@ import org.w3c.dom.Comment; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionAction; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; +import org.eclipse.m2e.core.internal.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 8fc9676d..e1f234c0 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,8 @@ 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.lifecycle.model.PluginExecutionAction; +import org.eclipse.m2e.core.internal.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 128e23ff..0d4823de 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 @@ -34,10 +34,10 @@ import org.apache.maven.plugin.MojoExecution; import org.apache.maven.project.MavenProject; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; -import org.eclipse.m2e.core.internal.lifecycle.model.LifecycleMappingMetadataSource; -import org.eclipse.m2e.core.internal.lifecycle.model.PluginExecutionMetadata; -import org.eclipse.m2e.core.internal.lifecycle.model.io.xpp3.LifecycleMappingMetadataSourceXpp3Reader; +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.lifecyclemapping.model.io.xpp3.LifecycleMappingMetadataSourceXpp3Reader; import org.eclipse.m2e.core.internal.project.registry.MavenProjectFacade; import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager; import org.eclipse.m2e.core.project.IMavenProjectFacade; diff --git a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java index 904352e4..17eeb083 100644 --- a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java +++ b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java @@ -60,7 +60,7 @@ import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.embedder.MavenModelManager; import org.eclipse.m2e.core.internal.embedder.MavenImpl; -import org.eclipse.m2e.core.internal.lifecycle.LifecycleMappingFactory; +import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryRefreshJob; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.IMavenProjectImportResult; |