X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fweb%2Fmvc%2Fprovisioning%2FAvailableModulesHtml.java;fp=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fweb%2Fmvc%2Fprovisioning%2FAvailableModulesHtml.java;h=7a860996db26c80b5972f569c3704828245b573e;hb=af874b12bcb864e1ee2b48e8d6e1fea3a584c53d;hp=338de8353c6175e462d4b787a22d25d98a1ac9e2;hpb=f4766f726a8e2fa93ab4fb5f895a7cbbcc719d2f;p=gpl%2Fargeo-slc.git 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 338de8353..7a860996d 100644 --- 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("

Distribution " + md + "

"); for (NameVersion nameVersion : md.listModulesNameVersions()) { - String fileName = nameVersion.getName() + "-" - + nameVersion.getVersion() + ".jar"; - String moduleUrl = baseUrl + fileName; - out - .write("" + fileName - + "
"); + 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("" + + jarFileName(nameVersion) + "
"); } }