From: sg481n Date: Wed, 23 Aug 2017 20:30:52 +0000 (-0400) Subject: Update project structure to org.onap X-Git-Tag: 2.0.0-ONAP~12 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=commitdiff_plain;h=e4b20cc6f7c31f48ddd0de5bcd054b09a35cd510 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 --- diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml index 7e2ede8a..85203c25 100644 --- a/datarouter-node/pom.xml +++ b/datarouter-node/pom.xml @@ -21,14 +21,18 @@ * --> - 4.0.0 - - com.att.datarouter-node + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + + org.onap.dmaap.datarouter + parent + 1.0.0-SNAPSHOT + ../pom.xml + + + datarouter-node - 1.0.0-SNAPSHOT jar - datarouter-node https://github.com/att/DMAAP_DATAROUTER @@ -44,9 +48,13 @@ 1.8 1.8 ${basedir}/target/ - hub.docker.com + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - + junit @@ -221,7 +229,7 @@ - com.att.research.datarouter.node.NodeMain + org.onap.datarouter.node.NodeMain @@ -243,7 +251,7 @@ true - com.att.research.datarouter.node.NodeMain + org.onap.datarouter.node.NodeMain @@ -389,35 +397,7 @@ - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrhdme - https://oss.sonatype.org/ - true - - + org.codehaus.mojo @@ -430,43 +410,53 @@ - - - com.blackducksoftware.integration - hub-maven-plugin - 1.0.4 - false - - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - + - - - - ossrhdme - https://oss.sonatype.org/content/repositories/snapshots - - - ossrhdme - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - + + + ecomp-releases + AAF Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + AAF Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + onap-plugin-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + onap-jar-snapshots + https://nexus.onap.org/content/repositories/snapshots + + + spring-repo + Spring repo + https://artifacts.alfresco.com/nexus/content/repositories/public/ + + + repository.jboss.org-public + JBoss.org Maven repository + https://repository.jboss.org/nexus/content/groups/public + + - - https://github.com/att/DMAAP_DATAROUTER.git - ${project.scm.connection} - https://github.com/att/DMAAP_DATAROUTER/tree/master - + 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 similarity index 95% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/Delivery.java rename to 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 { 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 similarity index 96% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryQueue.java rename to 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 similarity index 96% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryQueueHelper.java rename to 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 similarity index 94% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryTask.java rename to 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 { - 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 similarity index 96% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/DeliveryTaskHelper.java rename to 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 similarity index 95% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/DestInfo.java rename to 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 similarity index 95% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/IsFrom.java rename to 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 similarity index 96% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/LogManager.java rename to 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 similarity index 96% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/NodeConfig.java rename to 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 similarity index 94% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/NodeConfigManager.java rename to 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 similarity index 92% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/NodeMain.java rename to 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. *

