Replacing att.com namespace

Issue-ID: DMAAP-52
Change-Id: Ia6d5c1725119b893c50fed13c2c2d6fd47f4f917
Signed-off-by: Fiachra Corcoran <fiachra.corcoran@ericsson.com>

5 files changed, 188 insertions, 189 deletions

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index f43fbd1c..b4b5a8e3 100644
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -20,31 +20,25 @@
   * ECOMP is a trademark and service mark of AT&T Intellectual Property.

   *

 -->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-	  <modelVersion>4.0.0</modelVersion>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+	<modelVersion>4.0.0</modelVersion>

 	<parent>

 		<groupId>org.onap.dmaap.datarouter</groupId>

 		<artifactId>parent</artifactId>

 		<version>1.0.1-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>

 	</parent>

-	

- 

 	<artifactId>datarouter-node</artifactId>

 	<packaging>jar</packaging>

 	<name>datarouter-node</name>

 	<url>https://github.com/att/DMAAP_DATAROUTER</url>

-

-

-

 	<properties>

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

 		<maven.compiler.source>1.8</maven.compiler.source>

 		<maven.compiler.target>1.8</maven.compiler.target>

-		<dockerLocation>${basedir}/target/</dockerLocation>

+		<docker.location>${basedir}/target/</docker.location>

 		<sonar.language>java</sonar.language>

-			<sonar.skip>false</sonar.skip>

+		<sonar.skip>false</sonar.skip>

 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>

 		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>

@@ -57,7 +51,6 @@
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>

 		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>

 	</properties>

-	

 	<dependencies>

 		<dependency>

 			<groupId>junit</groupId>

@@ -70,7 +63,6 @@
 			<artifactId>json</artifactId>

 			<version>20160810</version>

 		</dependency>

-

 		<dependency>

 			<groupId>javax.mail</groupId>

 			<artifactId>javax.mail-api</artifactId>

@@ -86,24 +78,23 @@
 			<artifactId>servlet-api</artifactId>

 			<version>2.5</version>

 		</dependency>

-		 <dependency>

-            <groupId>com.thoughtworks.xstream</groupId>

-            <artifactId>xstream</artifactId>

-            <version>1.4.7</version>

-        </dependency>

-	<dependency>

-		<groupId>ch.qos.logback</groupId>

-		<artifactId>logback-classic</artifactId>

-		<version>1.2.0</version>

-		<scope>compile</scope>

-	</dependency>

-	<dependency>

-		<groupId>ch.qos.logback</groupId>

-		<artifactId>logback-core</artifactId>

-		<version>1.2.0</version>

-		<scope>compile</scope>

-	</dependency>

-

+		<dependency>

+			<groupId>com.thoughtworks.xstream</groupId>

+			<artifactId>xstream</artifactId>

+			<version>1.4.7</version>

+		</dependency>

+		<dependency>

+			<groupId>ch.qos.logback</groupId>

+			<artifactId>logback-classic</artifactId>

+			<version>1.2.0</version>

+			<scope>compile</scope>

+		</dependency>

+		<dependency>

+			<groupId>ch.qos.logback</groupId>

+			<artifactId>logback-core</artifactId>

+			<version>1.2.0</version>

+			<scope>compile</scope>

+		</dependency>

 		<dependency>

 			<groupId>org.eclipse.jetty</groupId>

 			<artifactId>jetty-server</artifactId>

@@ -139,25 +130,21 @@
 			<artifactId>jetty-http</artifactId>

 			<version>7.6.14.v20131031</version>

 		</dependency>

-

 		<dependency>

 			<groupId>org.eclipse.jetty</groupId>

 			<artifactId>jetty-security</artifactId>

 			<version>7.6.14.v20131031</version>

 		</dependency>

-

 		<dependency>

 			<groupId>org.eclipse.jetty</groupId>

 			<artifactId>jetty-websocket</artifactId>

 			<version>7.6.14.v20131031</version>

 		</dependency>

-

 		<dependency>

 			<groupId>org.eclipse.jetty</groupId>

 			<artifactId>jetty-io</artifactId>

 			<version>7.6.14.v20131031</version>

 		</dependency>

-

 		<dependency>

 			<groupId>org.apache.commons</groupId>

 			<artifactId>commons-io</artifactId>

@@ -177,15 +164,13 @@
 		<dependency>

 			<groupId>org.apache.httpcomponents</groupId>

 			<artifactId>httpcore</artifactId>

-			<version>4.2.2</version>

+			<version>4.4</version>

 		</dependency>

-

 		<dependency>

 			<groupId>commons-codec</groupId>

 			<artifactId>commons-codec</artifactId>

 			<version>1.6</version>

 		</dependency>

-

 		<dependency>

 			<groupId>org.mozilla</groupId>

 			<artifactId>rhino</artifactId>

@@ -212,8 +197,6 @@
 				</exclusion>

 			</exclusions>

 		</dependency>

-

-

 		<dependency>

 			<groupId>log4j</groupId>

 			<artifactId>log4j</artifactId>

@@ -221,7 +204,6 @@
 			<scope>compile</scope>

 		</dependency>

 	</dependencies>

-

 	<build>

 		<finalName>datarouter-node</finalName>

 		<resources>

@@ -246,20 +228,12 @@
 					<include>**/log4j.properties</include>

 				</includes>

 			</resource>

-

 		</resources>

 		<plugins>

 			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-compiler-plugin</artifactId>

 				<configuration>

-					<archive>

-						<manifest>

-							<mainClass>org.onap.datarouter.node.NodeMain</mainClass>

-

-						</manifest>

-					</archive>

-

 					<source>1.8</source>

 					<target>1.8</target>

 				</configuration>

@@ -274,18 +248,18 @@
 					</descriptorRefs>

 					<outputDirectory>${basedir}/target/opt/app/datartr/lib</outputDirectory>

 					<archive>

-

 						<manifest>

 							<addClasspath>true</addClasspath>

-							<mainClass>org.onap.datarouter.node.NodeMain</mainClass>

+							<mainClass>org.onap.dmaap.datarouter.node.NodeMain</mainClass>

 						</manifest>

 					</archive>

 				</configuration>

-

 				<executions>

 					<execution>

-						<id>make-assembly</id> <!-- this is used for inheritance merges -->

-						<phase>package</phase> <!-- bind to the packaging phase -->

+						<id>make-assembly</id>

+						<!-- this is used for inheritance merges -->

+						<phase>package</phase>

+						<!-- bind to the packaging phase -->

 						<goals>

 							<goal>single</goal>

 						</goals>

@@ -304,7 +278,7 @@
 							<goal>copy-resources</goal>

 						</goals>

 						<configuration>

-							<outputDirectory>${dockerLocation}</outputDirectory>

+							<outputDirectory>${docker.location}</outputDirectory>

 							<overwrite>true</overwrite>

 							<resources>

 								<resource>

@@ -337,24 +311,24 @@
 						</configuration>

 					</execution>

 					<execution>

-        <id>copy-resources-1</id>

-        <phase>validate</phase>

-        <goals>

-          <goal>copy-resources</goal>

-        </goals>

-        <configuration>

-          <outputDirectory>${basedir}/target/opt/app/datartr/self_signed</outputDirectory>

-          <resources>

-            <resource>

-                        <directory>${basedir}/self_signed</directory>

-                        <includes>

-                            <include>misc/**</include>

-                            <include>**/**</include>

-                        </includes>

-                    </resource>

-          </resources>

-        </configuration>

-      </execution>

+						<id>copy-resources-1</id>

+						<phase>validate</phase>

+						<goals>

+							<goal>copy-resources</goal>

+						</goals>

+						<configuration>

+							<outputDirectory>${basedir}/target/opt/app/datartr/self_signed</outputDirectory>

+							<resources>

+								<resource>

+									<directory>${basedir}/self_signed</directory>

+									<includes>

+										<include>misc/**</include>

+										<include>**/**</include>

+									</includes>

+								</resource>

+							</resources>

+						</configuration>

+					</execution>

 				</executions>

 			</plugin>

 			<plugin>

@@ -363,7 +337,7 @@
 				<version>0.4.11</version>

 				<configuration>

 					<imageName>onap/dmaap/datarouter-node</imageName>

-					<dockerDirectory>${dockerLocation}</dockerDirectory>

+					<dockerDirectory>${docker.location}</dockerDirectory>

 					<serverId>docker-hub</serverId>

 					<registryUrl>https://${docker.registry}</registryUrl>

 					<imageTags>

@@ -373,7 +347,6 @@
 					<forceTags>true</forceTags>

 				</configuration>

 			</plugin>

-

 			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-dependency-plugin</artifactId>

@@ -394,49 +367,46 @@
 					</execution>

 				</executions>

 			</plugin>

-										<plugin>

-			<groupId>org.apache.maven.plugins</groupId>

-			<artifactId>maven-javadoc-plugin</artifactId>

-			<configuration>

-			<failOnError>false</failOnError>

-			</configuration>

-			<executions>

-				<execution>

-					<id>attach-javadocs</id>

-					<goals>

-						<goal>jar</goal>

-					</goals>

-				</execution>

-			</executions>

-		</plugin> 

-	   

-	   

-	       <plugin>

