From fa1da98c8618e2e51ae5bddd6eb28fc1fb407e52 Mon Sep 17 00:00:00 2001 From: Fiachra Corcoran Date: Thu, 26 Jul 2018 07:23:34 +0100 Subject: [PATCH] Replacing att.com namespace Issue-ID: DMAAP-52 Change-Id: Ia6d5c1725119b893c50fed13c2c2d6fd47f4f917 Signed-off-by: Fiachra Corcoran --- .gitignore | 3 + 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 +- datarouter-prov/pom.xml | 1126 ++++++++++---------- .../onap/dmaap/datarouter/authz/impl/package.html | 10 +- .../dmaap/datarouter/provisioning/BaseServlet.java | 6 +- .../datarouter/provisioning/InternalServlet.java | 6 +- .../onap/dmaap/datarouter/provisioning/Main.java | 18 +- .../datarouter/provisioning/SynchronizerTask.java | 4 +- .../provisioning/beans/IngressRoute.java | 2 +- .../provisioning/beans/Subscription.java | 2 +- .../dmaap/datarouter/provisioning/package.html | 20 +- .../dmaap/datarouter/provisioning/utils/DB.java | 16 +- .../datarouter/provisioning/utils/DRRouteCLI.java | 4 +- .../provisioning/utils/LogfileLoader.java | 2 +- .../provisioning/utils/PurgeLogDirTask.java | 6 +- .../org/onap/dmaap/datarouter/reports/package.html | 12 +- .../resources/docker-compose/docker-compose.yml | 16 +- .../docker-compose/prov_data/provserver.properties | 53 +- .../src/main/resources/docker/startup.sh | 3 +- .../src/main/resources/log4j.properties | 14 +- datarouter-prov/src/main/resources/logback.xml | 2 +- datarouter-prov/src/main/resources/misc/doaction | 19 + datarouter-prov/src/main/resources/misc/dr-route | 30 +- datarouter-prov/src/main/resources/misc/drtrprov | 30 +- .../main/resources/misc/log4j.drroute.properties | 16 +- .../src/main/resources/misc/log4j.properties.tmpl | 38 +- datarouter-prov/src/main/resources/misc/provcmd | 29 +- datarouter-prov/src/main/resources/misc/runreports | 30 +- .../src/main/resources/provserver.properties | 40 +- pom.xml | 288 +++-- 34 files changed, 1089 insertions(+), 1133 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..96f5bf70 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.iml +.idea +**/target/ \ No newline at end of file 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" = "" ] diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml index 9d6841c7..07ddc84a 100644 --- a/datarouter-prov/pom.xml +++ b/datarouter-prov/pom.xml @@ -20,608 +20,552 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * --> - - 4.0.0 - - org.onap.dmaap.datarouter - parent - 1.0.1-SNAPSHOT - ../pom.xml - - - datarouter-prov - jar - datarouter-prov - https://github.com/att/DMAAP_DATAROUTER - - - UTF-8 - 1.8 - 1.8 - ${basedir}/target/ - java - false - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.build.directory}/coverage-reports/jacoco-it.exec - true - ${project.version} - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - - - - ch.qos.logback - logback-classic - 1.2.0 - compile - - - ch.qos.logback - logback-core - 1.2.0 - compile - - + + 4.0.0 + + org.onap.dmaap.datarouter + parent + 1.0.1-SNAPSHOT + ../pom.xml + + datarouter-prov + jar + datarouter-prov + https://github.com/att/DMAAP_DATAROUTER + + UTF-8 + 1.8 + 1.8 + ${basedir}/target/ + java + false + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + + true + ${project.version} + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + + + + 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 - - org.json - json - 20160810 - - - javax.mail - javax.mail-api - 1.5.1 - - - com.att.eelf - eelf-core - 0.0.1 - - - javax.servlet - servlet-api - 2.5 - - - - org.eclipse.jetty - jetty-server - 7.6.14.v20131031 - - - org.eclipse.jetty - jetty-continuation - 7.6.14.v20131031 - - - org.eclipse.jetty - jetty-util - 7.6.14.v20131031 - - - org.eclipse.jetty - jetty-deploy - 7.6.14.v20131031 - - - org.eclipse.jetty - jetty-servlet - 7.6.14.v20131031 - - - org.eclipse.jetty - jetty-servlets - 7.6.14.v20131031 - - - org.eclipse.jetty - 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 - 1.3.2 - - - commons-lang - commons-lang - 2.4 - - - commons-io - commons-io - 2.1 - compile - - - org.apache.httpcomponents - httpcore - 4.2.2 - - - - org.mozilla - rhino - 1.7R3 - - - org.apache.james - apache-mime4j-core - 0.7 - - - org.apache.httpcomponents - httpclient - 4.5.3 - - - org.sonatype.http-testing-harness - junit-runner - 0.11 - - - org.databene - contiperf - - - - - junit - junit - 4.10 - test - - - - org.mockito - mockito-core - 1.10.19 - test - - - org.powermock - powermock-module-junit4 - 1.6.4 - test - - - org.powermock - powermock-api-mockito - 1.6.4 - test - - - - mysql - mysql-connector-java - 5.1.21 - - - org.eclipse.jetty.cdi - cdi-websocket - 9.3.11.v20160721 - - - - log4j - log4j - 1.2.17 - compile - - - - - datarouter-prov - - - src/main/resources - true - - **/*.properties - - - - src/main/resources - true - - **/proserver.properties - - - - src/main/resources - true - - **/EelfMessages.properties - - - - src/main/resources - true - - **/log4j.properties - - - - - - - - maven-assembly-plugin - 2.4 - - - jar-with-dependencies - - ${basedir}/target/opt/app/datartr/lib - - - - true - org.onap.datarouter.provisioning.Main - - - - - - - - make-assembly - package - - single - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - true - org.onap.datarouter.provisioning.Main - ${basedir}/target/opt/app/datartr/lib - - - - 1.8 - 1.8 - - 3.6.0 - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - - copy-docker-file - package - - copy-resources - - - ${dockerLocation} - true - - - ${basedir}/src/main/resources/docker - true - - **/* - - - - - - - - - com.spotify - docker-maven-plugin - 0.4.11 - - onap/dmaap/datarouter-prov - ${dockerLocation} - docker-hub - https://${docker.registry} - - ${project.version} - latest - - true - - - - - - - maven-resources-plugin - 2.7 - - - copy-resources-1 - validate - - copy-resources - - - ${basedir}/target/opt/app/datartr/lib - + + org.json + json + 20160810 + + + javax.mail + javax.mail-api + 1.5.1 + + + com.att.eelf + eelf-core + 0.0.1 + + + javax.servlet + servlet-api + 2.5 + + + org.eclipse.jetty + jetty-server + 7.6.14.v20131031 + + + org.eclipse.jetty + jetty-continuation + 7.6.14.v20131031 + + + org.eclipse.jetty + jetty-util + 7.6.14.v20131031 + + + org.eclipse.jetty + jetty-deploy + 7.6.14.v20131031 + + + org.eclipse.jetty + jetty-servlet + 7.6.14.v20131031 + + + org.eclipse.jetty + jetty-servlets + 7.6.14.v20131031 + + + org.eclipse.jetty + 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 + 1.3.2 + + + commons-lang + commons-lang + 2.4 + + + commons-io + commons-io + 2.1 + compile + + + org.apache.httpcomponents + httpcore + 4.4 + + + org.mozilla + rhino + 1.7R3 + + + org.apache.james + apache-mime4j-core + 0.7 + + + org.apache.httpcomponents + httpclient + 4.5.3 + + + org.sonatype.http-testing-harness + junit-runner + 0.11 + + + org.databene + contiperf + + + + + junit + junit + 4.10 + test + + + org.mockito + mockito-core + 1.10.19 + test + + + org.powermock + powermock-module-junit4 + 1.6.4 + test + + + org.powermock + powermock-api-mockito + 1.6.4 + test + + + + mysql + mysql-connector-java + 5.1.21 + + + org.eclipse.jetty.cdi + cdi-websocket + 9.3.11.v20160721 + + + log4j + log4j + 1.2.17 + compile + + + + datarouter-prov + - ${project.basedir}/src/main/resources - - **/*.jar - - - - - - - copy-resources-2 - validate - - copy-resources - - - ${basedir}/target/opt/app/datartr/etc - + src/main/resources + true + + **/*.properties + + - ${basedir}/src/main/resources - - misc/** - **/** - - - - - - - copy-resources-3 - validate - - copy-resources - - - ${basedir}/target/opt/app/datartr - + src/main/resources + true + + **/proserver.properties + + - ${basedir}/data - - misc/** - **/** - - - - - - - copy-resources-4 - validate - - copy-resources - - - ${basedir}/target/opt/app/datartr/self_signed - + src/main/resources + true + + **/EelfMessages.properties + + - ${basedir}/self_signed - - misc/** - **/** - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/opt/app/datartr/lib - false - false - true - - - - - - - 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 - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - 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 - - - - - - - - - ecomp-releases - DR Release Repository - ${nexusproxy}${releaseNexusPath} - - - ecomp-snapshots - DR Snapshot Repository - ${nexusproxy}${snapshotNexusPath} - - - ecomp-site - dav:${nexusproxy}${sitePath} - - + src/main/resources + true + + **/log4j.properties + + + + + + + maven-assembly-plugin + 2.4 + + + jar-with-dependencies + + ${basedir}/target/opt/app/datartr/lib + + + true + org.onap.dmaap.datarouter.provisioning.Main + + + + + + make-assembly + + package + + + single + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + 3.6.0 + + + com.spotify + docker-maven-plugin + 0.4.11 + + onap/dmaap/datarouter-prov + ${docker.location} + docker-hub + https://${docker.registry} + + ${project.version} + latest + + true + + + + maven-resources-plugin + 2.7 + + + copy-docker-file + package + + copy-resources + + + ${docker.location} + true + + + ${basedir}/src/main/resources/docker + true + + **/* + + + + + + + copy-resources-1 + validate + + copy-resources + + + ${basedir}/target/opt/app/datartr/lib + + + ${project.basedir}/src/main/resources + + **/*.jar + + + + + + + copy-resources-2 + validate + + copy-resources + + + ${basedir}/target/opt/app/datartr/etc + + + ${basedir}/src/main/resources + + misc/** + **/** + + + + + + + copy-resources-3 + validate + + copy-resources + + + ${basedir}/target/opt/app/datartr + + + ${basedir}/data + + misc/** + **/** + + + + + + + copy-resources-4 + validate + + copy-resources + + + ${basedir}/target/opt/app/datartr/self_signed + + + ${basedir}/self_signed + + misc/** + **/** + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/opt/app/datartr/lib + false + false + true + + + + + + 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 + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + 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 + + + + + + + + + ecomp-releases + DR Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + DR Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + onap-plugin-snapshots https://nexus.onap.org/content/repositories/snapshots/ - - - + \ No newline at end of file diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html index fae27ee0..0d051db3 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html @@ -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. @@ -27,7 +27,7 @@

