file name and location changes

Issue-ID: DMAAP-909
Change-Id: I22baeb7cdb05b51577102373e9f5a4f4de44dba3
Signed-off-by: sunil unnava <sunil.unnava@att.com>

diff --git a/pom.xml b/pom.xml
index 878ccd2..2d9c1d7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -179,11 +179,11 @@
                                        <descriptorRefs>
                                                <descriptorRef>jar-with-dependencies</descriptorRef>
                                        </descriptorRefs>
+                                       <appendAssemblyId>false</appendAssemblyId>
                                        <archive>
-
                                                <manifest>
                                                        <addClasspath>true</addClasspath>
-                                                       <mainClass>org.onap.dmaap.mr.MirrorMakerAgent</mainClass>
+                                                       <mainClass>org.onap.dmaap.mr.dmaapMMAgent.MirrorMakerAgent</mainClass>
                                                </manifest>
                                        </archive>
                                </configuration>

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 (file)
--- 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 (file)
--- 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