-		      <groupId>org.apache.maven.plugins</groupId>

-		      <artifactId>maven-source-plugin</artifactId>

-		      <version>2.2.1</version>

-		      <executions>

-			<execution>

-			  <id>attach-sources</id>

-			  <goals>

-			    <goal>jar-no-fork</goal>

-			  </goals>

-			</execution>

-		      </executions>

-		    </plugin>	

-			

-		<plugin>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-javadoc-plugin</artifactId>

+				<configuration>

+					<failOnError>false</failOnError>

+				</configuration>

+				<executions>

+					<execution>

+						<id>attach-javadocs</id>

+						<goals>

+							<goal>jar</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-source-plugin</artifactId>

+				<version>2.2.1</version>

+				<executions>

+					<execution>

+						<id>attach-sources</id>

+						<goals>

+							<goal>jar-no-fork</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

 				<groupId>org.codehaus.mojo</groupId>

 				<artifactId>cobertura-maven-plugin</artifactId>

 				<version>2.7</version>

 				<configuration>

 					<formats>

-					<format>html</format>

-					<format>xml</format>

-				  </formats>

+						<format>html</format>

+						<format>xml</format>

+					</formats>

 				</configuration>

 			</plugin>

-<plugin>

+			<plugin>

 				<groupId>org.sonatype.plugins</groupId>

 				<artifactId>nexus-staging-maven-plugin</artifactId>

 				<version>1.6.7</version>

@@ -447,74 +417,67 @@
 					<serverId>ecomp-staging</serverId>

 				</configuration>

 			</plugin>

-			

 			<plugin>

-          <groupId>org.jacoco</groupId>

-          <artifactId>jacoco-maven-plugin</artifactId>

-          <version>${jacoco.version}</version>

-          <configuration>

-            <excludes>

