Fixed classloader beans.xml leak

forge · Nov 27, 2012 · b2cf285 · b2cf285
1 parent c30b653
commit b2cf285
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/addon-manager/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java b/addon-manager/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java
@@ -54,7 +54,7 @@ public static ForgeArchive getDeployment()
    public void testResolvingAddon() throws InterruptedException
    {
       int addonCount = registry.getRegisteredAddons().size();
-      AddonEntry addon = AddonEntry.fromCoordinates("org.jboss.forge:forge-example-plugin,2.0.0-SNAPSHOT");
+      AddonEntry addon = AddonEntry.fromCoordinates("org.jboss.forge:example,2.0.0-SNAPSHOT");
       Assert.assertTrue(addonManager.install(addon));
       Assert.assertTrue(repository.isEnabled(addon));
       Thread.sleep(500);

diff --git a/container/src/main/java/org/jboss/forge/container/modules/providers/ForgeContainerSpec.java b/container/src/main/java/org/jboss/forge/container/modules/providers/ForgeContainerSpec.java
@@ -18,7 +18,6 @@ public class ForgeContainerSpec extends BaseModuleSpecProvider
 
    static
    {
-      paths.add("META-INF");
       paths.add("META-INF/services");
    }
 

diff --git a/container/src/main/java/org/jboss/forge/container/modules/providers/WeldClasspathSpec.java b/container/src/main/java/org/jboss/forge/container/modules/providers/WeldClasspathSpec.java
@@ -18,7 +18,6 @@ public class WeldClasspathSpec extends BaseModuleSpecProvider
 
    static
    {
-      // systemPaths.add("META-INF");
       paths.add("META-INF/services");
    }
 

diff --git a/container/src/main/resources/META-INF/forge.xml b/container/src/main/resources/META-INF/forge.xml
diff --git a/maven/src/test/java/org/jboss/forge/maven/dependency/MavenDependencyResolverTest.java b/maven/src/test/java/org/jboss/forge/maven/dependency/MavenDependencyResolverTest.java
@@ -42,7 +42,7 @@ public void setUp()
    public void testResolveNonJarArtifact() throws Exception
    {
 
-      CoordinateBuilder coordinate = CoordinateBuilder.create("org.jboss.forge:forge-example-plugin:2.0.0-SNAPSHOT")
+      CoordinateBuilder coordinate = CoordinateBuilder.create("org.jboss.forge:example:2.0.0-SNAPSHOT")
                .setClassifier(MavenDependencyResolver.FORGE_ADDON_CLASSIFIER);
       DependencyQueryBuilder query = DependencyQueryBuilder.create(coordinate).setFilter(
                new DependencyFilter()
@@ -99,7 +99,7 @@ public void testResolveArtifact() throws Exception
    public void testResolveNode() throws Exception
    {
       List<Dependency> addonDeps = resolver
-               .resolveAddonDependencies("org.jboss.forge:forge-example-plugin:jar:forge-addon:2.0.0-SNAPSHOT");
+               .resolveAddonDependencies("org.jboss.forge:example:jar:forge-addon:2.0.0-SNAPSHOT");
       Assert.assertNotNull(addonDeps);
       Assert.assertEquals(1, addonDeps.size());
       Assert.assertEquals("commons-lang", addonDeps.get(0).getCoordinate().getArtifactId());