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

SVN: 20551

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java

@@ -54,10 +54,6 @@ 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;
 
@@ -95,9 +91,7 @@ public class DataSetUploadClientServingServlet extends AbstractWebStartClientSer
         {
             if (null == codebaseUrl)
             {
-                codebaseUrl =
-                        server.getDefaultPutDataStoreBaseURL(getSessionToken(request))
-                                + "/datastore_server/" + UPLOAD_GUI_PATH;
+                codebaseUrl = server.getDefaultPutDataStoreBaseURL(getSessionToken(request));
             }
         }
 

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/"
                                     + BasicConstant.DATA_SET_UPLOAD_CLIENT_PATH);
                     String sessionToken = viewContext.getModel().getSessionContext().getSessionID();
                     urlParams.addParameter("session", sessionToken);