* 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 similarity index 95% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/NodeServlet.java rename to 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://node/publish/feedid/fileid - 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 similarity index 93% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/NodeUtils.java rename to 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 similarity index 96% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/PathFinder.java rename to 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 similarity index 94% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/ProvData.java rename to 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 similarity index 95% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/PublishId.java rename to 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 similarity index 95% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/RateLimitedOperation.java rename to 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 similarity index 96% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/RedirManager.java rename to 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 similarity index 97% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/StatusLog.java rename to 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 similarity index 95% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/SubnetMatcher.java rename to 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 similarity index 95% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/Target.java rename to 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 similarity index 95% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/TaskList.java rename to 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 similarity index 95% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/eelf/EELFFilter.java rename to 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 similarity index 94% rename from datarouter-node/src/main/java/com/att/research/datarouter/node/eelf/EelfMsgs.java rename to 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; diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml index 51c995de..80eecc76 100644 --- a/datarouter-prov/pom.xml +++ b/datarouter-prov/pom.xml @@ -21,14 +21,17 @@ * --> - 4.0.0 - - com.att.datarouter-prov + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + + org.onap.dmaap.datarouter + parent + 1.0.0-SNAPSHOT + ../pom.xml + + datarouter-prov - 1.0.0-SNAPSHOT jar - datarouter-prov https://github.com/att/DMAAP_DATAROUTER @@ -42,7 +45,11 @@ 1.8 1.8 ${basedir}/target/ - hub.docker.com + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -262,7 +269,7 @@ true - com.att.research.datarouter.provisioning.Main + org.onap.datarouter.provisioning.Main @@ -286,7 +293,7 @@ true - com.att.research.datarouter.provisioning.Main + org.onap.datarouter.provisioning.Main ${basedir}/target/opt/app/datartr/lib @@ -341,24 +348,6 @@ - - com.blackducksoftware.integration - hub-maven-plugin - 1.0.4 - false - - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - maven-resources-plugin @@ -493,35 +482,7 @@ - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrhdme - https://oss.sonatype.org/ - true - - + org.codehaus.mojo @@ -536,23 +497,49 @@ - - - - ossrhdme - https://oss.sonatype.org/content/repositories/snapshots - - - ossrhdme - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - + + ecomp-releases + AAF Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + AAF Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + - - - https://github.com/att/DMAAP_DATAROUTER.git - ${project.scm.connection} - https://github.com/att/DMAAP_DATAROUTER/tree/master - + + + onap-plugin-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + onap-jar-snapshots + https://nexus.onap.org/content/repositories/snapshots + + + spring-repo + Spring repo + https://artifacts.alfresco.com/nexus/content/repositories/public/ + + + repository.jboss.org-public + JBoss.org Maven repository + https://repository.jboss.org/nexus/content/groups/public + + diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/AuthorizationResponse.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/AuthorizationResponse.java similarity index 96% rename from datarouter-prov/src/main/java/com/att/research/datarouter/authz/AuthorizationResponse.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/AuthorizationResponse.java index 26956f82..e078429c 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/AuthorizationResponse.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/AuthorizationResponse.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.research.datarouter.authz; +package org.onap.dmaap.datarouter.authz; import java.util.List; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/AuthorizationResponseSupplement.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/AuthorizationResponseSupplement.java similarity index 96% rename from datarouter-prov/src/main/java/com/att/research/datarouter/authz/AuthorizationResponseSupplement.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/AuthorizationResponseSupplement.java index 2829c507..adb44ba3 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/AuthorizationResponseSupplement.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/AuthorizationResponseSupplement.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.authz; +package org.onap.dmaap.datarouter.authz; import java.util.Map; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/Authorizer.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/Authorizer.java similarity index 96% rename from datarouter-prov/src/main/java/com/att/research/datarouter/authz/Authorizer.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/Authorizer.java index bfed5c37..44719e66 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/Authorizer.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/Authorizer.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.authz; +package org.onap.dmaap.datarouter.authz; import java.util.Map; import javax.servlet.http.HttpServletRequest; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/AuthRespImpl.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/AuthRespImpl.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/AuthRespImpl.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/AuthRespImpl.java index db318d39..cb608c3b 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/AuthRespImpl.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/AuthRespImpl.java @@ -22,13 +22,13 @@ ******************************************************************************/ -package com.att.research.datarouter.authz.impl; +package org.onap.dmaap.datarouter.authz.impl; import java.util.ArrayList; import java.util.List; -import com.att.research.datarouter.authz.AuthorizationResponse; -import com.att.research.datarouter.authz.AuthorizationResponseSupplement; +import org.onap.dmaap.datarouter.authz.AuthorizationResponse; +import org.onap.dmaap.datarouter.authz.AuthorizationResponseSupplement; /** A representation of an authorization response returned by a XACML Policy Decision Point. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/AuthRespSupplementImpl.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/AuthRespSupplementImpl.java similarity index 92% rename from datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/AuthRespSupplementImpl.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/AuthRespSupplementImpl.java index 5d2b61c8..1f62c274 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/AuthRespSupplementImpl.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/AuthRespSupplementImpl.java @@ -22,12 +22,12 @@ ******************************************************************************/ -package com.att.research.datarouter.authz.impl; +package org.onap.dmaap.datarouter.authz.impl; import java.util.HashMap; import java.util.Map; -import com.att.research.datarouter.authz.AuthorizationResponseSupplement; +import org.onap.dmaap.datarouter.authz.AuthorizationResponseSupplement; /** Carries supplementary information--an advice or an obligation--from the authorization response returned * by a XACML Policy Decision Point. Not used in Data Router R1. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/AuthzResource.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/AuthzResource.java similarity index 96% rename from datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/AuthzResource.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/AuthzResource.java index 1a201b7e..2e957939 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/AuthzResource.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/AuthzResource.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.authz.impl; +package org.onap.dmaap.datarouter.authz.impl; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/ProvAuthorizer.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/ProvAuthorizer.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/ProvAuthorizer.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/ProvAuthorizer.java index d6683d5c..6ab9e2ab 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/ProvAuthorizer.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/ProvAuthorizer.java @@ -21,17 +21,16 @@ * * ******************************************************************************/ -package com.att.research.datarouter.authz.impl; +package org.onap.dmaap.datarouter.authz.impl; import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.apache.log4j.Logger; - -import com.att.research.datarouter.authz.AuthorizationResponse; -import com.att.research.datarouter.authz.Authorizer; -import com.att.research.datarouter.authz.impl.AuthzResource.ResourceType; +import org.onap.dmaap.datarouter.authz.AuthorizationResponse; +import org.onap.dmaap.datarouter.authz.Authorizer; +import org.onap.dmaap.datarouter.authz.impl.AuthzResource.ResourceType; /** Authorizer for the provisioning API for Data Router R1 * diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/ProvDataProvider.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/ProvDataProvider.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/ProvDataProvider.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/ProvDataProvider.java index 76ae0344..580fe99d 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/ProvDataProvider.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/ProvDataProvider.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.research.datarouter.authz.impl; +package org.onap.dmaap.datarouter.authz.impl; /** Interface to access data about subscriptions and feeds. A software component that * uses the ProvAuthorizer needs to supply an implementation of this interface. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html similarity index 100% rename from datarouter-prov/src/main/java/com/att/research/datarouter/authz/impl/package.html rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/authz/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/package.html similarity index 100% rename from datarouter-prov/src/main/java/com/att/research/datarouter/authz/package.html rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/package.html diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/BaseServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/BaseServlet.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/BaseServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/BaseServlet.java index a4784936..45d97485 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/BaseServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/BaseServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN; @@ -51,23 +51,22 @@ import javax.servlet.http.HttpServletRequest; import org.apache.log4j.Logger; import org.json.JSONObject; import org.json.JSONTokener; +import org.onap.dmaap.datarouter.authz.Authorizer; +import org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer; +import org.onap.dmaap.datarouter.authz.impl.ProvDataProvider; +import org.onap.dmaap.datarouter.provisioning.beans.Deleteable; +import org.onap.dmaap.datarouter.provisioning.beans.Feed; +import org.onap.dmaap.datarouter.provisioning.beans.Group; +import org.onap.dmaap.datarouter.provisioning.beans.Insertable; +import org.onap.dmaap.datarouter.provisioning.beans.NodeClass; +import org.onap.dmaap.datarouter.provisioning.beans.Parameters; +import org.onap.dmaap.datarouter.provisioning.beans.Subscription; +import org.onap.dmaap.datarouter.provisioning.beans.Updateable; +import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.ThrottleFilter; import org.json.JSONException; import org.slf4j.MDC; -import com.att.research.datarouter.authz.Authorizer; -import com.att.research.datarouter.authz.impl.ProvAuthorizer; -import com.att.research.datarouter.authz.impl.ProvDataProvider; -import com.att.research.datarouter.provisioning.beans.Deleteable; -import com.att.research.datarouter.provisioning.beans.Feed; -import com.att.research.datarouter.provisioning.beans.Insertable; -import com.att.research.datarouter.provisioning.beans.NodeClass; -import com.att.research.datarouter.provisioning.beans.Parameters; -import com.att.research.datarouter.provisioning.beans.Subscription; -import com.att.research.datarouter.provisioning.beans.Updateable; -import com.att.research.datarouter.provisioning.utils.DB; -import com.att.research.datarouter.provisioning.utils.ThrottleFilter; -import com.att.research.datarouter.provisioning.beans.Group; //Groups feature Rally:US708115 - 1610 - import java.util.Properties; import java.util.regex.Pattern; import javax.mail.Message; @@ -191,9 +190,9 @@ public class BaseServlet extends HttpServlet implements ProvDataProvider { */ protected BaseServlet() { if (eventlogger == null) - eventlogger = Logger.getLogger("com.att.research.datarouter.provisioning.events"); + eventlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.events"); if (intlogger == null) - intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); if (authz == null) authz = new ProvAuthorizer(this); if (startmsg_flag) { diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/DRFeedsServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/DRFeedsServlet.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/DRFeedsServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/DRFeedsServlet.java index df27042d..135d157e 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/DRFeedsServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/DRFeedsServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.IOException; import java.io.InvalidObjectException; @@ -32,14 +32,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.json.JSONObject; +import org.onap.dmaap.datarouter.authz.AuthorizationResponse; +import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Feed; +import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs; +import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.att.research.datarouter.authz.AuthorizationResponse; -import com.att.research.datarouter.provisioning.beans.EventLogRecord; -import com.att.research.datarouter.provisioning.beans.Feed; -import com.att.research.datarouter.provisioning.eelf.EelfMsgs; -import com.att.research.datarouter.provisioning.utils.JSONUtilities; /** * This servlet handles provisioning for the <drFeedsURL> which is the URL on the @@ -52,7 +52,7 @@ import com.att.research.datarouter.provisioning.utils.JSONUtilities; @SuppressWarnings("serial") public class DRFeedsServlet extends ProxyServlet { //Adding EELF Logger Rally:US664892 - private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.DRFeedsServlet"); + private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.DRFeedsServlet"); /** * DELETE on the <drFeedsURL> -- not supported. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/FeedLogServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/FeedLogServlet.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/FeedLogServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/FeedLogServlet.java index dd6b75dc..f5a2f7a8 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/FeedLogServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/FeedLogServlet.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; /** * This servlet handles requests to the <feedLogURL> diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/FeedServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/FeedServlet.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/FeedServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/FeedServlet.java index aff68538..b9056744 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/FeedServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/FeedServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.IOException; import java.io.InvalidObjectException; @@ -31,13 +31,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.json.JSONObject; +import org.onap.dmaap.datarouter.authz.AuthorizationResponse; +import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Feed; +import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.att.research.datarouter.authz.AuthorizationResponse; -import com.att.research.datarouter.provisioning.beans.EventLogRecord; -import com.att.research.datarouter.provisioning.beans.Feed; -import com.att.research.datarouter.provisioning.eelf.EelfMsgs; /** * This servlet handles provisioning for the <feedURL> which is generated by the provisioning @@ -51,7 +51,7 @@ import com.att.research.datarouter.provisioning.eelf.EelfMsgs; public class FeedServlet extends ProxyServlet { //Adding EELF Logger Rally:US664892 - private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.FeedServlet"); + private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.FeedServlet"); /** * Delete the Feed at the address /feed/<feednumber>. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/GroupServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/GroupServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java index 84ec3d2c..aa89dd2f 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/GroupServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.IOException; import java.io.InvalidObjectException; @@ -32,13 +32,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.json.JSONObject; - -import com.att.research.datarouter.authz.AuthorizationResponse; -import com.att.research.datarouter.provisioning.BaseServlet.ContentHeader; -import com.att.research.datarouter.provisioning.beans.EventLogRecord; -import com.att.research.datarouter.provisioning.beans.Group; -import com.att.research.datarouter.provisioning.beans.Subscription; -import com.att.research.datarouter.provisioning.utils.JSONUtilities; +import org.onap.dmaap.datarouter.authz.AuthorizationResponse; +import org.onap.dmaap.datarouter.provisioning.BaseServlet.ContentHeader; +import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Group; +import org.onap.dmaap.datarouter.provisioning.beans.Subscription; +import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities; /** * This servlet handles provisioning for the <groups> which is generated by the provisioning diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/InternalServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/InternalServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java index e50a478e..bec58ccd 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/InternalServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.ByteArrayOutputStream; import java.io.File; @@ -40,16 +40,16 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.json.JSONArray; +import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.LogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Parameters; +import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs; +import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader; +import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.att.research.datarouter.provisioning.beans.EventLogRecord; -import com.att.research.datarouter.provisioning.beans.LogRecord; -import com.att.research.datarouter.provisioning.beans.Parameters; -import com.att.research.datarouter.provisioning.eelf.EelfMsgs; -import com.att.research.datarouter.provisioning.utils.DB; -import com.att.research.datarouter.provisioning.utils.RLEBitSet; -import com.att.research.datarouter.provisioning.utils.LogfileLoader; /** *

