LMS-2131 Changed URLs to make it work on the server.

SVN: 20583

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;

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);