Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Bricon2014-10-16 14:38:33 -0400
committerFred Bricon2015-03-24 13:21:47 -0400
commit9a3c27c321e2ad5766034c88578fe35d1d09556c (patch)
tree6a9931ceca9cddda6f20473e99e51a7610c94e21 /org.eclipse.m2e.core
parent84ba5a9a32eac2cc78d57a98dc7eedc3e2fcea91 (diff)
downloadm2e-core-9a3c27c321e2ad5766034c88578fe35d1d09556c.tar.gz
m2e-core-9a3c27c321e2ad5766034c88578fe35d1d09556c.tar.xz
m2e-core-9a3c27c321e2ad5766034c88578fe35d1d09556c.zip
336461 : update archetyper to 2.3
Change-Id: I7d67c0f3c67f59d420a99868cac85a22449ce1db Signed-off-by: Fred Bricon <fbricon@gmail.com>
Diffstat (limited to 'org.eclipse.m2e.core')
-rw-r--r--org.eclipse.m2e.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java8
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java6
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java8
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java12
5 files changed, 10 insertions, 26 deletions
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index ce33b8ab..2f61528e 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.7,
JavaSE-1.8
Export-Package: org.eclipse.m2e.core,
- org.eclipse.m2e.core.archetype,
+ org.eclipse.m2e.core.archetype;x-friends:="org.eclipse.m2e.core.ui",
org.eclipse.m2e.core.embedder,
org.eclipse.m2e.core.internal;x-internal:=true,
org.eclipse.m2e.core.internal.archetype;x-internal:=true,
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 84b0615f..26b8cd9b 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
@@ -40,7 +40,6 @@ import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.classworlds.ClassWorld;
-import org.apache.maven.archetype.Archetype;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.common.ArchetypeArtifactManager;
import org.apache.maven.archetype.source.ArchetypeDataSource;
@@ -400,13 +399,6 @@ public class MavenPluginActivator extends Plugin {
}
/**
- * @deprecated use {@link ArchetypeManager#getArchetyper()}
- */
- public Archetype getArchetype() {
- return archetypeManager.getArchetyper();
- }
-
- /**
* @deprecated use {@link ArchetypeManager#getArchetypeDataSource(String)}
*/
public ArchetypeDataSource getArchetypeDataSource(String hint) {
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java
index dd569a03..2c8728e8 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java
@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.source.ArchetypeDataSource;
import org.apache.maven.archetype.source.ArchetypeDataSourceException;
@@ -69,8 +69,8 @@ public abstract class ArchetypeCatalogFactory {
return getId();
}
- protected Archetype getArchetyper() {
- return MavenPluginActivator.getDefault().getArchetype();
+ protected ArchetypeManager getArchetyper() {
+ return MavenPluginActivator.getDefault().getArchetypeManager().getArchetyper();
}
/**
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java
index 61e33f77..82910fdb 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java
@@ -62,7 +62,7 @@ public class ArchetypeManager {
final ArchetypeArtifactManager aaMgr;
- private final org.apache.maven.archetype.Archetype archetyper;
+ private final org.apache.maven.archetype.ArchetypeManager archetyper;
private final PlexusContainer container;
@@ -72,7 +72,7 @@ public class ArchetypeManager {
this.writer = new ArchetypeCatalogsWriter();
try {
this.aaMgr = container.lookup(ArchetypeArtifactManager.class);
- this.archetyper = container.lookup(org.apache.maven.archetype.Archetype.class);
+ this.archetyper = container.lookup(org.apache.maven.archetype.ArchetypeManager.class);
} catch(ComponentLookupException ex) {
throw new NoSuchComponentException(ex);
}
@@ -209,9 +209,9 @@ public class ArchetypeManager {
}
/**
- * @since 1.5
+ * @since 2.0
*/
- public org.apache.maven.archetype.Archetype getArchetyper() {
+ public org.apache.maven.archetype.ArchetypeManager getArchetyper() {
return archetyper;
}
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 c1464978..58d5f656 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
@@ -44,7 +44,6 @@ import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -296,13 +295,6 @@ public class ProjectConfigurationManager implements IProjectConfigurationManager
}
}
- /**
- * A compatibility proxy stub
- */
- private static interface A {
- public IAdaptable[] adaptElements(IAdaptable[] objects);
- }
-
public void updateProjectConfiguration(IProject project, IProgressMonitor monitor) throws CoreException {
updateProjectConfiguration(new MavenUpdateRequest(project, mavenConfiguration.isOffline(), false), monitor);
}
@@ -886,8 +878,8 @@ public class ProjectConfigurationManager implements IProjectConfigurationManager
}
}
- private org.apache.maven.archetype.Archetype getArchetyper() {
- return MavenPluginActivator.getDefault().getArchetype();
+ private org.apache.maven.archetype.ArchetypeManager getArchetyper() {
+ return MavenPluginActivator.getDefault().getArchetypeManager().getArchetyper();
}
public Set<MavenProjectInfo> collectProjects(Collection<MavenProjectInfo> projects) {

Back to the top