From 7df6ca5fcfabe60c08d8f59c6f082fd8f3480d7d Mon Sep 17 00:00:00 2001 From: cramakri <cramakri> Date: Tue, 29 Mar 2011 14:36:58 +0000 Subject: [PATCH] LMS-2131 Changed URLs to make it work on the server. SVN: 20552 --- .../client/api/gui/DataSetUploadClientServingServlet.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java index 05f2cacae51..82bf80fb30c 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java @@ -54,6 +54,10 @@ public class DataSetUploadClientServingServlet extends AbstractWebStartClientSer + " <argument>${session-id}</argument>\n" + " </application-desc>\n" + "</jnlp>"); + // This must be the same value as what is assigned to the ${dss_upload_gui} variable in + // dss/build.xml . + private static final String UPLOAD_GUI_PATH = "dss_upload_gui"; + @Resource(name = ResourceNames.COMMON_SERVER) private ICommonServer server; @@ -91,7 +95,9 @@ public class DataSetUploadClientServingServlet extends AbstractWebStartClientSer { if (null == codebaseUrl) { - codebaseUrl = server.getDefaultPutDataStoreBaseURL(getSessionToken(request)); + codebaseUrl = + server.getDefaultPutDataStoreBaseURL(getSessionToken(request)) + "/" + + UPLOAD_GUI_PATH; } } -- GitLab