tracking: introduce permlink property

SVN: 13746

deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/Parameters.java

@@ -22,6 +22,7 @@ import java.util.Properties;
 
 import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.mail.MailClient;
+import ch.systemsx.cisd.common.utilities.PropertyUtils;
 
 /**
  * @author Tomasz Pylak
@@ -34,12 +35,16 @@ public class Parameters
 
     private static final String OPENBIS_SERVER_URL = "openbis-server-url";
 
+    private static final String PERMLINK_URL = "permlink-url";
+
     private final String openbisUser;
 
     private final String openbisPassword;
 
     private final String openbisServerURL;
 
+    private final String permlinkURL;
+
     private final IMailClient mailClient;
 
     public Parameters(Properties props)
@@ -47,6 +52,7 @@ public class Parameters
         this.openbisUser = getMandatoryProperty(props, OPENBIS_USER);
         this.openbisPassword = getMandatoryProperty(props, OPENBIS_PASSWORD);
         this.openbisServerURL = getMandatoryProperty(props, OPENBIS_SERVER_URL);
+        this.permlinkURL = PropertyUtils.getProperty(props, PERMLINK_URL, openbisServerURL);
         this.mailClient = new MailClient(props);
     }
 
@@ -69,4 +75,9 @@ public class Parameters
     {
         return mailClient;
     }
+
+    public String getPermlinkURL()
+    {
+        return permlinkURL;
+    }
 }

deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java

@@ -99,7 +99,7 @@ public class TrackingClient
             {
                 throw createAuthentificationException(params, null);
             }
-            trackingServer.setBaseIndexURL(session.getSessionToken(), params.getOpenbisServerURL());
+            trackingServer.setBaseIndexURL(session.getSessionToken(), params.getPermlinkURL());
             return session;
         } catch (Exception ex)
         {

deep_sequencing_unit/tracking/dist/etc/service.properties

 openbis-user=<login>
 openbis-password=<password>
-openbis-server-url = https://<openbis-server-url>:8443/openbis
-
+openbis-server-url = https://<openbis-server-url>:8443/openbis/openbis
+permlink-url = https://<openbis-server-url>:8443/openbis
 
 # SMTP properties.
 # To test the system and save emails as files instead of sending them,