Turned Runtime.createClassLoader() into Runtime.loadModule() beca…

…use we need the info about the module that was actually loaded before getting its class loader (#21)
ceylon · May 9, 2013 · 1ac8ba3 · 1ac8ba3
1 parent 6292a56
commit 1ac8ba3
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/api/src/main/java/ceylon/modules/api/runtime/AbstractRuntime.java b/api/src/main/java/ceylon/modules/api/runtime/AbstractRuntime.java
@@ -46,7 +46,7 @@ public abstract class AbstractRuntime implements ceylon.modules.spi.runtime.Runt
      * @return new module instance or null if no such descriptor
      * @throws Exception for any error
      */
-    public static Module loadModule(ClassLoader cl, String moduleName) throws Exception {
+    public static Module loadModuleMetaData(ClassLoader cl, String moduleName) throws Exception {
         final String moduleClassName = moduleName + MODULE_INFO_CLASS;
         try {
             Class<?> klass = cl.loadClass(moduleClassName);
@@ -57,11 +57,11 @@ public static Module loadModule(ClassLoader cl, String moduleName) throws Except
 
     }
 
-    protected Module readModule(String name, File moduleFile) throws Exception {
+    protected Module readModuleMetaData(String name, File moduleFile) throws Exception {
         final URL url = moduleFile.toURI().toURL();
         final ClassLoader parent = getClass().getClassLoader();
         final ClassLoader cl = new URLClassLoader(new URL[]{url}, parent);
-        return loadModule(cl, name);
+        return loadModuleMetaData(cl, name);
     }
 
     protected static void invokeRun(ClassLoader cl, String runClassName, final String[] args) throws Exception {
@@ -102,8 +102,9 @@ public void execute(Configuration conf) throws Exception {
         String name = exe.substring(0, p > 0 ? p : exe.length());
         String mv = (p > 0 ? exe.substring(p + 1) : null);
 
-        ClassLoader cl = createClassLoader(name, mv, conf);
-        Module runtimeModule = loadModule(cl, name);
+        org.jboss.modules.Module m = loadModule(name, mv, conf);
+        ClassLoader cl = SecurityActions.getClassLoader(m);
+        Module runtimeModule = loadModuleMetaData(cl, name);
         if (runtimeModule != null) {
             final String mn = runtimeModule.name();
             if (name.equals(mn) == false)

diff --git a/api/src/main/java/ceylon/modules/api/runtime/SecurityActions.java b/api/src/main/java/ceylon/modules/api/runtime/SecurityActions.java
@@ -19,8 +19,11 @@
 
 import java.lang.reflect.Method;
 import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.security.PrivilegedExceptionAction;
 
+import org.jboss.modules.Module;
+
 /**
  * Security actions.
  *
@@ -62,6 +65,25 @@ private static void invokeRunInternal(final Class<?> runClass, final String[] ar
         }
     }
 
+    /**
+     * Get classloader from a module.
+     *
+     * @param module the current module
+     * @return module's classloader
+     */
+    static ClassLoader getClassLoader(final Module module) {
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+                public ClassLoader run() {
+                    return module.getClassLoader();
+                }
+            });
+        } else {
+            return module.getClassLoader();
+        }
+    }
+
     public static ClassLoader setContextClassLoader(final ClassLoader cl) throws Exception {
         final SecurityManager sm = System.getSecurityManager();
         if (sm != null) {

diff --git a/impl/src/main/java/ceylon/modules/jboss/runtime/AbstractJBossRuntime.java b/impl/src/main/java/ceylon/modules/jboss/runtime/AbstractJBossRuntime.java
@@ -50,7 +50,7 @@
  * @author <a href="mailto:ales.justin@jboss.org">Ales Justin</a>
  */
 public abstract class AbstractJBossRuntime extends AbstractRuntime {
-    public ClassLoader createClassLoader(String name, String version, Configuration conf) throws Exception {
+    public Module loadModule(String name, String version, Configuration conf) throws Exception {
         if (RepositoryManager.DEFAULT_MODULE.equals(name)) {
             if (version != null) {
                 throw new CeylonRuntimeException("Invalid module identifier: default module should not have any version");
@@ -93,8 +93,7 @@ public ClassLoader createClassLoader(String name, String version, Configuration
         }
         try {
             ModuleLoader moduleLoader = createModuleLoader(conf);
-            Module module = moduleLoader.loadModule(moduleIdentifier);
-            return SecurityActions.getClassLoader(module);
+            return moduleLoader.loadModule(moduleIdentifier);
         } catch (ModuleNotFoundException e) {
             String spec = e.getMessage().replace(':', '/');
             final CeylonRuntimeException cre = new CeylonRuntimeException("Could not find module: " + spec + " (invalid version?)");

diff --git a/spi/src/main/java/ceylon/modules/spi/runtime/Runtime.java b/spi/src/main/java/ceylon/modules/spi/runtime/Runtime.java
@@ -17,6 +17,8 @@
 
 package ceylon.modules.spi.runtime;
 
+import org.jboss.modules.Module;
+
 import ceylon.modules.Configuration;
 import ceylon.modules.spi.Executable;
 
@@ -35,5 +37,5 @@ public interface Runtime extends Executable {
      * @return module classloader instance
      * @throws Exception for ay error
      */
-    ClassLoader createClassLoader(String name, String version, Configuration conf) throws Exception;
+    Module loadModule(String name, String version, Configuration conf) throws Exception;
 }