From b001c1ac5a0b4d938a69adb47f4613f64dc71c1a Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Thu, 28 Feb 2019 10:10:49 -0600 Subject: move all hard install config to environment vars + support multiple system properties files with variable interpolation loaded at initialization + support of configurable JVM options (-X, etc ..). + rearrange aaf configuration to avoid {{}} installation variables and use dynamic enviroment variables. + miscellaneous clean up in areas touched and checkstyle. Change-Id: I71ad839778e17eb57c098a2c5cc2bf96e468669a Issue-ID: POLICY-1524 Signed-off-by: Jorge Hernandez --- .../config/feature-pooling-dmaap.properties | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'feature-pooling-dmaap') diff --git a/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties b/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties index 1d549855..2786a613 100644 --- a/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties +++ b/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties @@ -84,13 +84,15 @@ pooling.beijing.topic=${env:POOLING_TOPIC} # the list of sources and sinks should be identical -ueb.source.topics=${env:POOLING_TOPIC} -ueb.sink.topics=${env:POOLING_TOPIC} - -ueb.source.topics.${{POOLING_TOPIC}}.servers=${env:DMAAP_SERVERS} -ueb.source.topics.${{POOLING_TOPIC}}.apiKey= -ueb.source.topics.${{POOLING_TOPIC}}.apiSecret= - -ueb.sink.topics.${{POOLING_TOPIC}}.servers=${env:DMAAP_SERVERS} -ueb.sink.topics.${{POOLING_TOPIC}}.apiKey= -ueb.sink.topics.${{POOLING_TOPIC}}.apiSecret= +ueb.source.topics=POOLING_TOPIC +ueb.sink.topics=POOLING_TOPIC + +ueb.source.topics.POOLING_TOPIC.servers=${env:DMAAP_SERVERS} +ueb.source.topics.POOLING_TOPIC.effectiveTopic=${env:POOLING_TOPIC} +ueb.source.topics.POOLING_TOPIC.apiKey= +ueb.source.topics.POOLING_TOPIC.apiSecret= + +ueb.sink.topics.POOLING_TOPIC.servers=${env:DMAAP_SERVERS} +ueb.sink.topics.POOLING_TOPIC.effectiveTopic=${env:POOLING_TOPIC} +ueb.sink.topics.POOLING_TOPIC.apiKey= +ueb.sink.topics.POOLING_TOPIC.apiSecret= -- cgit 1.2.3-korg