@@ -121,7 +121,7 @@ import com.att.research.datarouter.provisioning.utils.LogfileLoader; * * /internal/route/* * * - * URLs under this path are handled via the {@link com.att.research.datarouter.provisioning.RouteServlet} + * URLs under this path are handled via the {@link org.onap.dmaap.datarouter.provisioning.RouteServlet} * * * @@ -150,7 +150,7 @@ import com.att.research.datarouter.provisioning.utils.LogfileLoader; public class InternalServlet extends ProxyServlet { private static Integer logseq = new Integer(0); // another piece of info to make log spool file names unique //Adding EELF Logger Rally:US664892 - private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.InternalServlet"); + private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.InternalServlet"); /** * Delete a parameter at the address /internal/api/<parameter>. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/LogServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/LogServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java index 7ef74d12..74377873 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/LogServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.IOException; import java.sql.Connection; @@ -40,17 +40,17 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.json.LOGJSONObject; +import org.onap.dmaap.datarouter.provisioning.beans.DeliveryRecord; +import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.ExpiryRecord; +import org.onap.dmaap.datarouter.provisioning.beans.LOGJSONable; +import org.onap.dmaap.datarouter.provisioning.beans.PublishRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Subscription; +import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs; +import org.onap.dmaap.datarouter.provisioning.utils.DB; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.att.research.datarouter.provisioning.beans.DeliveryRecord; -import com.att.research.datarouter.provisioning.beans.EventLogRecord; -import com.att.research.datarouter.provisioning.beans.ExpiryRecord; -import com.att.research.datarouter.provisioning.beans.LOGJSONable; -import com.att.research.datarouter.provisioning.beans.PublishRecord; -import com.att.research.datarouter.provisioning.beans.Subscription; -import com.att.research.datarouter.provisioning.eelf.EelfMsgs; -import com.att.research.datarouter.provisioning.utils.DB; /** * This servlet handles requests to the <feedLogURL> and <subLogURL>, @@ -62,7 +62,7 @@ import com.att.research.datarouter.provisioning.utils.DB; @SuppressWarnings("serial") public class LogServlet extends BaseServlet { //Adding EELF Logger Rally:US664892 - private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.LogServlet"); + private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.LogServlet"); private static final long TWENTYFOUR_HOURS = (24 * 60 * 60 * 1000L); private static final String fmt1 = "yyyy-MM-dd'T'HH:mm:ss'Z'"; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/Main.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/Main.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java index 5911ecd8..f5c93c79 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/Main.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.security.Security; import java.util.Properties; @@ -45,11 +45,10 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; - -import com.att.research.datarouter.provisioning.utils.DB; -import com.att.research.datarouter.provisioning.utils.LogfileLoader; -import com.att.research.datarouter.provisioning.utils.PurgeLogDirTask; -import com.att.research.datarouter.provisioning.utils.ThrottleFilter; +import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader; +import org.onap.dmaap.datarouter.provisioning.utils.PurgeLogDirTask; +import org.onap.dmaap.datarouter.provisioning.utils.ThrottleFilter; /** *

@@ -99,7 +98,7 @@ public class Main { */ public static void main(String[] args) throws Exception { Security.setProperty("networkaddress.cache.ttl", "4"); - Logger logger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); // Check DB is accessible and contains the expected tables if (! checkDatabase(logger)) diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/Poker.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Poker.java similarity index 89% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/Poker.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Poker.java index 13350df0..1d9f7143 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/Poker.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Poker.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.FileInputStream; import java.io.IOException; @@ -46,15 +46,14 @@ import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; - -import com.att.research.datarouter.provisioning.beans.EgressRoute; -import com.att.research.datarouter.provisioning.beans.Feed; -import com.att.research.datarouter.provisioning.beans.IngressRoute; -import com.att.research.datarouter.provisioning.beans.NetworkRoute; -import com.att.research.datarouter.provisioning.beans.Parameters; -import com.att.research.datarouter.provisioning.beans.Subscription; -import com.att.research.datarouter.provisioning.beans.Group; //Groups feature Rally:US708115 - 1610 -import com.att.research.datarouter.provisioning.utils.*; +import org.onap.dmaap.datarouter.provisioning.beans.EgressRoute; +import org.onap.dmaap.datarouter.provisioning.beans.Feed; +import org.onap.dmaap.datarouter.provisioning.beans.Group; +import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute; +import org.onap.dmaap.datarouter.provisioning.beans.NetworkRoute; +import org.onap.dmaap.datarouter.provisioning.beans.Parameters; +import org.onap.dmaap.datarouter.provisioning.beans.Subscription; +import org.onap.dmaap.datarouter.provisioning.utils.*; /** * This class handles the two timers (described in R1 Design Notes), and takes care of issuing @@ -93,7 +92,7 @@ public class Poker extends TimerTask { private Poker() { timer1 = timer2 = 0; rolex = new Timer(); - logger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); try { this_pod = InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/ProxyServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProxyServlet.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/ProxyServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProxyServlet.java index b22b018f..2db1ce40 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/ProxyServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProxyServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.File; import java.io.FileInputStream; @@ -53,9 +53,8 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.entity.BasicHttpEntity; import org.apache.http.impl.client.AbstractHttpClient; import org.apache.http.impl.client.DefaultHttpClient; - -import com.att.research.datarouter.provisioning.utils.DB; -import com.att.research.datarouter.provisioning.utils.URLUtilities; +import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities; /** * This class is the base class for those servlets that need to proxy their requests from the diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/PublishServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java similarity index 91% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/PublishServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java index 2a8e2e3c..e736d79c 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/PublishServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.IOException; import java.io.InputStream; @@ -39,14 +39,14 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONArray; import org.json.JSONObject; import org.json.JSONTokener; +import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Feed; +import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute; +import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs; +import org.onap.dmaap.datarouter.provisioning.utils.*; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.att.research.datarouter.provisioning.beans.EventLogRecord; -import com.att.research.datarouter.provisioning.beans.Feed; -import com.att.research.datarouter.provisioning.beans.IngressRoute; -import com.att.research.datarouter.provisioning.eelf.EelfMsgs; -import com.att.research.datarouter.provisioning.utils.*; /** * This servlet handles redirects for the <publishURL> on the provisioning server, @@ -63,7 +63,7 @@ public class PublishServlet extends BaseServlet { private String provstring; private List irt; //Adding EELF Logger Rally:US664892 - private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.PublishServlet"); + private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.PublishServlet"); @Override diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/RouteServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/RouteServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java index 68fd4c71..ab7aff8d 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/RouteServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.IOException; import java.util.Set; @@ -31,14 +31,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.json.JSONObject; - -import com.att.research.datarouter.provisioning.beans.Deleteable; -import com.att.research.datarouter.provisioning.beans.EgressRoute; -import com.att.research.datarouter.provisioning.beans.EventLogRecord; -import com.att.research.datarouter.provisioning.beans.IngressRoute; -import com.att.research.datarouter.provisioning.beans.Insertable; -import com.att.research.datarouter.provisioning.beans.NetworkRoute; -import com.att.research.datarouter.provisioning.beans.NodeClass; +import org.onap.dmaap.datarouter.provisioning.beans.Deleteable; +import org.onap.dmaap.datarouter.provisioning.beans.EgressRoute; +import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute; +import org.onap.dmaap.datarouter.provisioning.beans.Insertable; +import org.onap.dmaap.datarouter.provisioning.beans.NetworkRoute; +import org.onap.dmaap.datarouter.provisioning.beans.NodeClass; /** *

diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/StatisticsServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java similarity index 96% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/StatisticsServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java index 1c508b77..a4bb07be 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/StatisticsServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.IOException; import java.sql.Connection; @@ -41,8 +41,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.json.JSONException; import org.json.LOGJSONObject; -import com.att.research.datarouter.provisioning.beans.EventLogRecord; -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * This Servlet handles requests to the <Statistics API> and <Statistics consilidated resultset>, diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SubLogServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubLogServlet.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SubLogServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubLogServlet.java index 0f196b28..689efec0 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SubLogServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubLogServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; /** * This servlet handles requests to the <subLogURL>, diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SubscribeServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscribeServlet.java similarity index 92% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SubscribeServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscribeServlet.java index ea79e9ff..71967803 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SubscribeServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscribeServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.IOException; import java.io.InvalidObjectException; @@ -32,15 +32,15 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.json.JSONObject; +import org.onap.dmaap.datarouter.authz.AuthorizationResponse; +import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Feed; +import org.onap.dmaap.datarouter.provisioning.beans.Subscription; +import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs; +import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.att.research.datarouter.authz.AuthorizationResponse; -import com.att.research.datarouter.provisioning.beans.EventLogRecord; -import com.att.research.datarouter.provisioning.beans.Feed; -import com.att.research.datarouter.provisioning.beans.Subscription; -import com.att.research.datarouter.provisioning.eelf.EelfMsgs; -import com.att.research.datarouter.provisioning.utils.JSONUtilities; /** * This servlet handles provisioning for the <subscribeURL> which is generated by the provisioning @@ -53,7 +53,7 @@ import com.att.research.datarouter.provisioning.utils.JSONUtilities; public class SubscribeServlet extends ProxyServlet { //Adding EELF Logger Rally:US664892 - private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.SubscribeServlet"); + private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.SubscribeServlet"); /** * DELETE on the <subscribeUrl> -- not supported. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SubscriptionServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SubscriptionServlet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java index 0bb47175..bbb1c6ba 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SubscriptionServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.IOException; import java.io.InvalidObjectException; @@ -36,13 +36,13 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; import org.json.JSONObject; +import org.onap.dmaap.datarouter.authz.AuthorizationResponse; +import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Subscription; +import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.att.research.datarouter.authz.AuthorizationResponse; -import com.att.research.datarouter.provisioning.beans.EventLogRecord; -import com.att.research.datarouter.provisioning.beans.Subscription; -import com.att.research.datarouter.provisioning.eelf.EelfMsgs; /** * This servlet handles provisioning for the <subscriptionURL> which is generated by the provisioning @@ -58,7 +58,7 @@ import com.att.research.datarouter.provisioning.eelf.EelfMsgs; public class SubscriptionServlet extends ProxyServlet { public static final String SUBCNTRL_CONTENT_TYPE = "application/vnd.att-dr.subscription-control"; //Adding EELF Logger Rally:US664892 - private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.SubscriptionServlet"); + private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.SubscriptionServlet"); /** * DELETE on the <subscriptionUrl> -- delete a subscription. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SynchronizerTask.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SynchronizerTask.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SynchronizerTask.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SynchronizerTask.java index 9cb9b7c0..a85bfc88 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/SynchronizerTask.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SynchronizerTask.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning; +package org.onap.dmaap.datarouter.provisioning; import java.io.ByteArrayOutputStream; import java.io.File; @@ -65,19 +65,18 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; - -import com.att.research.datarouter.provisioning.beans.EgressRoute; -import com.att.research.datarouter.provisioning.beans.Feed; -import com.att.research.datarouter.provisioning.beans.IngressRoute; -import com.att.research.datarouter.provisioning.beans.NetworkRoute; -import com.att.research.datarouter.provisioning.beans.Parameters; -import com.att.research.datarouter.provisioning.beans.Subscription; -import com.att.research.datarouter.provisioning.beans.Syncable; -import com.att.research.datarouter.provisioning.utils.DB; -import com.att.research.datarouter.provisioning.utils.RLEBitSet; -import com.att.research.datarouter.provisioning.utils.LogfileLoader; -import com.att.research.datarouter.provisioning.utils.URLUtilities; -import com.att.research.datarouter.provisioning.beans.Group; //Groups feature Rally:US708115 - 1610 +import org.onap.dmaap.datarouter.provisioning.beans.EgressRoute; +import org.onap.dmaap.datarouter.provisioning.beans.Feed; +import org.onap.dmaap.datarouter.provisioning.beans.Group; +import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute; +import org.onap.dmaap.datarouter.provisioning.beans.NetworkRoute; +import org.onap.dmaap.datarouter.provisioning.beans.Parameters; +import org.onap.dmaap.datarouter.provisioning.beans.Subscription; +import org.onap.dmaap.datarouter.provisioning.beans.Syncable; +import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader; +import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet; +import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities; /** * This class handles synchronization between provisioning servers (PODs). It has three primary functions: @@ -129,7 +128,7 @@ public class SynchronizerTask extends TimerTask { @SuppressWarnings("deprecation") private SynchronizerTask() { - logger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); rolex = new Timer(); spooldir = (new DB()).getProperties().getProperty("com.att.research.datarouter.provserver.spooldir"); state = UNKNOWN; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/BaseLogRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/BaseLogRecord.java similarity index 96% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/BaseLogRecord.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/BaseLogRecord.java index 327f95f2..d8df6fd1 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/BaseLogRecord.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/BaseLogRecord.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Deleteable.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Deleteable.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Deleteable.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Deleteable.java index c16bdbc1..bec29ac2 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Deleteable.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Deleteable.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.Connection; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/DeliveryExtraRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/DeliveryExtraRecord.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/DeliveryExtraRecord.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/DeliveryExtraRecord.java index 1a1cb569..bf7ead66 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/DeliveryExtraRecord.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/DeliveryExtraRecord.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/DeliveryRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/DeliveryRecord.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/DeliveryRecord.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/DeliveryRecord.java index b4791d48..330ba309 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/DeliveryRecord.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/DeliveryRecord.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/EgressRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/EgressRoute.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java index 94b59ce4..8c8b715c 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/EgressRoute.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,8 +34,7 @@ import java.util.TreeSet; import org.apache.log4j.Logger; import org.json.JSONObject; - -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * The representation of one route in the Egress Route Table. @@ -44,7 +43,7 @@ import com.att.research.datarouter.provisioning.utils.DB; * @version $Id: EgressRoute.java,v 1.3 2013/12/16 20:30:23 eby Exp $ */ public class EgressRoute extends NodeClass implements Comparable { - private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); private final int subid; private final int nodeid; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/EventLogRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EventLogRecord.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/EventLogRecord.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EventLogRecord.java index adf45d49..4069c4c2 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/EventLogRecord.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EventLogRecord.java @@ -22,13 +22,13 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.security.cert.X509Certificate; import javax.servlet.http.HttpServletRequest; -import com.att.research.datarouter.provisioning.BaseServlet; +import org.onap.dmaap.datarouter.provisioning.BaseServlet; /** * This class is used to log provisioning server events. Each event consists of a who diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/ExpiryRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/ExpiryRecord.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/ExpiryRecord.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/ExpiryRecord.java index 1db5417b..29a7feac 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/ExpiryRecord.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/ExpiryRecord.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Feed.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Feed.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java index 4ee5ab96..9cc2beee 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Feed.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.io.InvalidObjectException; import java.sql.Connection; @@ -41,10 +41,9 @@ import java.util.Set; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; - -import com.att.research.datarouter.provisioning.utils.DB; -import com.att.research.datarouter.provisioning.utils.JSONUtilities; -import com.att.research.datarouter.provisioning.utils.URLUtilities; +import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities; +import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities; /** * The representation of a Feed. Feeds can be retrieved from the DB, or stored/updated in the DB. @@ -52,7 +51,7 @@ import com.att.research.datarouter.provisioning.utils.URLUtilities; * @version $Id: Feed.java,v 1.13 2013/10/28 18:06:52 eby Exp $ */ public class Feed extends Syncable { - private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); private static int next_feedid = getMaxFeedID() + 1; private int feedid; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/FeedAuthorization.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/FeedAuthorization.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java index 5701ce9f..49578b86 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/FeedAuthorization.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.util.HashSet; import java.util.Set; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/FeedEndpointID.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedEndpointID.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/FeedEndpointID.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedEndpointID.java index f009c64c..b9ffc400 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/FeedEndpointID.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedEndpointID.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/FeedLinks.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedLinks.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/FeedLinks.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedLinks.java index ccce9c4b..14aa1077 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/FeedLinks.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedLinks.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.io.InvalidObjectException; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Group.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Group.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java index 3f55b00a..884cd2b7 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Group.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.io.InvalidObjectException; import java.sql.Connection; @@ -36,9 +36,8 @@ import java.util.List; import org.apache.log4j.Logger; import org.json.JSONObject; - -import com.att.research.datarouter.provisioning.utils.DB; -import com.att.research.datarouter.provisioning.utils.URLUtilities; +import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities; /** * The representation of a Subscription. Subscriptions can be retrieved from the DB, or stored/updated in the DB. @@ -46,7 +45,7 @@ import com.att.research.datarouter.provisioning.utils.URLUtilities; * @version $Id: Group.java,v 1.0 2016/07/19 */ public class Group extends Syncable { - private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); private static int next_groupid = getMaxGroupID() + 1; private int groupid; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/IngressRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/IngressRoute.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java index a9ea9bc7..056c7695 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/IngressRoute.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.net.InetAddress; import java.net.UnknownHostException; @@ -43,8 +43,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; - -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * The representation of one route in the Ingress Route Table. @@ -53,7 +52,7 @@ import com.att.research.datarouter.provisioning.utils.DB; * @version $Id: IngressRoute.java,v 1.3 2013/12/16 20:30:23 eby Exp $ */ public class IngressRoute extends NodeClass implements Comparable { - private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); private final int seq; private final int feedid; private final String userid; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Insertable.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Insertable.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Insertable.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Insertable.java index 6604ab41..62195378 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Insertable.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Insertable.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.Connection; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/JSONable.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/JSONable.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/JSONable.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/JSONable.java index cbea9ad0..f276bd3d 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/JSONable.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/JSONable.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import org.json.JSONObject; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/LOGJSONable.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LOGJSONable.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/LOGJSONable.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LOGJSONable.java index 93cdfaa9..943e2149 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/LOGJSONable.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LOGJSONable.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import org.json.LOGJSONObject; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Loadable.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Loadable.java similarity index 92% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Loadable.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Loadable.java index 3676f450..957d71d0 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Loadable.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Loadable.java @@ -22,12 +22,12 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.PreparedStatement; import java.sql.SQLException; -import com.att.research.datarouter.provisioning.utils.LogfileLoader; +import org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader; /** * This interface is used by bean classes that can be loaded into the LOG_RECORDS table using the diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/LogRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/LogRecord.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java index 1ddc5094..dbb2133b 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/LogRecord.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.io.IOException; import java.io.OutputStream; @@ -35,8 +35,8 @@ import java.sql.Types; import java.text.ParseException; import java.util.Iterator; -import com.att.research.datarouter.provisioning.utils.DB; -import com.att.research.datarouter.provisioning.utils.RLEBitSet; +import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet; /** * The representation of a Log Record, as retrieved from the DB. Since this record format is only used diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/NetworkRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/NetworkRoute.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java index 59f21928..74c5406c 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/NetworkRoute.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,8 +34,7 @@ import java.util.TreeSet; import org.apache.log4j.Logger; import org.json.JSONObject; - -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * The representation of one route in the Network Route Table. @@ -44,7 +43,7 @@ import com.att.research.datarouter.provisioning.utils.DB; * @version $Id: NetworkRoute.java,v 1.2 2013/12/16 20:30:23 eby Exp $ */ public class NetworkRoute extends NodeClass implements Comparable { - private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); private final int fromnode; private final int tonode; private final int vianode; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/NodeClass.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/NodeClass.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java index 321885b4..e3dd8524 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/NodeClass.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NodeClass.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,8 +34,7 @@ import java.util.Set; import java.util.TreeSet; import org.apache.log4j.Logger; - -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * This class is used to aid in the mapping of node names from/to node IDs. @@ -68,7 +67,7 @@ public abstract class NodeClass extends Syncable { nextid = n+1; } // take | separated list, add domain if needed. - Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); for (String node : nodes) { node = normalizeNodename(node); if (!map.containsKey(node)) { diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Parameters.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Parameters.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java index 1cb4bcad..a47569fd 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Parameters.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.Connection; import java.sql.PreparedStatement; @@ -35,8 +35,7 @@ import java.util.Map; import org.apache.log4j.Logger; import org.json.JSONObject; - -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * Methods to provide access to Provisioning parameters in the DB. @@ -69,7 +68,7 @@ public class Parameters extends Syncable { public static final String THROTTLE_FILTER = "THROTTLE_FILTER"; public static final String STATIC_ROUTING_NODES = "STATIC_ROUTING_NODES"; //Adding new param for static Routing - Rally:US664862-1610 - private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); private String keyname; private String value; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/PubFailRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PubFailRecord.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/PubFailRecord.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PubFailRecord.java index 1fe1473b..de2ad731 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/PubFailRecord.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PubFailRecord.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/PublishRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/PublishRecord.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java index a844c768..74a9c4b5 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/PublishRecord.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/SubDelivery.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubDelivery.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/SubDelivery.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubDelivery.java index 66e44af5..2341f2ba 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/SubDelivery.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubDelivery.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/SubLinks.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubLinks.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/SubLinks.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubLinks.java index 27128d86..2f66a498 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/SubLinks.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubLinks.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.io.InvalidObjectException; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Subscription.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Subscription.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java index 7ab10a45..7e9f2ca8 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Subscription.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.io.InvalidObjectException; import java.sql.Connection; @@ -36,10 +36,10 @@ import java.util.List; import org.apache.log4j.Logger; import org.json.JSONObject; -import java.util.Properties; +import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities; -import com.att.research.datarouter.provisioning.utils.DB; -import com.att.research.datarouter.provisioning.utils.URLUtilities; +import java.util.Properties; /** * The representation of a Subscription. Subscriptions can be retrieved from the DB, or stored/updated in the DB. @@ -47,7 +47,7 @@ import com.att.research.datarouter.provisioning.utils.URLUtilities; * @version $Id: Subscription.java,v 1.9 2013/10/28 18:06:53 eby Exp $ */ public class Subscription extends Syncable { - private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); private static int next_subid = getMaxSubID() + 1; private int subid; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Syncable.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Syncable.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Syncable.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Syncable.java index 00163c1c..8e6b9c9c 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Syncable.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Syncable.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.Connection; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Updateable.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Updateable.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Updateable.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Updateable.java index a9b19e7c..d7d0b33f 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/Updateable.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Updateable.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.provisioning.beans; +package org.onap.dmaap.datarouter.provisioning.beans; import java.sql.Connection; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/package.html similarity index 100% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/beans/package.html rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/package.html diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/eelf/EelfMsgs.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/eelf/EelfMsgs.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/eelf/EelfMsgs.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/eelf/EelfMsgs.java index 3a230416..ccd29381 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/eelf/EelfMsgs.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/eelf/EelfMsgs.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.research.datarouter.provisioning.eelf; +package org.onap.dmaap.datarouter.provisioning.eelf; import com.att.eelf.i18n.EELFResolvableErrorEnum; import com.att.eelf.i18n.EELFResourceManager; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/eelf/JettyFilter.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/eelf/JettyFilter.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/eelf/JettyFilter.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/eelf/JettyFilter.java index cfef910c..1e127d8a 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/eelf/JettyFilter.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/eelf/JettyFilter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.research.datarouter.provisioning.eelf; +package org.onap.dmaap.datarouter.provisioning.eelf; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.filter.Filter; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html similarity index 100% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/package.html rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/DB.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/DB.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java index ec4b0e68..1f558ec8 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/DB.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.utils; +package org.onap.dmaap.datarouter.provisioning.utils; import java.io.File; import java.io.FileReader; @@ -46,11 +46,10 @@ import java.util.Queue; import java.util.Set; import org.apache.log4j.Logger; - -import com.att.research.datarouter.provisioning.beans.DeliveryRecord; -import com.att.research.datarouter.provisioning.beans.ExpiryRecord; -import com.att.research.datarouter.provisioning.beans.Loadable; -import com.att.research.datarouter.provisioning.beans.PublishRecord; +import org.onap.dmaap.datarouter.provisioning.beans.DeliveryRecord; +import org.onap.dmaap.datarouter.provisioning.beans.ExpiryRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Loadable; +import org.onap.dmaap.datarouter.provisioning.beans.PublishRecord; /** * Load the DB JDBC driver, and manage a simple pool of connections to the DB. @@ -67,7 +66,7 @@ public class DB { private static String DB_LOGIN = "datarouter"; private static String DB_PASSWORD = "datarouter"; private static Properties props; - private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); private static Queue queue = new LinkedList(); public static String HTTPS_PORT; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/DRRouteCLI.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java similarity index 96% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/DRRouteCLI.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java index 36d46e3b..4c98f8e0 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/DRRouteCLI.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.utils; +package org.onap.dmaap.datarouter.provisioning.utils; import java.io.File; import java.io.FileInputStream; @@ -63,7 +63,7 @@ public class DRRouteCLI { * Invoke the CLI. The CLI can be run with a single command (given as command line arguments), * or in an interactive mode where the user types a sequence of commands to the program. The CLI is invoked via: * 

