[PORTAL] Move portal subcharts to components

In order to allow to define dependencies per subchart let's move all
of them to components and make sure that they can be build
independently.

Issue-ID: AAF-1134
Change-Id: Ia75ba66d9338dbacaea500c20f6a5b384d1685a1
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>

6 files changed, 0 insertions, 577 deletions

diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties
deleted file mode 100755
index 148c080df5..0000000000
--- a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-# Modifications Copyright © 2018 AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# domain settings
-#domain_class_location =
-
-# validator settings
-#default_error_message = Default error message
-
-login_url_no_ret_val = http://{{.Values.global.portalHostName}}:{{.Values.global.portalPort}}/ONAPPORTAL/login.htm
-
-user_attribute_name      = user
-
-# User Session settings
-roles_attribute_name          = roles
-role_functions_attribute_name = role_functions
-
-# 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
-
-# ECOMP settings
-ecomp_app_id = 1
-# Role settings
-sys_admin_role_id = 1
-account_admin_role_id = 999
-restricted_app_role_id = 900
-
-# Home Page index html
-home_page          					= /index.html
-
-authentication_mechanism =DBAUTH
-
-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.
-
-#
-# Number of seconds to poll health (database operational, etc.)
-#
-health_poll_interval_seconds = 5
-#
-# If a component is down a log entry will be written that triggers an alert.  This parameter specifies how often this alert should be triggered
-# if the component remains down.   For example a value of 30, would translate to 30 * 60 seconds = 1800 seconds, or every 30 minutes
-#
-health_fail_alert_every_x_intervals =  30
diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml
deleted file mode 100644
index 99fe917de5..0000000000
--- a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  ============LICENSE_START==========================================

-  ONAP Portal

-  ===================================================================

-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.

-  Modifications Copyright © 2018 Amdocs, Bell Canada 

-  ====================================================================

-  Unless otherwise specified, all software contained herein is licensed

-  under the Apache License, Version 2.0 (the “License”);

-  you may not use this software except in compliance with the License.

-  You may obtain a copy of the License at

-

-       http://www.apache.org/licenses/LICENSE-2.0

-

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

-

-  Unless otherwise specified, all documentation contained herein is licensed

-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);

-  you may not use this documentation except in compliance with the License.

-  You may obtain a copy of the License at

-

-              https://creativecommons.org/licenses/by/4.0/

-

-  Unless required by applicable law or agreed to in writing, documentation

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  See the License for the specific language governing permissions and

-  limitations under the License.

-

-  ============LICENSE_END============================================

--->

-<!DOCTYPE xml>

-<configuration scan="true" scanPeriod="3 seconds" debug="true">

-

-	<!-- specify the component name -->

-	<property name="componentName" value="onapportal"></property>

-

-	<!-- specify the base path of the log directory -->

-	<property name="logDirPrefix" value="/var/log/onap"></property>

-

-	<!-- The directories where logs are written -->

-	<property name="logDirectory" value="${logDirPrefix}/${componentName}" />

-	<!-- Can easily relocate debug logs by modifying this path. -->

-	<property name="debugLogDirectory" value="${logDirPrefix}/${componentName}" />

-

-	<!-- log file names -->

-	<property name="generalLogName" value="application" />

-	<property name="errorLogName" value="error" />

-	<property name="metricsLogName" value="metrics" />

-	<property name="auditLogName" value="audit" />

-	<property name="debugLogName" value="debug" />

-	<!-- These loggers are not used in code (yet). <property name="securityLogName"

-		value="security" /> <property name="policyLogName" value="policy" /> <property

-		name="performanceLogName" value="performance" /> <property name="serverLogName"

-		value="server" /> -->

-

-	<!-- ServerFQDN=Server,  -->

-	<property name="auditLoggerPattern"

-		value="%X{AuditLogBeginTimestamp}|%X{AuditLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />

-

-	<property name="metricsLoggerPattern"

-		value="%X{MetricsLogBeginTimestamp}|%X{MetricsLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVisualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />

-

-	<property name="errorLoggerPattern"

-		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ClassName}|%X{AlertSeverity}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />

-

-	<property name="defaultLoggerPattern"

-		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ClassName}| %msg%n" />

-

-	<!-- use %class so library logging calls yield their class name -->

-  	<property name="applicationLoggerPattern"

-		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%class{36}| %msg%n" />

-

-	<!--

-	<property name="defaultPattern"

-		value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />

-	<property name="debugLoggerPattern"

-		value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />

-	 -->

-	<!-- <property name="debugLoggerPattern" value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n"

-		/> -->

-	<!-- Example evaluator filter applied against console appender -->

-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">

-		<encoder>

-			<pattern>${applicationLoggerPattern}</pattern>

-		</encoder>

-	</appender>

-

-	<!-- ============================================================================ -->

-	<!-- EELF Appenders -->

-	<!-- ============================================================================ -->

-

-	<!-- The EELFAppender is used to record events to the general application

-		log -->

-

-

-	<appender name="EELF"

-		class="ch.qos.logback.core.rolling.RollingFileAppender">

-		<file>${logDirectory}/${generalLogName}.log</file>

-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-			<!-- daily rollover -->

-			<fileNamePattern>${logDirectory}/${generalLogName}.log.%d{yyyy-MM-dd}.zip

-			</fileNamePattern>

-			<maxHistory>30</maxHistory>

-		</rollingPolicy>

-		<encoder>

-			<pattern>${applicationLoggerPattern}</pattern>

-		</encoder>

-		<filter class="org.openecomp.portalapp.portal.utils.CustomLoggingFilter" />

-	</appender>

-

-	<appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">

-		<queueSize>256</queueSize>

-		<!-- Class name is part of caller data -->

-    	<includeCallerData>true</includeCallerData>

-		<appender-ref ref="EELF" />

-	</appender>

-

-	<!-- EELF Security Appender. This appender is used to record security events

-		to the security log file. Security events are separate from other loggers

-		in EELF so that security log records can be captured and managed in a secure

-		way separate from the other logs. This appender is set to never discard any

-		events. -->

-	<!-- <appender name="EELFSecurity" class="ch.qos.logback.core.rolling.RollingFileAppender">

