Changeset 1931 for trunk

Timestamp:

2011-08-16 13:59:00 (9 months ago)

Author:

karel

Message:

Allow fixing versions for specific artifacts

Location:

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

Files:

• classloading/XmlClassLoaderBuilder.java (modified) (3 diffs)
• module/build/ModuleConfigBuilder.java (modified) (3 diffs)
• module/build/VersionManager.java (added)

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

@@ -16 +16 @@
 package org.kauriproject.runtime.classloading;
 
-import org.w3c.dom.Element;
-import org.kauriproject.util.xml.DocumentHelper;
-import org.kauriproject.runtime.repository.ArtifactRepository;
-import org.kauriproject.runtime.repository.ArtifactRef;
-import org.kauriproject.runtime.repository.RepoArtifactRef;
-import org.kauriproject.runtime.repository.FileArtifactRef;
-import org.kauriproject.runtime.rapi.ModuleSource;
-import org.kauriproject.runtime.KauriRuntime;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import java.util.List;
-import java.util.ArrayList;
+import org.kauriproject.runtime.module.build.VersionManager;
+import org.kauriproject.runtime.rapi.ModuleSource;
+import org.kauriproject.runtime.repository.ArtifactRef;
+import org.kauriproject.runtime.repository.ArtifactRepository;
+import org.kauriproject.runtime.repository.FileArtifactRef;
+import org.kauriproject.runtime.repository.RepoArtifactRef;
+import org.kauriproject.util.xml.DocumentHelper;
+import org.w3c.dom.Element;
 
 /**
@@ -38 +38 @@
     private ModuleSource moduleSource;
     private ArtifactRepository repository;
+    private VersionManager versionManager;
 
-    public static ClassLoadingConfig build(Element element, ModuleSource moduleSource, ArtifactRepository repository) throws Exception {
-        return new XmlClassLoaderBuilder(element, moduleSource, repository).build();
+    public static ClassLoadingConfig build(Element element, ModuleSource moduleSource, ArtifactRepository repository, VersionManager versionManager) throws Exception {
+        return new XmlClassLoaderBuilder(element, moduleSource, repository, versionManager).build();
     }
 
-    private XmlClassLoaderBuilder(Element element, ModuleSource moduleSource, ArtifactRepository repository) {
+    private XmlClassLoaderBuilder(Element element, ModuleSource moduleSource, ArtifactRepository repository, VersionManager versionManager) {
         this.element = element;
         this.moduleSource = moduleSource;
         this.repository = repository;
+        this.versionManager = versionManager;
     }
 
@@ -71 +73 @@
                     String artifactId = DocumentHelper.getAttribute(classPathEl, "artifactId", true);
                     String classifier = DocumentHelper.getAttribute(classPathEl, "classifier", false);
-                    String version = DocumentHelper.getAttribute(classPathEl, "version", !groupId.equals("org.kauriproject"));
-                    version = version == null ? KauriRuntime.getVersion() : version;
+                    String version = DocumentHelper.getAttribute(classPathEl, "version", false);
+                    String preferredVersion = versionManager.getPreferredVersion(groupId, artifactId);
+                    version = version == null ? preferredVersion : version;
+                    if (version == null) {
+                        String message = String.format("Version for artifact %s:%s (%s) not specified, and no preference found in runtime configuration.", groupId, artifactId, classifier);
+                        throw new RuntimeException(message);
+                    }
+
                     ArtifactRef artifactRef = new RepoArtifactRef(groupId, artifactId, classifier, version);
 

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

@@ -16 +16 @@
 package org.kauriproject.runtime.module.build;
 
+import java.io.InputStream;
+import java.util.Collections;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.kauriproject.runtime.KauriRTException;
 import org.kauriproject.runtime.KauriRuntime;
-import org.kauriproject.runtime.KauriRTException;
-import org.kauriproject.runtime.repository.FileArtifactRef;
+import org.kauriproject.runtime.classloading.ArtifactSharingMode;
+import org.kauriproject.runtime.classloading.ClassLoadingConfig;
+import org.kauriproject.runtime.classloading.ClassLoadingConfigImpl;
+import org.kauriproject.runtime.classloading.ClasspathEntry;
+import org.kauriproject.runtime.classloading.XmlClassLoaderBuilder;
+import org.kauriproject.runtime.model.ModuleDefinition;
 import org.kauriproject.runtime.module.ModuleConfig;
 import org.kauriproject.runtime.module.ModuleConfigImpl;
 import org.kauriproject.runtime.rapi.ModuleSource;
-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.*;
+import org.kauriproject.runtime.repository.FileArtifactRef;
+import org.kauriproject.util.io.IOUtils;
 import org.kauriproject.util.xml.DocumentHelper;
-import org.kauriproject.util.io.IOUtils;
 import org.w3c.dom.Document;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.*;
-import java.io.InputStream;
 
 public class ModuleConfigBuilder {
@@ -53 +54 @@
     private ModuleConfig build() {
         ModuleSource moduleSource = null;
+        VersionManager versionManager = new VersionManager(runtime);
         try {
             moduleSource = runtime.getModuleSourceManager().getModuleSource(moduleDefinition.getFile(), moduleDefinition.getSourceType());
@@ -62 +64 @@
                 try {
                     Document document = DocumentHelper.parse(is);
-                    classLoadingConfig = XmlClassLoaderBuilder.build(document.getDocumentElement(), moduleSource, runtime.getArtifactRepository());
+                    classLoadingConfig = XmlClassLoaderBuilder.build(document.getDocumentElement(), moduleSource, runtime.getArtifactRepository(), versionManager);
                 } finally {
                     IOUtils.closeQuietly(is);