From d9f5e7364845230e6aa53601383094556ccac1b3 Mon Sep 17 00:00:00 2001 From: sunil unnava Date: Tue, 8 Jan 2019 16:35:54 -0500 Subject: [PATCH] file name and location changes Issue-ID: DMAAP-909 Change-Id: I22baeb7cdb05b51577102373e9f5a4f4de44dba3 Signed-off-by: sunil unnava --- pom.xml | 4 ++-- .../org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java | 4 ++-- src/test/resources/etc/mmagent.config | 12 +++++------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 878ccd2..2d9c1d7 100644 --- a/pom.xml +++ b/pom.xml @@ -179,11 +179,11 @@ jar-with-dependencies + false - true - org.onap.dmaap.mr.MirrorMakerAgent + org.onap.dmaap.mr.dmaapMMAgent.MirrorMakerAgent diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java index 86a653d..de19474 100644 --- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java +++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java @@ -56,7 +56,7 @@ public class MirrorMakerAgent { static final Logger logger = Logger.getLogger(MirrorMakerAgent.class); Properties mirrorMakerProperties = new Properties(); ListMirrorMaker mirrorMakers = null; - String mmagenthome = ""; + String mmagenthome = "/opt"; String kafkahome = ""; String topicURL = ""; String topicname = ""; @@ -100,7 +100,7 @@ public class MirrorMakerAgent { private boolean checkStartup() { FileInputStream input = null; try { - this.mmagenthome = System.getProperty("MMAGENTHOME"); + //this.mmagenthome = System.getProperty("MMAGENTHOME"); input = new FileInputStream(mmagenthome + "/etc/mmagent.config"); logger.info("mmagenthome is set :" + mmagenthome + " loading properties at /etc/mmagent.config"); } catch (IOException ex) { diff --git a/src/test/resources/etc/mmagent.config b/src/test/resources/etc/mmagent.config index 1d978c1..0270a86 100644 --- a/src/test/resources/etc/mmagent.config +++ b/src/test/resources/etc/mmagent.config @@ -1,7 +1,5 @@ -#kafkahome=C:/dev/att/kafka_2.10-0.8.2.1 -kafkahome=/opt/ -topicURL=http://172.18.0.1:3904 -#topicname=com.att.agenttest -topicname=org.openecomp.dmaapBC.mmatopic -mechid=dgl@openecomp.org -password=ecomp_admin \ No newline at end of file +kafkahome=/opt/kafka +topicURL=http://message-router:3904 +topicname=org.onap.dmaap.mr.mmagent +mechid=demo@people.osaaf.org +password=YKCAVhSQ+nedsh1Nry57l19jJQSnk8gs \ No newline at end of file -- 2.16.6