Replacing att.com namespace

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

13 files changed, 173 insertions, 147 deletions

diff --git a/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml b/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml
index 4e2a81a7..1c33e3b8 100644
--- a/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml
+++ b/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml
@@ -20,10 +20,10 @@
 # * ECOMP is a trademark and service mark of AT&T Intellectual Property.

 # *

 #-------------------------------------------------------------------------------

-version: '2'

+version: '2.1'

 services: 

   datarouter-prov:

-    image: attos/datarouter-prov

+    image: onap/dmaap/datarouter-prov

     container_name: datarouter-prov

     hostname: prov.datarouternew.com

     ports:

@@ -36,13 +36,13 @@ services:
 #      - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt

     entrypoint: ["bash", "-c", "sleep 10; /bin/sh -c ./startup.sh"]

     depends_on:

-      - mysql_container

+      mysql_container:

+        condition: service_healthy

     extra_hosts:

       - "node.datarouternew.com:172.18.0.4"

-

     

   datarouter-node:

-    image: attos/datarouter-node

+    image: onap/dmaap/datarouter-node

     container_name: datarouter-node

     hostname: node.datarouternew.com

     ports:

@@ -60,10 +60,10 @@ services:
     image: mysql/mysql-server:5.6

     container_name: mysql

     ports:

-     - "3306:3306"

+      - "3306:3306"

     environment:

       MYSQL_ROOT_PASSWORD: att2017

     volumes:

-    - ./database:/tmp/database

-    - ./database:/docker-entrypoint-initdb.d

+      - ./database:/tmp/database

+      - ./database:/docker-entrypoint-initdb.d

     

diff --git a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties
index 6a03cbd1..b722a640 100644
--- a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties
+++ b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================

 # * org.onap.dmaap

 # * ===========================================================================

-# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

+# * Copyright � 2017 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.

@@ -20,40 +20,29 @@
 # * ECOMP is a trademark and service mark of AT&T Intellectual Property.

 # *

 #-------------------------------------------------------------------------------

-#

-#                        AT&T - PROPRIETARY

-#          THIS FILE CONTAINS PROPRIETARY INFORMATION OF

-#        AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN

-#             ACCORDANCE WITH APPLICABLE AGREEMENTS.

-#

-#          Copyright (c) 2013 AT&T Knowledge Ventures

-#              Unpublished and Not for Publication

-#                     All Rights Reserved

-#

-# CVS: $Id: provserver.properties,v 1.7 2013/05/29 14:44:36 eby Exp $

-#

+

 

 #Jetty Server properties

-com.att.research.datarouter.provserver.http.port           = 8080

-com.att.research.datarouter.provserver.https.port          = 8443

-com.att.research.datarouter.provserver.https.relaxation	   = true

-com.att.research.datarouter.provserver.keymanager.password = changeit

-com.att.research.datarouter.provserver.keystore.type       = jks

-com.att.research.datarouter.provserver.keystore.path       = /opt/app/datartr/self_signed/keystore.jks

+org.onap.dmaap.datarouter.provserver.http.port           = 8080

+org.onap.dmaap.datarouter.provserver.https.port          = 8443

+org.onap.dmaap.datarouter.provserver.https.relaxation	   = false

+org.onap.dmaap.datarouter.provserver.keymanager.password = changeit

+org.onap.dmaap.datarouter.provserver.keystore.type       = jks

+org.onap.dmaap.datarouter.provserver.keystore.path       = /opt/app/datartr/self_signed/keystore.jks

 

-com.att.research.datarouter.provserver.keystore.password   = changeit

-#com.att.research.datarouter.provserver.truststore.path     = /home/eby/dr2/misc/cacerts+1

-#com.att.research.datarouter.provserver.truststore.path     = /usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts

-com.att.research.datarouter.provserver.truststore.path     = /opt/app/datartr/self_signed/cacerts.jks

+org.onap.dmaap.datarouter.provserver.keystore.password   = changeit

+#org.onap.dmaap.datarouter.provserver.truststore.path     = /home/eby/dr2/misc/cacerts+1

+#org.onap.dmaap.datarouter.provserver.truststore.path     = /usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts

+org.onap.dmaap.datarouter.provserver.truststore.path     = /opt/app/datartr/self_signed/cacerts.jks

 

-com.att.research.datarouter.provserver.truststore.password = changeit

-com.att.research.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs

-com.att.research.datarouter.provserver.spooldir            = /opt/app/datartr/spool

-#com.att.research.datarouter.provserver.dbscripts          = /home/eby/dr2/cvs/datarouter/prov/misc/

