Modular distributions

[gpl/argeo-slc.git] / runtime / org.argeo.slc.server / src / main / java / org / argeo / slc / web / mvc / provisioning / AvailableModulesHtml.java

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesHtml.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesHtml.java
index 338de8353c6175e462d4b787a22d25d98a1ac9e2..7a860996db26c80b5972f569c3704828245b573e 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesHtml.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesHtml.java
@@ -3,8 +3,10 @@ package org.argeo.slc.web.mvc.provisioning;
 import java.io.IOException;
 import java.io.Writer;
 
+import org.argeo.slc.build.Distribution;
 import org.argeo.slc.build.ModularDistribution;
 import org.argeo.slc.build.NameVersion;
+import org.argeo.slc.core.build.ResourceDistribution;
 
 /** List of modules for a distribution. */
 public class AvailableModulesHtml extends AbstractAvailableModules {
@@ -14,12 +16,22 @@ public class AvailableModulesHtml extends AbstractAvailableModules {
                out.write("<h1>Distribution " + md + "</h1>");
 
                for (NameVersion nameVersion : md.listModulesNameVersions()) {
-                       String fileName = nameVersion.getName() + "-"
-                                       + nameVersion.getVersion() + ".jar";
-                       String moduleUrl = baseUrl + fileName;
-                       out
-                                       .write("<a href=\"" + moduleUrl + "\">" + fileName
-                                                       + "</a><br/>");
+                       Distribution distribution = md.getModuleDistribution(nameVersion
+                                       .getName(), nameVersion.getVersion());
+
+                       String moduleUrl = null;
+                       if (distribution instanceof ResourceDistribution) {
+                               String url = ((ResourceDistribution) distribution)
+                                               .getLocation().getURL().toString();
+                               if (url.startsWith("reference:"))
+                                       moduleUrl = url;
+                       }
+
+                       if (moduleUrl == null)
+                               moduleUrl = jarUrl(baseUrl, nameVersion);
+
+                       out.write("<a href=\"" + moduleUrl + "\">"
+                                       + jarFileName(nameVersion) + "</a><br/>");
                }
        }