Changeset 223

Timestamp:

2008-05-14 13:40:08 (5 years ago)

Author:

bruno

Message:

While testing some problems related to the reloading classloader, I've splitted of the construction of the classloaders from the construction of the modules. Think this is useful to keep.

Location:

trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime

Files:

• KauriRuntime.java (modified) (2 diffs)
• module/build/ModuleBuilder.java (modified) (1 diff)

trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/KauriRuntime.java

@@ -35 +35 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.jci.ReloadingClassLoader;
+import org.apache.commons.jci.monitor.FilesystemAlterationMonitor;
+import org.apache.commons.jci.monitor.FilesystemAlterationObserver;
 
 import java.util.*;
 import java.net.MalformedURLException;
+import java.lang.reflect.Field;
 
 /**
@@ -111 +114 @@
         List<ClasspathEntry> sharedClasspath = ClassLoaderConfigurer.configureClassPaths(moduleConfigs, config.getEnableArtifactSharing());
 
-        // Construct the classloader
+        // Construct the shared classloader
         infolog.debug("Creating shared classloader");
 
         rootClassLoaderHandle = ClassLoaderBuilder.build(sharedClasspath, this.getClass().getClassLoader(), config.getRepository());
         rootClassLoader = rootClassLoaderHandle.getClassLoader();
+
+        // Construct the classloaders of the various modules
+        List<ClassLoaderHandle> moduleClassLoaders = new ArrayList<ClassLoaderHandle>();
+        for (ModuleConfig cfg : moduleConfigs) {
+            ClassLoaderHandle classLoaderHandle = cfg.getClassLoadingConfig().getClassLoader(getClassLoader());
+            moduleClassLoaders.add(classLoaderHandle);
+
+            ClassLoader classLoader = classLoaderHandle.getClassLoader();
+            if (classLoader instanceof ReloadingClassLoader) {
+                // modules should also listen and reload when something in the shared classloader changes
+                rootClassLoaderHandle.addReloadNotificationListener((ReloadingClassLoader)classLoader);
+            }
+        }
 
         // Create the modules
         infolog.info("Starting the modules.");
         modules = new ArrayList<Module>(config.getModules().size());
-        for (ModuleConfig moduleConfig : moduleConfigs) {
-            Module module = ModuleBuilder.build(moduleConfig, this, config.getConfigProperties());
+        for (int i = 0; i < moduleConfigs.size(); i++) {
+            ModuleConfig moduleConfig = moduleConfigs.get(i);
+            Module module = ModuleBuilder.build(moduleConfig, moduleClassLoaders.get(i), this, config.getConfigProperties());
             modules.add(module);
             modulesById.put(module.getDefinition().getId(), module);
-            if (module.getClassLoaderHandle().getClassLoader() instanceof ReloadingClassLoader) {
-                // modules should also listen and reload when something in the shared classloader changes
-                rootClassLoaderHandle.addReloadNotificationListener((ReloadingClassLoader)module.getClassLoaderHandle().getClassLoader());
-            }
         }
 

trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/module/build/ModuleBuilder.java

@@ -41 +41 @@
     }
 
-    public static Module build(ModuleConfig cfg, KauriRuntime runtime, Properties springConfigProperties) throws ArtifactNotFoundException, MalformedURLException {
-        return new ModuleBuilder().buildInt(cfg, runtime, springConfigProperties);
+    public static Module build(ModuleConfig cfg, ClassLoaderHandle classLoaderHandle, KauriRuntime runtime, Properties springConfigProperties) throws ArtifactNotFoundException, MalformedURLException {
+        return new ModuleBuilder().buildInt(cfg, classLoaderHandle, runtime, springConfigProperties);
     }
 
-    private Module buildInt(ModuleConfig cfg, KauriRuntime runtime, Properties springConfigProperties) throws ArtifactNotFoundException, MalformedURLException {
+    private Module buildInt(ModuleConfig cfg, ClassLoaderHandle classLoaderHandle, KauriRuntime runtime, Properties springConfigProperties) throws ArtifactNotFoundException, MalformedURLException {
         infolog.info("Starting module " + cfg.getId() + " - " + cfg.getLocation());
         ClassLoader previousContextClassLoader = Thread.currentThread().getContextClassLoader();
         RestserviceFacet restserviceFacet = new RestserviceFacet(runtime.getRestserviceManager());
         try {
-            ClassLoaderHandle classLoaderHandle = cfg.getClassLoadingConfig().getClassLoader(runtime.getClassLoader());
             ClassLoader classLoader = classLoaderHandle.getClassLoader();
-
             Thread.currentThread().setContextClassLoader(classLoader);