-com.att.research.datarouter.provserver.logretention        = 30

+org.onap.dmaap.datarouter.provserver.truststore.password = changeit

+org.onap.dmaap.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs

+org.onap.dmaap.datarouter.provserver.spooldir            = /opt/app/datartr/spool

+#org.onap.dmaap.datarouter.provserver.dbscripts          = /home/eby/dr2/cvs/datarouter/prov/misc/

+org.onap.dmaap.datarouter.provserver.logretention        = 30

 

 # Database access

-com.att.research.datarouter.db.driver   = com.mysql.jdbc.Driver

-com.att.research.datarouter.db.url      = jdbc:mysql://172.18.0.2:3306/datarouter

-com.att.research.datarouter.db.login    = datarouter

-com.att.research.datarouter.db.password = datarouter

+org.onap.dmaap.datarouter.db.driver   = com.mysql.jdbc.Driver

+org.onap.dmaap.datarouter.db.url      = jdbc:mysql://172.18.0.2:3306/datarouter

+org.onap.dmaap.datarouter.db.login    = datarouter

+org.onap.dmaap.datarouter.db.password = datarouter

diff --git a/datarouter-prov/src/main/resources/docker/startup.sh b/datarouter-prov/src/main/resources/docker/startup.sh
index 191a8049..e964f66e 100644
--- a/datarouter-prov/src/main/resources/docker/startup.sh
+++ b/datarouter-prov/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
@@ -8,7 +9,7 @@ CLASSPATH=$ETC
 for FILE in `find $LIB -name *.jar`; do
   CLASSPATH=$CLASSPATH:$FILE
 done
-java -classpath $CLASSPATH  com.att.research.datarouter.provisioning.Main
+java -classpath $CLASSPATH  org.onap.dmaap.datarouter.provisioning.Main
 
 runner_file="$LIB/datarouter-prov-jar-with-dependencies.jar"
 echo "Starting using" $runner_file
diff --git a/datarouter-prov/src/main/resources/log4j.properties b/datarouter-prov/src/main/resources/log4j.properties
index bb4eaa0c..15ba888b 100644
--- a/datarouter-prov/src/main/resources/log4j.properties
+++ b/datarouter-prov/src/main/resources/log4j.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================

 # * org.onap.dmaap

 # * ===========================================================================

-# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

+# * Copyright � 2017 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.

@@ -31,8 +31,8 @@ log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] - %m%n
 #

 # Logger used for provisioning events

 #

-log4j.logger.com.att.research.datarouter.provisioning.events=info, eventlog

-log4j.additivity.com.att.research.datarouter.provisioning.events=false

+log4j.logger.org.onap.dmaap.datarouter.provisioning.events=info, eventlog

+log4j.additivity.org.onap.dmaap.datarouter.provisioning.events=false

 

 log4j.appender.eventlog=org.apache.log4j.DailyRollingFileAppender

 log4j.appender.eventlog.file=/root/dr2/logs/provevent.log

@@ -44,8 +44,8 @@ log4j.appender.eventlog.layout.ConversionPattern=%d %-5p [%t] - %m%n
 #

 # Logger used for internal provisioning server events

 #

-log4j.logger.com.att.research.datarouter.provisioning.internal=debug, intlog

-log4j.additivity.com.att.research.datarouter.provisioning.internal=false

+log4j.logger.org.onap.dmaap.datarouter.provisioning.internal=debug, intlog

+log4j.additivity.org.onap.dmaap.datarouter.provisioning.internal=false

 

 log4j.appender.intlog=org.apache.log4j.DailyRollingFileAppender

 log4j.appender.intlog.file=/root/dr2/logs/provint.log

@@ -57,8 +57,8 @@ log4j.appender.intlog.layout.ConversionPattern=%d %-5p [%t] - %m%n
 #

 # Logger used for policy engine

 #

-log4j.logger.com.att.research.datarouter.authz.impl.ProvAuthorizer=debug, pelog

-log4j.additivity.com.att.research.datarouter.authz.impl.ProvAuthorizer=false

+log4j.logger.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=debug, pelog

+log4j.additivity.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=false

 

 log4j.appender.pelog=org.apache.log4j.DailyRollingFileAppender

 log4j.appender.pelog.file=/root/dr2/logs/policyengine.log

diff --git a/datarouter-prov/src/main/resources/logback.xml b/datarouter-prov/src/main/resources/logback.xml
index 7d73e0de..a9655154 100644
--- a/datarouter-prov/src/main/resources/logback.xml
+++ b/datarouter-prov/src/main/resources/logback.xml
@@ -301,7 +301,7 @@
    <appender name="jettylog"

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

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

