From fa1da98c8618e2e51ae5bddd6eb28fc1fb407e52 Mon Sep 17 00:00:00 2001
From: Fiachra Corcoran <fiachra.corcoran@ericsson.com>
Date: Thu, 26 Jul 2018 07:23:34 +0100
Subject: Replacing att.com namespace

Issue-ID: DMAAP-52
Change-Id: Ia6d5c1725119b893c50fed13c2c2d6fd47f4f917
Signed-off-by: Fiachra Corcoran <fiachra.corcoran@ericsson.com>
---
 .../src/main/resources/docker/startup.sh            |  5 +++--
 datarouter-node/src/main/resources/logback.xml      |  2 +-
 datarouter-node/src/main/resources/misc/doaction    | 19 +++++++++++++++++++
 datarouter-node/src/main/resources/misc/drtrnode    | 21 ++++++++++++++++++++-
 4 files changed, 43 insertions(+), 4 deletions(-)

(limited to 'datarouter-node/src/main')

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" = "" ]
-- 
cgit 1.2.3-korg