diff options
57 files changed, 122 insertions, 117 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddDependencyAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddDependencyAction.java index 9225b81a..df5522f1 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddDependencyAction.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddDependencyAction.java @@ -46,7 +46,7 @@ import org.apache.maven.project.MavenProject; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.core.IMavenConstants; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.ui.internal.Messages; import org.eclipse.m2e.core.ui.internal.dialogs.MavenRepositorySearchDialog; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddPluginAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddPluginAction.java index ee76d967..e30d1bd8 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddPluginAction.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/AddPluginAction.java @@ -33,7 +33,7 @@ import org.apache.maven.project.MavenProject; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.core.IMavenConstants; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.ui.internal.Messages; import org.eclipse.m2e.core.ui.internal.dialogs.MavenRepositorySearchDialog; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java index f461b552..7dac78de 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/OpenPomAction.java @@ -63,9 +63,9 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.ArtifactKey; import org.eclipse.m2e.core.embedder.IMaven; -import org.eclipse.m2e.core.index.IIndex; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IIndex; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.IMavenProjectRegistry; import org.eclipse.m2e.core.ui.internal.Messages; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenGoalSelectionDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenGoalSelectionDialog.java index f95ef200..1fad1f52 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenGoalSelectionDialog.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenGoalSelectionDialog.java @@ -29,10 +29,10 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.core.IMavenConstants; -import org.eclipse.m2e.core.index.IIndex; -import org.eclipse.m2e.core.index.IndexManager; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IIndex; +import org.eclipse.m2e.core.internal.index.IndexManager; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.ui.internal.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenRepositorySearchDialog.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenRepositorySearchDialog.java index f078005a..cc503bb0 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenRepositorySearchDialog.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/dialogs/MavenRepositorySearchDialog.java @@ -41,9 +41,9 @@ import org.apache.maven.model.PluginManagement; import org.apache.maven.project.MavenProject; import org.eclipse.m2e.core.embedder.ArtifactKey; -import org.eclipse.m2e.core.index.IIndex; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IIndex; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.ui.internal.Messages; import org.eclipse.m2e.core.ui.internal.search.util.Packaging; import org.eclipse.m2e.core.ui.internal.util.M2EUIUtils; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenInstallationsPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenInstallationsPreferencePage.java index 09647533..bd4d5569 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenInstallationsPreferencePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenInstallationsPreferencePage.java @@ -81,8 +81,8 @@ import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.embedder.MavenRuntime; import org.eclipse.m2e.core.embedder.MavenRuntimeManager; -import org.eclipse.m2e.core.index.IndexManager; import org.eclipse.m2e.core.internal.embedder.MavenEmbeddedRuntime; +import org.eclipse.m2e.core.internal.index.IndexManager; import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants; import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; import org.eclipse.m2e.core.ui.internal.Messages; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java index aa54ae1a..16fb5db2 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java @@ -68,7 +68,7 @@ import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.embedder.MavenRuntime; import org.eclipse.m2e.core.embedder.MavenRuntimeManager; -import org.eclipse.m2e.core.index.IndexManager; +import org.eclipse.m2e.core.internal.index.IndexManager; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.MavenUpdateRequest; import org.eclipse.m2e.core.ui.internal.Messages; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/IndexSearchEngine.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/IndexSearchEngine.java index 6bab025d..3d43497e 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/IndexSearchEngine.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/IndexSearchEngine.java @@ -21,13 +21,14 @@ import java.util.TreeSet; import org.apache.maven.artifact.versioning.ComparableVersion; import org.eclipse.core.runtime.CoreException; -import org.eclipse.m2e.core.index.IIndex; -import org.eclipse.m2e.core.index.IndexManager; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; -import org.eclipse.m2e.core.index.MatchTyped.MatchType; -import org.eclipse.m2e.core.index.MatchTypedStringSearchExpression; -import org.eclipse.m2e.core.index.SearchExpression; + +import org.eclipse.m2e.core.internal.index.IIndex; +import org.eclipse.m2e.core.internal.index.IndexManager; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.MatchTypedStringSearchExpression; +import org.eclipse.m2e.core.internal.index.SearchExpression; +import org.eclipse.m2e.core.internal.index.MatchTyped.MatchType; /** diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/Packaging.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/Packaging.java index cf98ea6b..243239b7 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/Packaging.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/search/util/Packaging.java @@ -11,8 +11,8 @@ package org.eclipse.m2e.core.ui.internal.search.util; -import org.eclipse.m2e.core.index.SearchExpression; -import org.eclipse.m2e.core.index.SourcedSearchExpression; +import org.eclipse.m2e.core.internal.index.SearchExpression; +import org.eclipse.m2e.core.internal.index.SourcedSearchExpression; /** diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java index 1d92175a..6db2e5ff 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java @@ -54,12 +54,12 @@ import org.eclipse.ui.part.DrillDownAdapter; import org.eclipse.ui.part.ViewPart; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.index.IndexListener; -import org.eclipse.m2e.core.index.IndexManager; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; -import org.eclipse.m2e.core.internal.index.IndexedArtifactGroup; -import org.eclipse.m2e.core.internal.index.NexusIndex; +import org.eclipse.m2e.core.internal.index.IndexListener; +import org.eclipse.m2e.core.internal.index.IndexManager; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.nexus.IndexedArtifactGroup; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndex; import org.eclipse.m2e.core.repository.IRepository; import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; import org.eclipse.m2e.core.ui.internal.MavenImages; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/AbstractIndexedRepositoryNode.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/AbstractIndexedRepositoryNode.java index 649b03a6..8d1cec99 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/AbstractIndexedRepositoryNode.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/AbstractIndexedRepositoryNode.java @@ -14,8 +14,9 @@ package org.eclipse.m2e.core.ui.internal.views.nodes; import java.util.Arrays; import org.eclipse.core.runtime.CoreException; -import org.eclipse.m2e.core.internal.index.IndexedArtifactGroup; -import org.eclipse.m2e.core.internal.index.NexusIndex; + +import org.eclipse.m2e.core.internal.index.nexus.IndexedArtifactGroup; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndex; import org.eclipse.m2e.core.ui.internal.MavenImages; import org.eclipse.swt.graphics.Image; import org.slf4j.Logger; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/AbstractRepositoriesNode.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/AbstractRepositoriesNode.java index 22584919..e13e7f5f 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/AbstractRepositoriesNode.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/AbstractRepositoriesNode.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.internal.index.NexusIndex; -import org.eclipse.m2e.core.internal.index.NexusIndexManager; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndex; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndexManager; import org.eclipse.m2e.core.repository.IRepository; import org.eclipse.m2e.core.repository.IRepositoryRegistry; import org.eclipse.m2e.core.ui.internal.MavenImages; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactFileNode.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactFileNode.java index 31a3d270..95a0c3f6 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactFileNode.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactFileNode.java @@ -13,9 +13,9 @@ package org.eclipse.m2e.core.ui.internal.views.nodes; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.m2e.core.embedder.ArtifactKey; -import org.eclipse.m2e.core.index.IIndex; -import org.eclipse.m2e.core.index.IndexedArtifactFile; -import org.eclipse.m2e.core.internal.index.NexusIndexManager; +import org.eclipse.m2e.core.internal.index.IIndex; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndexManager; import org.eclipse.m2e.core.ui.internal.MavenImages; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactGroupNode.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactGroupNode.java index 8217693d..b00a472e 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactGroupNode.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactGroupNode.java @@ -15,9 +15,10 @@ import java.util.ArrayList; import java.util.Collection; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.internal.index.IndexedArtifactGroup; -import org.eclipse.m2e.core.internal.index.NexusIndexManager; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.nexus.IndexedArtifactGroup; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndexManager; + import org.eclipse.swt.graphics.Image; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactNode.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactNode.java index 48dfd489..d0778c62 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactNode.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/IndexedArtifactNode.java @@ -14,8 +14,8 @@ package org.eclipse.m2e.core.ui.internal.views.nodes; import java.util.ArrayList; import java.util.Set; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.ui.internal.Messages; import org.eclipse.m2e.core.ui.internal.MavenImages; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/LocalRepositoryNode.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/LocalRepositoryNode.java index 2027b183..b42e29a0 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/LocalRepositoryNode.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/LocalRepositoryNode.java @@ -12,7 +12,7 @@ package org.eclipse.m2e.core.ui.internal.views.nodes; import org.eclipse.m2e.core.ui.internal.Messages; -import org.eclipse.m2e.core.internal.index.NexusIndex; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndex; import org.eclipse.m2e.core.repository.IRepository; /** diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/LocalRepositoryRootNode.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/LocalRepositoryRootNode.java index 08766df9..6cc82b6a 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/LocalRepositoryRootNode.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/LocalRepositoryRootNode.java @@ -13,8 +13,8 @@ package org.eclipse.m2e.core.ui.internal.views.nodes; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.ui.internal.Messages; -import org.eclipse.m2e.core.internal.index.NexusIndex; -import org.eclipse.m2e.core.internal.index.NexusIndexManager; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndex; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndexManager; import org.eclipse.m2e.core.ui.internal.MavenImages; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/ProjectRepositoriesNode.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/ProjectRepositoriesNode.java index 1b48ccb7..f057af73 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/ProjectRepositoriesNode.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/ProjectRepositoriesNode.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.ui.internal.Messages; -import org.eclipse.m2e.core.internal.index.NexusIndex; -import org.eclipse.m2e.core.internal.index.NexusIndexManager; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndex; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndexManager; import org.eclipse.m2e.core.repository.IRepository; import org.eclipse.m2e.core.repository.IRepositoryRegistry; import org.eclipse.m2e.core.ui.internal.MavenImages; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/RepositoryNode.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/RepositoryNode.java index e48e4b22..de94a5bd 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/RepositoryNode.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/RepositoryNode.java @@ -12,7 +12,7 @@ package org.eclipse.m2e.core.ui.internal.views.nodes; import org.eclipse.m2e.core.ui.internal.Messages; -import org.eclipse.m2e.core.internal.index.NexusIndex; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndex; import org.eclipse.m2e.core.repository.IRepository; /** diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/WorkspaceRepositoryNode.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/WorkspaceRepositoryNode.java index 45d7159a..2ed0da50 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/WorkspaceRepositoryNode.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/nodes/WorkspaceRepositoryNode.java @@ -12,7 +12,7 @@ package org.eclipse.m2e.core.ui.internal.views.nodes; import org.eclipse.m2e.core.ui.internal.Messages; -import org.eclipse.m2e.core.internal.index.NexusIndex; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndex; /** * WorkspaceRepositoryNode diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenDependenciesWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenDependenciesWizardPage.java index 362ac4f5..a236cdc9 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenDependenciesWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenDependenciesWizardPage.java @@ -25,8 +25,9 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.IWizardContainer; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; + +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.ui.internal.MavenImages; import org.eclipse.m2e.core.ui.internal.Messages; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileArtifactWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileArtifactWizardPage.java index 3bd1983b..9dcb7caf 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileArtifactWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileArtifactWizardPage.java @@ -39,7 +39,7 @@ import org.apache.maven.project.MavenProject; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.ArtifactKey; import org.eclipse.m2e.core.embedder.IMaven; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.ui.internal.Messages; 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/MavenPomSelectionComponent.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomSelectionComponent.java index 2973915f..5ebdc561 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomSelectionComponent.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomSelectionComponent.java @@ -60,11 +60,11 @@ import org.apache.lucene.search.BooleanQuery; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.ArtifactKey; -import org.eclipse.m2e.core.index.IIndex; -import org.eclipse.m2e.core.index.IndexManager; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; -import org.eclipse.m2e.core.index.UserInputSearchExpression; +import org.eclipse.m2e.core.internal.index.IIndex; +import org.eclipse.m2e.core.internal.index.IndexManager; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.UserInputSearchExpression; import org.eclipse.m2e.core.ui.internal.MavenImages; import org.eclipse.m2e.core.ui.internal.Messages; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java index c501191f..9e345a4d 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java @@ -86,10 +86,10 @@ import org.eclipse.m2e.core.archetype.ArchetypeCatalogFactory.NexusIndexerCatalo import org.eclipse.m2e.core.archetype.ArchetypeManager; import org.eclipse.m2e.core.embedder.ArtifactKey; import org.eclipse.m2e.core.embedder.IMaven; -import org.eclipse.m2e.core.index.IMutableIndex; -import org.eclipse.m2e.core.index.IndexListener; -import org.eclipse.m2e.core.index.IndexManager; import org.eclipse.m2e.core.internal.MavenPluginActivator; +import org.eclipse.m2e.core.internal.index.IMutableIndex; +import org.eclipse.m2e.core.internal.index.IndexListener; +import org.eclipse.m2e.core.internal.index.IndexManager; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.repository.IRepository; import org.eclipse.m2e.core.ui.internal.MavenImages; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArtifactPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArtifactPage.java index 5e3f3d89..3be03e3b 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArtifactPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArtifactPage.java @@ -17,7 +17,8 @@ import java.util.Map; import org.apache.maven.model.Model; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.window.Window; -import org.eclipse.m2e.core.index.IndexedArtifactFile; + +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.ui.internal.Messages; import org.eclipse.m2e.core.ui.internal.dialogs.MavenRepositorySearchDialog; diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index 98795dd6..bb890ed0 100644 --- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -29,12 +29,12 @@ Export-Package: org.eclipse.m2e.core, org.eclipse.m2e.core.builder;x-internal:=true, org.eclipse.m2e.core.core, org.eclipse.m2e.core.embedder, - org.eclipse.m2e.core.index, org.eclipse.m2e.core.internal;x-internal:=true, org.eclipse.m2e.core.internal.builder;x-internal:=true, org.eclipse.m2e.core.internal.content;x-internal:=true, org.eclipse.m2e.core.internal.embedder;x-internal:=true, org.eclipse.m2e.core.internal.index;x-internal:=true, + org.eclipse.m2e.core.internal.index.nexus;x-internal:=true, org.eclipse.m2e.core.internal.jobs;x-internal:=true, org.eclipse.m2e.core.internal.lifecyclemapping;x-internal:=true, org.eclipse.m2e.core.internal.lifecyclemapping.discovery;x-internal:=true, diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/MavenPlugin.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/MavenPlugin.java index de98de72..907c29b7 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/MavenPlugin.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/MavenPlugin.java @@ -15,8 +15,8 @@ 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.embedder.MavenRuntimeManager; -import org.eclipse.m2e.core.index.IndexManager; import org.eclipse.m2e.core.internal.MavenPluginActivator; +import org.eclipse.m2e.core.internal.index.IndexManager; import org.eclipse.m2e.core.project.IProjectConfigurationManager; import org.eclipse.m2e.core.project.IMavenProjectRegistry; import org.eclipse.m2e.core.repository.IRepositoryRegistry; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java index 1abff2b9..c324b9ce 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java @@ -58,13 +58,13 @@ 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.embedder.MavenRuntimeManager; -import org.eclipse.m2e.core.index.IndexManager; import org.eclipse.m2e.core.internal.embedder.MavenEmbeddedRuntime; import org.eclipse.m2e.core.internal.embedder.MavenImpl; import org.eclipse.m2e.core.internal.embedder.MavenWorkspaceRuntime; -import org.eclipse.m2e.core.internal.index.IndexesExtensionReader; -import org.eclipse.m2e.core.internal.index.IndexingTransferListener; -import org.eclipse.m2e.core.internal.index.NexusIndexManager; +import org.eclipse.m2e.core.internal.index.IndexManager; +import org.eclipse.m2e.core.internal.index.nexus.IndexesExtensionReader; +import org.eclipse.m2e.core.internal.index.nexus.IndexingTransferListener; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndexManager; import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; import org.eclipse.m2e.core.internal.markers.IMavenMarkerManager; import org.eclipse.m2e.core.internal.markers.MavenMarkerManager; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IIndex.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IIndex.java index 0add0fd5..3b812e56 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IIndex.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IIndex.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; import java.io.File; import java.util.Collection; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IMutableIndex.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IMutableIndex.java index c6d11b3f..88ed2995 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IMutableIndex.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IMutableIndex.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; import java.io.File; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IndexListener.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexListener.java index 27ac3473..a31469ef 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IndexListener.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexListener.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; import org.eclipse.m2e.core.repository.IRepository; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IndexManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexManager.java index 0dbf701a..5f548eb5 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IndexManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexManager.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IndexedArtifact.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexedArtifact.java index 541f8bca..63c4f27d 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IndexedArtifact.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexedArtifact.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; import java.util.Comparator; import java.util.Set; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IndexedArtifactFile.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexedArtifactFile.java index 9fff9bdb..c0f380e8 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/IndexedArtifactFile.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexedArtifactFile.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; import java.util.Date; import java.util.List; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/MatchTyped.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/MatchTyped.java index e3c9363b..19a04950 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/MatchTyped.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/MatchTyped.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; /** * MatchTyped is a interface that describes the wanted match type to be used. diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/MatchTypedStringSearchExpression.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/MatchTypedStringSearchExpression.java index 23050079..b6038ded 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/MatchTypedStringSearchExpression.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/MatchTypedStringSearchExpression.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; /** * MatchTypedStringSearchExpression diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/SearchExpression.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/SearchExpression.java index 8b4592b2..cf4ec0d1 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/SearchExpression.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/SearchExpression.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; /** * SearchExpression is a wrapper interface for expressions representable as plain strings to be used within searches. diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/SourcedSearchExpression.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/SourcedSearchExpression.java index f9932d03..4eb4405a 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/SourcedSearchExpression.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/SourcedSearchExpression.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; /** * SourcedSearchExpression is a search expression usually "sourced" from some programmatic source, and we already know diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/StringSearchExpression.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/StringSearchExpression.java index 756413e1..a65dce5d 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/StringSearchExpression.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/StringSearchExpression.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; /** * StringSearchExpression is a SearchExpression that has String value. diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/UserInputSearchExpression.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/UserInputSearchExpression.java index dfa7ea7b..d5245bb7 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/index/UserInputSearchExpression.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/UserInputSearchExpression.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.m2e.core.index; +package org.eclipse.m2e.core.internal.index; /** * UserInputSearchExpression is a search expression usually coming from user input (like some UI dialogue, element or diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/ArtifactScanningMonitor.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/ArtifactScanningMonitor.java index a4c9b0c5..67e26bad 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/ArtifactScanningMonitor.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/ArtifactScanningMonitor.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import java.io.File; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/AsyncFetcher.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java index 7f8b68b2..97d1ff3e 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/AsyncFetcher.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import java.io.File; import java.io.FileNotFoundException; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/CompositeIndex.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/CompositeIndex.java index a481fd2d..4a14363c 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/CompositeIndex.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/CompositeIndex.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import java.io.File; import java.util.Collection; @@ -22,10 +22,10 @@ import java.util.TreeSet; import org.eclipse.core.runtime.CoreException; import org.eclipse.m2e.core.embedder.ArtifactKey; -import org.eclipse.m2e.core.index.IIndex; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; -import org.eclipse.m2e.core.index.SearchExpression; +import org.eclipse.m2e.core.internal.index.IIndex; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.SearchExpression; /** diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/EquinoxLock.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/EquinoxLock.java index 4aa82f6e..06da383c 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/EquinoxLock.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/EquinoxLock.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import org.eclipse.core.runtime.internal.adaptor.Locker; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/EquinoxLocker.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/EquinoxLocker.java index e88c7e0c..caeb7c0e 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/EquinoxLocker.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/EquinoxLocker.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import java.io.File; import java.io.IOException; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexUpdaterJob.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/IndexUpdaterJob.java index 2b1381b8..fe5a55d4 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexUpdaterJob.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/IndexUpdaterJob.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import java.util.ArrayList; import java.util.Stack; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexedArtifactGroup.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/IndexedArtifactGroup.java index 96dc8e65..591b2e1b 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexedArtifactGroup.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/IndexedArtifactGroup.java @@ -9,11 +9,11 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import java.util.LinkedHashMap; -import org.eclipse.m2e.core.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; import org.eclipse.m2e.core.repository.IRepository; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexesExtensionReader.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/IndexesExtensionReader.java index 3e5bd76e..68a0d9b9 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexesExtensionReader.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/IndexesExtensionReader.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexingTransferListener.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/IndexingTransferListener.java index 31f6590e..fbbaacf6 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/IndexingTransferListener.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/IndexingTransferListener.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import java.io.File; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/NexusIndex.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndex.java index 35b8a23e..de52ffcc 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/NexusIndex.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndex.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import java.io.File; import java.util.Collection; @@ -26,11 +26,11 @@ import org.apache.maven.index.Field; import org.apache.maven.index.MAVEN; import org.eclipse.m2e.core.embedder.ArtifactKey; -import org.eclipse.m2e.core.index.IIndex; -import org.eclipse.m2e.core.index.IMutableIndex; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; -import org.eclipse.m2e.core.index.SearchExpression; +import org.eclipse.m2e.core.internal.index.IIndex; +import org.eclipse.m2e.core.internal.index.IMutableIndex; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.SearchExpression; import org.eclipse.m2e.core.repository.IRepository; diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/NexusIndexManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java index cab8419b..810e8636 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/NexusIndexManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.core.internal.index; +package org.eclipse.m2e.core.internal.index.nexus; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -88,18 +88,18 @@ import org.eclipse.m2e.core.embedder.ArtifactKey; 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.index.IIndex; -import org.eclipse.m2e.core.index.IndexListener; -import org.eclipse.m2e.core.index.IndexManager; -import org.eclipse.m2e.core.index.IndexedArtifact; -import org.eclipse.m2e.core.index.IndexedArtifactFile; -import org.eclipse.m2e.core.index.MatchTyped; -import org.eclipse.m2e.core.index.MatchTyped.MatchType; -import org.eclipse.m2e.core.index.SearchExpression; -import org.eclipse.m2e.core.index.SourcedSearchExpression; import org.eclipse.m2e.core.internal.MavenPluginActivator; import org.eclipse.m2e.core.internal.Messages; -import org.eclipse.m2e.core.internal.index.IndexUpdaterJob.IndexCommand; +import org.eclipse.m2e.core.internal.index.IIndex; +import org.eclipse.m2e.core.internal.index.IndexListener; +import org.eclipse.m2e.core.internal.index.IndexManager; +import org.eclipse.m2e.core.internal.index.IndexedArtifact; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.MatchTyped; +import org.eclipse.m2e.core.internal.index.SearchExpression; +import org.eclipse.m2e.core.internal.index.SourcedSearchExpression; +import org.eclipse.m2e.core.internal.index.MatchTyped.MatchType; +import org.eclipse.m2e.core.internal.index.nexus.IndexUpdaterJob.IndexCommand; import org.eclipse.m2e.core.internal.repository.IRepositoryIndexer; import org.eclipse.m2e.core.project.IMavenProjectChangedListener; import org.eclipse.m2e.core.project.IMavenProjectFacade; diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java index 719cb005..e9e6b570 100644 --- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java +++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/InsertArtifactProposal.java @@ -37,8 +37,8 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.m2e.core.index.IIndex; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IIndex; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.ui.internal.dialogs.MavenRepositorySearchDialog; import org.eclipse.m2e.core.ui.internal.editing.PomEdits.Operation; import org.eclipse.m2e.core.ui.internal.editing.PomEdits.OperationTuple; diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependenciesComposite.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependenciesComposite.java index eb3ebca3..b6ff0272 100644 --- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependenciesComposite.java +++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependenciesComposite.java @@ -42,7 +42,7 @@ import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.window.Window; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.ArtifactKey; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.IMavenProjectRegistry; import org.eclipse.m2e.core.ui.internal.dialogs.EditDependencyDialog; diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java index 0626dda1..7614315a 100644 --- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java +++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java @@ -38,7 +38,7 @@ import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.ArtifactKey; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.ui.internal.MavenImages; import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction; diff --git a/org.eclipse.m2e.integration.tests.common/src/org/eclipse/m2e/integration/tests/common/UIIntegrationTestCase.java b/org.eclipse.m2e.integration.tests.common/src/org/eclipse/m2e/integration/tests/common/UIIntegrationTestCase.java index 4358af77..d0fef6c9 100644 --- a/org.eclipse.m2e.integration.tests.common/src/org/eclipse/m2e/integration/tests/common/UIIntegrationTestCase.java +++ b/org.eclipse.m2e.integration.tests.common/src/org/eclipse/m2e/integration/tests/common/UIIntegrationTestCase.java @@ -117,7 +117,7 @@ import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.embedder.MavenModelManager; import org.eclipse.m2e.core.embedder.MavenRuntime; import org.eclipse.m2e.core.embedder.MavenRuntimeManager; -import org.eclipse.m2e.core.internal.index.NexusIndexManager; +import org.eclipse.m2e.core.internal.index.nexus.NexusIndexManager; import org.eclipse.m2e.core.internal.repository.RepositoryRegistry; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.IMavenProjectImportResult; diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java index 9f520f56..5947cad2 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java @@ -40,8 +40,8 @@ import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.AbstractMavenConfigurationChangeListener; import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.embedder.MavenConfigurationChangeEvent; -import org.eclipse.m2e.core.index.IndexManager; import org.eclipse.m2e.core.internal.MavenPluginActivator; +import org.eclipse.m2e.core.internal.index.IndexManager; import org.eclipse.m2e.core.internal.project.registry.MavenProjectManager; import org.eclipse.m2e.jdt.internal.BuildPathManager; import org.eclipse.m2e.jdt.internal.Messages; diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java index 7ed34036..28e4578b 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java @@ -70,8 +70,8 @@ import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.ArtifactKey; import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.embedder.IMavenConfiguration; -import org.eclipse.m2e.core.index.IndexManager; -import org.eclipse.m2e.core.index.IndexedArtifactFile; +import org.eclipse.m2e.core.internal.index.IndexManager; +import org.eclipse.m2e.core.internal.index.IndexedArtifactFile; import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory; import org.eclipse.m2e.core.project.IMavenProjectChangedListener; import org.eclipse.m2e.core.project.IMavenProjectFacade; |