X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fweb%2Fmvc%2Fprovisioning%2FAbstractAvailableModules.java;h=f85f4d86c821b834bb24f8c233b56b11da75a4c0;hb=af874b12bcb864e1ee2b48e8d6e1fea3a584c53d;hp=e9acf08f2a911ad78ace333b05e979abb6dbafa8;hpb=b98bef7b2e743103c93e719ac5c18bf41858ec3a;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AbstractAvailableModules.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AbstractAvailableModules.java
index e9acf08f2..f85f4d86c 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AbstractAvailableModules.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AbstractAvailableModules.java
@@ -8,8 +8,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.slc.build.ModularDistribution;
+import org.argeo.slc.build.NameVersion;
 import org.springframework.web.HttpRequestHandler;
 
+import common.BaseUnit;
+
 /** List of modules for a distribution. */
 public abstract class AbstractAvailableModules implements HttpRequestHandler {
 	protected abstract void print(Writer out, String baseUrl,
@@ -23,8 +26,9 @@ public abstract class AbstractAvailableModules implements HttpRequestHandler {
 				.getAttribute("modularDistribution");
 
 		String baseUrl = "http://" + request.getServerName() + ":"
-				+ request.getServerPort() + request.getContextPath() + "/"
-				+ md.getName() + "/" + md.getVersion() + "/";
+				+ request.getServerPort() + request.getContextPath()
+				+ request.getServletPath() + "/" + md.getName() + "/"
+				+ md.getVersion() + "/";
 
 		print(response.getWriter(), baseUrl, md);
 	}
@@ -33,4 +37,12 @@ public abstract class AbstractAvailableModules implements HttpRequestHandler {
 		return "text/plain";
 	}
 
+	protected String jarUrl(String baseUrl, NameVersion nameVersion) {
+		return baseUrl + jarFileName(nameVersion);
+	}
+
+	protected String jarFileName(NameVersion nameVersion) {
+		return nameVersion.getName() + "-" + nameVersion.getVersion() + ".jar";
+	}
+
 }