Changeset 442

Timestamp:

2008-07-01 08:21:58 (5 years ago)

Author:

bruno

Message:

Introduce a ModuleSourceManager?, responsible for creation of ModuleSource?'s. It will only create one ModuleSource? per module location, so that if there are multiple instances of one module, only one module source will be created for them.

Location:

trunk/core

Files:

• kauri-runtime-tests/src/test/java/org/kauriproject/runtime/test/MultiModuleInstancesTest.java (added)
• kauri-runtime/src/main/java/org/kauriproject/runtime/KauriRuntime.java (modified) (4 diffs)
• kauri-runtime/src/main/java/org/kauriproject/runtime/module/build/ModuleConfigBuilder.java (modified) (2 diffs)
• kauri-runtime/src/main/java/org/kauriproject/runtime/module/sources (deleted)
• kauri-runtime/src/main/java/org/kauriproject/runtime/source (added)
• kauri-runtime/src/main/java/org/kauriproject/runtime/source/AbstractDirectoryModuleSource.java (added)
• kauri-runtime/src/main/java/org/kauriproject/runtime/source/AbstractModuleSource.java (added)
• kauri-runtime/src/main/java/org/kauriproject/runtime/source/ExpandedJarModuleSource.java (added)
• kauri-runtime/src/main/java/org/kauriproject/runtime/source/JarModuleSource.java (added)
• kauri-runtime/src/main/java/org/kauriproject/runtime/source/MavenSourceDirectoryModuleSource.java (added)
• kauri-runtime/src/main/java/org/kauriproject/runtime/source/ModuleSourceCreationException.java (added)
• kauri-runtime/src/main/java/org/kauriproject/runtime/source/ModuleSourceManager.java (added)
• kauri-runtime/src/main/java/org/kauriproject/runtime/source/SharedModuleSource.java (added)

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

@@ -31 +31 @@
 import org.kauriproject.runtime.classloading.ClassLoaderBuilder;
 import org.kauriproject.runtime.classloading.ClasspathEntry;
+import org.kauriproject.runtime.source.ModuleSourceManager;
 import org.kauriproject.util.ArgumentValidator;
 import org.apache.commons.logging.Log;
@@ -57 +58 @@
     private JavaServiceManager javaServiceManager;
     private RestserviceManager restserviceManager;
+    private ModuleSourceManager moduleSourceManager;
     protected final Log infolog = LogFactory.getLog(Logging.INFO_LOG_CATEGORY);
     private boolean started = false;
@@ -66 +68 @@
         this.javaServiceManager = new JavaServiceManager();
         this.restserviceManager = new RestserviceManager(this);
+        this.moduleSourceManager = new ModuleSourceManager();
     }
 
@@ -157 +160 @@
     }
 
+    public ModuleSourceManager getModuleSourceManager() {
+        return moduleSourceManager;
+    }
+
     public List<Module> getModules() {
         return modules;

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

@@ -22 +22 @@
 import org.kauriproject.runtime.module.ModuleConfigImpl;
 import org.kauriproject.runtime.rapi.ModuleSource;
-import org.kauriproject.runtime.module.sources.JarModuleSource;
-import org.kauriproject.runtime.module.sources.MavenSourceDirectoryModuleSource;
-import org.kauriproject.runtime.module.sources.ExpandedJarModuleSource;
+import org.kauriproject.runtime.source.JarModuleSource;
+import org.kauriproject.runtime.source.MavenSourceDirectoryModuleSource;
+import org.kauriproject.runtime.source.ExpandedJarModuleSource;
 import org.kauriproject.runtime.model.ModuleDefinition;
 import org.kauriproject.runtime.classloading.*;
@@ -53 +53 @@
         ModuleSource moduleSource = null;
         try {
-            switch (moduleDefinition.getSourceType()) {
-                case JAR:
-                    moduleSource = new JarModuleSource(moduleDefinition.getFile());
-                    break;
-                case EXPANDED_JAR:
-                    moduleSource = new ExpandedJarModuleSource(moduleDefinition.getFile());
-                    break;
-                case SOURCE_DIRECTORY:
-                    moduleSource = new MavenSourceDirectoryModuleSource(moduleDefinition.getFile());
-                    break;
-                default:
-                    throw new KauriRTException("Unexpected module definition type: " + moduleDefinition.getSourceType());
-            }
+            moduleSource = runtime.getModuleSourceManager().getModuleSource(moduleDefinition.getFile(), moduleDefinition.getSourceType());
 
             // build classpath