From 55bac427b18a6e37d6b09c4899b19b31cfa3d614 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Thu, 12 Oct 2017 17:02:29 -0400 Subject: [PATCH] Switch SDK app to Mariadb connector. Also drop properties for DBC app that is no longer deployed. Issue: PORTAL-104 Change-Id: I5db42bf8342650caf20675bcef43fcf3e3af2dbb Signed-off-by: Christopher Lott (cl778h) --- .../ECOMPDBCAPP/dbcapp.properties | 8 --- .../ECOMPDBCAPP/fusion.properties | 33 ------------ .../ECOMPDBCAPP/portal.properties | 26 --------- .../ECOMPDBCAPP/system.properties | 63 ---------------------- .../ECOMPSDKAPP/system.properties | 5 +- 5 files changed, 2 insertions(+), 133 deletions(-) delete mode 100644 deliveries/properties_simpledemo/ECOMPDBCAPP/dbcapp.properties delete mode 100644 deliveries/properties_simpledemo/ECOMPDBCAPP/fusion.properties delete mode 100644 deliveries/properties_simpledemo/ECOMPDBCAPP/portal.properties delete mode 100644 deliveries/properties_simpledemo/ECOMPDBCAPP/system.properties diff --git a/deliveries/properties_simpledemo/ECOMPDBCAPP/dbcapp.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/dbcapp.properties deleted file mode 100644 index 1c13384d..00000000 --- a/deliveries/properties_simpledemo/ECOMPDBCAPP/dbcapp.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Properties for the Data Bus Controller webapp -dmaap.rest.url.list = http://10.0.4.102:18080/webapi -# webapp's mechid is sent to DCAE for authorization -dmaap.mechid.name = m06672@dbcapp.dmaap.dcae.att.com -# encrypted with CipherUtil -dmaap.mechid.password = /F1vRhga1Ijw7yRFFj6R5A== -# Valid access methods are "dao" and "rest" -profile.access.method = dao diff --git a/deliveries/properties_simpledemo/ECOMPDBCAPP/fusion.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/fusion.properties deleted file mode 100644 index 4d4e17e9..00000000 --- a/deliveries/properties_simpledemo/ECOMPDBCAPP/fusion.properties +++ /dev/null @@ -1,33 +0,0 @@ -# login settings -login_method_backdoor = backdoor -login_method_attribute_name = login_method -login_method_csp = csp -login_method_web_junction = web_junction - -#login message -login.error.hrid.empty = Login failed, please contact system administrator. -login.error.hrid.not-found = User not found, please contact system administrator. -login.error.user.inactive = Account is disabled, please contact system administrator. - -authentication_mechanism = DBAUTH - -# User Session settings -user_attribute_name = user -roles_attribute_name = roles -role_functions_attribute_name = role_functions - -# POST settings -post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory -post_provider_url = todo_ldap -post_security_principal = ou=people,o=org,c=us -post_max_result_size = 499 - -# menu settings -menu_query_name = menuData -application_menu_set_name = APP -application_menu_attribute_name = applicationMenuData -business_direct_menu_set_name = BD -business_direct_menu_attribute_name = businessDirectMenuData - -# Role settings -sys_admin_role_id = 1 diff --git a/deliveries/properties_simpledemo/ECOMPDBCAPP/portal.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/portal.properties deleted file mode 100644 index cec3bb3c..00000000 --- a/deliveries/properties_simpledemo/ECOMPDBCAPP/portal.properties +++ /dev/null @@ -1,26 +0,0 @@ -# Properties read by ECOMP Framework library, ecompFW.jar - -# epsdk 1.1 has org.openecomp package prefix -portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl -portal.api.prefix = /api -max.idle.time = 5 -user.attribute.name = user_attribute - -# Legacy property TODO -ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm - -# URL of the ECOMP Portal REST API -ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi - -#Use REST API instead of UEB to fetch the functional menu data -use_rest_for_functional_menu=true - -# Don't fetch functional menu via UEB in 1610. -ueb_listeners_enable = false - -# Application key is used by session management -ueb_app_key = MtRwsF16RdpHZ7eM - -# The inbox name property should not be required when the REST API is used, -# but in 1610 FuncMenuController logs ALARM if it cannot find this key. -ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-TEST diff --git a/deliveries/properties_simpledemo/ECOMPDBCAPP/system.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/system.properties deleted file mode 100644 index 5ba96b13..00000000 --- a/deliveries/properties_simpledemo/ECOMPDBCAPP/system.properties +++ /dev/null @@ -1,63 +0,0 @@ -#Local -app_display_name = DMaaP Bus Ctlr - -db.driver = org.mariadb.jdbc.Driver -db.connectionURL = jdbc:mariadb://portal-db:3306/dbca_os -db.userName = root -db.password = Aa123456 -db.encrypt_flag = false -db.hib.dialect = org.hibernate.dialect.MySQLDialect -db.min_pool_size = 5 -db.max_pool_size = 10 -hb.dialect = org.hibernate.dialect.MySQLDialect -hb.show_sql = false -hb.db_reconnect = true -hb.idle_connection_test_period = 3600 - -# Directory with the Quantum.lic file -files_path = /opt/app/tomcat/webapps/dmaap-bc-app/WEB-INF/dbcapp - -application_user_id = 30000 -post_default_role_id = 16 -clustered = true - -#Enable Fusion Mobile capabilities for the application -mobile_enable = false - -# Cache config file is needed on the classpath -cache_config_file_path = /WEB-INF/classes/cache.ccf -cache_switch = 199 -cache_load_on_startup = false - -user_name = fullName -decryption_key = AGLDdG4D04BKm2IxIWEr8o== - -#element map files -element_map_file_path = /tmp -element_map_icon_path = app/fusionapp/icons/ - -# Quartz is not used by the DBC application -# log_cron = -# mylogins_feed_cron = -# sessiontimeout_feed_cron = -# my_login_feed_output_dir = - -# ECOMP Portal Shared Context REST API URL is not used by the DBC application -# ecomp_shared_context_rest_url = - -contact_us_link = https://todo_contact_us_link - -# An Unique 128-bit value defined to identify a specific version -# of an application deployed on a specific virtual machine. -# This value must be generated and updated by the application -# which is using the ECOMP SDK at the time of its deployment. -# Online Unique UUID generator - https://www.uuidgenerator.net/ -# ID generated for DBC to supply to EELF -# A bogus value is cached in SCM: 12345678-.. -instance_uuid = 12345678-90ab-cdef-1234-567890abcdef - -# R Cloud feature -guard_notebook_url=https://todo_rcloud_link - -# Application base URL is a proper prefix of the on-boarded URL. -app_base_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPDBCAPP/ diff --git a/deliveries/properties_simpledemo/ECOMPSDKAPP/system.properties b/deliveries/properties_simpledemo/ECOMPSDKAPP/system.properties index 105502f1..72478fb6 100644 --- a/deliveries/properties_simpledemo/ECOMPSDKAPP/system.properties +++ b/deliveries/properties_simpledemo/ECOMPSDKAPP/system.properties @@ -23,9 +23,8 @@ decryption_key = AGLDdG4D04BKm2IxIWEr8o== # The following properties MAY require changes by partner applications. ########################################################################## -#Mysql -db.driver = com.mysql.jdbc.Driver -db.connectionURL = jdbc:mysql://portal-db:3306/ecomp_sdk +db.driver = org.mariadb.jdbc.Driver +db.connectionURL = jdbc:mariadb://portal-db:3306/ecomp_sdk db.userName = root db.password = Aa123456 db.min_pool_size = 5 -- 2.16.6