[FIXUP] Migrate to Guice directly

Author: HannesWell

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/archetype/ArchetypePlugin.java

@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -34,6 +35,8 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import com.google.inject.Module;
 
 import org.eclipse.aether.repository.RemoteRepository;
@@ -42,6 +45,11 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.sisu.space.BeanScanning;
+import org.eclipse.sisu.space.BundleClassSpace;
+import org.eclipse.sisu.space.ClassSpace;
+import org.eclipse.sisu.space.SpaceModule;
+import org.eclipse.sisu.wire.WireModule;
 
 import org.codehaus.plexus.ContainerConfiguration;
 import org.codehaus.plexus.DefaultContainerConfiguration;
@@ -54,6 +62,8 @@
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.archetype.catalog.Archetype;
 import org.apache.maven.archetype.common.ArchetypeArtifactManager;
+import org.apache.maven.archetype.common.DefaultArchetypeArtifactManager;
+import org.apache.maven.archetype.downloader.Downloader;
 import org.apache.maven.archetype.exception.UnknownArchetype;
 import org.apache.maven.archetype.metadata.ArchetypeDescriptor;
 import org.apache.maven.archetype.metadata.RequiredProperty;
@@ -117,7 +127,19 @@ protected void configure() {
         .setAutoWiring(true) //
         .setJSR250Lifecycle(true) //
         .setName("plexus"); //$NON-NLS-1$
+
+    ClassSpace space = new BundleClassSpace(FrameworkUtil.getBundle(ArchetypeArtifactManager.class));
+    Injector injector = Guice.createInjector(logginModule,
+        new WireModule(new SpaceModule(space, BeanScanning.INDEX, false)));
+    ArchetypeArtifactManager mgr1 = injector.getInstance(DefaultArchetypeArtifactManager.class);
+    try {
+      ArchetypeArtifactManager mgr2 = injector.getInstance(ArchetypeArtifactManager.class);
+    } catch(Exception ex) {
+      //TODO: doesn't work? 
+    }
     container = new DefaultPlexusContainer(cc, logginModule);
+    Downloader downloader = container.lookup(Downloader.class);
+    //TODO: a Downloader can be created, but isn't injected into the fields of a created  archetypeArtifactManager
     archetypeArtifactManager = container.lookup(ArchetypeArtifactManager.class);
     archetypeDataSourceMap = container.lookupMap(ArchetypeDataSource.class);
     addArchetypeCatalogFactory(

org.eclipse.m2e.maven.runtime/pom.xml

@@ -21,7 +21,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-	<version>3.9.900-SNAPSHOT</version>
+	<version>3.9.901-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>M2E Embedded Maven Runtime (includes Incubating components)</name>
@@ -202,8 +202,10 @@
 								org.slf4j.*;version="[1.7.31,3.0.0)",\
 								javax.inject;version="[1.0.0,2.0.0)",\
 								javax.annotation;version="[1.2.0,2.0.0)", \
-								org.apache.commons.cli;version="[1.4.0,2.0.0)", \
-								org.apache.commons.codec*
+								org.apache.commons.cli;version="[1.4.0,2.0.0)",\
+								org.apache.commons.codec*,\
+								org.osgi.*,\
+							
 							Require-Bundle: \
 								com.google.guava;bundle-version="32.2.1"
 

pom.xml

@@ -99,7 +99,7 @@
 		<dependency>
 			<groupId>org.eclipse.m2e</groupId>
 			<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-			<version>3.9.900-SNAPSHOT</version>
+			<version>3.9.901-SNAPSHOT</version>
 		</dependency>
 	</dependencies>