*\r
-->\r
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
- <modelVersion>4.0.0</modelVersion>\r
-\r
- <groupId>com.att.datarouter-node</groupId>\r
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+ <modelVersion>4.0.0</modelVersion>\r
+ <parent>\r
+ <groupId>org.onap.dmaap.datarouter</groupId>\r
+ <artifactId>parent</artifactId>\r
+ <version>1.0.0-SNAPSHOT</version>\r
+ <relativePath>../pom.xml</relativePath>\r
+ </parent>\r
+ \r
+ \r
<artifactId>datarouter-node</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
<packaging>jar</packaging>\r
-\r
<name>datarouter-node</name>\r
<url>https://github.com/att/DMAAP_DATAROUTER</url>\r
<licenses>\r
<maven.compiler.source>1.8</maven.compiler.source>\r
<maven.compiler.target>1.8</maven.compiler.target>\r
<dockerLocation>${basedir}/target/</dockerLocation>\r
- <docker.registry>hub.docker.com</docker.registry>\r
+ <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+ <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
+ <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
+ <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
+ <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
</properties>\r
-\r
+ \r
<dependencies>\r
<dependency>\r
<groupId>junit</groupId>\r
<configuration>\r
<archive>\r
<manifest>\r
- <mainClass>com.att.research.datarouter.node.NodeMain</mainClass>\r
+ <mainClass>org.onap.datarouter.node.NodeMain</mainClass>\r
\r
</manifest>\r
</archive>\r
\r
<manifest>\r
<addClasspath>true</addClasspath>\r
- <mainClass>com.att.research.datarouter.node.NodeMain</mainClass>\r
+ <mainClass>org.onap.datarouter.node.NodeMain</mainClass>\r
</manifest>\r
</archive>\r
</configuration>\r
</goals>\r
</execution>\r
</executions>\r
- </plugin>\r
- \r
-\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-gpg-plugin</artifactId>\r
- <version>1.5</version>\r
- <executions>\r
- <execution>\r
- <id>sign-artifacts</id>\r
- <phase>verify</phase>\r
- <goals>\r
- <goal>sign</goal>\r
- </goals>\r
- </execution>\r
- </executions>\r
- </plugin> \r
- \r
- <plugin>\r
- <groupId>org.sonatype.plugins</groupId>\r
- <artifactId>nexus-staging-maven-plugin</artifactId>\r
- <version>1.6.7</version>\r
- <extensions>true</extensions>\r
- <configuration>\r
- <serverId>ossrhdme</serverId>\r
- <nexusUrl>https://oss.sonatype.org/</nexusUrl>\r
- <autoReleaseAfterClose>true</autoReleaseAfterClose>\r
- </configuration>\r
- </plugin>\r
+ </plugin> \r
\r
<plugin>\r
<groupId>org.codehaus.mojo</groupId>\r
</formats>\r
</configuration>\r
</plugin>\r
- \r
- <plugin>\r
- <groupId>com.blackducksoftware.integration</groupId>\r
- <artifactId>hub-maven-plugin</artifactId>\r
- <version>1.0.4</version>\r
- <inherited>false</inherited>\r
- <configuration>\r
- <target>${project.basedir}</target>\r
- </configuration>\r
- <executions>\r
- <execution>\r
- <id>create-bdio-file</id>\r
- <phase>package</phase>\r
- <goals>\r
- <goal>createHubOutput</goal>\r
- </goals>\r
- </execution>\r
- </executions>\r
- </plugin>\r
+\r
</plugins>\r
</build>\r
- \r
- <distributionManagement>\r
- <snapshotRepository>\r
- <id>ossrhdme</id>\r
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>\r
- </snapshotRepository>\r
- <repository>\r
- <id>ossrhdme</id>\r
- <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>\r
- </repository>\r
+<distributionManagement>\r
+ <repository>\r
+ <id>ecomp-releases</id>\r
+ <name>AAF Release Repository</name>\r
+ <url>${nexusproxy}${releaseNexusPath}</url>\r
+ </repository>\r
+ <snapshotRepository>\r
+ <id>ecomp-snapshots</id>\r
+ <name>AAF Snapshot Repository</name>\r
+ <url>${nexusproxy}${snapshotNexusPath}</url>\r
+ </snapshotRepository>\r
+ <site>\r
+ <id>ecomp-site</id>\r
+ <url>dav:${nexusproxy}${sitePath}</url>\r
+ </site>\r
</distributionManagement>\r
+ <pluginRepositories>\r
+ <pluginRepository>\r
+ <id>onap-plugin-snapshots</id>\r
+ <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
+ </pluginRepository>\r
+ </pluginRepositories>\r
+ <repositories>\r
+ <repository>\r
+ <id>central</id>\r
+ <name>Maven 2 repository 2</name>\r
+ <url>http://repo2.maven.org/maven2/</url>\r
+ </repository>\r
+ <repository>\r
+ <id>onap-jar-snapshots</id>\r
+ <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
+ </repository>\r
+ <repository>\r
+ <id>spring-repo</id>\r
+ <name>Spring repo</name>\r
+ <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
+ </repository>\r
+ <repository>\r
+ <id>repository.jboss.org-public</id>\r
+ <name>JBoss.org Maven repository</name>\r
+ <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
+ </repository>\r
+ </repositories>\r
\r
- <scm>\r
- <connection>https://github.com/att/DMAAP_DATAROUTER.git</connection>\r
- <developerConnection>${project.scm.connection}</developerConnection>\r
- <url>https://github.com/att/DMAAP_DATAROUTER/tree/master</url>\r
- </scm>\r
+\r
\r
</project>\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.util.*;\r
import java.io.*;\r
* that queue has more files to deliver.\r
*/\r
public class Delivery {\r
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.Delivery");\r
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.Delivery");\r
private static class DelItem implements Comparable<DelItem> {\r
private String pubid;\r
private String spool;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.io.*;\r
import java.util.*;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
/**\r
* Interface to allow independent testing of the DeliveryQueue code\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.io.*;\r
import java.net.*;\r
* the file and its delivery data as well as to attempt delivery.\r
*/\r
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {\r
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.DeliveryTask");\r
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.DeliveryTask");\r
private DeliveryTaskHelper dth;\r
private String pubid;\r
private DestInfo di;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
/**\r
* Interface to allow independent testing of the DeliveryTask code.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
/**\r
* Information for a delivery destination that doesn't change from message to message\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.util.*;\r
import java.net.*;\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
* *\r
******************************************************************************/\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.util.*;\r
import java.util.regex.*;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.util.*;\r
import java.io.*;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.net.*;\r
import java.util.*;\r
import java.io.*;\r
import org.apache.log4j.Logger;\r
+import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.node.eelf.EelfMsgs;\r
\r
\r
/**\r
* configuration data fetched from the data router provisioning server.\r
*/\r
public class NodeConfigManager implements DeliveryQueueHelper {\r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.node.NodeConfigManager");\r
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.NodeConfigManager");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.node.NodeConfigManager");\r
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeConfigManager");\r
private static NodeConfigManager base = new NodeConfigManager();\r
\r
private Timer timer = new Timer("Node Configuration Timer", true);\r
private NodeConfigManager() {\r
Properties p = new Properties();\r
try {\r
- p.load(new FileInputStream(System.getProperty("com.att.research.datarouter.node.ConfigFile", "/opt/app/datartr/etc/node.properties")));\r
+ p.load(new FileInputStream(System.getProperty("org.onap.dmaap.datarouter.node.ConfigFile", "/opt/app/datartr/etc/node.properties")));\r
} catch (Exception e) {\r
\r
NodeUtils.setIpAndFqdnForEelf("NodeConfigManager");\r
eelflogger.error(EelfMsgs.MESSAGE_PROPERTIES_LOAD_ERROR);\r
- logger.error("NODE0301 Unable to load local configuration file " + System.getProperty("com.att.research.datarouter.node.ConfigFile", "/opt/app/datartr/etc/node.properties"), e);\r
+ logger.error("NODE0301 Unable to load local configuration file " + System.getProperty("org.onap.dmaap.datarouter.node.ConfigFile", "/opt/app/datartr/etc/node.properties"), e);\r
}\r
provurl = p.getProperty("ProvisioningURL", "https://feeds-drtr.web.att.com/internal/prov");\r
try {\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import org.eclipse.jetty.servlet.*;\r
import org.eclipse.jetty.util.ssl.*;\r
*/\r
public class NodeMain {\r
private NodeMain() {}\r
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.NodeMain");\r
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeMain");\r
private static class wfconfig implements Runnable {\r
private NodeConfigManager ncm;\r
public wfconfig(NodeConfigManager ncm) {\r
* Start the data router.\r
* <p>\r
* The location of the node configuration file can be set using the\r
- * com.att.research.datarouter.node.ConfigFile system property. By\r
+ * org.onap.dmaap.datarouter.node.ConfigFile system property. By\r
* default, it is "etc/node.properties".\r
*/\r
public static void main(String[] args) throws Exception {\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import javax.servlet.*;\r
import javax.servlet.http.*;\r
import java.io.*;\r
import java.nio.file.*;\r
import org.apache.log4j.Logger;\r
+import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.node.eelf.EelfMsgs;\r
\r
import java.net.*;\r
\r
* PUT/DELETE https://<i>node</i>/publish/<i>feedid</i>/<i>fileid</i> - publsh request\r
*/\r
public class NodeServlet extends HttpServlet {\r
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.NodeServlet");\r
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeServlet");\r
private static NodeConfigManager config;\r
private static Pattern MetaDataPattern;\r
private static SubnetMatcher internalsubnet = new SubnetMatcher("135.207.136.128/25");\r
//Adding EELF Logger Rally:US664892 \r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.node.NodeServlet");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.node.NodeServlet");\r
\r
static {\r
try {\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN;\r
import static com.att.eelf.configuration.Configuration.MDC_SERVER_IP_ADDRESS;\r
import java.text.*;\r
import org.apache.commons.codec.binary.Base64;\r
import org.apache.log4j.Logger;\r
+import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;\r
import org.slf4j.MDC;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.node.eelf.EelfMsgs;\r
\r
/**\r
* Utility functions for the data router node\r
*/\r
public class NodeUtils {\r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.node.NodeUtils");\r
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.NodeUtils");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.node.NodeUtils");\r
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.NodeUtils");\r
private static SimpleDateFormat logdate;\r
static {\r
logdate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.util.*;\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.io.*;\r
import java.util.*;\r
import org.json.*;\r
+import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;\r
import org.apache.log4j.Logger;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.node.eelf.EelfMsgs;\r
\r
/**\r
* Parser for provisioning data from the provisioning server.\r
* provisioning server to construct arrays of raw configuration entries.\r
*/\r
public class ProvData {\r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.node.ProvData");\r
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.node.ProvData");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.node.ProvData");\r
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.ProvData");\r
private NodeConfig.ProvNode[] pn;\r
private NodeConfig.ProvParam[] pp;\r
private NodeConfig.ProvFeed[] pf;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
/**\r
* Generate publish IDs\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.util.*;\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.util.*;\r
import java.io.*;\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.util.regex.*;\r
import java.util.*;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.net.*;\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
/**\r
* A destination to deliver a message\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.node;\r
+package org.onap.dmaap.datarouter.node;\r
\r
import java.util.*;\r
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
* *\r
******************************************************************************/\r
-package com.att.research.datarouter.node.eelf;\r
+package org.onap.dmaap.datarouter.node.eelf;\r
\r
import ch.qos.logback.classic.spi.ILoggingEvent;\r
import ch.qos.logback.core.filter.Filter;\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
* *\r
******************************************************************************/\r
-package com.att.research.datarouter.node.eelf;\r
+package org.onap.dmaap.datarouter.node.eelf;\r
\r
import com.att.eelf.i18n.EELFResolvableErrorEnum;\r
import com.att.eelf.i18n.EELFResourceManager;\r
*\r
-->\r
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
- <modelVersion>4.0.0</modelVersion>\r
-\r
- <groupId>com.att.datarouter-prov</groupId>\r
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+ <modelVersion>4.0.0</modelVersion>\r
+ <parent>\r
+ <groupId>org.onap.dmaap.datarouter</groupId>\r
+ <artifactId>parent</artifactId>\r
+ <version>1.0.0-SNAPSHOT</version>\r
+ <relativePath>../pom.xml</relativePath>\r
+ </parent>\r
+ \r
<artifactId>datarouter-prov</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
<packaging>jar</packaging>\r
-\r
<name>datarouter-prov</name>\r
<url>https://github.com/att/DMAAP_DATAROUTER</url>\r
<licenses>\r
<maven.compiler.source>1.8</maven.compiler.source>\r
<maven.compiler.target>1.8</maven.compiler.target>\r
<dockerLocation>${basedir}/target/</dockerLocation>\r
- <docker.registry>hub.docker.com</docker.registry>\r
+ <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+ <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
+ <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
+ <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
+ <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
</properties>\r
<dependencies>\r
\r
\r
<manifest>\r
<addClasspath>true</addClasspath>\r
- <mainClass>com.att.research.datarouter.provisioning.Main</mainClass>\r
+ <mainClass>org.onap.datarouter.provisioning.Main</mainClass>\r
\r
</manifest>\r
</archive>\r
<archive>\r
<manifest>\r
<addClasspath>true</addClasspath>\r
- <mainClass>com.att.research.datarouter.provisioning.Main</mainClass>\r
+ <mainClass>org.onap.datarouter.provisioning.Main</mainClass>\r
<outputDirectory>${basedir}/target/opt/app/datartr/lib</outputDirectory>\r
</manifest>\r
</archive>\r
</plugin> \r
\r
\r
-<plugin>\r
- <groupId>com.blackducksoftware.integration</groupId>\r
- <artifactId>hub-maven-plugin</artifactId>\r
- <version>1.0.4</version>\r
- <inherited>false</inherited>\r
- <configuration>\r
- <target>${project.basedir}</target>\r
- </configuration>\r
- <executions>\r
- <execution>\r
- <id>create-bdio-file</id>\r
- <phase>package</phase>\r
- <goals>\r
- <goal>createHubOutput</goal>\r
- </goals>\r
- </execution>\r
- </executions>\r
-</plugin>\r
\r
<plugin>\r
<artifactId>maven-resources-plugin</artifactId>\r
</goals>\r
</execution>\r
</executions>\r
- </plugin>\r
- \r
-\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-gpg-plugin</artifactId>\r
- <version>1.5</version>\r
- <executions>\r
- <execution>\r
- <id>sign-artifacts</id>\r
- <phase>verify</phase>\r
- <goals>\r
- <goal>sign</goal>\r
- </goals>\r
- </execution>\r
- </executions>\r
- </plugin> \r
- \r
- <plugin>\r
- <groupId>org.sonatype.plugins</groupId>\r
- <artifactId>nexus-staging-maven-plugin</artifactId>\r
- <version>1.6.7</version>\r
- <extensions>true</extensions>\r
- <configuration>\r
- <serverId>ossrhdme</serverId>\r
- <nexusUrl>https://oss.sonatype.org/</nexusUrl>\r
- <autoReleaseAfterClose>true</autoReleaseAfterClose>\r
- </configuration>\r
- </plugin>\r
+ </plugin> \r
\r
<plugin>\r
<groupId>org.codehaus.mojo</groupId>\r
</plugin>\r
</plugins>\r
</build>\r
- \r
- \r
<distributionManagement>\r
- <snapshotRepository>\r
- <id>ossrhdme</id>\r
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>\r
- </snapshotRepository>\r
- <repository>\r
- <id>ossrhdme</id>\r
- <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>\r
- </repository>\r
+ <repository>\r
+ <id>ecomp-releases</id>\r
+ <name>AAF Release Repository</name>\r
+ <url>${nexusproxy}${releaseNexusPath}</url>\r
+ </repository>\r
+ <snapshotRepository>\r
+ <id>ecomp-snapshots</id>\r
+ <name>AAF Snapshot Repository</name>\r
+ <url>${nexusproxy}${snapshotNexusPath}</url>\r
+ </snapshotRepository>\r
+ <site>\r
+ <id>ecomp-site</id>\r
+ <url>dav:${nexusproxy}${sitePath}</url>\r
+ </site>\r
</distributionManagement>\r
- \r
- <scm>\r
- <connection>https://github.com/att/DMAAP_DATAROUTER.git</connection>\r
- <developerConnection>${project.scm.connection}</developerConnection>\r
- <url>https://github.com/att/DMAAP_DATAROUTER/tree/master</url>\r
- </scm>\r
+ <pluginRepositories>\r
+ <pluginRepository>\r
+ <id>onap-plugin-snapshots</id>\r
+ <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
+ </pluginRepository>\r
+ </pluginRepositories>\r
+\r
+ <repositories>\r
+ <repository>\r
+ <id>central</id>\r
+ <name>Maven 2 repository 2</name>\r
+ <url>http://repo2.maven.org/maven2/</url>\r
+ </repository>\r
+ <repository>\r
+ <id>onap-jar-snapshots</id>\r
+ <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
+ </repository>\r
+ <repository>\r
+ <id>spring-repo</id>\r
+ <name>Spring repo</name>\r
+ <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
+ </repository>\r
+ <repository>\r
+ <id>repository.jboss.org-public</id>\r
+ <name>JBoss.org Maven repository</name>\r
+ <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
+ </repository>\r
+ </repositories>\r
\r
</project>\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
* *\r
******************************************************************************/\r
-package com.att.research.datarouter.authz;\r
+package org.onap.dmaap.datarouter.authz;\r
\r
import java.util.List;\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.authz;\r
+package org.onap.dmaap.datarouter.authz;\r
\r
import java.util.Map;\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.authz;\r
+package org.onap.dmaap.datarouter.authz;\r
\r
import java.util.Map;\r
import javax.servlet.http.HttpServletRequest;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.authz.impl;\r
+package org.onap.dmaap.datarouter.authz.impl;\r
\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import com.att.research.datarouter.authz.AuthorizationResponse;\r
-import com.att.research.datarouter.authz.AuthorizationResponseSupplement;\r
+import org.onap.dmaap.datarouter.authz.AuthorizationResponse;\r
+import org.onap.dmaap.datarouter.authz.AuthorizationResponseSupplement;\r
\r
\r
/** A representation of an authorization response returned by a XACML Policy Decision Point.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.authz.impl;\r
+package org.onap.dmaap.datarouter.authz.impl;\r
\r
import java.util.HashMap;\r
import java.util.Map;\r
\r
-import com.att.research.datarouter.authz.AuthorizationResponseSupplement;\r
+import org.onap.dmaap.datarouter.authz.AuthorizationResponseSupplement;\r
\r
/** Carries supplementary information--an advice or an obligation--from the authorization response returned\r
* by a XACML Policy Decision Point. Not used in Data Router R1.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.authz.impl;\r
+package org.onap.dmaap.datarouter.authz.impl;\r
\r
import java.util.regex.Matcher;\r
import java.util.regex.Pattern;\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.authz.impl;\r
+package org.onap.dmaap.datarouter.authz.impl;\r
\r
import java.util.Map;\r
\r
import javax.servlet.http.HttpServletRequest;\r
\r
import org.apache.log4j.Logger;\r
-\r
-import com.att.research.datarouter.authz.AuthorizationResponse;\r
-import com.att.research.datarouter.authz.Authorizer;\r
-import com.att.research.datarouter.authz.impl.AuthzResource.ResourceType;\r
+import org.onap.dmaap.datarouter.authz.AuthorizationResponse;\r
+import org.onap.dmaap.datarouter.authz.Authorizer;\r
+import org.onap.dmaap.datarouter.authz.impl.AuthzResource.ResourceType;\r
\r
/** Authorizer for the provisioning API for Data Router R1\r
* \r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
* *\r
******************************************************************************/\r
-package com.att.research.datarouter.authz.impl;\r
+package org.onap.dmaap.datarouter.authz.impl;\r
\r
/** Interface to access data about subscriptions and feeds. A software component that \r
* uses the <code>ProvAuthorizer</code> needs to supply an implementation of this interface.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN;\r
\r
import org.apache.log4j.Logger;\r
import org.json.JSONObject;\r
import org.json.JSONTokener;\r
+import org.onap.dmaap.datarouter.authz.Authorizer;\r
+import org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer;\r
+import org.onap.dmaap.datarouter.authz.impl.ProvDataProvider;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Deleteable;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Feed;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Group;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Insertable;\r
+import org.onap.dmaap.datarouter.provisioning.beans.NodeClass;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Parameters;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Updateable;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.ThrottleFilter;\r
import org.json.JSONException; \r
import org.slf4j.MDC;\r
\r
-import com.att.research.datarouter.authz.Authorizer;\r
-import com.att.research.datarouter.authz.impl.ProvAuthorizer;\r
-import com.att.research.datarouter.authz.impl.ProvDataProvider;\r
-import com.att.research.datarouter.provisioning.beans.Deleteable;\r
-import com.att.research.datarouter.provisioning.beans.Feed;\r
-import com.att.research.datarouter.provisioning.beans.Insertable;\r
-import com.att.research.datarouter.provisioning.beans.NodeClass;\r
-import com.att.research.datarouter.provisioning.beans.Parameters;\r
-import com.att.research.datarouter.provisioning.beans.Subscription;\r
-import com.att.research.datarouter.provisioning.beans.Updateable;\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
-import com.att.research.datarouter.provisioning.utils.ThrottleFilter;\r
-import com.att.research.datarouter.provisioning.beans.Group; //Groups feature Rally:US708115 - 1610 \r
-\r
import java.util.Properties;\r
import java.util.regex.Pattern;\r
import javax.mail.Message;\r
*/\r
protected BaseServlet() {\r
if (eventlogger == null)\r
- eventlogger = Logger.getLogger("com.att.research.datarouter.provisioning.events");\r
+ eventlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.events");\r
if (intlogger == null)\r
- intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
if (authz == null)\r
authz = new ProvAuthorizer(this);\r
if (startmsg_flag) {\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.IOException;\r
import java.io.InvalidObjectException;\r
import javax.servlet.http.HttpServletResponse;\r
\r
import org.json.JSONObject;\r
+import org.onap.dmaap.datarouter.authz.AuthorizationResponse;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Feed;\r
+import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
+import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.authz.AuthorizationResponse;\r
-import com.att.research.datarouter.provisioning.beans.EventLogRecord;\r
-import com.att.research.datarouter.provisioning.beans.Feed;\r
-import com.att.research.datarouter.provisioning.eelf.EelfMsgs;\r
-import com.att.research.datarouter.provisioning.utils.JSONUtilities;\r
\r
/**\r
* This servlet handles provisioning for the <drFeedsURL> which is the URL on the\r
@SuppressWarnings("serial")\r
public class DRFeedsServlet extends ProxyServlet {\r
//Adding EELF Logger Rally:US664892 \r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.DRFeedsServlet");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.DRFeedsServlet");\r
\r
/**\r
* DELETE on the <drFeedsURL> -- not supported.\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
/**\r
* This servlet handles requests to the <feedLogURL>\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.IOException;\r
import java.io.InvalidObjectException;\r
import javax.servlet.http.HttpServletResponse;\r
\r
import org.json.JSONObject;\r
+import org.onap.dmaap.datarouter.authz.AuthorizationResponse;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Feed;\r
+import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.authz.AuthorizationResponse;\r
-import com.att.research.datarouter.provisioning.beans.EventLogRecord;\r
-import com.att.research.datarouter.provisioning.beans.Feed;\r
-import com.att.research.datarouter.provisioning.eelf.EelfMsgs;\r
\r
/**\r
* This servlet handles provisioning for the <feedURL> which is generated by the provisioning\r
public class FeedServlet extends ProxyServlet {\r
\r
//Adding EELF Logger Rally:US664892 \r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.FeedServlet");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.FeedServlet");\r
\r
/**\r
* Delete the Feed at the address /feed/<feednumber>.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.IOException;\r
import java.io.InvalidObjectException;\r
import javax.servlet.http.HttpServletResponse;\r
\r
import org.json.JSONObject;\r
-\r
-import com.att.research.datarouter.authz.AuthorizationResponse;\r
-import com.att.research.datarouter.provisioning.BaseServlet.ContentHeader;\r
-import com.att.research.datarouter.provisioning.beans.EventLogRecord;\r
-import com.att.research.datarouter.provisioning.beans.Group;\r
-import com.att.research.datarouter.provisioning.beans.Subscription;\r
-import com.att.research.datarouter.provisioning.utils.JSONUtilities;\r
+import org.onap.dmaap.datarouter.authz.AuthorizationResponse;\r
+import org.onap.dmaap.datarouter.provisioning.BaseServlet.ContentHeader;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Group;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r
+import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities;\r
\r
/**\r
* This servlet handles provisioning for the <groups> which is generated by the provisioning\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.ByteArrayOutputStream;\r
import java.io.File;\r
import javax.servlet.http.HttpServletResponse;\r
\r
import org.json.JSONArray;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.LogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Parameters;\r
+import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader;\r
+import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.provisioning.beans.EventLogRecord;\r
-import com.att.research.datarouter.provisioning.beans.LogRecord;\r
-import com.att.research.datarouter.provisioning.beans.Parameters;\r
-import com.att.research.datarouter.provisioning.eelf.EelfMsgs;\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
-import com.att.research.datarouter.provisioning.utils.RLEBitSet;\r
-import com.att.research.datarouter.provisioning.utils.LogfileLoader;\r
\r
/**\r
* <p>\r
* <tr class="altColor">\r
* <td class="colFirst">/internal/route/*</td>\r
* <td class="colOne">*</td>\r
- * <td class="colLast">URLs under this path are handled via the {@link com.att.research.datarouter.provisioning.RouteServlet}</td>\r
+ * <td class="colLast">URLs under this path are handled via the {@link org.onap.dmaap.datarouter.provisioning.RouteServlet}</td>\r
* </tr>\r
* </table>\r
* </div>\r
public class InternalServlet extends ProxyServlet {\r
private static Integer logseq = new Integer(0); // another piece of info to make log spool file names unique\r
//Adding EELF Logger Rally:US664892 \r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.InternalServlet");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.InternalServlet");\r
\r
/**\r
* Delete a parameter at the address /internal/api/<parameter>.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.IOException;\r
import java.sql.Connection;\r
import javax.servlet.http.HttpServletResponse;\r
\r
import org.json.LOGJSONObject;\r
+import org.onap.dmaap.datarouter.provisioning.beans.DeliveryRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.ExpiryRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.LOGJSONable;\r
+import org.onap.dmaap.datarouter.provisioning.beans.PublishRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r
+import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.provisioning.beans.DeliveryRecord;\r
-import com.att.research.datarouter.provisioning.beans.EventLogRecord;\r
-import com.att.research.datarouter.provisioning.beans.ExpiryRecord;\r
-import com.att.research.datarouter.provisioning.beans.LOGJSONable;\r
-import com.att.research.datarouter.provisioning.beans.PublishRecord;\r
-import com.att.research.datarouter.provisioning.beans.Subscription;\r
-import com.att.research.datarouter.provisioning.eelf.EelfMsgs;\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
\r
/**\r
* This servlet handles requests to the <feedLogURL> and <subLogURL>,\r
@SuppressWarnings("serial")\r
public class LogServlet extends BaseServlet {\r
//Adding EELF Logger Rally:US664892 \r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.LogServlet");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.LogServlet");\r
\r
private static final long TWENTYFOUR_HOURS = (24 * 60 * 60 * 1000L);\r
private static final String fmt1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.security.Security;\r
import java.util.Properties;\r
import org.eclipse.jetty.servlet.ServletHolder;\r
import org.eclipse.jetty.util.ssl.SslContextFactory;\r
import org.eclipse.jetty.util.thread.QueuedThreadPool;\r
-\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
-import com.att.research.datarouter.provisioning.utils.LogfileLoader;\r
-import com.att.research.datarouter.provisioning.utils.PurgeLogDirTask;\r
-import com.att.research.datarouter.provisioning.utils.ThrottleFilter;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader;\r
+import org.onap.dmaap.datarouter.provisioning.utils.PurgeLogDirTask;\r
+import org.onap.dmaap.datarouter.provisioning.utils.ThrottleFilter;\r
\r
/**\r
* <p>\r
*/\r
public static void main(String[] args) throws Exception {\r
Security.setProperty("networkaddress.cache.ttl", "4");\r
- Logger logger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
\r
// Check DB is accessible and contains the expected tables\r
if (! checkDatabase(logger))\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.FileInputStream;\r
import java.io.IOException;\r
import org.json.JSONException;\r
import org.json.JSONObject;\r
import org.json.JSONTokener;\r
-\r
-import com.att.research.datarouter.provisioning.beans.EgressRoute;\r
-import com.att.research.datarouter.provisioning.beans.Feed;\r
-import com.att.research.datarouter.provisioning.beans.IngressRoute;\r
-import com.att.research.datarouter.provisioning.beans.NetworkRoute;\r
-import com.att.research.datarouter.provisioning.beans.Parameters;\r
-import com.att.research.datarouter.provisioning.beans.Subscription;\r
-import com.att.research.datarouter.provisioning.beans.Group; //Groups feature Rally:US708115 - 1610 \r
-import com.att.research.datarouter.provisioning.utils.*;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EgressRoute;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Feed;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Group;\r
+import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute;\r
+import org.onap.dmaap.datarouter.provisioning.beans.NetworkRoute;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Parameters;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r
+import org.onap.dmaap.datarouter.provisioning.utils.*;\r
\r
/**\r
* This class handles the two timers (described in R1 Design Notes), and takes care of issuing\r
private Poker() {\r
timer1 = timer2 = 0;\r
rolex = new Timer();\r
- logger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
try {\r
this_pod = InetAddress.getLocalHost().getHostName();\r
} catch (UnknownHostException e) {\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.File;\r
import java.io.FileInputStream;\r
import org.apache.http.entity.BasicHttpEntity;\r
import org.apache.http.impl.client.AbstractHttpClient;\r
import org.apache.http.impl.client.DefaultHttpClient;\r
-\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
-import com.att.research.datarouter.provisioning.utils.URLUtilities;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;\r
\r
/**\r
* This class is the base class for those servlets that need to proxy their requests from the\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.IOException;\r
import java.io.InputStream;\r
import org.json.JSONArray;\r
import org.json.JSONObject;\r
import org.json.JSONTokener;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Feed;\r
+import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute;\r
+import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
+import org.onap.dmaap.datarouter.provisioning.utils.*;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.provisioning.beans.EventLogRecord;\r
-import com.att.research.datarouter.provisioning.beans.Feed;\r
-import com.att.research.datarouter.provisioning.beans.IngressRoute;\r
-import com.att.research.datarouter.provisioning.eelf.EelfMsgs;\r
-import com.att.research.datarouter.provisioning.utils.*;\r
\r
/**\r
* This servlet handles redirects for the <publishURL> on the provisioning server,\r
private String provstring;\r
private List<IngressRoute> irt;\r
//Adding EELF Logger Rally:US664892 \r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.PublishServlet");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.PublishServlet");\r
\r
\r
@Override\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.IOException;\r
import java.util.Set;\r
import javax.servlet.http.HttpServletResponse;\r
\r
import org.json.JSONObject;\r
-\r
-import com.att.research.datarouter.provisioning.beans.Deleteable;\r
-import com.att.research.datarouter.provisioning.beans.EgressRoute;\r
-import com.att.research.datarouter.provisioning.beans.EventLogRecord;\r
-import com.att.research.datarouter.provisioning.beans.IngressRoute;\r
-import com.att.research.datarouter.provisioning.beans.Insertable;\r
-import com.att.research.datarouter.provisioning.beans.NetworkRoute;\r
-import com.att.research.datarouter.provisioning.beans.NodeClass;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Deleteable;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EgressRoute;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Insertable;\r
+import org.onap.dmaap.datarouter.provisioning.beans.NetworkRoute;\r
+import org.onap.dmaap.datarouter.provisioning.beans.NodeClass;\r
\r
/**\r
* <p>\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.IOException;\r
import java.sql.Connection;\r
import javax.servlet.http.HttpServletResponse;\r
import org.json.JSONException;\r
import org.json.LOGJSONObject;\r
-import com.att.research.datarouter.provisioning.beans.EventLogRecord;\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* This Servlet handles requests to the <Statistics API> and <Statistics consilidated resultset>,\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
/**\r
* This servlet handles requests to the <subLogURL>,\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.IOException;\r
import java.io.InvalidObjectException;\r
import javax.servlet.http.HttpServletResponse;\r
\r
import org.json.JSONObject;\r
+import org.onap.dmaap.datarouter.authz.AuthorizationResponse;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Feed;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r
+import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
+import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.authz.AuthorizationResponse;\r
-import com.att.research.datarouter.provisioning.beans.EventLogRecord;\r
-import com.att.research.datarouter.provisioning.beans.Feed;\r
-import com.att.research.datarouter.provisioning.beans.Subscription;\r
-import com.att.research.datarouter.provisioning.eelf.EelfMsgs;\r
-import com.att.research.datarouter.provisioning.utils.JSONUtilities;\r
\r
/**\r
* This servlet handles provisioning for the <subscribeURL> which is generated by the provisioning\r
public class SubscribeServlet extends ProxyServlet {\r
\r
//Adding EELF Logger Rally:US664892 \r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.SubscribeServlet");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.SubscribeServlet");\r
\r
/**\r
* DELETE on the <subscribeUrl> -- not supported.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.IOException;\r
import java.io.InvalidObjectException;\r
\r
import org.json.JSONException;\r
import org.json.JSONObject;\r
+import org.onap.dmaap.datarouter.authz.AuthorizationResponse;\r
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r
+import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
\r
import com.att.eelf.configuration.EELFLogger;\r
import com.att.eelf.configuration.EELFManager;\r
-import com.att.research.datarouter.authz.AuthorizationResponse;\r
-import com.att.research.datarouter.provisioning.beans.EventLogRecord;\r
-import com.att.research.datarouter.provisioning.beans.Subscription;\r
-import com.att.research.datarouter.provisioning.eelf.EelfMsgs;\r
\r
/**\r
* This servlet handles provisioning for the <subscriptionURL> which is generated by the provisioning\r
public class SubscriptionServlet extends ProxyServlet {\r
public static final String SUBCNTRL_CONTENT_TYPE = "application/vnd.att-dr.subscription-control";\r
//Adding EELF Logger Rally:US664892 \r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("com.att.research.datarouter.provisioning.SubscriptionServlet");\r
+ private static EELFLogger eelflogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.SubscriptionServlet");\r
\r
/**\r
* DELETE on the <subscriptionUrl> -- delete a subscription.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning;\r
+package org.onap.dmaap.datarouter.provisioning;\r
\r
import java.io.ByteArrayOutputStream;\r
import java.io.File;\r
import org.json.JSONException;\r
import org.json.JSONObject;\r
import org.json.JSONTokener;\r
-\r
-import com.att.research.datarouter.provisioning.beans.EgressRoute;\r
-import com.att.research.datarouter.provisioning.beans.Feed;\r
-import com.att.research.datarouter.provisioning.beans.IngressRoute;\r
-import com.att.research.datarouter.provisioning.beans.NetworkRoute;\r
-import com.att.research.datarouter.provisioning.beans.Parameters;\r
-import com.att.research.datarouter.provisioning.beans.Subscription;\r
-import com.att.research.datarouter.provisioning.beans.Syncable;\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
-import com.att.research.datarouter.provisioning.utils.RLEBitSet;\r
-import com.att.research.datarouter.provisioning.utils.LogfileLoader;\r
-import com.att.research.datarouter.provisioning.utils.URLUtilities;\r
-import com.att.research.datarouter.provisioning.beans.Group; //Groups feature Rally:US708115 - 1610 \r
+import org.onap.dmaap.datarouter.provisioning.beans.EgressRoute;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Feed;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Group;\r
+import org.onap.dmaap.datarouter.provisioning.beans.IngressRoute;\r
+import org.onap.dmaap.datarouter.provisioning.beans.NetworkRoute;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Parameters;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Syncable;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader;\r
+import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet;\r
+import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;\r
\r
/**\r
* This class handles synchronization between provisioning servers (PODs). It has three primary functions:\r
\r
@SuppressWarnings("deprecation")\r
private SynchronizerTask() {\r
- logger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
rolex = new Timer();\r
spooldir = (new DB()).getProperties().getProperty("com.att.research.datarouter.provserver.spooldir");\r
state = UNKNOWN;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.PreparedStatement;\r
import java.sql.ResultSet;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.Connection;\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.PreparedStatement;\r
import java.sql.ResultSet;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.PreparedStatement;\r
import java.sql.ResultSet;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.Connection;\r
import java.sql.PreparedStatement;\r
\r
import org.apache.log4j.Logger;\r
import org.json.JSONObject;\r
-\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* The representation of one route in the Egress Route Table.\r
* @version $Id: EgressRoute.java,v 1.3 2013/12/16 20:30:23 eby Exp $\r
*/\r
public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {\r
- private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
private final int subid;\r
private final int nodeid;\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.security.cert.X509Certificate;\r
\r
import javax.servlet.http.HttpServletRequest;\r
\r
-import com.att.research.datarouter.provisioning.BaseServlet;\r
+import org.onap.dmaap.datarouter.provisioning.BaseServlet;\r
\r
/**\r
* This class is used to log provisioning server events. Each event consists of a who\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.PreparedStatement;\r
import java.sql.ResultSet;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.io.InvalidObjectException;\r
import java.sql.Connection;\r
import org.apache.log4j.Logger;\r
import org.json.JSONArray;\r
import org.json.JSONObject;\r
-\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
-import com.att.research.datarouter.provisioning.utils.JSONUtilities;\r
-import com.att.research.datarouter.provisioning.utils.URLUtilities;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities;\r
+import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;\r
\r
/**\r
* The representation of a Feed. Feeds can be retrieved from the DB, or stored/updated in the DB.\r
* @version $Id: Feed.java,v 1.13 2013/10/28 18:06:52 eby Exp $\r
*/\r
public class Feed extends Syncable {\r
- private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
private static int next_feedid = getMaxFeedID() + 1;\r
\r
private int feedid;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.util.HashSet;\r
import java.util.Set;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.io.InvalidObjectException;\r
\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.io.InvalidObjectException;\r
import java.sql.Connection;\r
\r
import org.apache.log4j.Logger;\r
import org.json.JSONObject;\r
-\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
-import com.att.research.datarouter.provisioning.utils.URLUtilities;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;\r
\r
/**\r
* The representation of a Subscription. Subscriptions can be retrieved from the DB, or stored/updated in the DB.\r
* @version $Id: Group.java,v 1.0 2016/07/19 \r
*/\r
public class Group extends Syncable {\r
- private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
private static int next_groupid = getMaxGroupID() + 1;\r
\r
private int groupid;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.net.InetAddress;\r
import java.net.UnknownHostException;\r
import org.apache.log4j.Logger;\r
import org.json.JSONArray;\r
import org.json.JSONObject;\r
-\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* The representation of one route in the Ingress Route Table.\r
* @version $Id: IngressRoute.java,v 1.3 2013/12/16 20:30:23 eby Exp $\r
*/\r
public class IngressRoute extends NodeClass implements Comparable<IngressRoute> {\r
- private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
private final int seq;\r
private final int feedid;\r
private final String userid;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.Connection;\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import org.json.JSONObject;\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import org.json.LOGJSONObject;\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.PreparedStatement;\r
import java.sql.SQLException;\r
\r
-import com.att.research.datarouter.provisioning.utils.LogfileLoader;\r
+import org.onap.dmaap.datarouter.provisioning.utils.LogfileLoader;\r
\r
/**\r
* This interface is used by bean classes that can be loaded into the LOG_RECORDS table using the\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.io.IOException;\r
import java.io.OutputStream;\r
import java.text.ParseException;\r
import java.util.Iterator;\r
\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
-import com.att.research.datarouter.provisioning.utils.RLEBitSet;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet;\r
\r
/**\r
* The representation of a Log Record, as retrieved from the DB. Since this record format is only used\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.Connection;\r
import java.sql.PreparedStatement;\r
\r
import org.apache.log4j.Logger;\r
import org.json.JSONObject;\r
-\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* The representation of one route in the Network Route Table.\r
* @version $Id: NetworkRoute.java,v 1.2 2013/12/16 20:30:23 eby Exp $\r
*/\r
public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute> {\r
- private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
private final int fromnode;\r
private final int tonode;\r
private final int vianode;\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.Connection;\r
import java.sql.PreparedStatement;\r
import java.util.TreeSet;\r
\r
import org.apache.log4j.Logger;\r
-\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* This class is used to aid in the mapping of node names from/to node IDs.\r
nextid = n+1;\r
}\r
// take | separated list, add domain if needed.\r
- Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
for (String node : nodes) {\r
node = normalizeNodename(node);\r
if (!map.containsKey(node)) {\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.Connection;\r
import java.sql.PreparedStatement;\r
\r
import org.apache.log4j.Logger;\r
import org.json.JSONObject;\r
-\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* Methods to provide access to Provisioning parameters in the DB.\r
public static final String THROTTLE_FILTER = "THROTTLE_FILTER";\r
public static final String STATIC_ROUTING_NODES = "STATIC_ROUTING_NODES"; //Adding new param for static Routing - Rally:US664862-1610\r
\r
- private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
\r
private String keyname;\r
private String value;\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.PreparedStatement;\r
import java.sql.ResultSet;\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.PreparedStatement;\r
import java.sql.ResultSet;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.ResultSet;\r
import java.sql.SQLException;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.io.InvalidObjectException;\r
\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.io.InvalidObjectException;\r
import java.sql.Connection;\r
\r
import org.apache.log4j.Logger;\r
import org.json.JSONObject;\r
-import java.util.Properties;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;\r
\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
-import com.att.research.datarouter.provisioning.utils.URLUtilities;\r
+import java.util.Properties;\r
\r
/**\r
* The representation of a Subscription. Subscriptions can be retrieved from the DB, or stored/updated in the DB.\r
* @version $Id: Subscription.java,v 1.9 2013/10/28 18:06:53 eby Exp $\r
*/\r
public class Subscription extends Syncable {\r
- private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
private static int next_subid = getMaxSubID() + 1;\r
\r
private int subid;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.Connection;\r
\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.provisioning.beans;\r
+package org.onap.dmaap.datarouter.provisioning.beans;\r
\r
import java.sql.Connection;\r
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
* *\r
******************************************************************************/\r
-package com.att.research.datarouter.provisioning.eelf;\r
+package org.onap.dmaap.datarouter.provisioning.eelf;\r
\r
import com.att.eelf.i18n.EELFResolvableErrorEnum;\r
import com.att.eelf.i18n.EELFResourceManager;\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
* *\r
******************************************************************************/\r
-package com.att.research.datarouter.provisioning.eelf;\r
+package org.onap.dmaap.datarouter.provisioning.eelf;\r
\r
import ch.qos.logback.classic.spi.ILoggingEvent;\r
import ch.qos.logback.core.filter.Filter;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.utils;\r
+package org.onap.dmaap.datarouter.provisioning.utils;\r
\r
import java.io.File;\r
import java.io.FileReader;\r
import java.util.Set;\r
\r
import org.apache.log4j.Logger;\r
-\r
-import com.att.research.datarouter.provisioning.beans.DeliveryRecord;\r
-import com.att.research.datarouter.provisioning.beans.ExpiryRecord;\r
-import com.att.research.datarouter.provisioning.beans.Loadable;\r
-import com.att.research.datarouter.provisioning.beans.PublishRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.DeliveryRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.ExpiryRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Loadable;\r
+import org.onap.dmaap.datarouter.provisioning.beans.PublishRecord;\r
\r
/**\r
* Load the DB JDBC driver, and manage a simple pool of connections to the DB.\r
private static String DB_LOGIN = "datarouter";\r
private static String DB_PASSWORD = "datarouter";\r
private static Properties props;\r
- private static Logger intlogger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
private static Queue<Connection> queue = new LinkedList<Connection>();\r
\r
public static String HTTPS_PORT;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.utils;\r
+package org.onap.dmaap.datarouter.provisioning.utils;\r
\r
import java.io.File;\r
import java.io.FileInputStream;\r
* Invoke the CLI. The CLI can be run with a single command (given as command line arguments),\r
* or in an interactive mode where the user types a sequence of commands to the program. The CLI is invoked via:\r
* <pre>\r
- * java com.att.research.datarouter.provisioning.utils.DRRouteCLI [ -s <i>server</i> ] [ <i>command</i> ]\r
+ * java org.onap.dmaap.datarouter.provisioning.utils.DRRouteCLI [ -s <i>server</i> ] [ <i>command</i> ]\r
* </pre>\r
* A full description of the arguments to this command are\r
* <a href="http://wiki.proto.research.att.com/doku.php?id=datarouter-route-cli">here</a>.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.utils;\r
+package org.onap.dmaap.datarouter.provisioning.utils;\r
\r
import java.net.InetAddress;\r
import java.net.UnknownHostException;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.utils;\r
+package org.onap.dmaap.datarouter.provisioning.utils;\r
\r
import java.io.File;\r
import java.io.FileInputStream;\r
import java.util.zip.GZIPInputStream;\r
\r
import org.apache.log4j.Logger;\r
-\r
-import com.att.research.datarouter.provisioning.BaseServlet;\r
-import com.att.research.datarouter.provisioning.beans.DeliveryExtraRecord;\r
-import com.att.research.datarouter.provisioning.beans.DeliveryRecord;\r
-import com.att.research.datarouter.provisioning.beans.ExpiryRecord;\r
-import com.att.research.datarouter.provisioning.beans.Loadable;\r
-import com.att.research.datarouter.provisioning.beans.LogRecord;\r
-import com.att.research.datarouter.provisioning.beans.Parameters;\r
-import com.att.research.datarouter.provisioning.beans.PubFailRecord;\r
-import com.att.research.datarouter.provisioning.beans.PublishRecord;\r
+import org.onap.dmaap.datarouter.provisioning.BaseServlet;\r
+import org.onap.dmaap.datarouter.provisioning.beans.DeliveryExtraRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.DeliveryRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.ExpiryRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Loadable;\r
+import org.onap.dmaap.datarouter.provisioning.beans.LogRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Parameters;\r
+import org.onap.dmaap.datarouter.provisioning.beans.PubFailRecord;\r
+import org.onap.dmaap.datarouter.provisioning.beans.PublishRecord;\r
\r
/**\r
* This class provides methods that run in a separate thread, in order to process logfiles uploaded into the spooldir.\r
private boolean idle;\r
\r
private LogfileLoader() {\r
- this.logger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ this.logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
this.db = new DB();\r
this.spooldir = db.getProperties().getProperty("com.att.research.datarouter.provserver.spooldir");\r
this.set_start = getIdRange();\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.utils;\r
+package org.onap.dmaap.datarouter.provisioning.utils;\r
\r
import java.io.File;\r
import java.util.Properties;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.utils;\r
+package org.onap.dmaap.datarouter.provisioning.utils;\r
\r
import java.util.ArrayList;\r
import java.util.Iterator;\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.utils;\r
+package org.onap.dmaap.datarouter.provisioning.utils;\r
\r
import java.io.IOException;\r
import java.io.InputStream;\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import com.att.research.datarouter.provisioning.beans.Parameters;\r
-\r
import org.apache.log4j.Logger;\r
import org.eclipse.jetty.continuation.Continuation;\r
import org.eclipse.jetty.continuation.ContinuationSupport;\r
import org.eclipse.jetty.server.AbstractHttpConnection;\r
import org.eclipse.jetty.server.Request;\r
+import org.onap.dmaap.datarouter.provisioning.beans.Parameters;\r
\r
/**\r
* This filter checks /publish requests to the provisioning server to allow ill-behaved publishers to be throttled.\r
public class ThrottleFilter extends TimerTask implements Filter {\r
public static final int DEFAULT_N = 10;\r
public static final int DEFAULT_M = 5;\r
- public static final String THROTTLE_MARKER = "com.att.research.datarouter.provisioning.THROTTLE_MARKER";\r
+ public static final String THROTTLE_MARKER = "org.onap.dmaap.datarouter.provisioning.THROTTLE_MARKER";\r
private static final String JETTY_REQUEST = "org.eclipse.jetty.server.Request";\r
private static final long ONE_MINUTE = 60000L;\r
private static final int ACTION_DROP = 0;\r
private static int m_minutes = 0; // sampling period\r
private static int action = ACTION_DROP; // action to take (throttle or drop)\r
\r
- private static Logger logger = Logger.getLogger("com.att.research.datarouter.provisioning.internal");\r
+ private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
private static Map<String, Counter> map = new HashMap<String, Counter>();\r
private static final Timer rolex = new Timer();\r
\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.provisioning.utils;\r
+package org.onap.dmaap.datarouter.provisioning.utils;\r
\r
import java.net.InetAddress;\r
import java.net.UnknownHostException;\r
import java.util.Arrays;\r
\r
-import com.att.research.datarouter.provisioning.BaseServlet;\r
+import org.onap.dmaap.datarouter.provisioning.BaseServlet;\r
\r
/**\r
* Utility functions used to generate the different URLs used by the Data Router.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.reports;\r
+package org.onap.dmaap.datarouter.reports;\r
\r
import java.io.FileNotFoundException;\r
import java.io.PrintWriter;\r
import java.util.Map;\r
import java.util.TreeSet;\r
\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* Generate a daily per feed latency report. The report is a .csv file containing the following columns:\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.reports;\r
+package org.onap.dmaap.datarouter.reports;\r
\r
import java.io.FileNotFoundException;\r
import java.io.FileReader;\r
\r
import org.json.JSONException;\r
import org.json.JSONObject;\r
-\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* Generate a feeds report. The report is a .CSV file.\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.reports;\r
+package org.onap.dmaap.datarouter.reports;\r
\r
import java.io.FileNotFoundException;\r
import java.io.PrintWriter;\r
import java.util.ArrayList;\r
import java.util.List;\r
\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* Generate a per-file latency report. It reports on the details related to one file published\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.reports;\r
+package org.onap.dmaap.datarouter.reports;\r
\r
import java.lang.reflect.Constructor;\r
import java.util.Calendar;\r
/**\r
* Generate .csv report files from the database. Usage:\r
* <pre>\r
- * java com.att.research.datarouter.reports.Report [ -t <i>type</i> ] [ -o <i>outfile</i> ] [ <i>fromdate</i> [ <i>todate</i> ]]\r
+ * java org.onap.dmaap.datarouter.reports.Report [ -t <i>type</i> ] [ -o <i>outfile</i> ] [ <i>fromdate</i> [ <i>todate</i> ]]\r
* </pre>\r
* <i>type</i> should be <b>volume</b> for a {@link VolumeReport},\r
* <b>feed</b> for a {@link FeedReport},\r
\r
for (int i = 0; i < args.length; i++) {\r
if (args[i].equals("-?")) {\r
- System.err.println("usage: java com.att.research.datarouter.reports.Report [ -t <i>type</i> ] [ -o <i>outfile</i> ] [ <i>fromdate</i> [ <i>todate</i> ]]");\r
+ System.err.println("usage: java org.onap.dmaap.datarouter.reports.Report [ -t <i>type</i> ] [ -o <i>outfile</i> ] [ <i>fromdate</i> [ <i>todate</i> ]]");\r
System.exit(0);\r
} else if (args[i].equals("-o")) {\r
if (++i < args.length) {\r
if (++i < args.length) {\r
String base = args[i];\r
base = Character.toUpperCase(base.charAt(0)) + base.substring(1);\r
- base = "com.att.research.datarouter.reports."+base+"Report";\r
+ base = "org.onap.dmaap.datarouter.reports."+base+"Report";\r
try {\r
@SuppressWarnings("unchecked")\r
Class<? extends ReportBase> cl = (Class<? extends ReportBase>) Class.forName(base);\r
* *\r
******************************************************************************/\r
\r
-package com.att.research.datarouter.reports;\r
+package org.onap.dmaap.datarouter.reports;\r
\r
import org.apache.log4j.Logger;\r
\r
public ReportBase() {\r
this.from = 0;\r
this.to = System.currentTimeMillis();\r
- this.logger = Logger.getLogger("com.att.research.datarouter.reports");\r
+ this.logger = Logger.getLogger("org.onap.dmaap.datarouter.reports");\r
}\r
\r
public void setFrom(long from) {\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.reports;\r
+package org.onap.dmaap.datarouter.reports;\r
\r
import java.io.FileNotFoundException;\r
import java.io.PrintWriter;\r
import java.util.Map;\r
import java.util.TreeSet;\r
\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* Generate a subscribers report. The report is a .CSV file. It contains information per-day and per-subscriber,\r
******************************************************************************/\r
\r
\r
-package com.att.research.datarouter.reports;\r
+package org.onap.dmaap.datarouter.reports;\r
\r
import java.io.FileNotFoundException;\r
import java.io.PrintWriter;\r
import java.util.Map;\r
import java.util.TreeSet;\r
\r
-import com.att.research.datarouter.provisioning.utils.DB;\r
+import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
/**\r
* Generate a traffic volume report. The report is a .csv file containing the following columns:\r
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)
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 */
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
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
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;
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
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
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
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
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
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
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;
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;
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
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;
--- /dev/null
+<!--\r
+ ============LICENSE_START==================================================\r
+ * org.onap.dmaap\r
+ * ===========================================================================\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
+ * ===========================================================================\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ * \r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ * \r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END====================================================\r
+ *\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+ *\r
+-->\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+ <modelVersion>4.0.0</modelVersion>\r
+ <groupId>org.onap.dmaap.datarouter</groupId>\r
+ <artifactId>parent</artifactId>\r
+ <name>datarouter</name>\r
+ <version>1.0.0-SNAPSHOT</version>\r
+ <packaging>pom</packaging>\r
+ <url>https://github.com/att/DMAAP_DATAROUTER</url>\r
+ <licenses>\r
+ <license>\r
+ <name>BSD License</name>\r
+ <url> </url>\r
+ </license>\r
+ </licenses>\r
+ \r
+ <parent>\r
+ <groupId>org.onap.oparent</groupId>\r
+ <artifactId>oparent</artifactId>\r
+ <version>1.0.0-SNAPSHOT</version>\r
+ </parent>\r
+ \r
+ <properties>\r
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+ <maven.compiler.source>1.8</maven.compiler.source>\r
+ <maven.compiler.target>1.8</maven.compiler.target>\r
+ <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+ <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
+ <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
+ <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
+ <sitePath>/content/sites/site/org/onap/datarouter/${project.artifactId}/${project.version}</sitePath>\r
+ </properties>\r
+ \r
+ \r
+ <modules>\r
+ <module>datarouter-prov</module>\r
+ <module>datarouter-node</module>\r
+ </modules>\r
+ \r
+ <build>\r
+ <plugins>\r
+ <plugin>\r
+ <groupId>org.sonatype.plugins</groupId>\r
+ <artifactId>nexus-staging-maven-plugin</artifactId>\r
+ <version>1.6.7</version>\r
+ <extensions>true</extensions>\r
+ <configuration>\r
+ <nexusUrl>${nexusproxy}</nexusUrl>\r
+ <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+ <serverId>ecomp-staging</serverId>\r
+ </configuration>\r
+ </plugin>\r
+ </plugins>\r
+ </build>\r
+ <distributionManagement>\r
+ <repository>\r
+ <id>ecomp-releases</id>\r
+ <name>AAF Release Repository</name>\r
+ <url>${nexusproxy}${releaseNexusPath}</url>\r
+ </repository>\r
+ <snapshotRepository>\r
+ <id>ecomp-snapshots</id>\r
+ <name>AAF Snapshot Repository</name>\r
+ <url>${nexusproxy}${snapshotNexusPath}</url>\r
+ </snapshotRepository>\r
+ <site>\r
+ <id>ecomp-site</id>\r
+ <url>dav:${nexusproxy}${sitePath}</url>\r
+ </site>\r
+ </distributionManagement>\r
+ <pluginRepositories>\r
+ <pluginRepository>\r
+ <id>onap-plugin-snapshots</id>\r
+ <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
+ </pluginRepository>\r
+ </pluginRepositories>\r
+ \r
+<repositories>\r
+ <repository>\r
+ <id>central</id>\r
+ <name>Maven 2 repository 2</name>\r
+ <url>http://repo2.maven.org/maven2/</url>\r
+ </repository>\r
+ <repository>\r
+ <id>onap-jar-snapshots</id>\r
+ <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
+ </repository>\r
+ <repository>\r
+ <id>spring-repo</id>\r
+ <name>Spring repo</name>\r
+ <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
+ </repository>\r
+ <repository>\r
+ <id>repository.jboss.org-public</id>\r
+ <name>JBoss.org Maven repository</name>\r
+ <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
+ </repository>\r
+ </repositories> \r
+</project>
\ No newline at end of file
Code Review / dmaap / datarouter.git / commitdiff