From 4023e0ac4d7dbc6a3405691cbbebc4d9945c2f5a Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 10 Dec 2019 16:32:39 +0100 Subject: [PATCH] updated configuration --- docs/images/user/basic/login.png | Bin 0 -> 26252 bytes .../service/i18n/impl/I18nSupportImpl.java | 20 ++++++++++++------ .../sebserver/webservice/WebserviceInfo.java | 4 ++-- .../config/application-dev-gui.properties | 5 +---- .../config/application-dev-ws.properties | 4 ++-- .../resources/config/application.properties | 4 +++- 6 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 docs/images/user/basic/login.png diff --git a/docs/images/user/basic/login.png b/docs/images/user/basic/login.png new file mode 100644 index 0000000000000000000000000000000000000000..9a23e72d30e015d2709faa35f2e4614304f444fa GIT binary patch literal 26252 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 L`S8-FPa6LPe$A*H literal 0 HcmV?d00001 diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java index 2d3075f1..92412f5c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java @@ -42,6 +42,12 @@ public class I18nSupportImpl implements I18nSupport { private static final Logger log = LoggerFactory.getLogger(I18nSupportImpl.class); + private static final String SUPPORTED_LANGUAGES_KEY = "sebserver.gui.supported.languages"; + private static final String MULTILINGUAL_KEY = "sebserver.gui.multilingual"; + private static final String TIME_DISPLAYFORMAT_KEY = "sebserver.gui.time.displayformat"; + private static final String DATETIME_DISPLAYFORMAT_KEY = "sebserver.gui.datetime.displayformat"; + private static final String DATE_DISPLAYFORMAT_KEY = "sebserver.gui.date.displayformat"; + private static final String DATE_DISPLAYFORMAT_TIMEZONE_KEY = "sebserver.gui.date.displayformat.timezone"; private static final String ATTR_CURRENT_SESSION_LOCALE = "CURRENT_SESSION_LOCALE"; private final DateTimeFormatter timeZoneFormatter; @@ -63,33 +69,33 @@ public class I18nSupportImpl implements I18nSupport { this.timeZoneFormatter = DateTimeFormat .forPattern(environment.getProperty( - "sebserver.gui.date.displayformat.timezone", + DATE_DISPLAYFORMAT_TIMEZONE_KEY, Constants.TIME_ZONE_OFFSET_TAIL_FORMAT)); this.displayDateFormatter = DateTimeFormat .forPattern(environment.getProperty( - "sebserver.gui.date.displayformat", + DATE_DISPLAYFORMAT_KEY, Constants.DEFAULT_DISPLAY_DATE_FORMAT)) .withZoneUTC(); this.displayDateTimeFormatter = DateTimeFormat .forPattern(environment.getProperty( - "sebserver.gui.datetime.displayformat", + DATETIME_DISPLAYFORMAT_KEY, Constants.DEFAULT_DIPLAY_DATE_TIME_FORMAT)) .withZoneUTC(); this.displayTimeFormatter = DateTimeFormat .forPattern(environment.getProperty( - "sebserver.gui.time.displayformat", + TIME_DISPLAYFORMAT_KEY, Constants.DEFAULT_TIME_FORMAT)) .withZoneUTC(); final boolean multilingual = BooleanUtils.toBoolean(environment.getProperty( - "sebserver.gui.multilingual", - "false")); + MULTILINGUAL_KEY, + Constants.FALSE_STRING)); if (multilingual) { final String languagesString = environment.getProperty( - "sebserver.gui.languages", + SUPPORTED_LANGUAGES_KEY, Locale.ENGLISH.getLanguage()); this.supportedLanguages = Utils.immutableCollectionOf( diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java b/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java index d1d5eec0..d707b867 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java @@ -35,9 +35,9 @@ public class WebserviceInfo { private static final String VERSION_KEY = "sebserver.version"; private static final String WEB_SERVICE_TEST_PROPERTY = "sebserver.test.property"; - private static final String WEB_SERVICE_SERVER_NAME_KEY = "sebserver.webservice.http.server.name"; + private static final String WEB_SERVICE_SERVER_NAME_KEY = "sebserver.webservice.http.external.servername"; private static final String WEB_SERVICE_HTTP_SCHEME_KEY = "sebserver.webservice.http.scheme"; - private static final String WEB_SERVICE_HTTP_PORT = "sebserver.webservice.http.port"; + private static final String WEB_SERVICE_HTTP_PORT = "sebserver.webservice.http.external.port"; private static final String WEB_SERVICE_HOST_ADDRESS_KEY = "server.address"; private static final String WEB_SERVICE_SERVER_PORT_KEY = "server.port"; private static final String WEB_SERVICE_EXAM_API_DISCOVERY_ENDPOINT_KEY = diff --git a/src/main/resources/config/application-dev-gui.properties b/src/main/resources/config/application-dev-gui.properties index 75fc56dc..57722038 100644 --- a/src/main/resources/config/application-dev-gui.properties +++ b/src/main/resources/config/application-dev-gui.properties @@ -2,9 +2,6 @@ server.address=localhost server.port=8080 server.servlet.context-path=/ -server.servlet.session.cookie.http-only=true -server.servlet.session.tracking-modes=cookie - sebserver.gui.entrypoint=/gui sebserver.gui.webservice.protocol=http sebserver.gui.webservice.address=localhost @@ -20,7 +17,7 @@ sebserver.gui.list.page.size=15 sebserver.gui.date.displayformat=yyyy-MM-dd HH:mm sebserver.gui.date.displayformat.timezone=|ZZ sebserver.gui.multilingual=false -sebserver.gui.languages=en,de +sebserver.gui.supported.languages=en,de sebserver.gui.seb.client.config.download.filename=SEBClientSettings.seb sebserver.gui.seb.exam.config.download.filename=SEBExamSettings.seb \ No newline at end of file diff --git a/src/main/resources/config/application-dev-ws.properties b/src/main/resources/config/application-dev-ws.properties index 7f932e60..7b97be70 100644 --- a/src/main/resources/config/application-dev-ws.properties +++ b/src/main/resources/config/application-dev-ws.properties @@ -23,8 +23,8 @@ sebserver.http.client.read-timeout=10000 sebserver.init.adminaccount.gen-on-init=false sebserver.webservice.distributed=false sebserver.webservice.http.scheme=http -sebserver.webservice.http.server.name=${server.address} -#sebserver.webservice.http.port=${server.port} +sebserver.webservice.http.external.servername=${server.address} +#sebserver.webservice.http.external.port=${server.port} sebserver.webservice.http.redirect.gui=/gui sebserver.webservice.api.admin.endpoint=/admin-api/v1 sebserver.webservice.api.admin.accessTokenValiditySeconds=3600 diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties index 4bd019bb..295cff04 100644 --- a/src/main/resources/config/application.properties +++ b/src/main/resources/config/application.properties @@ -6,8 +6,10 @@ spring.mandatory-file-encoding=UTF-8 spring.http.encoding.charset=UTF-8 spring.http.encoding.enabled=true +server.servlet.session.cookie.http-only=true +server.servlet.session.tracking-modes=cookie + sebserver.version=0.5.1 beta -sebserver.supported.languages=en sebserver.init.organisation.name=ETHZ sebserver.init.adminaccount.gen-on-init=true sebserver.init.adminaccount.username=super-admin