-              <exclude>**/gen/**</exclude>

-              <exclude>**/generated-sources/**</exclude>

-              <exclude>**/yang-gen/**</exclude>

-              <exclude>**/pax/**</exclude>

-            </excludes>

-          </configuration>

-          <executions>

-

-            <execution>

-              <id>pre-unit-test</id>

-              <goals>

-                <goal>prepare-agent</goal>

-              </goals>

-              <configuration>

-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>

-                <propertyName>surefireArgLine</propertyName>

-              </configuration>

-            </execution>

-            

-       

-            <execution>

-              <id>post-unit-test</id>

-              <phase>test</phase>

-              <goals>

-                <goal>report</goal>

-              </goals>

-              <configuration>

-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>

-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>

-              </configuration>

-            </execution>

-            <execution>

-              <id>pre-integration-test</id>

-              <phase>pre-integration-test</phase>

-              <goals>

-                <goal>prepare-agent</goal>

-              </goals>

-              <configuration>

-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>

-

-                <propertyName>failsafeArgLine</propertyName>

-              </configuration>

-            </execution>

-

-       

-            <execution>

-              <id>post-integration-test</id>

-              <phase>post-integration-test</phase>

-              <goals>

-                <goal>report</goal>

-              </goals>

-              <configuration>

-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>

-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>

-              </configuration>

-            </execution>

-          </executions>

-        </plugin>

+				<groupId>org.jacoco</groupId>

+				<artifactId>jacoco-maven-plugin</artifactId>

+				<version>${jacoco.version}</version>

+				<configuration>

+					<excludes>

+						<exclude>**/gen/**</exclude>

+						<exclude>**/generated-sources/**</exclude>

+						<exclude>**/yang-gen/**</exclude>

+						<exclude>**/pax/**</exclude>

+					</excludes>

+				</configuration>

+				<executions>

+					<execution>

+						<id>pre-unit-test</id>

+						<goals>

+							<goal>prepare-agent</goal>

+						</goals>

+						<configuration>

+							<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>

+							<propertyName>surefireArgLine</propertyName>

+						</configuration>

+					</execution>

+					<execution>

+						<id>post-unit-test</id>

+						<phase>test</phase>

+						<goals>

+							<goal>report</goal>

+						</goals>

+						<configuration>

+							<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>

+							<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>

+						</configuration>

+					</execution>

+					<execution>

+						<id>pre-integration-test</id>

+						<phase>pre-integration-test</phase>

+						<goals>

+							<goal>prepare-agent</goal>

+						</goals>

+						<configuration>

+							<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>

+							<propertyName>failsafeArgLine</propertyName>

+						</configuration>

+					</execution>

+					<execution>

+						<id>post-integration-test</id>

+						<phase>post-integration-test</phase>

+						<goals>

+							<goal>report</goal>

+						</goals>

+						<configuration>

+							<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>

+							<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

 		</plugins>

 	</build>

-<distributionManagement>

+	<distributionManagement>

 		<repository>

 			<id>ecomp-releases</id>

 			<name>DR Release Repository</name>

@@ -530,13 +493,10 @@
 			<url>dav:${nexusproxy}${sitePath}</url>

 		</site>

 	</distributionManagement>

-    <pluginRepositories>

-        <pluginRepository>

-            <id>onap-plugin-snapshots</id>

-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>

-        </pluginRepository>

-    </pluginRepositories>

-	

-

-	

-</project>

+	<pluginRepositories>

+		<pluginRepository>

+			<id>onap-plugin-snapshots</id>

+			<url>https://nexus.onap.org/content/repositories/snapshots/</url>

+		</pluginRepository>

+	</pluginRepositories>

+</project>
\ No newline at end of file
diff --git a/datarouter-node/src/main/resources/docker/startup.sh b/datarouter-node/src/main/resources/docker/startup.sh
index 8cb71dd6..2384d6df 100644
--- a/datarouter-node/src/main/resources/docker/startup.sh
+++ b/datarouter-node/src/main/resources/docker/startup.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 LIB=/opt/app/datartr/lib
 ETC=/opt/app/datartr/etc
 echo "this is LIB" $LIB
@@ -11,8 +12,8 @@ CLASSPATH=$ETC
 for FILE in `find $LIB -name *.jar`; do
   CLASSPATH=$CLASSPATH:$FILE
 done
-java -classpath $CLASSPATH  com.att.research.datarouter.node.NodeMain
+java -classpath $CLASSPATH  org.onap.dmaap.datarouter.node.NodeMain
 
 runner_file="$LIB/datarouter-node-jar-with-dependencies.jar"
 echo "Starting using" $runner_file
-java -Dcom.att.eelf.logging.file==/opt/app/datartr/etc/logback.xml -Dcom.att.eelf.logging.path=/ -Dcom.att.research.datarouter.node.ConfigFile==/opt/app/datartr/etc/node.properties -jar $runner_file
\ No newline at end of file
+java -Dcom.att.eelf.logging.file==/opt/app/datartr/etc/logback.xml -Dcom.att.eelf.logging.path=/ -Dorg.onap.dmaap.datarouter.node.ConfigFile==/opt/app/datartr/etc/node.properties -jar $runner_file
\ No newline at end of file
diff --git a/datarouter-node/src/main/resources/logback.xml b/datarouter-node/src/main/resources/logback.xml
index a47486d9..11d22c74 100644
--- a/datarouter-node/src/main/resources/logback.xml
+++ b/datarouter-node/src/main/resources/logback.xml
@@ -301,7 +301,7 @@
    <appender name="jettyAndNodelog"

     class="ch.qos.logback.core.rolling.RollingFileAppender">

     <file>${logDirectory}/${jettyAndNodeLogName}.log</file>

-     <filter class="com.att.research.datarouter.node.eelf.EELFFilter" />

+     <filter class="org.onap.dmaap.datarouter.node.eelf.EELFFilter" />

     <rollingPolicy

       class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">

       <fileNamePattern>${logDirectory}/${jettyAndNodeLogName}.%i.log.zip

diff --git a/datarouter-node/src/main/resources/misc/doaction b/datarouter-node/src/main/resources/misc/doaction
index 617b01d9..654afb62 100644
--- a/datarouter-node/src/main/resources/misc/doaction
+++ b/datarouter-node/src/main/resources/misc/doaction
@@ -1,4 +1,23 @@
 #!/bin/bash
+# ============LICENSE_START=======================================================
+# org.onap.dmaap
+# ================================================================================
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 cd /opt/app/datartr/etc
 for action in "$@"
diff --git a/datarouter-node/src/main/resources/misc/drtrnode b/datarouter-node/src/main/resources/misc/drtrnode
index ba784f36..9bce062d 100644
--- a/datarouter-node/src/main/resources/misc/drtrnode
+++ b/datarouter-node/src/main/resources/misc/drtrnode
@@ -1,4 +1,23 @@
 #!/bin/bash
+# ============LICENSE_START=======================================================
+# org.onap.dmaap
+# ================================================================================
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 umask 0022
 TZ=GMT0
@@ -44,7 +63,7 @@ start() {
 	chmod 755 /opt/app/datartr/spool/s
 
 	rm -f /opt/app/datartr/etc/SHUTDOWN
-	nohup java com.att.research.datarouter.node.NodeMain </dev/null >/dev/null 2>&1 &
+	nohup java org.onap.dmaap.datarouter.node.NodeMain </dev/null >/dev/null 2>&1 &
 	sleep 5
 	PIDS=`pids`
 	if [ "$PIDS" = "" ]