JBIDE-19550: Export missing packages for external plugins

jbosstools · Apr 2, 2015 · 2670bd8 · 2670bd8
1 parent 685ac0c
commit 2670bd8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 33 deletions.
diff --git a/...rge.core/src/org/jboss/tools/forge/core/internal/furnace/CompositeFurnaceClassLoader.java b/...rge.core/src/org/jboss/tools/forge/core/internal/furnace/CompositeFurnaceClassLoader.java
@@ -6,42 +6,34 @@
  */
 package org.jboss.tools.forge.core.internal.furnace;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
-public class CompositeFurnaceClassLoader extends ClassLoader
-{
-   private final List<ClassLoader> loaders = Collections.synchronizedList(new ArrayList<ClassLoader>());
+public class CompositeFurnaceClassLoader extends ClassLoader {
+	private final Set<ClassLoader> loaders = new LinkedHashSet<>();
 
-   public CompositeFurnaceClassLoader(List<ClassLoader> loaders)
-   {
-      super(null);
-      this.loaders.addAll(loaders);
-      this.loaders.remove(this);
-   }
+	public CompositeFurnaceClassLoader(Collection<ClassLoader> loaders) {
+		super(null);
+		this.loaders.addAll(loaders);
+		this.loaders.remove(this);
+	}
 
-   @Override
-   public Class<?> loadClass(String name) throws ClassNotFoundException
-   {
-      for (ClassLoader classLoader : loaders)
-      {
-         try
-         {
-            return classLoader.loadClass(name);
-         }
-         catch (ClassNotFoundException notFound)
-         {
-            // oh well
-         }
-      }
+	@Override
+	public Class<?> loadClass(String name) throws ClassNotFoundException {
+		for (ClassLoader classLoader : loaders) {
+			try {
+				return classLoader.loadClass(name);
+			} catch (ClassNotFoundException notFound) {
+				// oh well
+			}
+		}
 
-      throw new ClassNotFoundException(name);
-   }
+		throw new ClassNotFoundException(name);
+	}
 
-   @Override
-   public String toString()
-   {
-      return loaders.toString();
-   }
+	@Override
+	public String toString() {
+		return loaders.toString();
+	}
 }
diff --git a/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF
@@ -38,6 +38,8 @@ Export-Package: bootpath,
    org.jboss.forge.addon.dependencies,
    org.jboss.forge.addon.resource",
  org.jboss.forge.addon.resource;uses:="org.jboss.forge.addon.resource.events,org.jboss.forge.addon.facets",
+ org.jboss.forge.addon.resource.monitor,
+ org.jboss.forge.addon.resource.transaction,
  org.jboss.forge.addon.shell.spi,
  org.jboss.forge.addon.shell.spi.command,
  org.jboss.forge.addon.ui;
@@ -74,6 +76,7 @@ Export-Package: bootpath,
  org.jboss.forge.furnace.exception,
  org.jboss.forge.furnace.lock,
  org.jboss.forge.furnace.proxy;uses:="javassist.util.proxy,new org.jboss.forge.furnace.proxy",
+ org.jboss.forge.furnace.proxy.javassist.util.proxy,
  org.jboss.forge.furnace.repositories;uses:="org.jboss.forge.furnace.addons,org.jboss.forge.furnace.versions",
  org.jboss.forge.furnace.se;uses:="org.jboss.forge.furnace",
  org.jboss.forge.furnace.services,