From 774321d2b58d4b4ab02c5c9976c9228e39361222 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 30 Mar 2011 12:53:35 +0000
Subject: [PATCH] LMS-2131 Changed URLs to make it work on the server.
SVN: 20583
---
.../client/api/gui/DataSetUploadClientServingServlet.java | 3 ++-
.../web/client/application/menu/dataset/DataSetMenu.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
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 5d689464e92..3c0fb430516 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
@@ -30,7 +30,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
@Controller
@RequestMapping(
{ "/" + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH,
- "/openbis/" + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH })
+ "/openbis/" + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH,
+ "/openbis/openbis/" + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH })
public class DataSetUploadClientServingServlet extends AbstractWebStartClientServingServlet
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
index 29a8440f454..416b3e5da40 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/dataset/DataSetMenu.java
@@ -73,7 +73,7 @@ public class DataSetMenu extends TopMenuItem
public void componentSelected(MenuEvent ce)
{
final URLMethodWithParameters urlParams =
- new URLMethodWithParameters("/openbis/"
+ new URLMethodWithParameters("/openbis/openbis/"
+ BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH);
String sessionToken = viewContext.getModel().getSessionContext().getSessionID();
urlParams.addParameter("session", sessionToken);
--
GitLab