-	 <filter class="com.att.research.datarouter.provisioning.eelf.JettyFilter" />

+	 <filter class="org.onap.dmaap.datarouter.provisioning.eelf.JettyFilter" />

     <rollingPolicy

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

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

diff --git a/datarouter-prov/src/main/resources/misc/doaction b/datarouter-prov/src/main/resources/misc/doaction
index 43193324..8e719d4e 100644
--- a/datarouter-prov/src/main/resources/misc/doaction
+++ b/datarouter-prov/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-prov/src/main/resources/misc/dr-route b/datarouter-prov/src/main/resources/misc/dr-route
index 77c6c180..56d7766c 100644
--- a/datarouter-prov/src/main/resources/misc/dr-route
+++ b/datarouter-prov/src/main/resources/misc/dr-route
@@ -1,18 +1,24 @@
 #!/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
 #
-#                        AT&T - PROPRIETARY
-#          THIS FILE CONTAINS PROPRIETARY INFORMATION OF
-#        AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN
-#             ACCORDANCE WITH APPLICABLE AGREEMENTS.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#          Copyright (c) 2013 AT&T Knowledge Ventures
-#              Unpublished and Not for Publication
-#                     All Rights Reserved
-#
-#  dr-route -- A script to interact with a provisioning server to manage the DR routing tables.
-#
-#  $Id: dr-route,v 1.2 2013/11/06 16:23:54 eby Exp $
+# 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.
+
 
 JAVA_HOME=/opt/java/jdk/jdk180
 JAVA_OPTS="-Xms1G -Xmx1G"
@@ -23,4 +29,4 @@ export CLASSPATH JAVA_HOME JAVA_OPTS TZ PATH
 
 $JAVA_HOME/bin/java \
 	-Dlog4j.configuration=file:///opt/app/datartr/etc/log4j.drroute.properties \
-	com.att.research.datarouter.provisioning.utils.DRRouteCLI $*
+	org.onap.dmaap.datarouter.provisioning.utils.DRRouteCLI $*
diff --git a/datarouter-prov/src/main/resources/misc/drtrprov b/datarouter-prov/src/main/resources/misc/drtrprov
index c801ce04..2afb6ecb 100644
--- a/datarouter-prov/src/main/resources/misc/drtrprov
+++ b/datarouter-prov/src/main/resources/misc/drtrprov
@@ -1,18 +1,24 @@
 #!/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
 #
-#                        AT&T - PROPRIETARY
-#          THIS FILE CONTAINS PROPRIETARY INFORMATION OF
-#        AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN
-#             ACCORDANCE WITH APPLICABLE AGREEMENTS.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#          Copyright (c) 2013 AT&T Knowledge Ventures
-#              Unpublished and Not for Publication
-#                     All Rights Reserved
-#
-#  This is the startup/shutdown script for the AT&T Data Router Provisioning Server.
-#
-#  $Id: drtrprov,v 1.3 2013/10/29 16:57:57 eby Exp $
+# 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
 
