diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/Parameters.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/Parameters.java index 53f4038181b48aad9080464d947ca8cbdddce4eb..5bcbb0fa5e57dba0f7679df29ba697cffedfbe3b 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/Parameters.java +++ b/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; + } } diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java index aca45be999bb4c3dfd773e3843495b471fa83edd..8a8bc95ea1da7702873a5b75e180d25d65db8349 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java +++ b/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) { diff --git a/deep_sequencing_unit/tracking/dist/etc/service.properties b/deep_sequencing_unit/tracking/dist/etc/service.properties index b125a7d19ee5d250cd3c22c1c39d092fbdd747e8..0bcfa459ebd37fb86ec510598eb3ca00ecd5c203 100644 --- a/deep_sequencing_unit/tracking/dist/etc/service.properties +++ b/deep_sequencing_unit/tracking/dist/etc/service.properties @@ -1,7 +1,7 @@ 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,