-		<file>${logDirectory}/${securityLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">

-		<fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip </fileNamePattern>

-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy

-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>

-		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>

-		</appender> <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">

-		<queueSize>256</queueSize> <discardingThreshold>0</discardingThreshold> <appender-ref

-		ref="EELFSecurity" /> </appender> -->

-

-	<!-- EELF Performance Appender. This appender is used to record performance

-		records. -->

-	<!-- <appender name="EELFPerformance" class="ch.qos.logback.core.rolling.RollingFileAppender">

-		<file>${logDirectory}/${performanceLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">

-		<fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip </fileNamePattern>

-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy

-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>

-		</triggeringPolicy> <encoder> <outputPatternAsHeader>true</outputPatternAsHeader>

-		<pattern>${defaultPattern}</pattern> </encoder> </appender> <appender name="asyncEELFPerformance"

-		class="ch.qos.logback.classic.AsyncAppender"> <queueSize>256</queueSize>

-		<appender-ref ref="EELFPerformance" /> </appender> -->

-

-	<!-- EELF Server Appender. This appender is used to record Server related

-		logging events. The Server logger and appender are specializations of the

-		EELF application root logger and appender. This can be used to segregate

-		Server events from other components, or it can be eliminated to record these

-		events as part of the application root log. -->

-	<!-- <appender name="EELFServer" class="ch.qos.logback.core.rolling.RollingFileAppender">

-		<file>${logDirectory}/${serverLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">

-		<fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip </fileNamePattern>

-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy

-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>

-		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>

-		</appender> <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender">

-		<queueSize>256</queueSize> <appender-ref ref="EELFServer" /> </appender> -->

-

-	<!-- EELF Policy Appender. This appender is used to record Policy engine

-		related logging events. The Policy logger and appender are specializations

-		of the EELF application root logger and appender. This can be used to segregate

-		Policy engine events from other components, or it can be eliminated to record

-		these events as part of the application root log. -->

-	<!-- <appender name="EELFPolicy" class="ch.qos.logback.core.rolling.RollingFileAppender">

-		<file>${logDirectory}/${policyLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">

-		<fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip </fileNamePattern>

-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy

-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>

-		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>

-		</appender> <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender">

-		<queueSize>256</queueSize> <appender-ref ref="EELFPolicy" /> </appender> -->

-

-	<!-- EELF Audit Appender. This appender is used to record audit engine related

-		logging events. The audit logger and appender are specializations of the

-		EELF application root logger and appender. This can be used to segregate

-		Policy engine events from other components, or it can be eliminated to record

-		these events as part of the application root log. -->

-

-	<appender name="EELFAudit"

-		class="ch.qos.logback.core.rolling.RollingFileAppender">

-		<file>${logDirectory}/${auditLogName}.log</file>

-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-			<!-- daily roll over -->

-			<fileNamePattern>${logDirectory}/${auditLogName}.log.%d{yyyy-MM-dd}.zip

-			</fileNamePattern>

-			<maxHistory>30</maxHistory>

-		</rollingPolicy>

-		<encoder>

-			<pattern>${auditLoggerPattern}</pattern>

-		</encoder>

-	</appender>

-	<appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">

-		<queueSize>256</queueSize>

-		<appender-ref ref="EELFAudit" />

-	</appender>

-

-	<appender name="EELFMetrics"

-		class="ch.qos.logback.core.rolling.RollingFileAppender">

-		<file>${logDirectory}/${metricsLogName}.log</file>

-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-			<!-- daily roll over -->

-			<fileNamePattern>${logDirectory}/${metricsLogName}.log.%d{yyyy-MM-dd}.zip

-			</fileNamePattern>

-			<maxHistory>30</maxHistory>

-		</rollingPolicy>

-		<encoder>

-			<pattern>${metricsLoggerPattern}</pattern>

-		</encoder>

-	</appender>

-

-

-	<appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">

-		<queueSize>256</queueSize>

-		<appender-ref ref="EELFMetrics" />

-	</appender>

-

-	<appender name="EELFError"

-		class="ch.qos.logback.core.rolling.RollingFileAppender">

-		<file>${logDirectory}/${errorLogName}.log</file>

-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-			<!-- daily roll over -->

-			<fileNamePattern>${logDirectory}/${errorLogName}.log.%d{yyyy-MM-dd}.zip

-			</fileNamePattern>

-			<maxHistory>30</maxHistory>

-		</rollingPolicy>

-		<encoder>

-			<pattern>${errorLoggerPattern}</pattern>

-		</encoder>

-	</appender>

-

-	<appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">

-		<queueSize>256</queueSize>

-		<appender-ref ref="EELFError" />

-	</appender>

-

-	<appender name="EELFDebug"

-		class="ch.qos.logback.core.rolling.RollingFileAppender">

-		<file>${debugLogDirectory}/${debugLogName}.log</file>

-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

-			<!-- daily roll over -->

-			<fileNamePattern>${logDirectory}/${debugLogName}.log.%d{yyyy-MM-dd}.zip

-			</fileNamePattern>

-			<maxHistory>30</maxHistory>

-		</rollingPolicy>

-		<encoder>

-			<pattern>${defaultLoggerPattern}</pattern>

-		</encoder>

-	</appender>

-

-	<appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">

-		<queueSize>256</queueSize>

-		<appender-ref ref="EELFDebug" />

-		<includeCallerData>true</includeCallerData>

-	</appender>

-

-

-	<!-- ============================================================================ -->

-	<!-- EELF loggers -->

-	<!-- ============================================================================ -->

-	<logger name="com.att.eelf" level="info" additivity="false">

-		<appender-ref ref="asyncEELF" />

-	</logger>

-

-	<!-- <logger name="com.att.eelf.security" level="info" additivity="false">

-		<appender-ref ref="asyncEELFSecurity" /> </logger> <logger name="com.att.eelf.perf"

-		level="info" additivity="false"> <appender-ref ref="asyncEELFPerformance"

-		/> </logger> <logger name="com.att.eelf.server" level="info" additivity="false">

-		<appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy"

-		level="info" additivity="false"> <appender-ref ref="asyncEELFPolicy" /> </logger> -->

-

-	<logger name="com.att.eelf.audit" level="info" additivity="false">

-		<appender-ref ref="asyncEELFAudit" />

-	</logger>

-

-	<logger name="com.att.eelf.metrics" level="info" additivity="false">

-		<appender-ref ref="asyncEELFMetrics" />

-	</logger>

-

-	<logger name="com.att.eelf.error" level="info" additivity="false">

-		<appender-ref ref="asyncEELFError" />

-	</logger>

-

-	<logger name="com.att.eelf.debug" level="debug" additivity="false">

-		<appender-ref ref="asyncEELFDebug" />

-	</logger>

-

-	<root level="INFO">

-		<appender-ref ref="asyncEELF" />

-	</root>

-

-</configuration>

diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties
deleted file mode 100644
index 6981fb05bc..0000000000
--- a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/music.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-music.version = v2
-music.keyspace = keyspaces
-music.session.keyspace = portal
-music.tables = tables
-music.session.attr.tables = spring_session_attributes
-music.session.meta.tables = spring_session
-music.consistency.info = type
-music.consistency.info.value = eventual
-music.cache = false
-music.session.max.inactive.interval.seconds = 1800
-music.serialize.compress = true
-
-#By default it's eventual
-music.atomic.get = false
-music.atomic.put = true
-cassandra.host={{.Values.cassandra.service.name}}
-zookeeper.host={{.Values.zookeeper.service.name}}
-cassandra.user={{.Values.cassandra.config.cassandraUsername}}
-cassandra.password={{.Values.cassandra.config.cassandraPassword}}
diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/openid-connect.properties b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/openid-connect.properties
deleted file mode 100755
index 1760d5bc71..0000000000
--- a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/openid-connect.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-authentication_server_url = http://{{.Values.global.portalHostName}}:8383/openid-connect-server-webapp/
-ecomp_openid_connect_client = http://{{.Values.global.portalHostName}}:{{.Values.global.portalPort}}/ONAPPORTAL/openid_connect_login
-ecomp_redirect_uri = http://{{.Values.global.portalHostName}}:{{.Values.global.portalPort}}/ONAPPORTAL/welcome.htm
diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/portal.properties b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/portal.properties
deleted file mode 100755
index 06726702f0..0000000000
--- a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/portal.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Not used by portal
-portal.api.impl.class = org.onap.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl.not.used.by.portal
-portal.api.prefix = /api
-max.idle.time = 5
-user.attribute.name = user_attribute
-
-# for single sign on
-ecomp_redirect_url = http://{{.Values.global.portalHostName}}:{{.Values.global.portalFEPort}}/ONAPPORTAL/login.htm
-
-# URL of the ECOMP Portal REST API
-ecomp_rest_url = http://{{.Values.global.portalHostName}}:{{.Values.global.portalPort}}/ONAPPORTAL/auxapi
-
-ueb_listeners_enable = true
-
-ueb_app_key = 7GkVcrO6sIDb3ngW
-ueb_app_secret = uCYgKjWKK5IxPGNNZzYSSWo9
-ueb_app_mailbox_name = ECOMP-PORTAL-INBOX
-
-ueb_url_list = message-router
-ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX
-
-# Consumer group name for UEB topic.
-# Use the special tag to generate a unique one for each sdk-app server.
-ueb_app_consumer_group_name = {UUID}
-
-role_access_centralized = remote
-
-ext_req_connection_timeout = 15000
-ext_req_read_timeout = 20000
diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties
deleted file mode 100755
index b5b4e48b97..0000000000
--- a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-# Modifications Copyright © 2020 AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#mysql
-db.driver = org.mariadb.jdbc.Driver
-db.connectionURL = jdbc:mariadb:failover://portal-db:3306/portal
-db.userName =root
-db.password =Aa123456
-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
-
-app_display_name = Portal
-files_path = /tmp
-context_root = ONAPPORTAL
-# menu settings
-menu_query_name                      = menuData
-menu_properties_file_location        = /WEB-INF/fusion/menu/
-application_menu_set_name            = APP
-application_menu_attribute_name      = applicationMenuData
-application_menu_properties_name     = menu.properties
-business_direct_menu_set_name        = BD
-business_direct_menu_properties_name = bd.menu.properties
-business_direct_menu_attribute_name  = businessDirectMenuData
-
-application_user_id           = 30000
-post_default_role_id          = 1
-
-#Enable Fusion Mobile capabilities for the application
-mobile_enable			  	  = false
-
-cache_config_file_path        = /WEB-INF/conf/cache.ccf
-cache_switch                  = 1
-cache_load_on_startup         = false
-
-user_name					  = fullName
-decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
-
-
-#Cron Schedules
-cron_site_name                = one
-log_cron                      = 0 * * * * ? *
-sessiontimeout_feed_cron	  = 0 0/5 * * * ? *
-
-#Front end URL
-frontend_url                  = https://{{.Values.global.portalHostName}}:{{.Values.global.portalFEPort}}/ONAPPORTAL/applicationsHome
-
-
-# An Unqiue 128-bit value defined to indentify a specific version of
-# ECOMP Portal deployed on a specific virtual machine.
-# This value must be generated and updated at the time of
-# the deployment.
-# Online Unique UUID generator - https://www.uuidgenerator.net/
-instance_uuid 				= 90bc9497-10e6-49fe-916b-dcdfaa972383
-
-elastic_search_url 			= http://
-contact_us_link				= http://
-user_guide_link             = http://
-
-# Contact Us page properties
-ush_ticket_url				= http://
-feedback_email_address		= portal@lists.onap.org
-portal_info_url				= https://
-
-#Online user bar refresh interval, in seconds
-online_user_update_rate                  = 30
-
-#Online user bar refresh total duration, in seconds
-online_user_update_duration       = 300
-
-#authenticate user server
-authenticate_user_server=http://{{.Values.global.portalHostName}}:8383/openid-connect-server-webapp/allUsers
-
-#window width threshold to collapse left/right menu when page onload
-window_width_threshold_left_menu = 1400
-window_width_threshold_right_menu = 1350
-
-# User notification refresh interval and duration, in seconds
-notification_update_rate = 90
-notification_update_duration = 900
-
-#Microservices Related Properties for Portal
-microservices.widget.protocol = http
-microservices.widget.hostname = portal-widget
-microservices.widget.username = widget_user
-microservices.widget.password = M+KcrCMVrR1rAxtiFE49n1uXC3FCkNBqFgeYsubEC/U=
-#This property won't be needed after consul is functional on VMs -
-microservices.widget.local.port = 8082
-microservices.m-learn.local.port = 8083
-#HALO API enable flag
-external_access_enable = false
-
-#delete auditlog from number of days ago
-auditlog_del_day_from = 365
-
-#External system notification URL
-external_system_notification_url= https://jira.onap.org/browse/
-
-#cookie domain
-cookie_domain = onap.org
-
-# External Central Auth system access
-remote_centralized_system_access = {{.Values.global.aafEnabled}}
-
-# External Access System Basic Auth Credentials & Rest endpoint
-ext_central_access_user_name = aaf_admin@people.osaaf.org
-ext_central_access_password = demo123456!
-ext_central_access_url = {{.Values.aafURL}}
-ext_central_access_user_domain = @people.osaaf.org
\ No newline at end of file