Commit 3af7a6a5 authored by ipatini's avatar ipatini
Browse files

EMS: Control Service: Removed @Value annotations from ControlServiceProperties...

EMS: Control Service: Removed @Value annotations from ControlServiceProperties and updated eu.melodic.event.control.properties file (added 'control.' prefix to IP_SETTING and EXECUTIONWARE settings)
parent 446f20f8
......@@ -12,11 +12,11 @@
#control.metasolver-configuration-url = ${METASOLVER_URL:http://metasolver:8092/updateConfiguration}
### Don't touch the next lines!!
#IP_SETTING=DEFAULT_IP
IP_SETTING=${EMS_IP_SETTING:PUBLIC_IP}
EMS_SERVER_ADDRESS=${${IP_SETTING}}
#EXECUTIONWARE=CLOUDIATOR
EXECUTIONWARE=PROACTIVE
#control.IP_SETTING=DEFAULT_IP
control.IP_SETTING=${EMS_IP_SETTING:PUBLIC_IP}
EMS_SERVER_ADDRESS=${${control.IP_SETTING}}
#control.EXECUTIONWARE=CLOUDIATOR
control.EXECUTIONWARE=PROACTIVE
################################################################################
### Log settings
......
......@@ -147,13 +147,13 @@ public class EmsInfoServiceImpl implements IEmsInfoService {
controlServiceInfo.put("current-cp-model-id", controlServiceCoordinator.getCurrentCpModelId());
if (controlServiceProperties!=null && infoServiceProperties!=null) {
controlServiceInfo.put("prop-ip-setting", controlServiceProperties.getIpSetting());
controlServiceInfo.put("prop-executionware", controlServiceProperties.getExecutionware().toString());
controlServiceInfo.put("prop-esb-url", controlServiceProperties.getEsbUrl());
controlServiceInfo.put("prop-metasolver-config-url", controlServiceProperties.getMetasolverConfigurationUrl());
controlServiceInfo.put("prop-metrics-update-interval", infoServiceProperties.getMetricsUpdateInterval());
controlServiceInfo.put("prop-metrics-client-update-interval", infoServiceProperties.getMetricsClientUpdateInterval());
controlServiceInfo.put("prop-metrics-stream-event-name", infoServiceProperties.getMetricsStreamEventName());
controlServiceInfo.put("prop-metrics-stream-update-interval", infoServiceProperties.getMetricsStreamUpdateInterval());
controlServiceInfo.put("prop-executionware", controlServiceProperties.getExecutionware().toString());
controlServiceInfo.put("prop-preload-camel-model", controlServiceProperties.getPreloadCamelModel());
controlServiceInfo.put("prop-preload-cp-model", controlServiceProperties.getPreloadCpModel());
controlServiceInfo.put("prop-upperware-grouping", controlServiceProperties.getUpperwareGrouping());
......
......@@ -43,12 +43,8 @@ public class ControlServiceProperties {
private boolean printBuildInfo;
@Value("${" + EMS_PROPERTIES_PREFIX + "IP_SETTING}")
private IpSetting ipSetting = IpSetting.PUBLIC_IP;
@Value("${" + EMS_PROPERTIES_PREFIX + "EXECUTIONWARE}")
private ExecutionWare executionware = ExecutionWare.PROACTIVE;
@Value("${" + EMS_PROPERTIES_PREFIX + "password-encoder-class:}")
private String passwordEncoderClass;
private String upperwareGrouping;
private String metasolverConfigurationUrl;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment