From a10c2a78cab5d009722b3998a89c6197ab482315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Wed, 31 Jul 2019 09:36:32 +0200 Subject: [PATCH] Renamed props app_mode => server_mode --- README.md | 8 ++++---- obp-api/src/main/resources/props/sample.props.template | 2 +- obp-api/src/main/scala/bootstrap/liftweb/Boot.scala | 2 +- obp-api/src/main/scala/code/api/util/APIUtil.scala | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 11f54c9ee..3cc9c8951 100644 --- a/README.md +++ b/README.md @@ -380,10 +380,10 @@ We use jetty8 to run the API in production mode. * Edit your props file(s) to contain one of the next cases: - 1) app_mode=portal - 2) app_mode=backend - 3) app_mode=multi - In case is not defined default case is the 3rd one i.e. app_mode=multi + 1) server_mode=portal + 2) server_mode=backend + 3) server_mode=multi + In case is not defined default case is the 3rd one i.e. server_mode=multi ## Using Akka remote storage diff --git a/obp-api/src/main/resources/props/sample.props.template b/obp-api/src/main/resources/props/sample.props.template index e277a8d9d..596c9b985 100644 --- a/obp-api/src/main/resources/props/sample.props.template +++ b/obp-api/src/main/resources/props/sample.props.template @@ -637,5 +637,5 @@ database_messages_scheduler_interval=3600 # -- OBP-API mode ------------------------------- # In case isn't defined default value is "multi" # Possible cases: portal, backend, multi -# app_mode=portal +# server_mode=portal # ----------------------------------------------- \ No newline at end of file diff --git a/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala b/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala index fe6342270..b1b22c46c 100644 --- a/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala @@ -374,7 +374,7 @@ class Boot extends MdcLoggable { // Build SiteMap - val indexPage = APIUtil.getPropsValue("app_mode", "multi") match { + val indexPage = APIUtil.getPropsValue("server_mode", "multi") match { case mode if mode == "portal" => List(Menu.i("Home") / "index") case mode if mode == "backend" => List() case _ => List(Menu.i("Home") / "index") diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala index e70cde192..86381fb8d 100644 --- a/obp-api/src/main/scala/code/api/util/APIUtil.scala +++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala @@ -1622,7 +1622,7 @@ Returns a string showed to the developer else false } - APIUtil.getPropsValue("app_mode", "multi") match { + APIUtil.getPropsValue("server_mode", "multi") match { case mode if mode == "portal" => false case mode if mode == "backend" => checkVersion case _ => checkVersion