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%2FAbstractAvailableModules.java;h=d56a5af05548ef0ba903dc009d17b8b0181f9f81;hb=fa2e3ec17c8f7168927cd1b4f2068776206a49e7;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..d56a5af05 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,6 +8,7 @@ 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; /** List of modules for a distribution. */ @@ -23,8 +24,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 +35,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"; + } + }