This package provides an implementation of the authorization-related interfaces -defined by the com.att.research.datarouter.authz package, intended for +defined by the org.onap.dmaap.datarouter.authz package, intended for use with the provisioning server for Data Router Release 1. In DR R1, we do not have an external policy engine, so this implementation performs the authorization locally. @@ -35,7 +35,7 @@ locally.

In order to perform the authorization, this package needs access to provisioning data about feeds and subscriptions. This package defines an interface -(com.att.research.datarouter.authz.impl.ProvDataProvider) through which it +(org.onap.dmaap.datarouter.authz.impl.ProvDataProvider) through which it expects to get this data. The provisioning server code must provide an implementation of this interface.

@@ -43,14 +43,14 @@ of this interface. A software component that wishes to use this implementation must:
  • Provide an implementation of the -com.att.research.datarouter.authz.impl.ProvDataProvider +org.onap.dmaap.datarouter.authz.impl.ProvDataProvider interface.
  • Create an instance of the ProvDataProvider implementation.
  • Create an instance of the -com.att.research.datarouter.authz.impl.ProvAuthorizer +org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer class defined in this package, passing it an instance of the ProvDataProvider implementation.
    • diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/BaseServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/BaseServlet.java index 45d97485..fb13f5d6 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/BaseServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/BaseServlet.java @@ -484,11 +484,11 @@ public class BaseServlet extends HttpServlet implements ProvDataProvider { private void checkHttpsRelaxation() { if(mailSendFlag == false) { Properties p = (new DB()).getProperties(); - intlogger.info("HTTPS relaxatio: "+p.get("com.att.research.datarouter.provserver.https.relaxation")); + intlogger.info("HTTPS relaxatio: "+p.get("org.onap.dmaap.datarouter.provserver.https.relaxation")); - if(p.get("com.att.research.datarouter.provserver.https.relaxation").equals("true")) { + if(p.get("org.onap.dmaap.datarouter.provserver.https.relaxation").equals("true")) { try { - notifyPSTeam(p.get("com.att.research.datarouter.provserver.https.relax.notify").toString()); + notifyPSTeam(p.get("org.onap.dmaap.datarouter.provserver.https.relax.notify").toString()); } catch (Exception e) { e.printStackTrace(); diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java index bec58ccd..14c960cc 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java @@ -256,7 +256,7 @@ public class InternalServlet extends ProxyServlet { } if (path.startsWith("/logs/")) { Properties p = (new DB()).getProperties(); - String logdir = p.getProperty("com.att.research.datarouter.provserver.accesslog.dir"); + String logdir = p.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir"); String logfile = path.substring(6); if (logdir != null && logfile != null && logfile.indexOf('/') < 0) { File log = new File(logdir + "/" + logfile); @@ -399,7 +399,7 @@ public class InternalServlet extends ProxyServlet { eventlogger.info(elr); return; } - String spooldir = (new DB()).getProperties().getProperty("com.att.research.datarouter.provserver.spooldir"); + String spooldir = (new DB()).getProperties().getProperty("org.onap.dmaap.datarouter.provserver.spooldir"); String spoolname = String.format("%d-%d-", System.currentTimeMillis(), Thread.currentThread().getId()); synchronized (logseq) { // perhaps unnecessary, but it helps make the name unique @@ -487,7 +487,7 @@ public class InternalServlet extends ProxyServlet { private JSONArray generateLogfileList() { JSONArray ja = new JSONArray(); Properties p = (new DB()).getProperties(); - String s = p.getProperty("com.att.research.datarouter.provserver.accesslog.dir"); + String s = p.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir"); if (s != null) { String[] dirs = s.split(","); for (String dir : dirs) { diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java index f5c93c79..70dbd446 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java @@ -82,11 +82,11 @@ import org.onap.dmaap.datarouter.provisioning.utils.ThrottleFilter; public class Main { /** The truststore to use if none is specified */ public static final String DEFAULT_TRUSTSTORE = "/opt/java/jdk/jdk180/jre/lib/security/cacerts"; - public static final String KEYSTORE_TYPE_PROPERTY = "com.att.research.datarouter.provserver.keystore.type"; - public static final String KEYSTORE_PATH_PROPERTY = "com.att.research.datarouter.provserver.keystore.path"; - public static final String KEYSTORE_PASSWORD_PROPERTY = "com.att.research.datarouter.provserver.keystore.password"; - public static final String TRUSTSTORE_PATH_PROPERTY = "com.att.research.datarouter.provserver.truststore.path"; - public static final String TRUSTSTORE_PASSWORD_PROPERTY = "com.att.research.datarouter.provserver.truststore.password"; + public static final String KEYSTORE_TYPE_PROPERTY = "org.onap.dmaap.datarouter.provserver.keystore.type"; + public static final String KEYSTORE_PATH_PROPERTY = "org.onap.dmaap.datarouter.provserver.keystore.path"; + public static final String KEYSTORE_PASSWORD_PROPERTY = "org.onap.dmaap.datarouter.provserver.keystore.password"; + public static final String TRUSTSTORE_PATH_PROPERTY = "org.onap.dmaap.datarouter.provserver.truststore.path"; + public static final String TRUSTSTORE_PASSWORD_PROPERTY = "org.onap.dmaap.datarouter.provserver.truststore.password"; /** The one and only {@link Server} instance in this JVM */ private static Server server; @@ -108,8 +108,8 @@ public class Main { // Get properties Properties p = (new DB()).getProperties(); - int http_port = Integer.parseInt(p.getProperty("com.att.research.datarouter.provserver.http.port", "8080")); - int https_port = Integer.parseInt(p.getProperty("com.att.research.datarouter.provserver.https.port", "8443")); + int http_port = Integer.parseInt(p.getProperty("org.onap.dmaap.datarouter.provserver.http.port", "8080")); + int https_port = Integer.parseInt(p.getProperty("org.onap.dmaap.datarouter.provserver.https.port", "8443")); // HTTP connector SelectChannelConnector http = new SelectChannelConnector(); @@ -138,7 +138,7 @@ public class Main { cf.setKeyStoreType(p.getProperty(KEYSTORE_TYPE_PROPERTY, "jks")); cf.setKeyStorePath(p.getProperty(KEYSTORE_PATH_PROPERTY)); cf.setKeyStorePassword(p.getProperty(KEYSTORE_PASSWORD_PROPERTY)); - cf.setKeyManagerPassword(p.getProperty("com.att.research.datarouter.provserver.keymanager.password")); + cf.setKeyManagerPassword(p.getProperty("org.onap.dmaap.datarouter.provserver.keymanager.password")); String ts = p.getProperty(TRUSTSTORE_PATH_PROPERTY); if (ts != null && ts.length() > 0) { System.out.println("@@ TS -> "+ts); @@ -173,7 +173,7 @@ public class Main { // Request log configuration NCSARequestLog nrl = new NCSARequestLog(); - nrl.setFilename(p.getProperty("com.att.research.datarouter.provserver.accesslog.dir") + "/request.log.yyyy_mm_dd"); + nrl.setFilename(p.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir") + "/request.log.yyyy_mm_dd"); nrl.setFilenameDateFormat("yyyyMMdd"); nrl.setRetainDays(90); nrl.setAppend(true); diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SynchronizerTask.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SynchronizerTask.java index a85bfc88..1e5751a3 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SynchronizerTask.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SynchronizerTask.java @@ -130,7 +130,7 @@ public class SynchronizerTask extends TimerTask { private SynchronizerTask() { logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); rolex = new Timer(); - spooldir = (new DB()).getProperties().getProperty("com.att.research.datarouter.provserver.spooldir"); + spooldir = (new DB()).getProperties().getProperty("org.onap.dmaap.datarouter.provserver.spooldir"); state = UNKNOWN; doFetch = true; // start off with a fetch nextsynctime = 0; @@ -172,7 +172,7 @@ public class SynchronizerTask extends TimerTask { // Run once every 5 seconds to check DNS, etc. long interval = 0; try { - String s = props.getProperty("com.att.research.datarouter.provserver.sync_interval", "5000"); + String s = props.getProperty("org.onap.dmaap.datarouter.provserver.sync_interval", "5000"); interval = Long.parseLong(s); } catch (NumberFormatException e) { interval = 5000L; diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java index 056c7695..39d859dc 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java @@ -302,7 +302,7 @@ public class IngressRoute extends NodeClass implements Comparable /** * Compare IP addresses as byte arrays to a subnet specified as a CIDR. - * Taken from com.att.research.datarouter.node.SubnetMatcher and modified somewhat. + * Taken from org.onap.dmaap.datarouter.node.SubnetMatcher and modified somewhat. */ public class SubnetMatcher { private byte[] sn; diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java index 7e9f2ca8..4084f744 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java @@ -213,7 +213,7 @@ public class Subscription extends Syncable { //Data Router Subscriber HTTPS Relaxation feature USERSTORYID:US674047. Properties p = (new DB()).getProperties(); - if(p.get("com.att.research.datarouter.provserver.https.relaxation").toString().equals("false") && !jo.has("sync")) { + if(p.get("org.onap.dmaap.datarouter.provserver.https.relaxation").toString().equals("false") && !jo.has("sync")) { if (!url.startsWith("https://")) throw new InvalidObjectException("delivery URL is not HTTPS"); } diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html index 7b009312..113b1cc4 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html @@ -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. @@ -39,7 +39,7 @@ URLs are from the document URLs for DR Release 1 Version 1.2. / <drFeedsUrl> - {@link com.att.research.datarouter.provisioning.DRFeedsServlet} + {@link org.onap.dmaap.datarouter.provisioning.DRFeedsServlet} DELETE GET POST @@ -48,7 +48,7 @@ URLs are from the document URLs for DR Release 1 Version 1.2. /feed/feedid <feedUrl> - {@link com.att.research.datarouter.provisioning.FeedServlet} + {@link org.onap.dmaap.datarouter.provisioning.FeedServlet} DELETE GET POST @@ -57,7 +57,7 @@ URLs are from the document URLs for DR Release 1 Version 1.2. /publish/feedid <publishUrl> - {@link com.att.research.datarouter.provisioning.PublishServlet} + {@link org.onap.dmaap.datarouter.provisioning.PublishServlet} DELETE GET POST @@ -66,7 +66,7 @@ URLs are from the document URLs for DR Release 1 Version 1.2. /subscribe/feedid <subscribeUrl> - {@link com.att.research.datarouter.provisioning.SubscribeServlet} + {@link org.onap.dmaap.datarouter.provisioning.SubscribeServlet} DELETE GET POST @@ -75,7 +75,7 @@ URLs are from the document URLs for DR Release 1 Version 1.2. /feedlog/feedid <feedLogUrl> - {@link com.att.research.datarouter.provisioning.FeedLogServlet} + {@link org.onap.dmaap.datarouter.provisioning.FeedLogServlet} DELETE GET POST @@ -84,7 +84,7 @@ URLs are from the document URLs for DR Release 1 Version 1.2. /subs/subid <subscriptionUrl> - {@link com.att.research.datarouter.provisioning.SubscriptionServlet} + {@link org.onap.dmaap.datarouter.provisioning.SubscriptionServlet} DELETE GET POST @@ -93,7 +93,7 @@ URLs are from the document URLs for DR Release 1 Version 1.2. /sublog/subid <subLogUrl> - {@link com.att.research.datarouter.provisioning.SubLogServlet} + {@link org.onap.dmaap.datarouter.provisioning.SubLogServlet} DELETE GET POST @@ -102,7 +102,7 @@ URLs are from the document URLs for DR Release 1 Version 1.2. /internal/* <internalUrl> - {@link com.att.research.datarouter.provisioning.InternalServlet} + {@link org.onap.dmaap.datarouter.provisioning.InternalServlet} DELETE GET POST @@ -111,7 +111,7 @@ URLs are from the document URLs for DR Release 1 Version 1.2. /internal/route/* <routeUrl> - {@link com.att.research.datarouter.provisioning.RouteServlet} + {@link org.onap.dmaap.datarouter.provisioning.RouteServlet} DELETE GET POST diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java index 1f558ec8..01605718 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java @@ -83,12 +83,12 @@ public class DB { InputStream inStream = getClass().getClassLoader().getResourceAsStream(CONFIG_FILE); try { props.load(inStream); - DB_DRIVER = (String) props.get("com.att.research.datarouter.db.driver"); - DB_URL = (String) props.get("com.att.research.datarouter.db.url"); - DB_LOGIN = (String) props.get("com.att.research.datarouter.db.login"); - DB_PASSWORD = (String) props.get("com.att.research.datarouter.db.password"); - HTTPS_PORT = (String) props.get("com.att.research.datarouter.provserver.https.port"); - HTTP_PORT = (String) props.get("com.att.research.datarouter.provserver.http.port"); + DB_DRIVER = (String) props.get("org.onap.dmaap.datarouter.db.driver"); + DB_URL = (String) props.get("org.onap.dmaap.datarouter.db.url"); + DB_LOGIN = (String) props.get("org.onap.dmaap.datarouter.db.login"); + DB_PASSWORD = (String) props.get("org.onap.dmaap.datarouter.db.password"); + HTTPS_PORT = (String) props.get("org.onap.dmaap.datarouter.provserver.https.port"); + HTTP_PORT = (String) props.get("org.onap.dmaap.datarouter.provserver.http.port"); Class.forName(DB_DRIVER); } catch (IOException e) { intlogger.fatal("PROV9003 Opening properties: "+e.getMessage()); @@ -671,13 +671,13 @@ public class DB { } /** * Initialize the tables by running the initialization scripts located in the directory specified - * by the property com.att.research.datarouter.provserver.dbscripts. Scripts have names of + * by the property org.onap.dmaap.datarouter.provserver.dbscripts. Scripts have names of * the form mysql_init_NNNN. * @param c a DB connection * @param n the number of the mysql_init_NNNN script to run */ private void runInitScript(Connection c, int n) { - String scriptdir = (String) props.get("com.att.research.datarouter.provserver.dbscripts"); + String scriptdir = (String) props.get("org.onap.dmaap.datarouter.provserver.dbscripts"); StringBuilder sb = new StringBuilder(); try { String scriptfile = String.format("%s/mysql_init_%04d", scriptdir, n); diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java index 4c98f8e0..a3f4b32c 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java @@ -113,8 +113,8 @@ public class DRRouteCLI { this.httpclient = new DefaultHttpClient(); Properties p = (new DB()).getProperties(); - String truststore_file = p.getProperty("com.att.research.datarouter.provserver.truststore.path"); - String truststore_pw = p.getProperty("com.att.research.datarouter.provserver.truststore.password"); + String truststore_file = p.getProperty("org.onap.dmaap.datarouter.provserver.truststore.path"); + String truststore_pw = p.getProperty("org.onap.dmaap.datarouter.provserver.truststore.password"); KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType()); if (truststore_file == null || truststore_file.equals("")) { diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java index b19bee10..830e21c9 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java @@ -107,7 +107,7 @@ public class LogfileLoader extends Thread { private LogfileLoader() { this.logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal"); this.db = new DB(); - this.spooldir = db.getProperties().getProperty("com.att.research.datarouter.provserver.spooldir"); + this.spooldir = db.getProperties().getProperty("org.onap.dmaap.datarouter.provserver.spooldir"); this.set_start = getIdRange(); this.set_end = set_start + SET_SIZE - 1; this.seq_set = new RLEBitSet(); diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java index 5a5d550f..8cfce5cf 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java @@ -30,7 +30,7 @@ import java.util.TimerTask; /** * This class provides a {@link TimerTask} that purges old logfiles - * (older than the number of days specified by the com.att.research.datarouter.provserver.logretention property). + * (older than the number of days specified by the org.onap.dmaap.datarouter.provserver.logretention property). * @author Robert Eby * @version $Id: PurgeLogDirTask.java,v 1.2 2013/07/05 13:48:05 eby Exp $ */ @@ -42,8 +42,8 @@ public class PurgeLogDirTask extends TimerTask { public PurgeLogDirTask() { Properties p = (new DB()).getProperties(); - logdir = p.getProperty("com.att.research.datarouter.provserver.accesslog.dir"); - String s = p.getProperty("com.att.research.datarouter.provserver.logretention", "30"); + logdir = p.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir"); + String s = p.getProperty("org.onap.dmaap.datarouter.provserver.logretention", "30"); long n = 30; try { n = Long.parseLong(s); diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/package.html b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/package.html index 2c2d26b3..88c3d5e0 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/package.html +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/package.html @@ -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. @@ -33,11 +33,11 @@ The classes in this package, and the reports they generate are:

    - - - - - + + + + +
    ClassReport
    {@link com.att.research.datarouter.reports.DailyLatencyReport}dailylatency.csv
    {@link com.att.research.datarouter.reports.FeedReport}NOT CURRENTLY USED
    {@link com.att.research.datarouter.reports.LatencyReport}
    {@link com.att.research.datarouter.reports.SubscriberReport}subscriber.csv
    {@link com.att.research.datarouter.reports.VolumeReport}volumes.csv
    {@link org.onap.dmaap.datarouter.reports.DailyLatencyReport}dailylatency.csv
    {@link org.onap.dmaap.datarouter.reports.FeedReport}NOT CURRENTLY USED
    {@link org.onap.dmaap.datarouter.reports.LatencyReport}
    {@link org.onap.dmaap.datarouter.reports.SubscriberReport}subscriber.csv
    {@link org.onap.dmaap.datarouter.reports.VolumeReport}volumes.csv
    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 @@ ${logDirectory}/${jettyLogName}.log - + ${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 - - 4.0.0 - org.onap.dmaap.datarouter - parent - dmaap-datarouter - 1.0.1-SNAPSHOT - pom - https://github.com/att/DMAAP_DATAROUTER - - - - org.onap.oparent - oparent - 0.1.1 - - - - UTF-8 - 1.8 - 1.8 - java - false - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.build.directory}/coverage-reports/jacoco-it.exec - true - ${project.version} - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ - /content/sites/site/org/onap/datarouter/${project.artifactId}/${project.version} - - - - - datarouter-prov - datarouter-node - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - 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 - - - - - - - - - ecomp-releases - DR Release Repository - ${nexusproxy}${releaseNexusPath} - - - ecomp-snapshots - DR Snapshot Repository - ${nexusproxy}${snapshotNexusPath} - - - ecomp-site - dav:${nexusproxy}${sitePath} - - + + 4.0.0 + org.onap.dmaap.datarouter + parent + dmaap-datarouter + 1.0.1-SNAPSHOT + pom + https://github.com/att/DMAAP_DATAROUTER + + org.onap.oparent + oparent + 0.1.1 + + + UTF-8 + 1.8 + 1.8 + java + false + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/dmaap/datarouter/${project.artifactId}/${project.version} + + + datarouter-prov + datarouter-node + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + 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 + + + + + + + + + ecomp-releases + DR Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + DR Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + onap-plugin-snapshots https://nexus.onap.org/content/repositories/snapshots/ - - + \ No newline at end of file -- 2.16.6