@@ -60,7 +66,7 @@ start() {
 		exit 0
 	fi
 	echo '0 1 * * * /opt/app/datartr/bin/runreports' | crontab
-	nohup java $JAVA_OPTS com.att.research.datarouter.provisioning.Main </dev/null &
+	nohup java $JAVA_OPTS org.onap.dmaap.datarouter.provisioning.Main </dev/null &
 	sleep 5
 	PIDS=`pids`
 	if [ "$PIDS" = "" ]
diff --git a/datarouter-prov/src/main/resources/misc/log4j.drroute.properties b/datarouter-prov/src/main/resources/misc/log4j.drroute.properties
index 4ff4278c..57d93c8e 100644
--- a/datarouter-prov/src/main/resources/misc/log4j.drroute.properties
+++ b/datarouter-prov/src/main/resources/misc/log4j.drroute.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================

 # * org.onap.dmaap

 # * ===========================================================================

-# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

+# * Copyright � 2017 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.

@@ -19,20 +19,6 @@
 # *

 # * ECOMP is a trademark and service mark of AT&T Intellectual Property.

 # *

-#-------------------------------------------------------------------------------

-#

-#                        AT&T - PROPRIETARY

-#          THIS FILE CONTAINS PROPRIETARY INFORMATION OF

-#        AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN

-#             ACCORDANCE WITH APPLICABLE AGREEMENTS.

-#

-#          Copyright (c) 2013 AT&T Knowledge Ventures

-#              Unpublished and Not for Publication

-#                     All Rights Reserved

-#

-# CVS: $Id: log4j.drroute.properties,v 1.1 2013/11/06 16:23:54 eby Exp $

-#	This log4j properties file is used only by dr-route

-#

 

 log4j.rootLogger=INFO, stdout

 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

diff --git a/datarouter-prov/src/main/resources/misc/log4j.properties.tmpl b/datarouter-prov/src/main/resources/misc/log4j.properties.tmpl
index ed1d7fab..304ee17c 100644
--- a/datarouter-prov/src/main/resources/misc/log4j.properties.tmpl
+++ b/datarouter-prov/src/main/resources/misc/log4j.properties.tmpl
@@ -1,24 +1,32 @@
 cat <<!EOF
+# ============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
 #
-#                        AT&T - PROPRIETARY
-#          THIS FILE CONTAINS PROPRIETARY INFORMATION OF
-#        AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN
-#             ACCORDANCE WITH APPLICABLE AGREEMENTS.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#          Copyright (c) 2013 AT&T Knowledge Ventures
-#              Unpublished and Not for Publication
-#                     All Rights Reserved
-#
-# CVS: $Id: log4j.properties.tmpl,v 1.4 2014/01/13 19:44:57 eby Exp $
+# 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.
+
 
 log4j.rootLogger=info
 
 #
 # Logger used for provisioning events
 #
-log4j.logger.com.att.research.datarouter.provisioning.events=info, eventlog
-log4j.additivity.com.att.research.datarouter.provisioning.events=false
+log4j.logger.org.onap.dmaap.datarouter.provisioning.events=info, eventlog
+log4j.additivity.org.onap.dmaap.datarouter.provisioning.events=false
 
 log4j.appender.eventlog=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.eventlog.file=${DRTR_PROV_LOGS:-/opt/app/datartr/logs}/provevent.log
@@ -30,8 +38,8 @@ log4j.appender.eventlog.layout.ConversionPattern=%d %-5p [%t] - %m%n
 #
 # Logger used for internal provisioning server events
 #
-log4j.logger.com.att.research.datarouter.provisioning.internal=debug, intlog
-log4j.additivity.com.att.research.datarouter.provisioning.internal=false
+log4j.logger.org.onap.dmaap.datarouter.provisioning.internal=debug, intlog
+log4j.additivity.org.onap.dmaap.datarouter.provisioning.internal=false
 
 log4j.appender.intlog=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.intlog.file=${DRTR_PROV_LOGS:-/opt/app/datartr/logs}/provint.log
@@ -43,8 +51,8 @@ log4j.appender.intlog.layout.ConversionPattern=%d %-5p [%t] - %m%n
 #
 # Logger used for policy engine
 #
-log4j.logger.com.att.research.datarouter.authz.impl.ProvAuthorizer=debug, pelog
-log4j.additivity.com.att.research.datarouter.authz.impl.ProvAuthorizer=false
+log4j.logger.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=debug, pelog
+log4j.additivity.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=false
 
 log4j.appender.pelog=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.pelog.file=${DRTR_PROV_LOGS:-/opt/app/datartr/logs}/policyengine.log
diff --git a/datarouter-prov/src/main/resources/misc/provcmd b/datarouter-prov/src/main/resources/misc/provcmd
index 63efa543..b48084f1 100644
--- a/datarouter-prov/src/main/resources/misc/provcmd
+++ b/datarouter-prov/src/main/resources/misc/provcmd
@@ -1,19 +1,24 @@
 #!/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
 #
-#                        AT&T - PROPRIETARY
-#          THIS FILE CONTAINS PROPRIETARY INFORMATION OF
-#        AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN
-#             ACCORDANCE WITH APPLICABLE AGREEMENTS.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#          Copyright (c) 2013 AT&T Knowledge Ventures
-#              Unpublished and Not for Publication
-#                     All Rights Reserved
-#
-#  provcmd -- A script to interact with a provisioning server to manage the provisioning parameters.
-#     Set $VERBOSE to a non-empty string to see the curl commands as they are executed.
-#
-#  $Id: provcmd,v 1.6 2014/03/31 13:23:33 eby Exp $
+# 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.
+
 
 PATH=/opt/app/datartr/bin:/bin:/usr/bin:$PATH
 PROVCMD="$0"
diff --git a/datarouter-prov/src/main/resources/misc/runreports b/datarouter-prov/src/main/resources/misc/runreports
index 009b7496..170d6efb 100644
--- a/datarouter-prov/src/main/resources/misc/runreports
+++ b/datarouter-prov/src/main/resources/misc/runreports
@@ -1,24 +1,30 @@
 #!/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
 #
-#                        AT&T - PROPRIETARY
-#          THIS FILE CONTAINS PROPRIETARY INFORMATION OF
-#        AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN
-#             ACCORDANCE WITH APPLICABLE AGREEMENTS.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#          Copyright (c) 2013 AT&T Knowledge Ventures
-#              Unpublished and Not for Publication
-#                     All Rights Reserved
-#
-#  This script runs daily to generate reports files in the logs directory.
-#
-#  $Id: runreports,v 1.2 2013/11/06 16:23:54 eby Exp $
+# 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
 
 JAVA_HOME=/opt/java/jdk/jdk180
 JAVA_OPTS="-Xms1G -Xmx4G"
-JAVA_CLASS=com.att.research.datarouter.reports.Report
+JAVA_CLASS=org.onap.dmaap.datarouter.reports.Report
 TZ=GMT0
 PATH=$JAVA_HOME/bin:/bin:/usr/bin
 CLASSPATH=`echo /opt/app/datartr/etc /opt/app/datartr/lib/*.jar | tr ' ' ':'`
diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties
index af5073e5..b722a640 100644
--- a/datarouter-prov/src/main/resources/provserver.properties
+++ b/datarouter-prov/src/main/resources/provserver.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================

 # * org.onap.dmaap

 # * ===========================================================================

-# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

+# * Copyright � 2017 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.

@@ -23,26 +23,26 @@
 

 

 #Jetty Server properties

-com.att.research.datarouter.provserver.http.port           = 8080

-com.att.research.datarouter.provserver.https.port          = 8443

-com.att.research.datarouter.provserver.https.relaxation	   = true

-com.att.research.datarouter.provserver.keymanager.password = changeit

-com.att.research.datarouter.provserver.keystore.type       = jks

-com.att.research.datarouter.provserver.keystore.path       = /opt/app/datartr/self_signed/keystore.jks

+org.onap.dmaap.datarouter.provserver.http.port           = 8080

+org.onap.dmaap.datarouter.provserver.https.port          = 8443

+org.onap.dmaap.datarouter.provserver.https.relaxation	   = false

+org.onap.dmaap.datarouter.provserver.keymanager.password = changeit

+org.onap.dmaap.datarouter.provserver.keystore.type       = jks

+org.onap.dmaap.datarouter.provserver.keystore.path       = /opt/app/datartr/self_signed/keystore.jks

 

-com.att.research.datarouter.provserver.keystore.password   = changeit

-#com.att.research.datarouter.provserver.truststore.path     = /home/eby/dr2/misc/cacerts+1

-#com.att.research.datarouter.provserver.truststore.path     = /usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts

-com.att.research.datarouter.provserver.truststore.path     = /opt/app/datartr/self_signed/cacerts.jks

+org.onap.dmaap.datarouter.provserver.keystore.password   = changeit

+#org.onap.dmaap.datarouter.provserver.truststore.path     = /home/eby/dr2/misc/cacerts+1

+#org.onap.dmaap.datarouter.provserver.truststore.path     = /usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts

+org.onap.dmaap.datarouter.provserver.truststore.path     = /opt/app/datartr/self_signed/cacerts.jks

 

-com.att.research.datarouter.provserver.truststore.password = changeit

-com.att.research.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs

-com.att.research.datarouter.provserver.spooldir            = /opt/app/datartr/spool

-#com.att.research.datarouter.provserver.dbscripts          = /home/eby/dr2/cvs/datarouter/prov/misc/

-com.att.research.datarouter.provserver.logretention        = 30

+org.onap.dmaap.datarouter.provserver.truststore.password = changeit

+org.onap.dmaap.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs

+org.onap.dmaap.datarouter.provserver.spooldir            = /opt/app/datartr/spool

+#org.onap.dmaap.datarouter.provserver.dbscripts          = /home/eby/dr2/cvs/datarouter/prov/misc/

+org.onap.dmaap.datarouter.provserver.logretention        = 30

 

 # Database access

-com.att.research.datarouter.db.driver   = com.mysql.jdbc.Driver

-com.att.research.datarouter.db.url      = jdbc:mysql://172.18.0.2:3306/datarouter

-com.att.research.datarouter.db.login    = datarouter

-com.att.research.datarouter.db.password = datarouter

+org.onap.dmaap.datarouter.db.driver   = com.mysql.jdbc.Driver

+org.onap.dmaap.datarouter.db.url      = jdbc:mysql://172.18.0.2:3306/datarouter

+org.onap.dmaap.datarouter.db.login    = datarouter

+org.onap.dmaap.datarouter.db.password = datarouter