From 7fcc74469c941c1834cd02b54ff5ca88a53bf83b Mon Sep 17 00:00:00 2001 From: "mark.j.leonard" Date: Mon, 28 Jan 2019 11:42:54 +0000 Subject: Load type mappings from a group configuration file Change the filter-types.properties file: re-implement to use JSON content. Remove the System Property that defines the location of the file and add this to the Spring application properties. Initialise the type-to-model mappings using the key=value pairs from this JSON content. Refactor existing Junit tests to remove duplicated resource loading code. Change-Id: Idb2e962fe5cae39b70cc8cf16053d0a253f4fac0 Issue-ID: AAI-2121 Signed-off-by: mark.j.leonard --- src/main/bin/start.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main/bin') diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index c71acca..1ee1db6 100644 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -3,8 +3,8 @@ # ============LICENSE_START======================================================= # org.onap.aai # ================================================================================ -# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. -# Copyright © 2017-2018 European Software Marketing Ltd. +# Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved. +# Copyright © 2017-2019 European Software Marketing Ltd. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -34,7 +34,6 @@ fi PROPS="-DAPP_HOME=${APP_HOME}" PROPS="${PROPS} -DCONFIG_HOME=${CONFIG_HOME}" PROPS="${PROPS} -Dartifactgenerator.config=${CONFIG_HOME}/artifact-generator.properties" -PROPS="${PROPS} -Dgroupfilter.config=${CONFIG_HOME}/filter-types.properties" PROPS="${PROPS} -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}" JVM_MAX_HEAP=${MAX_HEAP:-1024} -- cgit 1.2.3-korg