From fa1da98c8618e2e51ae5bddd6eb28fc1fb407e52 Mon Sep 17 00:00:00 2001 From: Fiachra Corcoran 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 --- datarouter-node/pom.xml | 330 +++++++++------------ .../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 +- 5 files changed, 188 insertions(+), 189 deletions(-) (limited to 'datarouter-node') 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. * --> - - 4.0.0 + + 4.0.0 org.onap.dmaap.datarouter parent 1.0.1-SNAPSHOT ../pom.xml - - datarouter-node jar datarouter-node https://github.com/att/DMAAP_DATAROUTER - - - UTF-8 1.8 1.8 - ${basedir}/target/ + ${basedir}/target/ java - false + false jacoco ${project.build.directory}/surefire-reports ${project.build.directory}/coverage-reports/jacoco.exec @@ -57,7 +51,6 @@ /content/repositories/staging/ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - junit @@ -70,7 +63,6 @@ json 20160810 - javax.mail javax.mail-api @@ -86,24 +78,23 @@ servlet-api 2.5 - - com.thoughtworks.xstream - xstream - 1.4.7 - - - ch.qos.logback - logback-classic - 1.2.0 - compile - - - ch.qos.logback - logback-core - 1.2.0 - compile - - + + com.thoughtworks.xstream + xstream + 1.4.7 + + + ch.qos.logback + logback-classic + 1.2.0 + compile + + + ch.qos.logback + logback-core + 1.2.0 + compile + org.eclipse.jetty jetty-server @@ -139,25 +130,21 @@ jetty-http 7.6.14.v20131031 - org.eclipse.jetty jetty-security 7.6.14.v20131031 - org.eclipse.jetty jetty-websocket 7.6.14.v20131031 - org.eclipse.jetty jetty-io 7.6.14.v20131031 - org.apache.commons commons-io @@ -177,15 +164,13 @@ org.apache.httpcomponents httpcore - 4.2.2 + 4.4 - commons-codec commons-codec 1.6 - org.mozilla rhino @@ -212,8 +197,6 @@ - - log4j log4j @@ -221,7 +204,6 @@ compile - datarouter-node @@ -246,20 +228,12 @@ **/log4j.properties - org.apache.maven.plugins maven-compiler-plugin - - - org.onap.datarouter.node.NodeMain - - - - 1.8 1.8 @@ -274,18 +248,18 @@ ${basedir}/target/opt/app/datartr/lib - true - org.onap.datarouter.node.NodeMain + org.onap.dmaap.datarouter.node.NodeMain - - make-assembly - package + make-assembly + + package + single @@ -304,7 +278,7 @@ copy-resources - ${dockerLocation} + ${docker.location} true @@ -337,24 +311,24 @@ - copy-resources-1 - validate - - copy-resources - - - ${basedir}/target/opt/app/datartr/self_signed - - - ${basedir}/self_signed - - misc/** - **/** - - - - - + copy-resources-1 + validate + + copy-resources + + + ${basedir}/target/opt/app/datartr/self_signed + + + ${basedir}/self_signed + + misc/** + **/** + + + + + @@ -363,7 +337,7 @@ 0.4.11 onap/dmaap/datarouter-node - ${dockerLocation} + ${docker.location} docker-hub https://${docker.registry} @@ -373,7 +347,6 @@ true - org.apache.maven.plugins maven-dependency-plugin @@ -394,49 +367,46 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - false - - - - attach-javadocs - - jar - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - + + org.apache.maven.plugins + maven-javadoc-plugin + + false + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + org.codehaus.mojo cobertura-maven-plugin 2.7 - html - xml - + html + xml + - + org.sonatype.plugins nexus-staging-maven-plugin 1.6.7 @@ -447,74 +417,67 @@ ecomp-staging - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - **/gen/** - **/generated-sources/** - **/yang-gen/** - **/pax/** - - - - - - pre-unit-test - - prepare-agent - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - surefireArgLine - - - - - - post-unit-test - test - - report - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - ${project.reporting.outputDirectory}/jacoco-ut - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - ${project.build.directory}/code-coverage/jacoco-it.exec - - failsafeArgLine - - - - - - post-integration-test - post-integration-test - - report - - - ${project.build.directory}/code-coverage/jacoco-it.exec - ${project.reporting.outputDirectory}/jacoco-it - - - - + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + + + + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + + + - + ecomp-releases DR Release Repository @@ -530,13 +493,10 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - + + + onap-plugin-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + + \ 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 @@ ${logDirectory}/${jettyAndNodeLogName}.log - + ${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 2>&1 & + nohup java org.onap.dmaap.datarouter.node.NodeMain /dev/null 2>&1 & sleep 5 PIDS=`pids` if [ "$PIDS" = "" ] -- cgit 1.2.3-korg