From 4e419677a761f7cd39f74608ebadb14b02f76eeb Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 28 Jun 2017 08:00:52 +0000
Subject: [PATCH] SSDM-5078 : Configurable spring app name, defaults to be
backwards compatible
SVN: 38479
---
.../openbis/generic/client/web/client/application/Dict.java | 4 +++-
.../client/web/client/application/GenericConstants.java | 3 ++-
.../java/ch/systemsx/cisd/openbis/public/common-dictionary.js | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
index 391ba3770e9..adc8a2a55eb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
@@ -37,6 +37,8 @@ public abstract class Dict
// Can not be instantiated.
}
+ public static final String SPRING_APPLICATION_NAME = "springApplicationName";
+
public static final String APPLICATION_NAME = "applicationName";
public static final String OPENBIS_INSTANCE = "openbis_instance";
@@ -314,7 +316,7 @@ public abstract class Dict
public static final String EXPERIMENT = "experiment";
public static final String EXPERIMENTS = "experiments";
-
+
public static final String EXPERIMENT_IDENTIFIER = "experiment_identifier";
public static final String PART_OF = "part_of";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericConstants.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericConstants.java
index 17b448cdef4..eb37b76e1e0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericConstants.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericConstants.java
@@ -17,6 +17,7 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.i18n.client.Dictionary;
import ch.systemsx.cisd.openbis.generic.shared.basic.AttachmentDownloadConstants;
@@ -40,7 +41,7 @@ public final class GenericConstants
*/
public static final String ID_PREFIX = "openbis_";
- private static final String APPLICATION_NAME = "openbis";
+ private static final String APPLICATION_NAME = Dictionary.getDictionary("common").get(Dict.SPRING_APPLICATION_NAME);
public static final String COMMON_SERVER_NAME = createServicePath("common");
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
index 85c9cf91b8e..52a18e9704d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
@@ -7,7 +7,8 @@ entityTypes.experiment = "Experiment";
entityTypes.experiments = entityTypes.experiment + "s";
var common = {
-
+
+ springApplicationName: "openbis",
applicationName: "openBIS",
openbis_instance: "",
footer: "openBIS (Version {0})",
--
GitLab