aboutsummaryrefslogtreecommitdiffstats
path: root/datarouter-node/src/main/java
diff options
context:
space:
mode:
authorsg481n <sg481n@att.com>2017-08-23 16:30:52 -0400
committersg481n <sg481n@att.com>2017-08-23 17:06:39 -0400
commite4b20cc6f7c31f48ddd0de5bcd054b09a35cd510 (patch)
treea3359080a707e76332c4cfbb66d0af0a19b70191 /datarouter-node/src/main/java
parent315f5603d8e42969a13d985ca8bb50146e82325a (diff)
Update project structure to org.onap
Update project structure of dmaap/datarouter from com.att to org.onap and add distribution management and nexus repositires details. Issue-id: DMAAP-52 Change-Id: Ibafee1cba43c7c5a3f227a02417998d36ecaae6b Signed-off-by: sg481n <sg481n@att.com>
Diffstat (limited to 'datarouter-node/src/main/java')
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/Delivery.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/Delivery.java)4
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryQueue.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryQueue.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryQueueHelper.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryQueueHelper.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryTask.java)4
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTaskHelper.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryTaskHelper.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DestInfo.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/DestInfo.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/IsFrom.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/IsFrom.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/LogManager.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/LogManager.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfig.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/NodeConfig.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/NodeConfigManager.java)12
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/NodeMain.java)6
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/NodeServlet.java)8
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/NodeUtils.java)8
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/PathFinder.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/PathFinder.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/ProvData.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/ProvData.java)8
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/PublishId.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/PublishId.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/RateLimitedOperation.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/RateLimitedOperation.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/RedirManager.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/RedirManager.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/StatusLog.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/StatusLog.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/SubnetMatcher.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/SubnetMatcher.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/Target.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/Target.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/TaskList.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/TaskList.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/EELFFilter.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/eelf/EELFFilter.java)2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/EelfMsgs.java (renamed from datarouter-node/src/main/java/com/att/research/datarouter/node/eelf/EelfMsgs.java)2
24 files changed, 42 insertions, 42 deletions
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/Delivery.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/Delivery.java
index d0e88ec9..4494024d 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/Delivery.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/Delivery.java
@@ -21,7 +21,7 @@
* *
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.util.*;
import java.io.*;
@@ -40,7 +40,7 @@ import org.apache.log4j.Logger;
* that queue has more files to deliver.
*/
public class Delivery {
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.Delivery");
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.Delivery");
private static class DelItem implements Comparable<DelItem> {
private String pubid;
private String spool;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryQueue.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryQueue.java
index 71c77978..b2596a4d 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryQueue.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryQueue.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.io.*;
import java.util.*;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryQueueHelper.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryQueueHelper.java
index 770db1dc..172678bd 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryQueueHelper.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryQueueHelper.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
/**
* Interface to allow independent testing of the DeliveryQueue code
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryTask.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
index 3d72a417..c07822d2 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryTask.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.io.*;
import java.net.*;
@@ -37,7 +37,7 @@ import org.apache.log4j.Logger;
* the file and its delivery data as well as to attempt delivery.
*/
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.DeliveryTask");
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.DeliveryTask");
private DeliveryTaskHelper dth;
private String pubid;
private DestInfo di;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryTaskHelper.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTaskHelper.java
index 702bb29e..c9f1ef84 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryTaskHelper.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTaskHelper.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
/**
* Interface to allow independent testing of the DeliveryTask code.
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/DestInfo.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DestInfo.java
index e57fef8b..2b54f70a 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/DestInfo.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DestInfo.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
/**
* Information for a delivery destination that doesn't change from message to message
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/IsFrom.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/IsFrom.java
index bb3e4137..36dbc235 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/IsFrom.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/IsFrom.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.util.*;
import java.net.*;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/LogManager.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/LogManager.java
index 078deaa1..0e89f417 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/LogManager.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/LogManager.java
@@ -20,7 +20,7 @@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.util.*;
import java.util.regex.*;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/NodeConfig.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfig.java
index 689f7653..c196d46c 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/NodeConfig.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfig.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.util.*;
import java.io.*;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/NodeConfigManager.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java
index 01ca4426..b80babd6 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/NodeConfigManager.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java
@@ -22,16 +22,16 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.net.*;
import java.util.*;
import java.io.*;
import org.apache.log4j.Logger;
+import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import com.att.research.datarouter.node.eelf.EelfMsgs;
/**
@@ -45,8 +45,8 @@ import com.att.research.datarouter.node.eelf.EelfMsgs;
* configuration data fetched from the data router provisioning server.
*/
public class NodeConfigManager implements DeliveryQueueHelper {
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.node.NodeConfigManager");
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.NodeConfigManager");
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.node.NodeConfigManager");
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeConfigManager");
private static NodeConfigManager base = new NodeConfigManager();
private Timer timer = new Timer("Node Configuration Timer", true);
@@ -103,12 +103,12 @@ public class NodeConfigManager implements DeliveryQueueHelper {
private NodeConfigManager() {
Properties p = new Properties();
try {
- p.load(new FileInputStream(System.getProperty("com.att.research.datarouter.node.ConfigFile", "/opt/app/datartr/etc/node.properties")));
+ p.load(new FileInputStream(System.getProperty("org.onap.dmaap.datarouter.node.ConfigFile", "/opt/app/datartr/etc/node.properties")));
} catch (Exception e) {
NodeUtils.setIpAndFqdnForEelf("NodeConfigManager");
eelflogger.error(EelfMsgs.MESSAGE_PROPERTIES_LOAD_ERROR);
- logger.error("NODE0301 Unable to load local configuration file " + System.getProperty("com.att.research.datarouter.node.ConfigFile", "/opt/app/datartr/etc/node.properties"), e);
+ logger.error("NODE0301 Unable to load local configuration file " + System.getProperty("org.onap.dmaap.datarouter.node.ConfigFile", "/opt/app/datartr/etc/node.properties"), e);
}
provurl = p.getProperty("ProvisioningURL", "https://feeds-drtr.web.att.com/internal/prov");
try {
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/NodeMain.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
index c9390419..a34bacd0 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/NodeMain.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import org.eclipse.jetty.servlet.*;
import org.eclipse.jetty.util.ssl.*;
@@ -36,7 +36,7 @@ import org.apache.log4j.Logger;
*/
public class NodeMain {
private NodeMain() {}
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.NodeMain");
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeMain");
private static class wfconfig implements Runnable {
private NodeConfigManager ncm;
public wfconfig(NodeConfigManager ncm) {
@@ -70,7 +70,7 @@ public class NodeMain {
* Start the data router.
* <p>
* The location of the node configuration file can be set using the
- * com.att.research.datarouter.node.ConfigFile system property. By
+ * org.onap.dmaap.datarouter.node.ConfigFile system property. By
* default, it is "etc/node.properties".
*/
public static void main(String[] args) throws Exception {
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/NodeServlet.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java
index e0ec1f5b..eae7ca06 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/NodeServlet.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -31,10 +31,10 @@ import java.util.regex.*;
import java.io.*;
import java.nio.file.*;
import org.apache.log4j.Logger;
+import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import com.att.research.datarouter.node.eelf.EelfMsgs;
import java.net.*;
@@ -50,12 +50,12 @@ import java.net.*;
* PUT/DELETE https://<i>node</i>/publish/<i>feedid</i>/<i>fileid</i> - publsh request
*/
public class NodeServlet extends HttpServlet {
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.NodeServlet");
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeServlet");
private static NodeConfigManager config;
private static Pattern MetaDataPattern;
private static SubnetMatcher internalsubnet = new SubnetMatcher("135.207.136.128/25");
//Adding EELF Logger Rally:US664892
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.node.NodeServlet");
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.node.NodeServlet");
static {
try {
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/NodeUtils.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
index 5471c0d2..303d7ee7 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/NodeUtils.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN;
import static com.att.eelf.configuration.Configuration.MDC_SERVER_IP_ADDRESS;
@@ -36,18 +36,18 @@ import java.net.*;
import java.text.*;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
+import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
import org.slf4j.MDC;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import com.att.research.datarouter.node.eelf.EelfMsgs;
/**
* Utility functions for the data router node
*/
public class NodeUtils {
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.node.NodeUtils");
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.NodeUtils");
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.node.NodeUtils");
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeUtils");
private static SimpleDateFormat logdate;
static {
logdate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/PathFinder.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/PathFinder.java
index 7ff91839..b99f1685 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/PathFinder.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/PathFinder.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.util.*;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/ProvData.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/ProvData.java
index 19cb8993..c0e46eb3 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/ProvData.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/ProvData.java
@@ -22,16 +22,16 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.io.*;
import java.util.*;
import org.json.*;
+import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
import org.apache.log4j.Logger;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import com.att.research.datarouter.node.eelf.EelfMsgs;
/**
* Parser for provisioning data from the provisioning server.
@@ -40,8 +40,8 @@ import com.att.research.datarouter.node.eelf.EelfMsgs;
* provisioning server to construct arrays of raw configuration entries.
*/
public class ProvData {
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.node.ProvData");
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.ProvData");
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.node.ProvData");
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.ProvData");
private NodeConfig.ProvNode[] pn;
private NodeConfig.ProvParam[] pp;
private NodeConfig.ProvFeed[] pf;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/PublishId.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/PublishId.java
index 436adbad..fa285b27 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/PublishId.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/PublishId.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
/**
* Generate publish IDs
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/RateLimitedOperation.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/RateLimitedOperation.java
index 5bcbed83..5890e193 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/RateLimitedOperation.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/RateLimitedOperation.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.util.*;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/RedirManager.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/RedirManager.java
index 09473c14..336eee32 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/RedirManager.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/RedirManager.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.util.*;
import java.io.*;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/StatusLog.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/StatusLog.java
index 66aa4add..109eef27 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/StatusLog.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/StatusLog.java
@@ -21,7 +21,7 @@
* *
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.util.regex.*;
import java.util.*;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/SubnetMatcher.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/SubnetMatcher.java
index c1cfeaad..f353d513 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/SubnetMatcher.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/SubnetMatcher.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.net.*;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/Target.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/Target.java
index fe595d50..eeb18408 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/Target.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/Target.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
/**
* A destination to deliver a message
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/TaskList.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/TaskList.java
index 401c72a6..c8d58e6e 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/TaskList.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/TaskList.java
@@ -22,7 +22,7 @@
******************************************************************************/
-package com.att.research.datarouter.node;
+package org.onap.dmaap.datarouter.node;
import java.util.*;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/eelf/EELFFilter.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/EELFFilter.java
index 9b006585..225205ca 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/eelf/EELFFilter.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/EELFFilter.java
@@ -20,7 +20,7 @@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.research.datarouter.node.eelf;
+package org.onap.dmaap.datarouter.node.eelf;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.filter.Filter;
diff --git a/datarouter-node/src/main/java/com/att/research/datarouter/node/eelf/EelfMsgs.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/EelfMsgs.java
index 9963f413..509bceea 100644
--- a/datarouter-node/src/main/java/com/att/research/datarouter/node/eelf/EelfMsgs.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/EelfMsgs.java
@@ -20,7 +20,7 @@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.research.datarouter.node.eelf;
+package org.onap.dmaap.datarouter.node.eelf;
import com.att.eelf.i18n.EELFResolvableErrorEnum;
import com.att.eelf.i18n.EELFResourceManager;