Merge "Add kafka suppport on drools-apps"

10 files changed, 70 insertions, 0 deletions

diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties
index adf2b23a4..8e9d2dcab 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-RSP-topic.properties
@@ -16,6 +16,12 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
+
 dmaap.source.topics=A1-P-RSP
 dmaap.source.topics.A1-P-RSP.servers=${envd:DMAAP_SERVERS}
 dmaap.source.topics.A1-P-RSP.https=${envd:DMAAP_HTTPS:true}
+
+#Replace the properties with the following to use kafka message broker
+#kafka.source.topics=a1-p-rsp
+#kafka.source.topics.a1-p-rsp.servers=${envd:DMAAP_SERVERS}
+#kafka.source.topics.a1-p-rsp.https=${envd:DMAAP_HTTPS:true}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties
index 646d5a08a..26591baf0 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/A1-P-topic.properties
@@ -21,3 +21,9 @@ dmaap.sink.topics=A1-P
 dmaap.sink.topics.A1-P.servers=${envd:DMAAP_SERVERS}
 dmaap.sink.topics.A1-P.https=${envd:DMAAP_HTTPS:true}
 
+#Replace the properties with the following to use kafka message broker
+#kafka.sink.topics=a1-p
+
+#kafka.sink.topics.A1-P.servers=${envd:DMAAP_SERVERS}
+#kafka.sink.topics.A1-P.https=${envd:DMAAP_HTTPS:true}
+
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties
index d8260be27..f5b7c158c 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties
@@ -16,6 +16,7 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
+
 dmaap.source.topics=APPC-CL
 dmaap.sink.topics=APPC-CL
 
@@ -24,3 +25,13 @@ dmaap.source.topics.APPC-CL.https=${envd:DMAAP_HTTPS:true}
 
 dmaap.sink.topics.APPC-CL.servers=${envd:DMAAP_SERVERS}
 dmaap.sink.topics.APPC-CL.https=${envd:DMAAP_HTTPS:true}
+
+#Replace the properties with the following to use kafka message broker
+#kafka.source.topics=appc-cl
+#kafka.sink.topics=appc-cl
+
+#kafka.source.topics.appc-cl.servers=${envd:DMAAP_SERVERS}
+#kafka.source.topics.appc-cl.https=${envd:DMAAP_HTTPS:true}
+
+#kafka.sink.topics.appc-cl.servers=${envd:DMAAP_SERVERS}
+#kafka.sink.topics.appc-cl.https=${envd:DMAAP_HTTPS:true}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties
index fc088d742..f50958f0e 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties
@@ -16,8 +16,15 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
+
 dmaap.sink.topics=APPC-LCM-READ
 
 dmaap.sink.topics.APPC-LCM-READ.servers=${envd:DMAAP_SERVERS}
 dmaap.sink.topics.APPC-LCM-READ.https=${envd:DMAAP_HTTPS:true}
 
+#Replace the properties with the following to use kafka message broker
+#kafka.sink.topics=appc-lcm-read
+
+#kafka.sink.topics.appc-lcm-read.servers=${envd:DMAAP_SERVERS}
+#kafka.sink.topics.appc-lcm-read.https=${envd:DMAAP_HTTPS:true}
+
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties
index afcf207d2..414c3a2e8 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties
@@ -16,7 +16,14 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
+
 dmaap.source.topics=APPC-LCM-WRITE
 
 dmaap.source.topics.APPC-LCM-WRITE.servers=${envd:DMAAP_SERVERS}
 dmaap.source.topics.APPC-LCM-WRITE.https=${envd:DMAAP_HTTPS:true}
+
+#Replace the properties with the following to use kafka message broker
+#kafka.source.topics=appc-lcm-write
+
+#kafka.source.topics.appc-lcm-write.servers=${envd:DMAAP_SERVERS}
+#kafka.source.topics.appc-lcm-write.https=${envd:DMAAP_HTTPS:true}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties
index 01b091557..54ce1aaa7 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties
@@ -21,3 +21,9 @@ dmaap.sink.topics=DCAE_CL_RSP
 
 dmaap.sink.topics.DCAE_CL_RSP.servers=${env:DMAAP_SERVERS}
 dmaap.sink.topics.DCAE_CL_RSP.https=${envd:DMAAP_HTTPS:true}
+
+#Replace the properties with the following to use kafka message broker
+#kafka.sink.topics=dcae-cl-rsp
+
+#kafka.sink.topics.dcae-cl-rsp.servers=${env:DMAAP_SERVERS}
+#kafka.sink.topics.dcae-cl-rsp.https=${envd:DMAAP_HTTPS:true}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties
index 9fe004791..d444df859 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties
@@ -22,3 +22,11 @@ dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${envd:DCAE_TOPIC}
 dmaap.source.topics.DCAE_TOPIC.servers=${envd:DMAAP_SERVERS}
 dmaap.source.topics.DCAE_TOPIC.consumerGroup=${envd:DCAE_CONSUMER_GROUP}
 dmaap.source.topics.DCAE_TOPIC.https=${envd:DMAAP_HTTPS:true}
+
+#Replace the properties with the following to use kafka message broker
+#kafka.source.topics=dcae_topic
+
+#kafka.source.topics.dcae_topic.effectiveTopic=${envd:DCAE_TOPIC}
+#kafka.source.topics.dcae_topic.servers=${envd:DMAAP_SERVERS}
+#kafka.source.topics.dcae_topic.consumerGroup=${envd:DCAE_CONSUMER_GROUP}
+#kafka.source.topics.dcae_topic.https=${envd:DMAAP_HTTPS:true}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties
index ef5bd4997..74cf296dc 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties
@@ -19,3 +19,8 @@
 dmaap.sink.topics=POLICY-CL-MGT
 dmaap.sink.topics.POLICY-CL-MGT.servers=${envd:DMAAP_SERVERS}
 dmaap.sink.topics.POLICY-CL-MGT.https=${envd:DMAAP_HTTPS:true}
+
+#Replace the properties with the following to use kafka message broker
+#kafka.sink.topics=policy-cl-mgt
+#kafka.sink.topics.policy-cl-mgt.servers=${envd:DMAAP_SERVERS}
+#kafka.sink.topics.policy-cl-mgt.https=${envd:DMAAP_HTTPS:true}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties
index 4f5be14b9..b3b8ee297 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties
@@ -16,6 +16,12 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
+
 dmaap.source.topics=SDNR-CL-RSP
 dmaap.source.topics.SDNR-CL-RSP.servers=${envd:DMAAP_SERVERS}
 dmaap.source.topics.SDNR-CL-RSP.https=${envd:DMAAP_HTTPS:true}
+
+#Replace the properties with the following to use kafka message broker
+#kafka.source.topics=sdnr-cl-rsp
+#kafka.source.topics.sdnr-cl-rsp.servers=${envd:DMAAP_SERVERS}
+#kafka.source.topics.sdnr-cl-rsp.https=${envd:DMAAP_HTTPS:true}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties
index 99b55b994..145943543 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties
@@ -16,8 +16,16 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
+
+
 dmaap.sink.topics=SDNR-CL
 
 dmaap.sink.topics.SDNR-CL.servers=${envd:DMAAP_SERVERS}
 dmaap.sink.topics.SDNR-CL.https=${envd:DMAAP_HTTPS:true}
 
+#Replace the properties with the following to use kafka message broker
+#kafka.sink.topics=sdnr-cl
+
+#kafka.sink.topics.sdnr-cl.servers=${envd:DMAAP_SERVERS}
+#kafka.sink.topics.sdnr-cl.https=${envd:DMAAP_HTTPS:true}
+