FORGE-2186: Nuked DefaultPlexusContainer

forge · Jan 22, 2015 · 7e632d6 · 7e632d6
1 parent 434cdec
commit 7e632d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 945 deletions.
diff --git a/maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/PlexusContainer.java b/maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/PlexusContainer.java
@@ -13,8 +13,8 @@
 
 import org.codehaus.plexus.ContainerConfiguration;
 import org.codehaus.plexus.DefaultContainerConfiguration;
+import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.logging.console.ConsoleLoggerManager;
-import org.jboss.forge.addon.maven.projects.plexus.DefaultPlexusContainer;
 import org.jboss.forge.furnace.container.cdi.events.Local;
 import org.jboss.forge.furnace.event.PreShutdown;
 import org.jboss.forge.furnace.util.ClassLoaders;
@@ -25,7 +25,7 @@
 @Singleton
 class PlexusContainer
 {
-   private org.codehaus.plexus.PlexusContainer plexusContainer;
+   private org.codehaus.plexus.DefaultPlexusContainer plexusContainer;
 
    public <T> T lookup(final Class<T> type)
    {
@@ -85,10 +85,12 @@ public DefaultPlexusContainer call() throws Exception
                         {
                            ContainerConfiguration config = new DefaultContainerConfiguration().setAutoWiring(true);
                            plexusContainer = new DefaultPlexusContainer(config);
+                           // NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups
+                           plexusContainer.setLookupRealm(null);
                            ConsoleLoggerManager loggerManager = new ConsoleLoggerManager();
                            loggerManager.setThreshold("ERROR");
-                           ((DefaultPlexusContainer) plexusContainer).setLoggerManager(loggerManager);
-                           return (DefaultPlexusContainer) plexusContainer;
+                           plexusContainer.setLoggerManager(loggerManager);
+                           return plexusContainer;
                         }
                         catch (Exception e)
                         {