Replace lib:/// scheme by mvn:/// and file:/// and jar+file:/// everywhere

src/org/rascalmpl/interpreter/Evaluator.java

@@ -1174,6 +1174,7 @@ public Result<IValue> eval(IRascalMonitor monitor, Declaration declaration) {
      * @param string
      */
     public void doImport(IRascalMonitor monitor, String... string) {
+        assert monitor != null;
         IRascalMonitor old = setMonitor(monitor);
         interrupt = false;
         try {

src/org/rascalmpl/interpreter/utils/RascalManifest.java

@@ -6,7 +6,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -18,7 +17,6 @@
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 
-import org.rascalmpl.library.util.PathConfig;
 import org.rascalmpl.uri.URIResolverRegistry;
 import org.rascalmpl.uri.URIUtil;
 import org.rascalmpl.uri.jar.JarURIResolver;
@@ -41,12 +39,11 @@ public class RascalManifest {
     protected static final String SOURCE = "Source";
     protected static final String META_INF = "META-INF";
     public static final String META_INF_RASCAL_MF = META_INF + "/RASCAL.MF";
+    public static final String META_INF_MANIFEST_MF = META_INF + "/MANIFEST.MF";
     protected static final String MAIN_MODULE = "Main-Module";
     protected static final String MAIN_FUNCTION = "Main-Function";
     protected static final String PROJECT_NAME = "Project-Name";
-    protected static final String REQUIRE_BUNDLES = "Require-Bundles";
-    protected static final String REQUIRE_LIBRARIES = "Require-Libraries";
-
+
     public static String getRascalVersionNumber() {
         try {
             Enumeration<URL> resources = RascalManifest.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
@@ -61,11 +58,28 @@ public static String getRascalVersionNumber() {
                 }
             }
 
-            return "Rascal version not specified in META-INF/MANIFEST.MF???";
+            return "Not specified";
         } catch (IOException e) {
             return "unknown (due to " + e.getMessage();
         }
     }
+
+    /**
+     * This looks into the META-INF/MANIFEST.MF file for a Name and Specification-Version
+     */
+    public String getManifestVersionNumber(ISourceLocation project) throws IOException {
+        Manifest mf = new Manifest(javaManifest(project));
+
+        String bundleName = mf.getMainAttributes().getValue("Name");
+        if (bundleName != null && bundleName.equals("rascal")) {
+            String result = mf.getMainAttributes().getValue("Specification-Version");
+            if (result != null) {
+                return result;
+            }
+        }
+
+        return "unknown";
+    }
 
     public Manifest getDefaultManifest(String projectName) {
         Manifest manifest = new Manifest();
@@ -75,7 +89,6 @@ public Manifest getDefaultManifest(String projectName) {
         mainAttributes.put(new Attributes.Name(MAIN_MODULE), DEFAULT_MAIN_MODULE);
         mainAttributes.put(new Attributes.Name(MAIN_FUNCTION), DEFAULT_MAIN_FUNCTION);
         mainAttributes.put(new Attributes.Name(PROJECT_NAME), projectName);
-        mainAttributes.put(new Attributes.Name(REQUIRE_LIBRARIES), "");
         return manifest;
     }
 
@@ -152,13 +165,6 @@ public String getProjectName(File jarFile) {
         return getManifestProjectName(manifest(jarFile));
     }
 
-    /**
-     * @return a list of bundle names this jar depends on, or 'null' if none is configured.
-     */
-    public List<String> getRequiredLibraries(JarInputStream jarStream) {
-        return getManifestRequiredLibraries(manifest(jarStream));
-    }
-
     /**
      * @return the name of the main module of a deployment unit, or 'null' if none is configured.
      */
@@ -195,20 +201,6 @@ public boolean hasMainModule(Class<?> clazz) {
         return getManifestMainModule(manifest(clazz)) != null;
     }  
 
-    /**
-     * @return a list of bundle names this jar depends on, or 'null' if none is configured.
-     */
-    public List<String> getRequiredLibraries(File jarFile) {
-        return getManifestRequiredLibraries(manifest(jarFile));
-    }
-
-    /**
-     * @return a list of bundle names this jar depends on, or 'null' if none is configured.
-     */
-    public List<String> getRequiredLibraries(Class<?> clazz) {
-        return getManifestRequiredLibraries(manifest(clazz));
-    }
-
     /**
      * @return a list of paths relative to the root of the jar, if no such option is configured
      *         it will return ["src"].
@@ -238,17 +230,6 @@ public String getManifestMainModule(InputStream project) {
     public String getManifestMainFunction(InputStream project) {
         return getManifestAttribute(project, MAIN_FUNCTION, null);
     }
-
-    /**
-     * @return a list of bundle names this jar depends on, or 'null' if none is configured.
-     */
-    public List<String> getManifestRequiredLibraries(InputStream project) {
-        return getManifestAttributeList(project, REQUIRE_LIBRARIES, null);
-    }
-
-    public List<String> getManifestRequiredLibraries(ISourceLocation root) {
-        return getManifestAttributeList(manifest(root), REQUIRE_LIBRARIES, null);
-    }
 
     public InputStream manifest(Class<?> clazz) {
         return clazz.getResourceAsStream("/" + META_INF_RASCAL_MF);
@@ -262,6 +243,14 @@ public InputStream manifest(ISourceLocation root) {
         }
     }
 
+    public InputStream javaManifest(ISourceLocation root) {
+        try {
+            return URIResolverRegistry.getInstance().getInputStream(URIUtil.getChildLocation(JarURIResolver.jarify(root), META_INF_MANIFEST_MF));
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
     public String getProjectName(ISourceLocation root) {
         return getManifestProjectName(manifest(root));
     }
@@ -270,25 +259,6 @@ public List<String> getSourceRoots(ISourceLocation root) {
         return getManifestSourceRoots(manifest(root));
     }
 
-    public List<String> getRequiredLibraries(ISourceLocation root) {
-        return getManifestRequiredLibraries(manifest(root));
-    }
-
-    public PathConfig makePathConfig(ISourceLocation root) throws IOException {
-        List<ISourceLocation> libs = new ArrayList<>();
-        List<ISourceLocation> srcs = new ArrayList<>();
-
-        ISourceLocation binFolder = URIUtil.getChildLocation(root, "bin");
-        libs.add(binFolder);
-
-        RascalManifest mf = new RascalManifest();
-        for (String src : mf.getSourceRoots(root)) {
-            srcs.add(URIUtil.getChildLocation(root, src));
-        }
-
-        return new PathConfig(srcs, libs, binFolder);
-    }
-
     public InputStream manifest(JarInputStream stream) {
         JarEntry next = null;
         ByteArrayOutputStream out = new ByteArrayOutputStream();

src/org/rascalmpl/library/Location.rsc

@@ -45,6 +45,14 @@ loc relativize(list[loc] haystack, loc needle) {
     }
 }
 
+@synopsis{Shortens an absolute path to a jar inside the local maven repository.}
+@javaClass{org.rascalmpl.library.Prelude}
+java loc mavenize(loc jar);
+
+@synopsis{If the location points to a jar file, then this modifies the scheme and the path to point _inside_ of the jar.}
+@javaClass{org.rascalmpl.library.Prelude}
+java loc jarify(loc jar);
+
 @synopsis{Convert Windows path syntax to a `loc` value}
 @description{
 This conversion supports generic Windows path syntax, including:

src/org/rascalmpl/library/Messages.java

@@ -0,0 +1,142 @@
+package org.rascalmpl.library;
+
+import java.io.PrintWriter;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.rascalmpl.values.IRascalValueFactory;
+
+import io.usethesource.vallang.IConstructor;
+import io.usethesource.vallang.IList;
+import io.usethesource.vallang.ISourceLocation;
+import io.usethesource.vallang.IString;
+import io.usethesource.vallang.IValue;
+import io.usethesource.vallang.IValueFactory;
+import io.usethesource.vallang.type.TypeFactory;
+import io.usethesource.vallang.type.TypeStore;
+
+
+/**
+ * Java API for the messages in the standard library module `Message`
+ * 
+ * This is the standard format for all error messages in Rascal projects and beyond.
+ * Since some low-level core code also produces messages that should end up in UI,
+ * we write here a bridge between the Java and Rascal representation. 
+ * 
+ * TODO Later when the standard library is bootstrapped, this code might be replaced
+ * by the generated code from the compiler for the `Message` module.
+ */
+public class Messages {
+    private static final TypeFactory tf = TypeFactory.getInstance();
+    private static final IValueFactory vf = IRascalValueFactory.getInstance();
+    private static final TypeStore ts = new TypeStore();
+
+    // These declarations mirror the data definition in the `Message` root module of the standard library.
+    private static final io.usethesource.vallang.type.Type Message = tf.abstractDataType(ts, "Message");
+    private static final io.usethesource.vallang.type.Type Message_info = tf.constructor(ts, Message, "info", tf.stringType(), "msg", tf.sourceLocationType(), "at");
+    private static final io.usethesource.vallang.type.Type Message_warning = tf.constructor(ts, Message, "warning", tf.stringType(), "msg", tf.sourceLocationType(), "at");
+    private static final io.usethesource.vallang.type.Type Message_error = tf.constructor(ts, Message, "error", tf.stringType(), "msg", tf.sourceLocationType(), "at");
+
+    public static IValue info(String message, ISourceLocation loc) {
+        return vf.constructor(Message_info, vf.string(message), loc);
+    }
+
+    public static IValue warning(String message, ISourceLocation loc) {
+        return vf.constructor(Message_warning, vf.string(message), loc);
+    }
+
+    public static IValue error(String message, ISourceLocation loc) {
+        return vf.constructor(Message_error, vf.string(message), loc);
+    }
+
+    public static void write(IList messages, PrintWriter out) {
+        int maxLine = 0;
+        int maxColumn = 0;
+
+        for (IValue error : messages) {
+            ISourceLocation loc = (ISourceLocation) ((IConstructor) error).get("at");
+            if (loc.hasLineColumn()) {
+                maxLine = Math.max(loc.getBeginLine(), maxLine);
+                maxColumn = Math.max(loc.getBeginColumn(), maxColumn);
+            } 
+        }
+
+        int lineWidth = (int) Math.log10(maxLine + 1) + 1;
+		int colWidth = (int) Math.log10(maxColumn + 1) + 1;
+
+        Stream<IConstructor> sortedStream = messages.stream()
+            .map(IConstructor.class::cast)
+            .sorted((m1, m2) -> {
+                ISourceLocation l1 = (ISourceLocation) m1.get("at");
+                ISourceLocation l2 = (ISourceLocation) m2.get("at");
+
+                if (!l1.getScheme().equals(l2.getScheme())) {
+                    return l1.getScheme().compareTo(l2.getScheme());
+                }
+
+                if (!l1.getAuthority().equals(l2.getAuthority())) {
+                    return l1.getAuthority().compareTo(l2.getAuthority());
+                }
+
+                if (!l1.getPath().equals(l2.getPath())) {
+                    return l1.getPath().compareTo(l2.getPath());
+                }
+
+                if (l1.hasLineColumn() && l2.hasLineColumn()) {
+                    if (l1.getBeginLine() == l2.getBeginLine()) {
+                        return Integer.compare(l1.getBeginColumn(), l2.getBeginColumn());
+                    }
+                    else {
+                        return Integer.compare(l1.getBeginLine(), l2.getBeginLine());
+                    }
+                }
+                else if (l1.hasOffsetLength() && l2.hasOffsetLength()) {
+                    return Integer.compare(l1.getOffset(), l2.getOffset());
+                }
+                else if (l1.hasOffsetLength()) {
+                    return -1;
+                }
+                else if (l2.hasOffsetLength()) {
+                    return 1;
+                }
+
+                return 0;
+            });
+
+        for (IConstructor msg : sortedStream.collect(Collectors.toList())) {
+            String type = msg.getName();
+            boolean isError = type.equals("error");
+            boolean isWarning = type.equals("warning");
+
+            ISourceLocation loc = (ISourceLocation) msg.get("at");
+            int col = 0;
+            int line = 0;
+            if (loc.hasLineColumn()) {
+                col = loc.getBeginColumn();
+                line = loc.getBeginLine();
+            }
+
+            String output
+            = loc.getPath()
+            + ":"
+            + String.format("%0" + lineWidth + "d", line)
+            + ":"
+            + String.format("%0" + colWidth + "d", col)
+            + ": "
+            + ((IString) msg.get("msg")).getValue();
+
+            if (isError) {
+                out.println("[ERROR]   " + output);
+            }
+            else if (isWarning) {
+                out.println("[WARNING] " + output);
+            }
+            else {
+                out.println("[INFO]    " + output);
+            }
+        }
+
+        out.flush();
+		return;
+    }
+}

src/org/rascalmpl/library/Prelude.java

@@ -85,6 +85,8 @@
 import org.rascalmpl.uri.ISourceLocationWatcher.ISourceLocationChangeType;
 import org.rascalmpl.uri.ISourceLocationWatcher.ISourceLocationChanged;
 import org.rascalmpl.uri.ISourceLocationWatcher.ISourceLocationType;
+import org.rascalmpl.uri.file.MavenRepositoryURIResolver;
+import org.rascalmpl.uri.jar.JarURIResolver;
 import org.rascalmpl.uri.LogicalMapResolver;
 import org.rascalmpl.uri.URIResolverRegistry;
 import org.rascalmpl.uri.URIUtil;
@@ -3673,6 +3675,14 @@ public ISourceLocation resolveLocation(ISourceLocation loc) {
 		}
 	}
 
+	public ISourceLocation mavenize(ISourceLocation jar) {
+		return MavenRepositoryURIResolver.mavenize(jar);
+	}
+
+	public ISourceLocation jarify(ISourceLocation jar) {
+		return JarURIResolver.jarify(jar);
+	}
+
 	public ISet findResources(IString fileName) {
 		return resourceProvider.findResources(fileName.getValue()).stream().collect(values.setWriter());
 	}

src/org/rascalmpl/library/lang/java/m3/AST.rsc

@@ -414,7 +414,7 @@ public set[Declaration] createAstsFromMavenProject(loc project, bool collectBind
       throw "<project> is not a valid directory";
     }
 
-    classPaths = getProjectPathConfig(project).javaCompilerPath;
+    classPaths = getProjectPathConfig(project).libs;
     sourcePaths = getPaths(project, "java");
     return createAstsFromFiles({ p | sp <- sourcePaths, p <- find(sp, "java"), isFile(p)}, collectBindings, sourcePath = [*findRoots(sourcePaths)], classPath = classPaths, errorRecovery = errorRecovery, javaVersion = javaVersion);
 }

src/org/rascalmpl/library/lang/java/m3/Core.rsc

@@ -264,7 +264,7 @@ M3 createM3FromMavenProject(loc project, bool errorRecovery = false, bool includ
       throw "<project> is not a valid directory";
     }
 
-    list[loc] classPaths = getProjectPathConfig(project).javaCompilerPath;
+    list[loc] classPaths = getProjectPathConfig(project).libs;
 
     sourcePaths = getPaths(project, "java");
     M3 result = composeJavaM3(project, createM3sFromFiles({p | sp <- sourcePaths, p <- find(sp, "java"), isFile(p)}, errorRecovery = errorRecovery, sourcePath = [*findRoots(sourcePaths)], classPath = classPaths, javaVersion = javaVersion));