From f6f867b935a5e840494bacc3d0821e06285d809a Mon Sep 17 00:00:00 2001 From: rb7147 Date: Thu, 28 Sep 2017 16:43:22 -0400 Subject: [PATCH] Revert the SDK properties Changed the portal properties from onap to ecomp. Issue-Id: POLICY-273 Change-Id: I4c62bb1df2c181c6d506e4e4894b0f9e4a44e5cc Signed-off-by: rb7147 --- ONAP-SDK-APP/src/main/resources/portal.properties | 6 +++--- ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties | 2 +- .../files/install/servers/onap/WEB-INF/classes/portal.properties | 6 +++--- .../src/files/install/servers/onap/WEB-INF/conf/system.properties | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ONAP-SDK-APP/src/main/resources/portal.properties b/ONAP-SDK-APP/src/main/resources/portal.properties index 2ab096f1a..30cbf0fff 100644 --- a/ONAP-SDK-APP/src/main/resources/portal.properties +++ b/ONAP-SDK-APP/src/main/resources/portal.properties @@ -43,10 +43,10 @@ use_rest_for_functional_menu=true portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl # CSP Global Log On for single sign on -onap_redirect_url = todo_csp_global_logon +ecomp_redirect_url = todo_csp_global_logon # URL of the ONAP Portal REST API -onap_rest_url = todo_Onap_rest_url +ecomp_rest_url = todo_Onap_rest_url # Applications do not need to run a UEB listener in 1610. ueb_listeners_enable = false @@ -58,7 +58,7 @@ ueb_listeners_enable = false # UEB servers ueb_url_list = todo_ueb_list # ONAP Portal listens on this UEB topic -onap_portal_inbox_name = ONAP-PORTAL-INBOX-TEST-DEMETER +ecomp_portal_inbox_name = ONAP-PORTAL-INBOX-TEST-DEMETER # Replace these 3 default values with the ones for your specific App, # as shown on the on-boarding page on the ONAP Portal web application. ueb_app_key = ZOicEniw7BWDL1pM diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties b/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties index 991cb8aee..aa8ee1476 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties @@ -50,7 +50,7 @@ mylogins_feed_cron = 0 0/60 * * * ?; my_login_feed_output_dir = /tmp/MyLogins # ONAP Portal Shared Context REST API URL -onap_shared_context_rest_url= todo_shared_context_url +ecomp_shared_context_rest_url= todo_shared_context_url # Link shown in Help menu contact_us_link = todo_Contact_link diff --git a/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties index 6b5ba6186..eaee63f60 100644 --- a/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties +++ b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties @@ -44,11 +44,11 @@ use_rest_for_functional_menu=true portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl # CSP Global Log On for single sign on -onap_redirect_url = ${{ONAP_REDIRECT_URL}} +ecomp_redirect_url = ${{ONAP_REDIRECT_URL}} # URL of the ONAP Portal REST API # onap.homer.com is a development machine -onap_rest_url = ${{ONAP_REST_URL}} +ecomp_rest_url = ${{ONAP_REST_URL}} # Applications do not need to run a UEB listener in 1610. ueb_listeners_enable = false @@ -60,7 +60,7 @@ ueb_listeners_enable = false # UEB servers ueb_url_list = ${{ONAP_UEB_URL_LIST}} # ONAP Portal listens on this UEB topic -onap_portal_inbox_name = ${{ONAP_PORTAL_INBOX_NAME}} +ecomp_portal_inbox_name = ${{ONAP_PORTAL_INBOX_NAME}} # Replace these 3 default values with the ones for your specific App, # as shown on the on-boarding page on the ONAP Portal web application. ueb_app_key = ${{ONAP_UEB_APP_KEY}} diff --git a/packages/base/src/files/install/servers/onap/WEB-INF/conf/system.properties b/packages/base/src/files/install/servers/onap/WEB-INF/conf/system.properties index 387a4e29b..bb33c3f7a 100644 --- a/packages/base/src/files/install/servers/onap/WEB-INF/conf/system.properties +++ b/packages/base/src/files/install/servers/onap/WEB-INF/conf/system.properties @@ -65,7 +65,7 @@ mylogins_feed_cron = 0 0/60 * * * ?; my_login_feed_output_dir = /tmp/MyLogins # ONAP Portal Shared Context REST API URL -onap_shared_context_rest_url= ${{ONAP_SHARED_CONTEXT_REST_URL}} +ecomp_shared_context_rest_url= ${{ONAP_SHARED_CONTEXT_REST_URL}} # Link shown in Help menu contact_us_link = -- 2.16.6