-	 * java com.att.research.datarouter.provisioning.utils.DRRouteCLI [ -s server ] [ command ]
+	 * java org.onap.dmaap.datarouter.provisioning.utils.DRRouteCLI [ -s server ] [ command ]
 	 *
* A full description of the arguments to this command are * here. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/JSONUtilities.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/JSONUtilities.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/JSONUtilities.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/JSONUtilities.java index e1676588..886a85c7 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/JSONUtilities.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/JSONUtilities.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.utils; +package org.onap.dmaap.datarouter.provisioning.utils; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/LogfileLoader.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java similarity index 93% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/LogfileLoader.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java index f9c11f18..b19bee10 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/LogfileLoader.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.utils; +package org.onap.dmaap.datarouter.provisioning.utils; import java.io.File; import java.io.FileInputStream; @@ -47,16 +47,15 @@ import java.util.TreeSet; import java.util.zip.GZIPInputStream; import org.apache.log4j.Logger; - -import com.att.research.datarouter.provisioning.BaseServlet; -import com.att.research.datarouter.provisioning.beans.DeliveryExtraRecord; -import com.att.research.datarouter.provisioning.beans.DeliveryRecord; -import com.att.research.datarouter.provisioning.beans.ExpiryRecord; -import com.att.research.datarouter.provisioning.beans.Loadable; -import com.att.research.datarouter.provisioning.beans.LogRecord; -import com.att.research.datarouter.provisioning.beans.Parameters; -import com.att.research.datarouter.provisioning.beans.PubFailRecord; -import com.att.research.datarouter.provisioning.beans.PublishRecord; +import org.onap.dmaap.datarouter.provisioning.BaseServlet; +import org.onap.dmaap.datarouter.provisioning.beans.DeliveryExtraRecord; +import org.onap.dmaap.datarouter.provisioning.beans.DeliveryRecord; +import org.onap.dmaap.datarouter.provisioning.beans.ExpiryRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Loadable; +import org.onap.dmaap.datarouter.provisioning.beans.LogRecord; +import org.onap.dmaap.datarouter.provisioning.beans.Parameters; +import org.onap.dmaap.datarouter.provisioning.beans.PubFailRecord; +import org.onap.dmaap.datarouter.provisioning.beans.PublishRecord; /** * This class provides methods that run in a separate thread, in order to process logfiles uploaded into the spooldir. @@ -106,7 +105,7 @@ public class LogfileLoader extends Thread { private boolean idle; private LogfileLoader() { - this.logger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + this.logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); this.db = new DB(); this.spooldir = db.getProperties().getProperty("com.att.research.datarouter.provserver.spooldir"); this.set_start = getIdRange(); diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/PurgeLogDirTask.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/PurgeLogDirTask.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java index b705e6f8..5a5d550f 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/PurgeLogDirTask.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.utils; +package org.onap.dmaap.datarouter.provisioning.utils; import java.io.File; import java.util.Properties; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/RLEBitSet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/RLEBitSet.java similarity index 96% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/RLEBitSet.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/RLEBitSet.java index 58617414..a9df2feb 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/RLEBitSet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/RLEBitSet.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.utils; +package org.onap.dmaap.datarouter.provisioning.utils; import java.util.ArrayList; import java.util.Iterator; diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/ThrottleFilter.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/ThrottleFilter.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java index 6eb866c8..ba2ca7e7 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/ThrottleFilter.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.utils; +package org.onap.dmaap.datarouter.provisioning.utils; import java.io.IOException; import java.io.InputStream; @@ -43,13 +43,12 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.research.datarouter.provisioning.beans.Parameters; - import org.apache.log4j.Logger; import org.eclipse.jetty.continuation.Continuation; import org.eclipse.jetty.continuation.ContinuationSupport; import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Request; +import org.onap.dmaap.datarouter.provisioning.beans.Parameters; /** * This filter checks /publish requests to the provisioning server to allow ill-behaved publishers to be throttled. @@ -91,7 +90,7 @@ import org.eclipse.jetty.server.Request; public class ThrottleFilter extends TimerTask implements Filter { public static final int DEFAULT_N = 10; public static final int DEFAULT_M = 5; - public static final String THROTTLE_MARKER = "com.att.research.datarouter.provisioning.THROTTLE_MARKER"; + public static final String THROTTLE_MARKER = "org.onap.dmaap.datarouter.provisioning.THROTTLE_MARKER"; private static final String JETTY_REQUEST = "org.eclipse.jetty.server.Request"; private static final long ONE_MINUTE = 60000L; private static final int ACTION_DROP = 0; @@ -103,7 +102,7 @@ public class ThrottleFilter extends TimerTask implements Filter { private static int m_minutes = 0; // sampling period private static int action = ACTION_DROP; // action to take (throttle or drop) - private static Logger logger = Logger.getLogger("com.att.research.datarouter.provisioning.internal"); + private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); private static Map map = new HashMap(); private static final Timer rolex = new Timer(); diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/URLUtilities.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java similarity index 94% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/URLUtilities.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java index c1793e52..c3249426 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/URLUtilities.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/URLUtilities.java @@ -22,13 +22,13 @@ ******************************************************************************/ -package com.att.research.datarouter.provisioning.utils; +package org.onap.dmaap.datarouter.provisioning.utils; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Arrays; -import com.att.research.datarouter.provisioning.BaseServlet; +import org.onap.dmaap.datarouter.provisioning.BaseServlet; /** * Utility functions used to generate the different URLs used by the Data Router. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/package.html similarity index 100% rename from datarouter-prov/src/main/java/com/att/research/datarouter/provisioning/utils/package.html rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/package.html diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/DailyLatencyReport.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/DailyLatencyReport.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/reports/DailyLatencyReport.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/DailyLatencyReport.java index 63d612f9..cd48e623 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/DailyLatencyReport.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/DailyLatencyReport.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.reports; +package org.onap.dmaap.datarouter.reports; import java.io.FileNotFoundException; import java.io.PrintWriter; @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map; import java.util.TreeSet; -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * Generate a daily per feed latency report. The report is a .csv file containing the following columns: diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/FeedReport.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java similarity index 96% rename from datarouter-prov/src/main/java/com/att/research/datarouter/reports/FeedReport.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java index 9fe7e27f..a3e15dc3 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/FeedReport.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.reports; +package org.onap.dmaap.datarouter.reports; import java.io.FileNotFoundException; import java.io.FileReader; @@ -40,8 +40,7 @@ import java.util.GregorianCalendar; import org.json.JSONException; import org.json.JSONObject; - -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * Generate a feeds report. The report is a .CSV file. diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/LatencyReport.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/LatencyReport.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/reports/LatencyReport.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/LatencyReport.java index 96e096e9..c213c03d 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/LatencyReport.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/LatencyReport.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.reports; +package org.onap.dmaap.datarouter.reports; import java.io.FileNotFoundException; import java.io.PrintWriter; @@ -33,7 +33,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * Generate a per-file latency report. It reports on the details related to one file published diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/Report.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/Report.java similarity index 90% rename from datarouter-prov/src/main/java/com/att/research/datarouter/reports/Report.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/Report.java index bd64e0eb..f4e0255e 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/Report.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/Report.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.reports; +package org.onap.dmaap.datarouter.reports; import java.lang.reflect.Constructor; import java.util.Calendar; @@ -39,7 +39,7 @@ public class Report { /** * Generate .csv report files from the database. Usage: * 
-	 * java com.att.research.datarouter.reports.Report [ -t type ] [ -o outfile ] [ fromdate [ todate ]]
+	 * java org.onap.dmaap.datarouter.reports.Report [ -t type ] [ -o outfile ] [ fromdate [ todate ]]
 	 *
* type should be volume for a {@link VolumeReport}, * feed for a {@link FeedReport}, @@ -59,7 +59,7 @@ public class Report { for (int i = 0; i < args.length; i++) { if (args[i].equals("-?")) { - System.err.println("usage: java com.att.research.datarouter.reports.Report [ -t type ] [ -o outfile ] [ fromdate [ todate ]]"); + System.err.println("usage: java org.onap.dmaap.datarouter.reports.Report [ -t type ] [ -o outfile ] [ fromdate [ todate ]]"); System.exit(0); } else if (args[i].equals("-o")) { if (++i < args.length) { @@ -69,7 +69,7 @@ public class Report { if (++i < args.length) { String base = args[i]; base = Character.toUpperCase(base.charAt(0)) + base.substring(1); - base = "com.att.research.datarouter.reports."+base+"Report"; + base = "org.onap.dmaap.datarouter.reports."+base+"Report"; try { @SuppressWarnings("unchecked") Class cl = (Class) Class.forName(base); diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/ReportBase.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/ReportBase.java similarity index 91% rename from datarouter-prov/src/main/java/com/att/research/datarouter/reports/ReportBase.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/ReportBase.java index 2bdabf19..15f056d2 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/ReportBase.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/ReportBase.java @@ -21,7 +21,7 @@ * * ******************************************************************************/ -package com.att.research.datarouter.reports; +package org.onap.dmaap.datarouter.reports; import org.apache.log4j.Logger; @@ -39,7 +39,7 @@ abstract public class ReportBase implements Runnable { public ReportBase() { this.from = 0; this.to = System.currentTimeMillis(); - this.logger = Logger.getLogger("com.att.research.datarouter.reports"); + this.logger = Logger.getLogger("org.onap.dmaap.datarouter.reports"); } public void setFrom(long from) { diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/SubscriberReport.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/SubscriberReport.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/reports/SubscriberReport.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/SubscriberReport.java index b003ab12..5d62e1ec 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/SubscriberReport.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/SubscriberReport.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.reports; +package org.onap.dmaap.datarouter.reports; import java.io.FileNotFoundException; import java.io.PrintWriter; @@ -34,7 +34,7 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeSet; -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * Generate a subscribers report. The report is a .CSV file. It contains information per-day and per-subscriber, diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/VolumeReport.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/VolumeReport.java similarity index 95% rename from datarouter-prov/src/main/java/com/att/research/datarouter/reports/VolumeReport.java rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/VolumeReport.java index 92a85e2e..b210ef9f 100644 --- a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/VolumeReport.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/VolumeReport.java @@ -22,7 +22,7 @@ ******************************************************************************/ -package com.att.research.datarouter.reports; +package org.onap.dmaap.datarouter.reports; import java.io.FileNotFoundException; import java.io.PrintWriter; @@ -36,7 +36,7 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeSet; -import com.att.research.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.DB; /** * Generate a traffic volume report. The report is a .csv file containing the following columns: diff --git a/datarouter-prov/src/main/java/com/att/research/datarouter/reports/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/package.html similarity index 100% rename from datarouter-prov/src/main/java/com/att/research/datarouter/reports/package.html rename to datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/package.html diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/FillDB.java b/datarouter-prov/src/test/java/datarouter/provisioning/FillDB.java index c41cc801..f83113ef 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/FillDB.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/FillDB.java @@ -44,8 +44,7 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; import org.json.JSONArray; import org.json.JSONObject; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class FillDB { public static void main(String[] args) diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java b/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java index 9a96933b..d124af43 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testBase.java @@ -45,8 +45,7 @@ import org.json.JSONObject; import org.json.JSONTokener; import org.junit.After; import org.junit.Before; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testBase { /** The properties file to read the DB properties from */ diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testCleanup.java b/datarouter-prov/src/test/java/datarouter/provisioning/testCleanup.java index fa1c5f4c..bf991fdd 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testCleanup.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testCleanup.java @@ -35,8 +35,7 @@ import org.json.JSONArray; import org.json.JSONObject; import org.junit.Before; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testCleanup extends testBase { @Before diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsDelete.java b/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsDelete.java index fb4a554b..c7768b35 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsDelete.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsDelete.java @@ -34,8 +34,7 @@ import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpDelete; import org.apache.http.util.EntityUtils; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testDRFeedsDelete extends testBase { @Test diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsGet.java b/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsGet.java index 33303fa4..4ad90364 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsGet.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsGet.java @@ -40,8 +40,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testDRFeedsGet extends testBase { private JSONArray returnedlist; diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsPost.java b/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsPost.java index 65d041d1..51424230 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsPost.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsPost.java @@ -43,8 +43,7 @@ import org.json.JSONTokener; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testDRFeedsPost extends testBase { @BeforeClass diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsPut.java b/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsPut.java index aee58b26..0d133566 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsPut.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testDRFeedsPut.java @@ -34,8 +34,7 @@ import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpPut; import org.apache.http.util.EntityUtils; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testDRFeedsPut extends testBase { @Test diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testFeedDelete.java b/datarouter-prov/src/test/java/datarouter/provisioning/testFeedDelete.java index 6e2b7181..657da4e0 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testFeedDelete.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testFeedDelete.java @@ -39,8 +39,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testFeedDelete extends testBase { @BeforeClass diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testFeedPut.java b/datarouter-prov/src/test/java/datarouter/provisioning/testFeedPut.java index 8393a98a..1f845402 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testFeedPut.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testFeedPut.java @@ -44,8 +44,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testFeedPut extends testBase { @BeforeClass diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testInternalGet.java b/datarouter-prov/src/test/java/datarouter/provisioning/testInternalGet.java index 877975ac..02c295e2 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testInternalGet.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testInternalGet.java @@ -37,9 +37,8 @@ import org.json.JSONTokener; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; -import com.att.research.datarouter.provisioning.beans.Parameters; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.beans.Parameters; public class testInternalGet extends testBase { @BeforeClass diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testInternalMisc.java b/datarouter-prov/src/test/java/datarouter/provisioning/testInternalMisc.java index f8a1da10..d4339cc4 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testInternalMisc.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testInternalMisc.java @@ -36,8 +36,7 @@ import org.apache.http.util.EntityUtils; import org.json.JSONArray; import org.json.JSONTokener; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testInternalMisc extends testBase { @Test diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testLogGet.java b/datarouter-prov/src/test/java/datarouter/provisioning/testLogGet.java index 510150a2..cf0bc99c 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testLogGet.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testLogGet.java @@ -39,8 +39,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testLogGet extends testBase { private JSONArray returnedlist; diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testPublish.java b/datarouter-prov/src/test/java/datarouter/provisioning/testPublish.java index 15d0565f..ebbf43f4 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testPublish.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testPublish.java @@ -44,8 +44,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; public class testPublish extends testBase { private String publish_url; diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testRLEBitSet.java b/datarouter-prov/src/test/java/datarouter/provisioning/testRLEBitSet.java index 40970edf..bd777adc 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testRLEBitSet.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testRLEBitSet.java @@ -28,8 +28,7 @@ import static org.junit.Assert.fail; import java.util.Iterator; import org.junit.Test; - -import com.att.research.datarouter.provisioning.utils.RLEBitSet; +import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet; public class testRLEBitSet { @Test diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testSubscribePost.java b/datarouter-prov/src/test/java/datarouter/provisioning/testSubscribePost.java index 0f624ec5..49ed88d7 100644 --- a/datarouter-prov/src/test/java/datarouter/provisioning/testSubscribePost.java +++ b/datarouter-prov/src/test/java/datarouter/provisioning/testSubscribePost.java @@ -43,9 +43,8 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.research.datarouter.provisioning.FeedServlet; -import com.att.research.datarouter.provisioning.SubscribeServlet; +import org.onap.dmaap.datarouter.provisioning.FeedServlet; +import org.onap.dmaap.datarouter.provisioning.SubscribeServlet; public class testSubscribePost extends testBase { private int feednum = 0; diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..b8a9aca6 --- /dev/null +++ b/pom.xml @@ -0,0 +1,121 @@ + + + 4.0.0 + org.onap.dmaap.datarouter + parent + datarouter + 1.0.0-SNAPSHOT + pom + https://github.com/att/DMAAP_DATAROUTER + + + BSD License + + + + + + org.onap.oparent + oparent + 1.0.0-SNAPSHOT + + + + UTF-8 + 1.8 + 1.8 + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/datarouter/${project.artifactId}/${project.version} + + + + + datarouter-prov + datarouter-node + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + + + + ecomp-releases + AAF Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + AAF Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + + onap-plugin-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + onap-jar-snapshots + https://nexus.onap.org/content/repositories/snapshots + + + spring-repo + Spring repo + https://artifacts.alfresco.com/nexus/content/repositories/public/ + + + repository.jboss.org-public + JBoss.org Maven repository + https://repository.jboss.org/nexus/content/groups/public + + + \ No newline at end of file